X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=51cc6d1c5d79b7d9fa79f4049a729db857e0f753;hp=d4ddeb8fc57e870d24a50cff132cbbf7688b4b1d;hb=9a1eccdf02d2a541688c4d5e4f53310e81d8b6fe;hpb=6fb1323bf79f5fe514da3bbb44130fdfdbd8e46f

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index d4ddeb8..51cc6d1 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -64,19 +64,11 @@ typedef struct
  	gchar *bcc;
  	gchar *subject;
  	gchar *body;
- 	gchar *attachments;
-} SendMailIdleData;
-
-typedef struct 
-{
-	gchar *to;
- 	gchar *cc;
- 	gchar *bcc;
- 	gchar *subject;
- 	gchar *body;
 	gchar *attachments;
 } ComposeMailIdleData;
 
+static gboolean on_idle_compose_mail(gpointer user_data);
+
 /** uri_unescape:
  * @uri An escaped URI. URIs should always be escaped.
  * @len The length of the @uri string, or -1 if the string is null terminated.
@@ -116,70 +108,46 @@ static gchar* uri_unescape(const gchar* uri, size_t len)
  */
 static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_values)
 {
-	const gchar* start_to = NULL;
-	/* Remove the mailto: prefix: 
-	 * 7 is the length of "mailto:": */
-	if (strncmp (mailto, "mailto:", 7) == 0) {
-		start_to = mailto + 7;
-	}
-	
-	if (!start_to)
+	/* The URL must begin with mailto: */
+	if (strncmp (mailto, "mailto:", 7) != 0) {
 		return NULL;
-	
+	}
+	const gchar* start_to = mailto + 7;
+
 	/* Look for ?, or the end of the string, marking the end of the to address: */
 	const size_t len_to = strcspn (start_to, "?");
 	gchar* result_to = uri_unescape (start_to, len_to);
 	printf("debug: result_to=%s\n", result_to);
-	
+
+	if (list_items_and_values == NULL) {
+		return result_to;
+	}
+
 	/* Get any other items: */
 	const size_t len_mailto = strlen (start_to);
 	const gchar* p = start_to + len_to + 1; /* parsed so far. */
 	const gchar* end = start_to + len_mailto;
-	/* GSList *items = NULL; */
-	const gchar* start_item_name = p;
-	size_t len_item_name = 0;
-	const gchar* start_item_value = NULL;
 	while (p < end) {
-		
-		/* Looking for the end of a name; */
-		if (start_item_name) {
-			const size_t len = strcspn (p, "="); /* Returns whole string if none found. */
-			if (len) {
-				/* This marks the end of a name and the start of the value: */
-				len_item_name = len;
-				
-				/* Skip over the name and mark the start of the value: */
-				p += (len + 1); /* Skip over the = */
-				start_item_value = p;
-			}
+		const gchar *name, *value, *name_start, *name_end, *value_start, *value_end;
+		name_start = p;
+		name_end = strchr (name_start, '='); /* Separator between name and value */
+		if (name_end == NULL) {
+			g_debug ("Malformed URI: %s\n", mailto);
+			return result_to;
 		}
-		
-		/* Looking for the end of a value: */
-		if (start_item_value) {
-			const size_t len = strcspn (p, "?"); /* Returns whole string if none found. */
-			/* ? marks the start of a new item: */
-			if (len) {
-				if (start_item_name && len_item_name) {
-					/* Finish the previously-started item: */
-					gchar *item_value = uri_unescape (start_item_value, len);
-					gchar *item_name = g_strndup (start_item_name, len_item_name);
-					/* printf ("debug: item name=%s, value=%s\n", item_name, item_value); */
-					
-					/* Append the items to the list */
-					if(list_items_and_values) {
-						*list_items_and_values = g_slist_append (*list_items_and_values, item_name);
-						*list_items_and_values = g_slist_append (*list_items_and_values, item_value);
-					}
-				}
-				
-				/* Skip over the value and mark the start of a possible new name/value pair: */
-				p += (len + 1); /* Skip over the ? */
-				start_item_name = p;
-				len_item_name = 0;
-				start_item_value = NULL;
-			}
+		value_start = name_end + 1;
+		value_end = strchr (value_start, '&'); /* Separator between value and next parameter */
+
+		name = g_strndup(name_start, name_end - name_start);
+		if (value_end != NULL) {
+			value = uri_unescape(value_start, value_end - value_start);
+			p = value_end + 1;
+		} else {
+			value = uri_unescape(value_start, -1);
+			p = end;
 		}
-		
+		*list_items_and_values = g_slist_append (*list_items_and_values, (gpointer) name);
+		*list_items_and_values = g_slist_append (*list_items_and_values, (gpointer) value);
 	}
 	
 	return result_to;
@@ -212,102 +180,53 @@ check_and_offer_account_creation()
 static gboolean
 on_idle_mail_to(gpointer user_data)
 {
-	/* This is based on the implementation of main.c:start_uil(): */
-	
-	if (!check_and_offer_account_creation ())
-		return FALSE;
-		
 	gchar *uri = (gchar*)user_data;
 	GSList *list_names_and_values = NULL;
-	
-	/* Get the TnyTransportAccount so we can instantiate a mail operation: */
- 	ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr();
-	gchar *account_name = modest_account_mgr_get_default_account (account_mgr);
-	if (!account_name) {
-		g_printerr ("modest: no account found\n");
-	}
-	
-	TnyAccount *account = NULL;
-	if (account_mgr) {
-		account = modest_tny_account_store_get_transport_account_for_open_connection (
-			modest_runtime_get_account_store(), account_name);
-	}
-	
-	if (!account) {
-		g_printerr ("modest: failed to get tny account folder'\n", account_name);
-	} else {
-		gchar * from = modest_account_mgr_get_from_string (account_mgr,
-								  account_name);
-		if (!from) {
-			g_printerr ("modest: no from address for account '%s'\n", account_name);
-		} else {
-			const gchar *cc = NULL;
-			const gchar *bcc = NULL;
-			const gchar *subject = NULL;
-			const gchar *body = NULL;
-			
-			/* Get the relevant items from the list: */
-			GSList *list = list_names_and_values;
-			while (list) {
-				const gchar * name = (const gchar*)list->data;
-				GSList *list_value = g_slist_next (list);
-				const gchar * value = (const gchar*)list_value->data;
-				
-				if (strcmp (name, "cc") == 0) {
-					cc = value;
-				} else if (strcmp (name, "bcc") == 0) {
-					bcc = value;
-				} else if (strcmp (name, "subject") == 0) {
-					subject = value;
-				} else if (strcmp (name, "body") == 0) {
-					body = value;
-				}
-				
-				/* Go to the next pair: */
-				if (list_value) {
-					list = g_slist_next (list_value);
-				} else 
-					list = NULL;
-			}
-			
-			/* Create the message: */
-			gchar *to = uri_parse_mailto (uri, &list_names_and_values);
-			TnyMsg *msg  = modest_tny_msg_new (to, from, 
-				cc, bcc, subject, body, 
-				NULL /* attachments */);
-			g_free(to);
-			to = NULL;
-				
-			if (!msg) {
-				g_printerr ("modest: failed to create message\n");
-			} else {			
-				ModestWindow *win;
-
-				/* This is a GDK lock because we are an idle callback and
-				 * the code below is or does Gtk+ code */
-				gdk_threads_enter ();
-				win = modest_msg_edit_window_new (msg, account_name, FALSE);
-				modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
-				gtk_widget_show_all (GTK_WIDGET (win));
-				gdk_threads_leave ();
-				
-				g_object_unref (win);
-			}
-			
-			g_object_unref (G_OBJECT(msg));			
-			g_object_unref (G_OBJECT(account));
+
+	const gchar *cc = NULL;
+	const gchar *bcc = NULL;
+	const gchar *subject = NULL;
+	const gchar *body = NULL;
+
+	/* Get the relevant items from the list: */
+	gchar *to = uri_parse_mailto (uri, &list_names_and_values);
+	GSList *list = list_names_and_values;
+	while (list) {
+		GSList *list_value = g_slist_next (list);
+		const gchar * name = (const gchar*)list->data;
+		const gchar * value = (const gchar*)list_value->data;
+
+		if (strcmp (name, "cc") == 0) {
+			cc = value;
+		} else if (strcmp (name, "bcc") == 0) {
+			bcc = value;
+		} else if (strcmp (name, "subject") == 0) {
+			subject = value;
+		} else if (strcmp (name, "body") == 0) {
+			body = value;
 		}
- 	}
- 	
- 	g_free (account_name);
- 	
- 	/* Free the list, as required by the uri_parse_mailto() documentation: */
- 	if (list_names_and_values)
- 		g_slist_foreach (list_names_and_values, (GFunc)g_free, NULL);
- 	g_slist_free (list_names_and_values);
-		
+
+		list = g_slist_next (list_value);
+	}
+
+	ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */
+
+	idle_data->to = g_strdup (to);
+	idle_data->cc = g_strdup (cc);
+	idle_data->bcc = g_strdup (bcc);
+	idle_data->subject = g_strdup (subject);
+	idle_data->body = g_strdup (body);
+	idle_data->attachments = NULL;
+
+	/* Free the to: and the list, as required by uri_parse_mailto() */
+	g_free(to);
+	g_slist_foreach (list_names_and_values, (GFunc)g_free, NULL);
+	g_slist_free (list_names_and_values);
+
 	g_free(uri);
-	
+
+	on_idle_compose_mail((gpointer)idle_data);
+
 	return FALSE; /* Do not call this callback again. */
 }
 
@@ -426,12 +345,14 @@ on_idle_compose_mail(gpointer user_data)
 						idle_data->attachments = tmp;
 					}
 
-					list = g_strsplit(idle_data->attachments, ",", 0);
-					for (i=0; list[i] != NULL; i++) {
-						modest_msg_edit_window_attach_file_one(
+					if (idle_data->attachments != NULL) {
+						list = g_strsplit(idle_data->attachments, ",", 0);
+						for (i=0; list[i] != NULL; i++) {
+							modest_msg_edit_window_attach_file_one(
 								(ModestMsgEditWindow *)win, list[i]);
+						}
+						g_strfreev(list);
 					}
-					g_strfreev(list);
 
 					modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
 					gtk_widget_show_all (GTK_WIDGET (win));