X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=9832c3c7a66af967dfe395addb2abdec6438a84f;hp=b0c4f04fefcf23d83ee134f7b9409a92006cffaa;hb=94bf2a181e8b2644f037246b2fc3a70c865c22e2;hpb=10135c887c0c30ddefa85716b06d3e5795a17651

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index b0c4f04..9832c3c 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -34,6 +34,7 @@
 #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"
@@ -71,7 +72,6 @@ typedef struct
 
 
 static gboolean notify_error_in_dbus_callback (gpointer user_data);
-static gboolean notify_msg_not_found_in_idle (gpointer user_data);
 static gboolean on_idle_compose_mail(gpointer user_data);
 static gboolean on_idle_top_application (gpointer user_data);
 
@@ -409,7 +409,7 @@ on_show_opening_animation (gpointer userdata)
 }
 
 static gboolean
-on_hide_opening_animation (gpointer userdata)
+on_find_msg_async_destroy (gpointer userdata)
 {
 	OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
 
@@ -423,10 +423,136 @@ on_hide_opening_animation (gpointer userdata)
 		info->animation = NULL;
 	}
 
+	if (info->uri)
+		g_free (info->uri);
+	
+	if (info->account)
+		g_object_unref (info->account);
+
 	g_slice_free (OpenMsgPerformerInfo, info);
 	return FALSE;
 }
 
+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;
+        }
+
+        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);
+			
+			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 {
+                        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;
+			}
+
+                        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);
+                }
+
+		if (msg_view != NULL) {
+			if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+				gtk_widget_destroy (GTK_WIDGET (msg_view));
+			} else {
+				gtk_widget_show_all (GTK_WIDGET (msg_view));
+			}
+		}
+        }
+
+cleanup:
+        g_object_unref (header);
+
+end:
+        on_find_msg_async_destroy (info);
+}
+
+
 static void 
 on_open_message_performer (gboolean canceled, 
 			   GError *err,
@@ -435,96 +561,40 @@ on_open_message_performer (gboolean canceled,
 			   gpointer user_data)
 {
 	OpenMsgPerformerInfo *info;
-	gchar *uri;
-	TnyHeader *header;
-	gchar *msg_uid;
-	ModestWindowMgr *win_mgr;
-	ModestWindow *msg_view = NULL;
-	gboolean is_draft = FALSE;
 	TnyFolder *folder = NULL;
-	TnyMsg *msg = NULL;
 
 	info = (OpenMsgPerformerInfo *) user_data;
-	uri = info->uri;
-
-	if (canceled || err) {
-		goto frees;
-	}
-
-	/* 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), uri, NULL);
-	}
-	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;
-	}
-
-	/* Get message */
-	msg = tny_folder_find_msg (folder, uri, NULL);
-	if (!msg) {
-		g_idle_add (notify_msg_not_found_in_idle, NULL);
-		goto frees;
-	}
-
-	header = tny_msg_get_header (msg);
-	if (header && (tny_header_get_flags (header)&TNY_HEADER_FLAG_DELETED)) {
-		g_object_unref (header);
-		g_object_unref (msg);
-		g_idle_add (notify_msg_not_found_in_idle, NULL);
-		goto frees;
-	}
-	msg_uid =  modest_tny_folder_get_header_unique_id (header); 
-	win_mgr = modest_runtime_get_window_mgr ();
-
-	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;
-
-		/* g_debug ("creating new window for this msg"); */
-		modest_window_mgr_register_header (win_mgr, header, NULL);
-
-		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) {
-			msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
-		} else {
-			TnyHeader *header;
-			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))
-				tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
-			g_object_unref (header);
-			
-		}		
-		modest_window_mgr_register_window (win_mgr, msg_view);
-		gtk_widget_show_all (GTK_WIDGET (msg_view));
-	}
-	g_object_unref (header);
-	g_object_unref (msg);
-	g_object_unref (folder);
-
- frees:
-	g_free (info->uri);
-	if (info->account)
-		g_object_unref (info->account);
-	g_idle_add (on_hide_opening_animation, info);
+        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 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
@@ -579,7 +649,8 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 			info->account = g_object_ref (account);
 		info->uri = uri;
 		info->connect = TRUE;
-		info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+		info->animation = NULL;
+		info->animation_timeout = 0;
 
 		/* Try to get the message, if it's already downloaded
 		   we don't need to connect */
@@ -596,10 +667,21 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 			g_object_unref (local_folders_account);
 		}
 		if (folder) {
-			TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
-			if (msg) {
-				info->connect = FALSE;
-				g_object_unref (msg);
+			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);
 		}
@@ -620,60 +702,101 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval)
 	return osso_retval;
 }
 
-static gboolean
-on_idle_delete_message (gpointer user_data)
+static void 
+on_remove_msgs_finished (ModestMailOperation *mail_op,
+			 gpointer user_data)
+{	
+	TnyHeader *header;
+	ModestWindow *main_win = NULL, *msg_view = NULL;
+	ModestHeaderView *header_view;
+
+	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;
+	}
+
+	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;
+	TnyList *headers = NULL, *tmp_headers = NULL;
 	TnyFolder *folder = NULL;
 	TnyIterator *iter = NULL; 
 	TnyHeader *header = NULL, *msg_header = NULL;
 	TnyMsg *msg = NULL;
 	TnyAccount *account = NULL;
-	const char *uri = NULL, *uid = NULL;
-	gint res = 0;
+	char *uri;
+	gchar *uid = NULL;
 	ModestMailOperation *mail_op = NULL;
-	ModestWindow *main_win = NULL, *msg_view = NULL;
+	ModestWindow *main_win = NULL;
+
+	uri = (char *) userdata;
 
-	uri = (char *) user_data;
-	
 	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);
-		return OSSO_ERROR; 
+		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);
-		return OSSO_ERROR; 
+		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);
+
 	headers = tny_simple_list_new ();
 	tny_folder_get_headers (folder, headers, TRUE, NULL);
 	iter = tny_list_create_iterator (headers);
-	header = NULL;
 
 	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);
@@ -682,80 +805,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);
 		g_idle_add (notify_error_in_dbus_callback, NULL);			
-		return OSSO_ERROR;
+		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 */
 
 	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);
-	modest_mail_operation_remove_msg (mail_op, header, FALSE);
+
+	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));
-	
-	if (main_win) { /* no need if there's no window */ 
-		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));
-		}
-	}
 	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):
-	 */
-	if (main_win) { /* only needed when there's a mainwindow / UI */
-
-		/* This is a GDK lock because we are an idle callback and
-		 * the code below is or does Gtk+ code */
-		gdk_threads_enter (); /* CHECKED */
-		ModestHeaderView *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);
-		gdk_threads_leave ();
-	}
+	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;
 }
 
 
@@ -835,18 +936,21 @@ on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 			modest_runtime_get_account_store(), accname,
 			TNY_ACCOUNT_TYPE_TRANSPORT);
 		if (TNY_IS_ACCOUNT(acc)) {
-			gchar *tmp, *url = tny_account_get_url_string (acc);
+			gchar *tmp = NULL, *url = tny_account_get_url_string (acc);
 			ModestTnySendQueue *sendqueue =
-				modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(acc));
-			gchar *queue_str = modest_tny_send_queue_to_string (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);
+				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_free (str);
-			str = tmp;
 
 			g_object_unref (acc);
 		}
@@ -866,8 +970,11 @@ on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message)
 		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;
 }
 
@@ -903,9 +1010,12 @@ on_dbus_method_dump_operation_queue (DBusConnection *con, DBusMessage *message)
 		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;
 }
 
@@ -940,8 +1050,9 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 			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\n",
-					       str, tny_account_get_id (acc), url);
+			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);
@@ -954,8 +1065,9 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 			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\n",
-					       str, tny_account_get_id (acc), url);
+			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);
@@ -977,20 +1089,29 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 		dbus_connection_send (con, reply, &serial);
 		dbus_connection_flush (con);
 		dbus_message_unref (reply);
-	}
-	
+	}	
 	g_free (str);
-	return OSSO_OK;
-}
-
 
+	/* Let modest die */
+	g_idle_add (notify_error_in_dbus_callback, NULL);
 
+	return OSSO_OK;
+}
 
-static gint 
-on_send_receive(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)
+{
 	ModestConnectedVia connect_when;
 
+	if (err || canceled) {
+		g_idle_add (notify_error_in_dbus_callback, NULL);
+		return;
+	}
+
 	connect_when = modest_conf_get_int (modest_runtime_get_conf (), 
 					    MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL);
 	
@@ -999,53 +1120,31 @@ on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
 	   same as the one specified by the user */
 	if (connect_when == MODEST_CONNECTED_VIA_ANY ||
 	    connect_when == modest_platform_get_current_connection ()) {
-		/* Use g_idle to context-switch into the application's thread: */
-		g_idle_add(on_idle_send_receive, NULL);
+		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);
 	}
- 	
- 	return OSSO_OK;
 }
 
-static gboolean
-on_idle_open_default_inbox(gpointer user_data)
-{
-	ModestWindow *main_win;
-	GtkWidget *folder_view;
-	
-	if (!check_and_offer_account_creation ()) /* this has it's only lock already */
-		return 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 */
+static gint 
+on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
+{ 	
+	TnyDevice *device = modest_runtime_get_device ();
 
-	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
-	if (!main_win) {
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
-		gdk_threads_leave (); /* CHECKED */
-		return FALSE; /* don't call me again */
-	}
-		
-	/* Get the 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 */
-	
-	/* 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);
-	
-	return FALSE; /* Do not call this callback again. */
+	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);
+ 	
+ 	return OSSO_OK;
 }
 
 static gint 
 on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-	/* Use g_idle to context-switch into the application's thread: */
- 	g_idle_add(on_idle_open_default_inbox, NULL);
+ 	g_idle_add(on_idle_top_application, NULL);
  	
  	return OSSO_OK;
 }
@@ -1055,21 +1154,45 @@ 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 */
 	
+#ifdef MODEST_TOOLKIT_HILDON2
 	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
+						      TRUE);
+	new_window = TRUE;
+#else
+	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+						      FALSE);
+
+	if (!main_win) {
+		main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+							      TRUE);
+		new_window = TRUE;
+	}
+#endif
+
+	if (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));
+		}
+	}
+
+#ifndef MODEST_TOOLKIT_HILDON2
 	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 (main_win));
 		gtk_window_present (GTK_WINDOW (main_win));
-	} else
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
+	}
+#endif
 
 	gdk_threads_leave (); /* CHECKED */
 	
@@ -1084,6 +1207,21 @@ on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
  	
  	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 
@@ -1091,6 +1229,12 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
 			GArray * arguments, gpointer data,
 			osso_rpc_t * retval)
 {
+	/* 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) {
 		if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
 			goto param_error;
@@ -1239,12 +1383,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;
@@ -1254,9 +1428,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;
@@ -1276,96 +1450,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);
-
-	search_result_to_message (reply, hits);
+	SearchHelper *helper = g_slice_new (SearchHelper);
+	helper->search = search;
+	dbus_message_ref (message);
+	helper->message = message;
+	helper->con = con;
 
-	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);
 }
 
 
@@ -1670,6 +1825,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 
@@ -1685,8 +1859,19 @@ 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)) {
@@ -1738,11 +1923,3 @@ notify_error_in_dbus_callback (gpointer user_data)
 
 	return FALSE;
 }
-
-static gboolean
-notify_msg_not_found_in_idle (gpointer user_data)
-{
-	modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"));
-
-	return FALSE;
-}