X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=e551240c7b710d22ae9849396f228ed2d7330c1d;hp=032b8ec86b847676ff74070463f4e50024d3b706;hb=7e1f298013c408f6e4c0623952d001f39f27381b;hpb=8007ef7aa2b58f038b99691f402d32fa6c01f8f5

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 032b8ec..e551240 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -34,10 +34,12 @@
 #include "modest-tny-account.h"
 #include "modest-tny-folder.h"
 #include "modest-ui-actions.h"
-
+#include "modest-utils.h"
+#include "modest-debug.h"
 #include "modest-search.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "modest-tny-msg.h"
+#include "modest-platform.h"
 #include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdio.h>
@@ -54,6 +56,7 @@
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
 #include <tny-merge-folder.h>
+#include <tny-account.h>
 
 #include <modest-text-utils.h>
 
@@ -67,7 +70,10 @@ typedef struct
 	gchar *attachments;
 } ComposeMailIdleData;
 
+
+static gboolean notify_error_in_dbus_callback (gpointer user_data);
 static gboolean on_idle_compose_mail(gpointer user_data);
+static gboolean on_idle_top_application (gpointer user_data);
 
 /** uri_unescape:
  * @uri An escaped URI. URIs should always be escaped.
@@ -78,7 +84,8 @@ static gboolean on_idle_compose_mail(gpointer user_data);
  * 
  * Return value: An unescaped string. This should be freed with g_free().
  */
-static gchar* uri_unescape(const gchar* uri, size_t len)
+static gchar* 
+uri_unescape(const gchar* uri, size_t len)
 {
 	if (!uri)
 		return NULL;
@@ -106,7 +113,8 @@ static gchar* uri_unescape(const gchar* uri, size_t len)
  * 
  * Return value: The to address, unescaped. This should be freed with g_free().
  */
-static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_values)
+static gchar* 
+uri_parse_mailto (const gchar* mailto, GSList** list_items_and_values)
 {
 	/* The URL must begin with mailto: */
 	if (strncmp (mailto, "mailto:", 7) != 0) {
@@ -162,9 +170,7 @@ check_and_offer_account_creation()
 	gdk_threads_enter ();
 	
 	if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) {
-		printf ("DEBUG1: %s\n", __FUNCTION__);
 		const gboolean created = modest_ui_actions_run_account_setup_wizard (NULL);
-		printf ("DEBUG1: %s\n", __FUNCTION__);
 		if (!created) {
 			g_debug ("modest: %s: no account exists even after offering, "
 				 "or account setup was already underway.\n", __FUNCTION__);
@@ -182,14 +188,19 @@ on_idle_mail_to(gpointer user_data)
 {
 	gchar *uri = (gchar*)user_data;
 	GSList *list_names_and_values = NULL;
-
+	gchar *to = NULL;
 	const gchar *cc = NULL;
 	const gchar *bcc = NULL;
 	const gchar *subject = NULL;
 	const gchar *body = NULL;
 
+	if (!check_and_offer_account_creation ()) {
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		goto cleanup;
+	}
+
 	/* Get the relevant items from the list: */
-	gchar *to = uri_parse_mailto (uri, &list_names_and_values);
+	to = uri_parse_mailto (uri, &list_names_and_values);
 	GSList *list = list_names_and_values;
 	while (list) {
 		GSList *list_value = g_slist_next (list);
@@ -209,15 +220,11 @@ on_idle_mail_to(gpointer user_data)
 		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;
+	gdk_threads_enter (); /* CHECKED */
+	modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL, FALSE);
+	gdk_threads_leave (); /* CHECKED */
 
+cleanup:
 	/* 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);
@@ -225,24 +232,19 @@ on_idle_mail_to(gpointer user_data)
 
 	g_free(uri);
 
-	on_idle_compose_mail((gpointer)idle_data);
-
 	return FALSE; /* Do not call this callback again. */
 }
 
 static gint 
 on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-	if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
-     	return OSSO_ERROR;
-     	
-    /* Use g_idle to context-switch into the application's thread: */
- 
-    /* Get the arguments: */
- 	osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_MAIL_TO_ARG_URI);
- 	gchar *uri = g_strdup (val.value.s);
+ 	osso_rpc_t val;
+ 	gchar *uri;
+
+	/* Get arguments */
+ 	val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_MAIL_TO_ARG_URI);
+ 	uri = g_strdup (val.value.s);
  	
- 	/* printf("  debug: to=%s\n", idle_data->to); */
  	g_idle_add(on_idle_mail_to, (gpointer)uri);
  	
  	/* Note that we cannot report failures during sending, 
@@ -254,84 +256,74 @@ on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval)
 static gboolean
 on_idle_compose_mail(gpointer user_data)
 {
-	if (!check_and_offer_account_creation ())
-		return FALSE;
-	
+	GSList *attachments = NULL;
 	ComposeMailIdleData *idle_data = (ComposeMailIdleData*)user_data;
-        ModestWindow *win = NULL;
-        TnyMsg *msg = NULL;
 
-	/* Get the TnyTransportAccount so we can instantiate a mail operation: */
-	gchar *account_name = modest_account_mgr_get_default_account(modest_runtime_get_account_mgr());
-	if (!account_name) {
-		g_printerr ("modest: no account found.\n");
-		
-		/* TODO: If the call to this D-Bus method caused the application to start
-		 * then the new-account wizard will now be shown, and we need to wait 
-		 * until the account exists instead of just failing.
-		 */
+	if (!check_and_offer_account_creation ()) {
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		goto cleanup;
 	}
 
-        msg = modest_ui_actions_create_msg(account_name, idle_data->to, idle_data->cc,
-                                           idle_data->bcc, idle_data->subject, idle_data->body);
-        if (msg == NULL) goto cleanup;
-
-        /* This is a GDK lock because we are an idle callback and
-         * the code below is or does Gtk+ code */
-
-        gdk_threads_enter (); /* CHECKED */
-
-        win = modest_msg_edit_window_new (msg, account_name, FALSE);
-
-        /* it seems Sketch at least sends a leading ',' -- take that into account,
-         * ie strip that ,*/
-        if (idle_data->attachments && idle_data->attachments[0]==',') {
-                gchar *tmp = g_strdup (idle_data->attachments + 1);
-                g_free(idle_data->attachments);
-                idle_data->attachments = tmp;
-        }
-        if (idle_data->attachments != NULL) {
-                gchar **list = g_strsplit(idle_data->attachments, ",", 0);
-                gint i = 0;
-                for (i=0; list[i] != NULL; i++) {
-                        modest_msg_edit_window_attach_file_one(
-                                (ModestMsgEditWindow *)win, list[i]);
-                }
-                g_strfreev(list);
-        }
-
-        modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win);
-        gtk_widget_show_all (GTK_WIDGET (win));
+	/* it seems Sketch at least sends a leading ',' -- take that into account,
+	 * ie strip that ,*/
+	if (idle_data->attachments && idle_data->attachments[0]==',') {
+		gchar *tmp = g_strdup (idle_data->attachments + 1);
+		g_free(idle_data->attachments);
+		idle_data->attachments = tmp;
+	}
 
-        gdk_threads_leave (); /* CHECKED */
+	if (idle_data->attachments != NULL) {
+		gchar **list = g_strsplit(idle_data->attachments, ",", 0);
+		gint i = 0;
+		for (i=0; list[i] != NULL; i++) {
+			attachments = g_slist_append(attachments, g_strdup(list[i]));
+		}
+		g_strfreev(list);
+	}
 
+	/* If the message has nothing then mark the buffers as not
+	   modified. This happens in Maemo for example when opening a
+	   new message from Contacts plugin, it sends "" instead of
+	   NULLs */
+	gdk_threads_enter (); /* CHECKED */
+	if (!strncmp (idle_data->to, "", 1) &&
+	    !strncmp (idle_data->to, "", 1) &&
+	    !strncmp (idle_data->cc, "", 1) &&
+	    !strncmp (idle_data->bcc, "", 1) &&
+	    !strncmp (idle_data->subject, "", 1) &&
+	    !strncmp (idle_data->body, "", 1) &&
+	    attachments == NULL) {
+		modest_ui_actions_compose_msg(NULL, NULL, NULL, NULL, NULL, NULL, NULL, FALSE);
+	} else {
+		modest_ui_actions_compose_msg(NULL, idle_data->to, idle_data->cc,
+					      idle_data->bcc, idle_data->subject,
+					      idle_data->body, attachments, TRUE);
+	}
+	gdk_threads_leave (); /* CHECKED */
 cleanup:
-        if (win) g_object_unref (win);
-        if (msg) g_object_unref (msg);
- 	/* Free the idle data: */
+	g_slist_foreach(attachments, (GFunc)g_free, NULL);
+	g_slist_free(attachments);
 	g_free (idle_data->to);
 	g_free (idle_data->cc);
 	g_free (idle_data->bcc);
 	g_free (idle_data->subject);
 	g_free (idle_data->body);
 	g_free (idle_data->attachments);
-	g_free (idle_data);
-	
- 	g_free (account_name);
- 	
+	g_free(idle_data);
+
 	return FALSE; /* Do not call this callback again. */
 }
 
-static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
+static gint 
+on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-	if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT)
-     	return OSSO_ERROR;
+	ComposeMailIdleData *idle_data;
+	osso_rpc_t val;
      	
-	/* Use g_idle to context-switch into the application's thread: */
- 	ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */
+ 	idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */
  	
 	/* Get the arguments: */
- 	osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_TO);
+ 	val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_TO);
  	idle_data->to = g_strdup (val.value.s);
  	
  	val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_CC);
@@ -349,10 +341,9 @@ static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retv
  	val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_ATTACHMENTS);
  	idle_data->attachments = g_strdup (val.value.s);
 
+	/* Use g_idle to context-switch into the application's thread: */
   	g_idle_add(on_idle_compose_mail, (gpointer)idle_data);
  	
- 	/* Note that we cannot report failures during sending, 
- 	 * because that would be asynchronous. */
  	return OSSO_OK;
 }
 
@@ -360,263 +351,449 @@ static TnyMsg *
 find_message_by_url (const char *uri,  TnyAccount **ac_out)
 {
 	ModestTnyAccountStore *astore;
-	TnyAccount            *account;
-	TnyFolder             *folder;
-	TnyMsg                *msg;
-	GError *err = NULL;
-	account = NULL;
-	msg = NULL;
-	folder = NULL;
+	TnyAccount *account = NULL;
+	TnyFolder *folder = NULL;
+	TnyMsg *msg = NULL;
 
 	astore = modest_runtime_get_account_store ();
 	
-	if (astore == NULL) {
+	if (astore == NULL)
 		return NULL;
-	}
 
 	if (uri && g_str_has_prefix (uri, "merge://")) {
 		/* we assume we're talking about outbox folder, as this 
 		 * is the only merge folder we work with in modest */
 		return modest_tny_account_store_find_msg_in_outboxes (astore, uri, ac_out);
 	}
-	
-	printf ("DEBUG: %s: uri=%s\n", __FUNCTION__, uri);
-	/* TODO: When tinymail is built with the extra DBC assertion checks, 
-	 * this will crash for local folders (such as drafts),
-	 * because tny_folder_get_url_string() (in add_hit())
-	 * returns mail:/home/murrayc/yaddayadda 
-	 * instead of mail://localhost/home/murrayc/yaddayadd,
-	 * but I'm not sure where that folder URI is built. murrayc.
-	 */
 	account = tny_account_store_find_account (TNY_ACCOUNT_STORE (astore),
 						  uri);
 	
-	if (account == NULL) {
-		g_debug ("%s: tny_account_store_find_account() failed for\n  uri=%s\n", 
-			__FUNCTION__, uri);
-		return NULL;
-	}
-
-	g_debug ("%s: Found account.\n", __FUNCTION__);
-
-	if ( ! TNY_IS_STORE_ACCOUNT (account)) {
+	if (account == NULL || !TNY_IS_STORE_ACCOUNT (account))
 		goto out;
-	}
-
-	g_debug ("%s: Account is store account.\n", __FUNCTION__);
 	*ac_out = account;
 
-	folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account),
-						uri,
-						&err);
+	folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
 
-	if (folder == NULL) {
-		g_debug ("%s: tny_store_account_find_folder() failed for\n  account=%s, uri=%s.\n", __FUNCTION__, 
-			tny_account_get_id (TNY_ACCOUNT(account)), uri);
+	if (folder == NULL)
 		goto out;
-	}
 	
-	g_debug ("%s: Found folder. (%s)\n",  __FUNCTION__, uri);
+	msg = tny_folder_find_msg (folder, uri, NULL);
 	
-	msg = tny_folder_find_msg (folder, uri, &err);
-	
-	if (!msg) {
-		g_debug ("%s: tny_folder_find_msg() failed for folder %s\n  with error=%s.\n",
-			 __FUNCTION__, tny_folder_get_id (folder), err->message);
-	}
-
 out:
-	if (err)
-		g_error_free (err);
-
 	if (account && !msg) {
 		g_object_unref (account);
 		*ac_out = NULL;
 	}
-
 	if (folder)
 		g_object_unref (folder);
 
 	return msg;
 }
 
+typedef struct {
+	TnyAccount *account;
+	gchar *uri;
+	gboolean connect;
+	guint animation_timeout;
+	GtkWidget *animation;
+} OpenMsgPerformerInfo;
+
 static gboolean
-on_idle_open_message (gpointer user_data)
+on_show_opening_animation (gpointer userdata)
 {
-	TnyMsg       *msg = NULL;
-	TnyAccount   *account = NULL;
-	TnyHeader    *header = NULL; 
-	const char   *msg_uid = NULL;
-	char         *uri = NULL;
-	ModestWindowMgr *win_mgr = NULL;
-	TnyFolder    *folder = NULL;
-
-	uri = (char *) user_data;
+	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
+	info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening"));
+	info->animation_timeout = 0;
+	
+	return FALSE;
+}
 
-	/* g_debug ("modest: %s: Trying to find msg by url: %s", __FUNCTION__, uri); */
-	msg = find_message_by_url (uri, &account);
-	g_free (uri);
+static gboolean
+on_find_msg_async_destroy (gpointer userdata)
+{
+	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
 
-	if (msg == NULL) {
-		g_debug ("modest:  %s: message not found.", __FUNCTION__);
-		return FALSE;
+	if (info->animation_timeout>0) {
+		g_source_remove (info->animation_timeout);
+		info->animation_timeout = 0;
 	}
-	g_debug ("modest:  %s: Found message.", __FUNCTION__);
 
-	
-	folder = tny_msg_get_folder (msg);
-	
-	/* Drafts will be opened in the editor, instead of the viewer, as per the UI spec: */
-	/* FIXME: same should happen for Outbox; not enabling that, as the handling
-	 * of edited messages is not clear in that case */
-	gboolean is_draft = FALSE;
-	if (folder && modest_tny_folder_is_local_folder (folder) &&
-		(modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
-		is_draft = TRUE;
+	if (info->animation) {
+		gtk_widget_destroy (info->animation);
+		info->animation = NULL;
 	}
 
-	header = tny_msg_get_header (msg);
-	
-	/* TODO:  The modest_tny_folder_get_header_unique_id() documentation warns against 
-	 * using it with tny_msg_get_header(), and there is a 
-	 * " camel_folder_get_full_name: assertion `CAMEL_IS_FOLDER (folder)' failed" runtime warning,
-	 * but it seems to work.
-	 */	
-	msg_uid =  modest_tny_folder_get_header_unique_id(header); 
+	if (info->uri)
+		g_free (info->uri);
 	
-	win_mgr = modest_runtime_get_window_mgr ();
+	if (info->account)
+		g_object_unref (info->account);
 
-	/* This is a GDK lock because we are an idle callback and
-	 * the code below is or does Gtk+ code */
+	g_slice_free (OpenMsgPerformerInfo, info);
+	return FALSE;
+}
 
-	gdk_threads_enter (); /* CHECKED */
+static void     
+find_msg_async_cb (TnyFolder *folder, 
+                   gboolean cancelled, 
+                   TnyMsg *msg, 
+                   GError *err, 
+                   gpointer user_data)
+{
+        TnyHeader *header;
+        gchar *msg_uid;
+        ModestWindowMgr *win_mgr;
+        ModestWindow *msg_view = NULL;
+        gboolean is_draft = FALSE;
+        OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
+
+        if (err || cancelled) {
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                goto end;
+        }
 
-	gboolean already_opened = FALSE;
-	ModestWindow *msg_view = NULL;
-	if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
-		if (msg_view) {
-			g_debug ("modest: %s: A window for this message is open already: type=%s", 
-			__FUNCTION__, G_OBJECT_TYPE_NAME (msg_view));
-		}
-		
-		if (!msg_view)
-			g_debug ("modest_window_mgr_find_registered_header(): Returned TRUE, but msg_view is NULL");
-		else if (!MODEST_IS_MSG_VIEW_WINDOW (msg_view) && !MODEST_IS_MSG_EDIT_WINDOW (msg_view))
-			g_debug ("  DEBUG: But the window is not a msg view or edit window.");
-		else {
-			gtk_window_present (GTK_WINDOW(msg_view));
-			already_opened = TRUE;
-		}
-	}
-	
-	if (!already_opened) {
-		/* g_debug ("creating new window for this msg"); */
-		modest_window_mgr_register_header (win_mgr, header, NULL);
-		
-		const gchar *modest_account_name = 
-			modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+        header = tny_msg_get_header (msg);
+        if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
+                g_object_unref (header);
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                goto end;
+        }
+
+        msg_uid =  modest_tny_folder_get_header_unique_id (header);
+        win_mgr = modest_runtime_get_window_mgr ();
+
+        if (modest_tny_folder_is_local_folder (folder) &&
+            (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) {
+                is_draft = TRUE;
+        }
+
+        if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
+                gtk_window_present (GTK_WINDOW(msg_view));
+        } else {
+                const gchar *modest_account_name;
+                TnyAccount *account;
+
+                modest_window_mgr_register_header (win_mgr, header, NULL);
+
+                account = tny_folder_get_account (folder);
+                if (account) {
+                        modest_account_name =
+                                modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+                } else {
+                        modest_account_name = NULL;
+                }
+                        
+                /* Drafts will be opened in the editor, and others will be opened in the viewer */
+                if (is_draft) {
+			gchar *modest_account_name = NULL;
+			gchar *from_header;
+			
+			/* we cannot edit without a valid account... */
+			if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) {
+				if (!modest_ui_actions_run_account_setup_wizard(NULL)) {
+					modest_window_mgr_unregister_header (win_mgr, 
+									     header);
+					goto cleanup;
+				}
+			}
+               
+			from_header = tny_header_dup_from (header);
+			modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+			g_free (from_header);
 			
-		/* Drafts will be opened in the editor, and others will be opened in the viewer, 
-		 * as per the UI spec: */
-		if (is_draft) {
-			/* TODO: Maybe the msg_uid should be registered for edit windows too,
-			 * so we can open the same window again next time: */
-			msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
+			if (modest_account_name == NULL) {
+				ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
+				modest_account_name = modest_account_mgr_get_default_account (mgr);
+			}
+                        msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
+			g_free (modest_account_name);
 		} else {
-			msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name,
-						       msg_uid);
-		}
-		
-		modest_window_mgr_register_window (win_mgr, msg_view);
-		gtk_widget_show_all (GTK_WIDGET (msg_view));
-	}
+                        TnyHeader *header;
+			const gchar *modest_account_name;
+
+			if (account) {
+				modest_account_name = 
+					modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+			} else {
+				modest_account_name = NULL;
+			}
 
-	gdk_threads_leave (); /* CHECKED */
+                        header = tny_msg_get_header (msg);
+                        msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid);
+                        if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) {
+				ModestMailOperation *mail_op;
+				
+                                tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
+				/* Sync folder, we need this to save the seen flag */
+				mail_op = modest_mail_operation_new (NULL);
+				modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
+								 mail_op);
+				modest_mail_operation_sync_folder (mail_op, folder, FALSE);
+				g_object_unref (mail_op);
+			}
+                        g_object_unref (header);
+                }
 
-	g_object_unref (header);
-	g_object_unref (account);
-	g_object_unref (folder);
+		if (msg_view != NULL) {
+			modest_window_mgr_register_window (win_mgr, msg_view);
+			gtk_widget_show_all (GTK_WIDGET (msg_view));
+		}
+        }
 
-	return FALSE; /* Do not call this callback again. */
+cleanup:
+        g_object_unref (header);
+
+end:
+        on_find_msg_async_destroy (info);
 }
 
-static gint on_open_message(GArray * arguments, gpointer data, osso_rpc_t * retval)
+
+static void 
+on_open_message_performer (gboolean canceled, 
+			   GError *err,
+			   GtkWindow *parent_window, 
+			   TnyAccount *account, 
+			   gpointer user_data)
 {
-	if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT)
-     	return OSSO_ERROR;
-     	
-    /* Use g_idle to context-switch into the application's thread: */
+	OpenMsgPerformerInfo *info;
+	TnyFolder *folder = NULL;
+
+	info = (OpenMsgPerformerInfo *) user_data;
+        if (canceled || err) {
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                on_find_msg_async_destroy (info);
+                return;
+        }
 
-    /* Get the arguments: */
- 	osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI);
- 	gchar *uri = g_strdup (val.value.s);
- 	
- 	/* printf("  debug: to=%s\n", idle_data->to); */
- 	g_idle_add(on_idle_open_message, (gpointer)uri);
- 	
- 	/* Note that we cannot report failures during sending, 
- 	 * because that would be asynchronous. */
- 	return OSSO_OK;
+        /* Get folder */
+        if (!account) {
+                ModestTnyAccountStore *account_store;
+                ModestTnyLocalFoldersAccount *local_folders_account;
+                
+                account_store = modest_runtime_get_account_store ();
+                local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+                        modest_tny_account_store_get_local_folders_account (account_store));
+                folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+                g_object_unref (local_folders_account);
+        } else {
+                folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL);
+        }
+        if (!folder) {
+		modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+                on_find_msg_async_destroy (info);
+                return;
+        }
+        
+	info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+        /* Get message */
+        tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info);
+        g_object_unref (folder);
 }
 
 static gboolean
-on_idle_delete_message (gpointer user_data)
+on_idle_open_message_performer (gpointer user_data)
 {
-	TnyList      *headers = NULL;
-	TnyFolder    *folder = NULL;
-	TnyIterator  *iter = NULL; 
-	TnyHeader    *header = NULL;
-	TnyHeader    *msg_header = NULL;
-	TnyMsg       *msg = NULL;
-	TnyAccount   *account = NULL;
-	const char   *uri = NULL;
-	const char   *uid = NULL;
-	gint          res = 0;
+	ModestWindow *main_win = NULL;
+	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data;
 
-	uri = (char *) user_data;
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+						      FALSE); /* don't create */
 
-	/* g_debug ("modest: %s Searching for message (delete message)"); */
-	
-	msg = find_message_by_url (uri, &account);
+	/* Lock before the call as we're in an idle handler */
+	gdk_threads_enter ();
+	if (info->connect) {
+		modest_platform_connect_and_perform (GTK_WINDOW (main_win), TRUE, info->account, 
+						     on_open_message_performer, info);
+	} else {
+		on_open_message_performer (FALSE, NULL, GTK_WINDOW (main_win), info->account, info);
+	}
+	gdk_threads_leave ();
+
+	return FALSE;
+}
+
+static gint 
+on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
+{
+ 	osso_rpc_t val;
+ 	gchar *uri;
+	TnyAccount *account = NULL;
+	gint osso_retval;
+	gboolean is_merge;
+
+	/* Get the arguments: */
+ 	val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI);
+ 	uri = g_strdup (val.value.s);
+
+	is_merge = g_str_has_prefix (uri, "merge:");
+
+	/* Get the account */
+	if (!is_merge)
+		account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()),
+							  uri);
+
+ 	
+	if (is_merge || account) {
+		OpenMsgPerformerInfo *info;
+		TnyFolder *folder = NULL;
+
+		info = g_slice_new0 (OpenMsgPerformerInfo);
+		if (account) 
+			info->account = g_object_ref (account);
+		info->uri = uri;
+		info->connect = TRUE;
+		info->animation = NULL;
+		info->animation_timeout = 0;
+
+		/* Try to get the message, if it's already downloaded
+		   we don't need to connect */
+		if (account) {
+			folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+		} else {
+			ModestTnyAccountStore *account_store;
+			ModestTnyLocalFoldersAccount *local_folders_account;
+
+			account_store = modest_runtime_get_account_store ();
+			local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+				modest_tny_account_store_get_local_folders_account (account_store));
+			folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
+			g_object_unref (local_folders_account);
+		}
+		if (folder) {
+			TnyDevice *device;
+			gboolean device_online;
+
+			device = modest_runtime_get_device();
+			device_online = tny_device_is_online (device);
+			if (device_online) {
+				info->connect = TRUE;
+			} else {
+				TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
+				if (msg) {
+					info->connect = FALSE;
+					g_object_unref (msg);
+				} else {
+					info->connect = TRUE;
+				}
+			}
+			g_object_unref (folder);
+		}
+
+		/* We need to call it into an idle to get
+		   modest_platform_connect_and_perform into the main
+		   loop */
+		g_idle_add (on_idle_open_message_performer, info);
+		osso_retval = OSSO_OK;
+	} else {
+		g_free (uri);
+		osso_retval = OSSO_ERROR; 
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+ 	}
+
+	if (account)
+		g_object_unref (account);
+	return osso_retval;
+}
+
+static void 
+on_remove_msgs_finished (ModestMailOperation *mail_op,
+			 gpointer user_data)
+{	
+	TnyHeader *header;
+	ModestWindow *main_win = NULL, *msg_view = NULL;
+	ModestHeaderView *header_view;
 
-	if (msg == NULL) {
-		return OSSO_ERROR;
+	header = (TnyHeader *) user_data;
+
+	/* Get the main window if exists */
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+						      FALSE); /* don't create */
+	if (!main_win) {
+		g_object_unref (header);
+		return;
 	}
 
-	g_debug ("modest: %s: Found message", __FUNCTION__);
+	if (modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr(),
+						      header, &msg_view)) {
+		if (MODEST_IS_MSG_VIEW_WINDOW (msg_view))
+			modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view));
+	}	
+	g_object_unref (header);
+
+	/* Refilter the header view explicitly */
+	header_view = (ModestHeaderView *)
+		modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_win),
+						     MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW);
+	if (header_view && MODEST_IS_HEADER_VIEW (header_view))
+		modest_header_view_refilter (header_view);
+}
+
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
+{
+	TnyList *headers = NULL, *tmp_headers = NULL;
+	TnyFolder *folder = NULL;
+	TnyIterator *iter = NULL; 
+	TnyHeader *header = NULL, *msg_header = NULL;
+	TnyMsg *msg = NULL;
+	TnyAccount *account = NULL;
+	char *uri;
+	gchar *uid = NULL;
+	ModestMailOperation *mail_op = NULL;
+	ModestWindow *main_win = NULL;
+
+	uri = (char *) userdata;
+
+	msg = find_message_by_url (uri, &account);
+	if (account)
+		g_object_unref (account);
+
+	if (!msg) {
+		g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		g_free (uri);
+		return FALSE; 
+	}
+	
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(),
+						      FALSE); /* don't create */
 	
-	msg_header = tny_msg_get_header (msg);
-	uid = tny_header_get_uid (msg_header);
 	folder = tny_msg_get_folder (msg);
+	if (!folder) {
+		g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
+		g_object_unref (msg);
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		g_free (uri);
+		return FALSE; 
+	}
 
+	/* Get UID */
+	msg_header = tny_msg_get_header (msg);
+	uid = tny_header_dup_uid (msg_header);
+	g_object_unref (msg);
+	g_object_unref (msg_header);
 
-	/* tny_msg_get_header () flaw:
-	 * From tinythingy doc: You can't use the returned instance with the
-	 * TnyFolder operations
-	 *
-	 * To get a header instance that will work with these folder methods,
-	 * you can use tny_folder_get_headers.
-	 *
-	 * Ok, we will do so then. Sigh.
-	 * */
 	headers = tny_simple_list_new ();
-
 	tny_folder_get_headers (folder, headers, TRUE, NULL);
 	iter = tny_list_create_iterator (headers);
-	header = NULL;
 
-	/* g_debug ("Searching header for msg in folder"); */
 	while (!tny_iterator_is_done (iter)) {
-		const char *cur_id = NULL;
+		gchar *cur_id = NULL;
 
 		header = TNY_HEADER (tny_iterator_get_current (iter));
 		if (header)
-			cur_id = tny_header_get_uid (header);
+			cur_id = tny_header_dup_uid (header);
 		
 		if (cur_id && uid && g_str_equal (cur_id, uid)) {
+			g_free (cur_id);
 			/* g_debug ("Found corresponding header from folder"); */
 			break;
 		}
+		g_free (cur_id);
 
 		if (header) {
 			g_object_unref (header);
@@ -625,69 +802,58 @@ on_idle_delete_message (gpointer user_data)
 		
 		tny_iterator_next (iter);
 	}
-
+	g_free (uid);
 	g_object_unref (iter);
-	iter = NULL;
 	g_object_unref (headers);
-	headers = NULL;
-	
-	g_object_unref (msg_header);
-	msg_header = NULL;
-	g_object_unref (msg);
-	msg = NULL;
 
 	if (header == NULL) {
 		if (folder)
 			g_object_unref (folder);
-			
-		return OSSO_ERROR;
-	}	
+		g_idle_add (notify_error_in_dbus_callback, NULL);			
+		g_free (uri);
+		return FALSE;
+	}
 		
-	res = OSSO_OK;
-	
 	/* This is a GDK lock because we are an idle callback and
 	 * the code below is or does Gtk+ code */
-
 	gdk_threads_enter (); /* CHECKED */
-	ModestWindow *win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
-	modest_do_message_delete (header, win);
-	ModestWindowMgr *win_mgr = modest_runtime_get_window_mgr ();	
-	ModestWindow *msg_view = NULL; 
-	if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) {
-		if (MODEST_IS_MSG_VIEW_WINDOW (msg_view))
-			modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view));
-	}
-	
+
+	mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL);
+	modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op);
+
+	g_signal_connect (G_OBJECT (mail_op),
+			  "operation-finished",
+			  G_CALLBACK (on_remove_msgs_finished),
+			  g_object_ref (header));
+
+	tmp_headers = tny_simple_list_new ();
+	tny_list_append (tmp_headers, (GObject *) header);
+
+	modest_mail_operation_remove_msgs (mail_op, tmp_headers, FALSE);
+
+	g_object_unref (tmp_headers);
+	g_object_unref (G_OBJECT (mail_op));
 	gdk_threads_leave (); /* CHECKED */
 	
+	/* Clean */
 	if (header)
 		g_object_unref (header);
+	g_free (uri);
 	
-	if (folder) {
-		/* Trick: do a poke status in order to speed up the signaling
-		   of observers.
-		   A delete via the menu does this, in do_headers_action(), 
-		   though I don't know why.
-		 */
-		tny_folder_poke_status (folder);
-	
-		g_object_unref (folder);
-	}
-	
-	if (account)
-		g_object_unref (account);
-		
-	/* Refilter the header view explicitly, to make sure that 
-	 * deleted emails are really removed from view. 
-	 * (They are not really deleted until contact is made with the server, 
-	 * so they would appear with a strike-through until then):
-	 */
-	ModestHeaderView *header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget (
-		MODEST_MAIN_WINDOW(win), MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW));
-	if (header_view && MODEST_IS_HEADER_VIEW (header_view))
-		modest_header_view_refilter (header_view);
+	return FALSE;
+}
+
+static gboolean
+on_idle_delete_message (gpointer user_data)
+{
+	const char *uri = NULL;
+
+	uri = (char *) user_data;
+
+	g_thread_create (thread_prepare_delete_message, g_strdup (uri), FALSE, NULL);
+
+	return FALSE;
 	
-	return res;
 }
 
 
@@ -696,121 +862,325 @@ on_idle_delete_message (gpointer user_data)
 static gint
 on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval)
 {
-	if (arguments->len != MODEST_DBUS_DELETE_MESSAGE_ARGS_COUNT)
-     	return OSSO_ERROR;
-     	
-    /* Use g_idle to context-switch into the application's thread: */
-
-    /* Get the arguments: */
+	/* Get the arguments: */
  	osso_rpc_t val = g_array_index (arguments,
 			     osso_rpc_t,
 			     MODEST_DBUS_DELETE_MESSAGE_ARG_URI);
  	gchar *uri = g_strdup (val.value.s);
  	
- 	/* printf("  debug: to=%s\n", idle_data->to); */
+	/* Use g_idle to context-switch into the application's thread: */
  	g_idle_add(on_idle_delete_message, (gpointer)uri);
  	
- 	/* Note that we cannot report failures during sending, 
- 	 * because that would be asynchronous. */
  	return OSSO_OK;
 }
 
 static gboolean
 on_idle_send_receive(gpointer user_data)
 {
-	ModestWindow *win;
+	gboolean auto_update;
+	ModestWindow *main_win = NULL;
 
-	/* This is a GDK lock because we are an idle callback and
-	 * the code below is or does Gtk+ code */
+	main_win =
+		modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+						   FALSE); /* don't create */
 
 	gdk_threads_enter (); /* CHECKED */
 
-	/* Pick the main window if it exists */
-	win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+	/* Check if the autoupdate feature is on */
+	auto_update = modest_conf_get_bool (modest_runtime_get_conf (), 
+					    MODEST_CONF_AUTO_UPDATE, NULL);
+
+	if (auto_update)
+		/* Do send receive */
+		modest_ui_actions_do_send_receive_all (main_win, FALSE, FALSE, FALSE);
+	else
+		/* Disable auto update */
+		modest_platform_set_update_interval (0);
 
-	/* Send & receive all if "Update automatically" is set */
-	/* TODO: check the auto-update parameter in the configuration */
-	modest_ui_actions_do_send_receive_all (win);
-	
 	gdk_threads_leave (); /* CHECKED */
 	
-	return FALSE; /* Do not call this callback again. */
+	return FALSE;
 }
 
-static gint on_send_receive(GArray * arguments, gpointer data, osso_rpc_t * retval)
-{ 	
-	printf("DEBUG: modest: %s\n", __FUNCTION__);
-    /* Use g_idle to context-switch into the application's thread: */
 
-    /* This method has no arguments. */
- 	
- 	/* printf("  debug: to=%s\n", idle_data->to); */
- 	g_idle_add(on_idle_send_receive, NULL);
- 	
- 	/* Note that we cannot report failures during send/receive, 
- 	 * because that would be asynchronous. */
- 	return OSSO_OK;
+
+static gint 
+on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
+{
+	gchar *str;
+	
+	DBusMessage *reply;
+	dbus_uint32_t serial = 0;
+
+	GSList *account_names, *cursor;
+
+	str = g_strdup("\nsend queues\n"
+		       "===========\n");
+
+	cursor = account_names = modest_account_mgr_account_names
+		(modest_runtime_get_account_mgr(), TRUE); /* only enabled accounts */
+
+	while (cursor) {
+		TnyAccount *acc;
+		gchar *tmp, *accname = (gchar*)cursor->data;
+		
+		tmp = g_strdup_printf ("%s", str);
+		g_free (str);
+		str = tmp;
+		
+		/* transport */
+		acc = modest_tny_account_store_get_server_account (
+			modest_runtime_get_account_store(), accname,
+			TNY_ACCOUNT_TYPE_TRANSPORT);
+		if (TNY_IS_ACCOUNT(acc)) {
+			gchar *tmp = NULL, *url = tny_account_get_url_string (acc);
+			ModestTnySendQueue *sendqueue =
+				modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(acc), TRUE);
+
+			if (TNY_IS_SEND_QUEUE (sendqueue)) {
+				gchar *queue_str = modest_tny_send_queue_to_string (sendqueue);
+			
+				tmp = g_strdup_printf ("%s[%s]: '%s': %s\n%s",
+						       str, accname, tny_account_get_id (acc), url,
+						       queue_str);
+				g_free(queue_str);
+				g_free (str);
+				str = tmp;
+			}
+			g_free (url);
+
+			g_object_unref (acc);
+		}
+		
+		cursor = g_slist_next (cursor);
+	}
+	modest_account_mgr_free_account_names (account_names);
+							 
+	g_printerr (str);
+	
+	reply = dbus_message_new_method_return (message);
+	if (reply) {
+		dbus_message_append_args (reply,
+					  DBUS_TYPE_STRING, &str,
+					  DBUS_TYPE_INVALID);
+		dbus_connection_send (con, reply, &serial);
+		dbus_connection_flush (con);
+		dbus_message_unref (reply);
+	}
+	g_free (str);
+
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+
+	return OSSO_OK;
 }
 
-static gboolean on_idle_top_application (gpointer user_data);
 
-static gboolean
-on_idle_open_default_inbox(gpointer user_data)
+static gint 
+on_dbus_method_dump_operation_queue (DBusConnection *con, DBusMessage *message)
 {
-	if (!check_and_offer_account_creation ())
-		return FALSE;
+	gchar *str;
+	gchar *op_queue_str;
 	
-	/* This is a GDK lock because we are an idle callback and
-	 * the code below is or does Gtk+ code */
+	DBusMessage *reply;
+	dbus_uint32_t serial = 0;
 
-	gdk_threads_enter (); /* CHECKED */
+	/* operations queue; */
+	op_queue_str = modest_mail_operation_queue_to_string
+		(modest_runtime_get_mail_operation_queue ());
+		
+	str = g_strdup_printf ("\noperation queue\n"
+			       "===============\n"
+			       "status: %s\n"
+			       "%s\n",
+			       tny_device_is_online (modest_runtime_get_device ()) ? "online" : "offline",
+			       op_queue_str);
+	g_free (op_queue_str);
+	
+	g_printerr (str);
 	
-	ModestWindow *win = 
-		modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
+	reply = dbus_message_new_method_return (message);
+	if (reply) {
+		dbus_message_append_args (reply,
+					  DBUS_TYPE_STRING, &str,
+					  DBUS_TYPE_INVALID);
+		dbus_connection_send (con, reply, &serial);
+		dbus_connection_flush (con);
+		dbus_message_unref (reply);
+	}	
+	g_free (str);
 
-	/* Get the folder view */
-	GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win),
-							   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
-	modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+
+	return OSSO_OK;
+}
+
+
+
+static gint 
+on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
+{
+	gchar *str;
 	
-	gdk_threads_leave (); /* CHECKED */
+	DBusMessage *reply;
+	dbus_uint32_t serial = 0;
+
+	GSList *account_names, *cursor;
+
+	str = g_strdup ("\naccounts\n========\n");
+
+	cursor = account_names = modest_account_mgr_account_names
+		(modest_runtime_get_account_mgr(), TRUE); /* only enabled accounts */
+
+	while (cursor) {
+		TnyAccount *acc;
+		gchar *tmp, *accname = (gchar*)cursor->data;
+
+		tmp = g_strdup_printf ("%s[%s]\n", str, accname);
+		g_free (str);
+		str = tmp;
+		
+		/* store */
+		acc = modest_tny_account_store_get_server_account (
+			modest_runtime_get_account_store(), accname,
+			TNY_ACCOUNT_TYPE_STORE);
+		if (TNY_IS_ACCOUNT(acc)) {
+			gchar *tmp, *url = tny_account_get_url_string (acc);
+			tmp = g_strdup_printf ("%sstore    : '%s': %s (refs: %d)\n",
+					       str, tny_account_get_id (acc), url, 
+					       ((GObject*)acc)->ref_count-1);
+			g_free (str);
+			str = tmp;
+			g_free (url);
+			g_object_unref (acc);
+		}
+		
+		/* transport */
+		acc = modest_tny_account_store_get_server_account (
+			modest_runtime_get_account_store(), accname,
+			TNY_ACCOUNT_TYPE_TRANSPORT);
+		if (TNY_IS_ACCOUNT(acc)) {
+			gchar *tmp, *url = tny_account_get_url_string (acc);
+			tmp = g_strdup_printf ("%stransport: '%s': %s (refs: %d)\n",
+					       str, tny_account_get_id (acc), url, 
+					       ((GObject*)acc)->ref_count-1);
+			g_free (str);
+			str = tmp;
+			g_free (url);
+			g_object_unref (acc);
+		}
+		
+		cursor = g_slist_next (cursor);
+	}
 	
-	/* This D-Bus method is obviously meant to result in the UI being visible,
-	 * so show it, by calling this idle handler directly: */
-	on_idle_top_application(user_data);
+	modest_account_mgr_free_account_names (account_names);
+							 
+	g_printerr (str);
 	
-	return FALSE; /* Do not call this callback again. */
+	reply = dbus_message_new_method_return (message);
+	if (reply) {
+		dbus_message_append_args (reply,
+					  DBUS_TYPE_STRING, &str,
+					  DBUS_TYPE_INVALID);
+		dbus_connection_send (con, reply, &serial);
+		dbus_connection_flush (con);
+		dbus_message_unref (reply);
+	}	
+	g_free (str);
+
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+
+	return OSSO_OK;
 }
 
-static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
+static void
+on_send_receive_performer(gboolean canceled, 
+			  GError *err,
+			  GtkWindow *parent_window,
+			  TnyAccount *account,
+			  gpointer user_data)
 {
-    /* Use g_idle to context-switch into the application's thread: */
+	ModestConnectedVia connect_when;
+
+	if (err || canceled) {
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		return;
+	}
 
-    /* This method has no arguments. */
+	connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
+					    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
+	
+	/* Perform a send and receive if the user selected to connect
+	   via any mean or if the current connection method is the
+	   same as the one specified by the user */
+	if (connect_when == MODEST_CONNECTED_VIA_ANY ||
+	    connect_when == modest_platform_get_current_connection ()) {
+		g_idle_add (on_idle_send_receive, NULL);
+	} else {
+		/* We need this to allow modest to finish */
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+	}
+}
+
+
+static gint 
+on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
+{ 	
+	TnyDevice *device = modest_runtime_get_device ();
+
+	if (!tny_device_is_online (device))
+		modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL);
+	else
+		on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL);
  	
- 	g_idle_add(on_idle_open_default_inbox, NULL);
+ 	return OSSO_OK;
+}
+
+static gint 
+on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
+{
+ 	g_idle_add(on_idle_top_application, NULL);
  	
- 	/* Note that we cannot report failures during send/receive, 
- 	 * because that would be asynchronous. */
  	return OSSO_OK;
 }
 
 
-static gboolean on_idle_top_application (gpointer user_data)
+static gboolean 
+on_idle_top_application (gpointer user_data)
 {
-
+	ModestWindow *main_win;
+	gboolean new_window = FALSE;
+	
 	/* This is a GDK lock because we are an idle callback and
 	 * the code below is or does Gtk+ code */
 
 	gdk_threads_enter (); /* CHECKED */
+	
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+						      FALSE);
 
-	ModestWindow *win = 
-		modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ());
-	if (win) {
+	if (!main_win) {
+		main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+							      TRUE);
+		new_window = TRUE;
+	}
+
+	if (main_win) {
 		/* Ideally, we would just use gtk_widget_show(), 
 		 * but this widget is not coded correctly to support that: */
-		gtk_widget_show_all (GTK_WIDGET (win));
-		gtk_window_present (GTK_WINDOW (win));
+		gtk_widget_show_all (GTK_WIDGET (main_win));
+		gtk_window_present (GTK_WINDOW (main_win));
+
+		/* If we're showing an already existing window then
+		   reselect the INBOX */
+		if (!new_window) {
+			GtkWidget *folder_view;
+			folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (main_win),
+									   MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+			modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+		}
 	}
 
 	gdk_threads_leave (); /* CHECKED */
@@ -818,48 +1188,81 @@ static gboolean on_idle_top_application (gpointer user_data)
 	return FALSE; /* Do not call this callback again. */
 }
 
-static gint on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
+static gint 
+on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-    /* Use g_idle to context-switch into the application's thread: */
-
-    /* This method has no arguments. */
- 	
+	/* Use g_idle to context-switch into the application's thread: */
  	g_idle_add(on_idle_top_application, NULL);
  	
  	return OSSO_OK;
 }
+
+static gboolean 
+on_idle_show_memory_low (gpointer user_data)
+{
+	ModestWindow *main_win = NULL;
+
+	gdk_threads_enter ();
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE);
+	modest_platform_run_information_dialog (GTK_WINDOW (main_win),
+						dgettext("ke-recv","memr_ib_operation_disabled"),
+						TRUE);
+	gdk_threads_leave ();
+	
+	return FALSE;
+}
                       
 /* Callback for normal D-BUS messages */
-gint modest_dbus_req_handler(const gchar * interface, const gchar * method,
-                      GArray * arguments, gpointer data,
-                      osso_rpc_t * retval)
+gint 
+modest_dbus_req_handler(const gchar * interface, const gchar * method,
+			GArray * arguments, gpointer data,
+			osso_rpc_t * retval)
 {
-	
-	/* g_debug ("debug: %s\n", __FUNCTION__); */
-	g_debug ("debug: %s: method received: %s\n", __FUNCTION__, method);
-	
+	/* Check memory low conditions */
+	if (modest_platform_check_memory_low (NULL, FALSE)) {
+		g_idle_add (on_idle_show_memory_low, NULL);
+		goto param_error;
+	}
+
 	if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
-		return on_mail_to (arguments, data, retval);
+		if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
+			goto param_error;
+		return on_mail_to (arguments, data, retval);		
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) {
+		if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT)
+			goto param_error;
 		return on_open_message (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) {
+		if (arguments->len != 0)
+			goto param_error;
 		return on_send_receive (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) {
+		if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT)
+			goto param_error;
 		return on_compose_mail (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_DELETE_MESSAGE) == 0) {
+		if (arguments->len != MODEST_DBUS_DELETE_MESSAGE_ARGS_COUNT)
+			goto param_error;
 		return on_delete_message (arguments,data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) {
+		if (arguments->len != 0)
+			goto param_error;
 		return on_open_default_inbox (arguments, data, retval);
 	} else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) {
-		return on_top_application (arguments, data, retval);
-	}
-	else { 
+		if (arguments->len != 0)
+			goto param_error;
+		return on_top_application (arguments, data, retval); 
+	} else { 
 		/* We need to return INVALID here so
 		 * libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED,
 		 * so that our modest_dbus_req_filter will then be tried instead.
 		 * */
 		return OSSO_INVALID;
 	}
+ param_error:
+	/* Notify error in D-Bus method */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
+	return OSSO_ERROR;
 }
 					 
 /* A complex D-Bus type (like a struct),
@@ -893,7 +1296,7 @@ search_result_to_message (DBusMessage *reply,
 
 	for (hit_iter = hits; hit_iter; hit_iter = hit_iter->next) {
 		DBusMessageIter  struct_iter;
-		ModestSearchHit *hit;
+		ModestSearchResultHit *hit;
 		char            *msg_url;
 		const char      *subject;
 		const char      *folder;
@@ -903,7 +1306,7 @@ search_result_to_message (DBusMessage *reply,
 		gboolean         is_unread;
 		gint64           ts;
 
-		hit = (ModestSearchHit *) hit_iter->data;
+		hit = (ModestSearchResultHit *) hit_iter->data;
 
 		msg_url = hit->msgid;
 		subject = hit->subject;
@@ -961,7 +1364,7 @@ search_result_to_message (DBusMessage *reply,
 		g_free (hit->folder);
 		g_free (hit->sender);
 
-		g_slice_free (ModestSearchHit, hit);
+		g_slice_free (ModestSearchResultHit, hit);
 	}
 
 	dbus_message_iter_close_container (&iter, &array_iter);
@@ -969,12 +1372,42 @@ search_result_to_message (DBusMessage *reply,
 	return reply;
 }
 
+typedef struct
+{
+	DBusConnection *con;
+	DBusMessage *message;
+	ModestSearch *search;
+} SearchHelper;
+
+static void
+search_all_cb (GList *hits, gpointer user_data)
+{
+	DBusMessage  *reply;
+	SearchHelper *helper = (SearchHelper *) user_data;
+
+	reply = dbus_message_new_method_return (helper->message);
+
+	if (reply) {
+		dbus_uint32_t serial = 0;
+		
+		search_result_to_message (reply, hits);
+
+		dbus_connection_send (helper->con, reply, &serial);
+		dbus_connection_flush (helper->con);
+		dbus_message_unref (reply);
+	}
+
+	/* Free the helper */
+	dbus_message_unref (helper->message);
+	modest_search_free (helper->search);
+	g_slice_free (ModestSearch, helper->search);
+	g_slice_free (SearchHelper, helper);
+}
 
 static void
 on_dbus_method_search (DBusConnection *con, DBusMessage *message)
 {
 	ModestDBusSearchFlags dbus_flags;
-	DBusMessage  *reply = NULL;
 	dbus_bool_t  res;
 	dbus_int64_t sd_v;
 	dbus_int64_t ed_v;
@@ -984,9 +1417,9 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message)
 	const char *query;
 	time_t start_date;
 	time_t end_date;
-	GList *hits;
-
+	ModestSearch *search;
 	DBusError error;
+
 	dbus_error_init (&error);
 
 	sd_v = ed_v = 0;
@@ -1006,96 +1439,77 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message)
 	start_date = (time_t) sd_v;
 	end_date = (time_t) ed_v;
 
-	ModestSearch search;
-	memset (&search, 0, sizeof (search));
+	search = g_slice_new0 (ModestSearch);
 	
-	/* Remember what folder we are searching in:
-	 *
-	 * Note that we don't copy the strings, 
-	 * because this struct will only be used for the lifetime of this function.
-	 */
 	if (folder && g_str_has_prefix (folder, "MAND:")) {
-		search.folder = folder + strlen ("MAND:");
+		search->folder = g_strdup (folder + strlen ("MAND:"));
 	} else if (folder && g_str_has_prefix (folder, "USER:")) {
-		search.folder = folder + strlen ("USER:");
+		search->folder = g_strdup (folder + strlen ("USER:"));
 	} else if (folder && g_str_has_prefix (folder, "MY:")) {
-		search.folder = folder + strlen ("MY:");
+		search->folder = g_strdup (folder + strlen ("MY:"));
 	} else {
-		search.folder = folder;
+		search->folder = g_strdup (folder);
 	}
 
    /* Remember the text to search for: */
 #ifdef MODEST_HAVE_OGS
-	search.query  = query;
+	search->query  = g_strdup (query);
 #endif
 
 	/* Other criteria: */
-	search.start_date = start_date;
-	search.end_date  = end_date;
-	search.flags  = 0;
+	search->start_date = start_date;
+	search->end_date  = end_date;
+	search->flags = 0;
 
 	/* Text to serach for in various parts of the message: */
 	if (dbus_flags & MODEST_DBUS_SEARCH_SUBJECT) {
-		search.flags |= MODEST_SEARCH_SUBJECT;
-		search.subject = query;
+		search->flags |= MODEST_SEARCH_SUBJECT;
+		search->subject = g_strdup (query);
 	}
 
 	if (dbus_flags & MODEST_DBUS_SEARCH_SENDER) {
-		search.flags |=  MODEST_SEARCH_SENDER;
-		search.from = query;
+		search->flags |=  MODEST_SEARCH_SENDER;
+		search->from = g_strdup (query);
 	}
 
 	if (dbus_flags & MODEST_DBUS_SEARCH_RECIPIENT) {
-		search.flags |= MODEST_SEARCH_RECIPIENT; 
-		search.recipient = query;
+		search->flags |= MODEST_SEARCH_RECIPIENT; 
+		search->recipient = g_strdup (query);
 	}
 
 	if (dbus_flags & MODEST_DBUS_SEARCH_BODY) {
-		search.flags |=  MODEST_SEARCH_BODY; 
-		search.body = query;
+		search->flags |=  MODEST_SEARCH_BODY; 
+		search->body = g_strdup (query);
 	}
 
 	if (sd_v > 0) {
-		search.flags |= MODEST_SEARCH_BEFORE;
-		search.start_date = start_date;
+		search->flags |= MODEST_SEARCH_BEFORE;
+		search->start_date = start_date;
 	}
 
 	if (ed_v > 0) {
-		search.flags |= MODEST_SEARCH_AFTER;
-		search.end_date = end_date;
+		search->flags |= MODEST_SEARCH_AFTER;
+		search->end_date = end_date;
 	}
 
 	if (size_v > 0) {
-		search.flags |= MODEST_SEARCH_SIZE;
-		search.minsize = size_v;
+		search->flags |= MODEST_SEARCH_SIZE;
+		search->minsize = size_v;
 	}
 
 #ifdef MODEST_HAVE_OGS
-	search.flags |= MODEST_SEARCH_USE_OGS;
-	g_debug ("%s: Starting search for %s", __FUNCTION__, search.query);
+	search->flags |= MODEST_SEARCH_USE_OGS;
+	g_debug ("%s: Starting search for %s", __FUNCTION__, search->query);
 #endif
 
-	/* Note that this currently gets folders and messages from the servers, 
-	 * which can take a long time. libmodest_dbus_client_search() can timeout, 
-	 * reporting no results, if this takes a long time: */
-	hits = modest_search_all_accounts (&search);
-
-	reply = dbus_message_new_method_return (message);
+	SearchHelper *helper = g_slice_new (SearchHelper);
+	helper->search = search;
+	dbus_message_ref (message);
+	helper->message = message;
+	helper->con = con;
 
-	search_result_to_message (reply, hits);
-
-	if (reply == NULL) {
-		g_warning ("%s: Could not create reply.", __FUNCTION__);
-	}
-
-	if (reply) {
-		dbus_uint32_t serial = 0;
-		dbus_connection_send (con, reply, &serial);
-    	dbus_connection_flush (con);
-    	dbus_message_unref (reply);
-	}
-
-	g_list_free (hits);
+	/* Search asynchronously */
+	modest_search_all_accounts (search, search_all_cb, helper);
 }
 
 
@@ -1212,20 +1626,17 @@ add_single_folder_to_list (TnyFolder *folder, GList** list)
 		case TNY_FOLDER_TYPE_ARCHIVE:
 			prefix = "MAND:";
 			break;
+		case TNY_FOLDER_TYPE_INVALID:
+			g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+			return; /* don't add it */
 		default:
 			prefix = "USER:";
+			
 		}
 		
 
 		*list = g_list_append(*list, g_strdup_printf ("%s%s", prefix, id));
 	}
-		/*
-		else {
-			g_warning ("DEBUG: %s: folder has no name or ID.\n", __FUNCTION__);	
-		}
-		
-	}
-	*/
 }
 
 static void
@@ -1403,6 +1814,25 @@ on_dbus_method_get_folders (DBusConnection *con, DBusMessage *message)
 }
 
 
+static void
+reply_empty_results (DBusConnection *con, DBusMessage *msg)
+{
+	DBusMessage *reply = dbus_message_new_method_return (msg);
+	if (reply) {
+		dbus_uint32_t serial = 0;
+		/* we simply return an empty list, otherwise
+		   global-search gets confused */
+		search_result_to_message (reply, NULL);
+
+		dbus_connection_send (con, reply, &serial);
+		dbus_connection_flush (con);
+		dbus_message_unref (reply);
+	} else
+		g_warning ("%s: failed to send reply",
+			__FUNCTION__);
+}
+
+
 /** This D-Bus handler is used when the main osso-rpc 
  * D-Bus handler has not handled something.
  * We use this for D-Bus methods that need to use more complex types 
@@ -1418,15 +1848,40 @@ modest_dbus_req_filter (DBusConnection *con,
 	if (dbus_message_is_method_call (message,
 					 MODEST_DBUS_IFACE,
 					 MODEST_DBUS_METHOD_SEARCH)) {
-		on_dbus_method_search (con, message);
-		handled = TRUE;			 	
+		
+	/* don't try to search when there not enough mem */
+		if (modest_platform_check_memory_low (NULL, TRUE)) {
+			g_warning ("%s: not enough memory for searching",
+				   __FUNCTION__);
+			reply_empty_results (con, message);
+			handled = TRUE;
+
+		} else {
+			on_dbus_method_search (con, message);
+			handled = TRUE;
+		}
+			 	
 	} else if (dbus_message_is_method_call (message,
-					 MODEST_DBUS_IFACE,
-					 MODEST_DBUS_METHOD_GET_FOLDERS)) {
+						MODEST_DBUS_IFACE,
+						MODEST_DBUS_METHOD_GET_FOLDERS)) {
 		on_dbus_method_get_folders (con, message);
 		handled = TRUE;			 	
-	}
-	else {
+	} else if (dbus_message_is_method_call (message,
+						MODEST_DBUS_IFACE,
+						MODEST_DBUS_METHOD_DUMP_OPERATION_QUEUE)) {
+		on_dbus_method_dump_operation_queue (con, message);
+		handled = TRUE;
+	} else if (dbus_message_is_method_call (message,
+						MODEST_DBUS_IFACE,
+						MODEST_DBUS_METHOD_DUMP_ACCOUNTS)) {
+		on_dbus_method_dump_accounts (con, message);
+		handled = TRUE;
+	} else if (dbus_message_is_method_call (message,
+						MODEST_DBUS_IFACE,
+						MODEST_DBUS_METHOD_DUMP_SEND_QUEUES)) {
+		on_dbus_method_dump_send_queues (con, message);
+		handled = TRUE;
+	} else {
 		/* Note that this mentions methods that were already handled in modest_dbus_req_handler(). */
 		/* 
 		g_debug ("  debug: %s: Unexpected (maybe already handled) D-Bus method:\n   Interface=%s, Member=%s\n", 
@@ -1440,23 +1895,20 @@ modest_dbus_req_filter (DBusConnection *con,
 		DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
 }
 
-
-void
-modest_osso_cb_hw_state_handler(osso_hw_state_t *state, gpointer data)
+static gboolean
+notify_error_in_dbus_callback (gpointer user_data)
 {
-	/* TODO? */
-    /* printf("%s()\n", __PRETTY_FUNCTION__); */
-
-    if(state->system_inactivity_ind)
-    {
-    }
-    else if(state->save_unsaved_data_ind)
-    {
-    }
-    else
-    {
-    
-    }
-
-    /* printf("debug: %s(): return\n", __PRETTY_FUNCTION__); */
+	ModestMailOperation *mail_op;
+	ModestMailOperationQueue *mail_op_queue;
+
+	mail_op = modest_mail_operation_new (NULL);
+	mail_op_queue = modest_runtime_get_mail_operation_queue ();
+
+	/* Issues a noop operation in order to force the queue to emit
+	   the "queue-empty" signal to allow modest to quit */
+	modest_mail_operation_queue_add (mail_op_queue, mail_op);
+	modest_mail_operation_noop (mail_op);
+	g_object_unref (mail_op);
+
+	return FALSE;
 }