X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=ee7d3bd4db29f5053d9e5f35f62e41df1d0a0269;hp=739bffbde63b3557e9f29ada24a030c62b3ebf39;hb=6f7aa1b5e15f3024db75ccfe3138f520c607dc5d;hpb=80957932ddfdd050fba0b034acdfc0b656ea6464

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index 739bffb..ee7d3bd 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,133 @@ 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) {
+			modest_window_mgr_register_window (win_mgr, msg_view, NULL);
+			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,103 +558,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 (!folder) {
-		g_idle_add (notify_msg_not_found_in_idle, NULL);
-		goto frees;
-	}
-	
-	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
@@ -586,7 +646,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 */
@@ -603,10 +664,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);
 		}
@@ -660,8 +732,8 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
 		modest_header_view_refilter (header_view);
 }
 
-static gboolean
-on_idle_delete_message (gpointer user_data)
+static gpointer
+thread_prepare_delete_message (gpointer userdata)
 {
 	TnyList *headers = NULL, *tmp_headers = NULL;
 	TnyFolder *folder = NULL;
@@ -669,13 +741,13 @@ on_idle_delete_message (gpointer user_data)
 	TnyHeader *header = NULL, *msg_header = NULL;
 	TnyMsg *msg = NULL;
 	TnyAccount *account = NULL;
-	const char *uri = NULL;
+	char *uri;
 	gchar *uid = NULL;
 	ModestMailOperation *mail_op = NULL;
 	ModestWindow *main_win = NULL;
 
-	uri = (char *) user_data;
-	
+	uri = (char *) userdata;
+
 	msg = find_message_by_url (uri, &account);
 	if (account)
 		g_object_unref (account);
@@ -683,6 +755,7 @@ on_idle_delete_message (gpointer user_data)
 	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; 
 	}
 	
@@ -694,6 +767,7 @@ on_idle_delete_message (gpointer user_data)
 		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; 
 	}
 
@@ -736,6 +810,7 @@ on_idle_delete_message (gpointer user_data)
 		if (folder)
 			g_object_unref (folder);
 		g_idle_add (notify_error_in_dbus_callback, NULL);			
+		g_free (uri);
 		return FALSE;
 	}
 		
@@ -763,10 +838,24 @@ on_idle_delete_message (gpointer user_data)
 	/* Clean */
 	if (header)
 		g_object_unref (header);
+	g_free (uri);
 	
 	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;
+	
+}
+
 
 
 
@@ -844,18 +933,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);
 		}
@@ -956,7 +1048,8 @@ on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message)
 		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);
+					       str, tny_account_get_id (acc), url, 
+					       ((GObject*)acc)->ref_count-1);
 			g_free (str);
 			str = tmp;
 			g_free (url);
@@ -969,8 +1062,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);
@@ -1044,46 +1138,10 @@ on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
  	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 */
-
-	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. */
-}
-
 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;
 }
@@ -1093,6 +1151,7 @@ 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 */
@@ -1100,14 +1159,24 @@ on_idle_top_application (gpointer user_data)
 	gdk_threads_enter (); /* CHECKED */
 	
 	main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
-						      TRUE); /* create if non-existent */
+						      FALSE);
+
+	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 (main_win));
-		gtk_window_present (GTK_WINDOW (main_win));
-	} else
-		g_warning ("%s: BUG: no main window", __FUNCTION__);
+		/* 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 */
 	
@@ -1122,6 +1191,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 
@@ -1129,6 +1213,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;
@@ -1567,6 +1657,7 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list)
 	tny_folder_store_get_folders (folder_store,
 				      all_folders,
 				      NULL /* query */,
+				      FALSE,
 				      NULL /* error */);
 
 	TnyIterator *iter = tny_list_create_iterator (all_folders);
@@ -1719,6 +1810,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 
@@ -1734,8 +1844,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)) {
@@ -1787,11 +1908,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"), FALSE);
-
-	return FALSE;
-}