* src/dbus_api/modest-dbus-callback.c:

[modest] / src / dbus_api / modest-dbus-callbacks.c

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index dba5409..e551240 100644 (file)
--- 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"
@@ -455,7 +456,6 @@ find_msg_async_cb (TnyFolder *folder,
         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);
                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;
@@ -500,27 +500,12 @@ find_msg_async_cb (TnyFolder *folder,
                        }
                
                        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);
                        g_free (modest_account_name);
@@ -559,7 +544,6 @@ find_msg_async_cb (TnyFolder *folder,
 
 cleanup:
         g_object_unref (header);
-        g_object_unref (msg);
 
 end:
         on_find_msg_async_destroy (info);
@@ -748,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;
@@ -757,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);
@@ -771,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; 
        }
        
@@ -782,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; 
        }
 
@@ -824,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;
        }
                
@@ -851,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;
+       
+}
+