* Fixes NB#99458, do not show "Opening" banner when opening notifications
[modest] / src / dbus_api / modest-dbus-callbacks.c
index c3638aa..d8d2abb 100644 (file)
@@ -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"
 #include <string.h>
 #include <glib/gstdio.h>
 #ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <hildon-widgets/hildon-program.h>
 #include <libgnomevfs/gnome-vfs-mime-utils.h>
 #else
+#include <hildon/hildon-program.h>
 #include <libgnomevfs/gnome-vfs-mime.h>
 #endif
 #include <tny-fs-stream.h>
 
+#ifdef MODEST_TOOLKIT_HILDON2
+#include <hildon/hildon.h>
+#include <modest-accounts-window.h>
+#include <modest-folder-window.h>
+#endif
+
 #include <tny-list.h>
 #include <tny-iterator.h>
 #include <tny-simple-list.h>
@@ -71,7 +80,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);
 
@@ -398,18 +406,20 @@ typedef struct {
        GtkWidget *animation;
 } OpenMsgPerformerInfo;
 
+#ifndef MODEST_TOOLKIT_HILDON2
 static gboolean
 on_show_opening_animation (gpointer userdata)
 {
        OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
        info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening"));
        info->animation_timeout = 0;
-       
+
        return FALSE;
 }
+#endif
 
 static gboolean
-on_hide_opening_animation (gpointer userdata)
+on_find_msg_async_destroy (gpointer userdata)
 {
        OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata;
 
@@ -423,85 +433,70 @@ 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 
-on_open_message_performer (gboolean canceled, 
-                          GError *err,
-                          GtkWindow *parent_window, 
-                          TnyAccount *account, 
-                          gpointer user_data)
+static void     
+find_msg_async_cb (TnyFolder *folder, 
+                   gboolean cancelled, 
+                   TnyMsg *msg, 
+                   GError *err, 
+                   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 {
-
-               /* g_debug ("creating new window for this msg"); */
-               modest_window_mgr_register_header (win_mgr, header, NULL);
+        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;
+        }
 
-               /* Drafts will be opened in the editor, and others will be opened in the viewer */
-               if (is_draft) {
+        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;
                        
@@ -513,34 +508,19 @@ on_open_message_performer (gboolean canceled,
                                        goto cleanup;
                                }
                        }
-               
+               
                        from_header = tny_header_dup_from (header);
-                       if (from_header) {
-                               GSList *accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
-                               GSList *node = NULL;
-                               for (node = accounts; node != NULL; node = g_slist_next (node)) {
-                                       gchar *from = modest_account_mgr_get_from_string (modest_runtime_get_account_mgr (), node->data);
-                                       
-                                       if (from && (strcmp (from_header, from) == 0)) {
-                                               g_free (modest_account_name);
-                                               modest_account_name = g_strdup (node->data);
-                                               g_free (from);
-                                               break;
-                                       }
-                                       g_free (from);
-                               }
-                               g_slist_foreach (accounts, (GFunc) g_free, NULL);
-                               g_slist_free (accounts);
-                               g_free (from_header);
-                       }
-
+                       modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+                       g_free (from_header);
+                       
                        if (modest_account_name == NULL) {
-                               modest_account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ());
+                               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);
+                        msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
                        g_free (modest_account_name);
                } else {
-                       TnyHeader *header;
+                        TnyHeader *header;
                        const gchar *modest_account_name;
 
                        if (account) {
@@ -549,14 +529,13 @@ on_open_message_performer (gboolean canceled,
                        } 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)) {
+                        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);     
+                                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 (),
@@ -564,24 +543,69 @@ on_open_message_performer (gboolean canceled,
                                modest_mail_operation_sync_folder (mail_op, folder, FALSE);
                                g_object_unref (mail_op);
                        }
-                       g_object_unref (header);                        
-               }
+                        g_object_unref (header);
+                }
+
                if (msg_view != NULL) {
-                       modest_window_mgr_register_window (win_mgr, msg_view);
-                       gtk_widget_show_all (GTK_WIDGET (msg_view));
+                       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);
-       g_object_unref (msg);
-       g_object_unref (folder);
+        g_object_unref (header);
 
- frees:
-       g_free (info->uri);
-       if (info->account)
-               g_object_unref (info->account);
-       g_idle_add (on_hide_opening_animation, info);
+end:
+        on_find_msg_async_destroy (info);
+}
+
+
+static void 
+on_open_message_performer (gboolean canceled, 
+                          GError *err,
+                          GtkWindow *parent_window, 
+                          TnyAccount *account, 
+                          gpointer user_data)
+{
+       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 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;
+        }
+#ifndef MODEST_TOOLKIT_HILDON2
+       info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
+#endif
+        /* Get message */
+        tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info);
+        g_object_unref (folder);
 }
 
 static gboolean
@@ -636,7 +660,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 */
@@ -653,10 +678,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);
                }
@@ -683,7 +719,6 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
 {      
        TnyHeader *header;
        ModestWindow *main_win = NULL, *msg_view = NULL;
-       ModestHeaderView *header_view;
 
        header = (TnyHeader *) user_data;
 
@@ -702,16 +737,14 @@ on_remove_msgs_finished (ModestMailOperation *mail_op,
        }       
        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);
+       /* Refilter the header views explicitely */
+
+       /* TODO: call modest_window_mgr_refilter_header_views */
+       /* this call will go through all the windows, get the header views and refilter them */
 }
 
-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;
@@ -719,13 +752,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);
@@ -733,6 +766,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; 
        }
        
@@ -744,6 +778,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; 
        }
 
@@ -786,6 +821,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;
        }
                
@@ -813,10 +849,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;
+       
+}
+
 
 
 
@@ -894,18 +944,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), TRUE);
-                       gchar *queue_str = modest_tny_send_queue_to_string (sendqueue);
+
+                       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);
                }
@@ -1096,55 +1149,53 @@ on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval)
        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);
+       
+       return OSSO_OK;
+}
+
+#ifdef MODEST_TOOLKIT_HILDON2
 static gboolean
-on_idle_open_default_inbox(gpointer user_data)
+on_idle_top_application (gpointer user_data)
 {
-       ModestWindow *main_win;
-       GtkWidget *folder_view;
-       
-       if (!check_and_offer_account_creation ()) /* this has it's only lock already */
-               return FALSE;
+       HildonWindowStack *stack;
+       GtkWidget *window;
 
        /* 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 */
+       stack = hildon_window_stack_get_default ();
+       window = GTK_WIDGET (hildon_window_stack_peek (stack));
+
+       if (window) {
+               gtk_window_present (GTK_WINDOW (window));
+       } else {
+               ModestWindowMgr *mgr;
+
+               mgr = modest_runtime_get_window_mgr ();
+               window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr);
+               if (window) {
+                       modest_platform_remove_new_mail_notifications (FALSE);
+               } else {
+                       g_printerr ("modest: failed to get main window instance\n");
+               }
        }
-               
-       /* 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);
-       
-       return OSSO_OK;
-}
-
-
+#else
 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 */
@@ -1152,19 +1203,35 @@ 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) {
+               /* 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));
+               }
+       }
+
        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__);
+       }
 
        gdk_threads_leave (); /* CHECKED */
        
        return FALSE; /* Do not call this callback again. */
 }
+#endif
 
 static gint 
 on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval)
@@ -1174,6 +1241,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 
@@ -1181,6 +1263,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;
@@ -1619,6 +1707,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);
@@ -1807,7 +1896,7 @@ modest_dbus_req_filter (DBusConnection *con,
                                         MODEST_DBUS_METHOD_SEARCH)) {
                
        /* don't try to search when there not enough mem */
-               if (modest_platform_check_memory_low (NULL)) {
+               if (modest_platform_check_memory_low (NULL, TRUE)) {
                        g_warning ("%s: not enough memory for searching",
                                   __FUNCTION__);
                        reply_empty_results (con, message);
@@ -1869,11 +1958,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;
-}