Dbus open message faster user feedback (WIP 2)

[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 cdce41d..d0af1b7 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -286,7 +286,7 @@ on_idle_compose_mail(gpointer user_data)
                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]));
+                       attachments = g_slist_append(attachments, g_uri_unescape_string (list[i], NULL));
                }
                g_strfreev(list);
        }
@@ -605,6 +605,42 @@ on_open_message_performer (gboolean canceled,
                 on_find_msg_async_destroy (info);
                 return;
         }
+
+        if (!(modest_tny_folder_is_local_folder (folder) &&
+             (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS))) {
+               ModestWindowMgr *win_mgr;
+               ModestWindow *msg_view;
+
+               win_mgr = modest_runtime_get_window_mgr ();
+               if (modest_window_mgr_find_registered_message_uid (win_mgr, info->uri, &msg_view)) {
+                       gtk_window_present (GTK_WINDOW(msg_view));
+               } else {
+                       const gchar *modest_account_name;
+                       TnyAccount *account;
+
+                       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;
+                       }
+                       
+                       msg_view = modest_msg_view_window_new_from_uid (modest_account_name, NULL, info->uri);
+                       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));
+                               }
+                       }
+                       g_object_unref (account);
+
+               }
+               on_find_msg_async_destroy (info);
+               return;
+        }
+
 #ifndef MODEST_TOOLKIT_HILDON2
        info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
 #endif
@@ -769,7 +805,7 @@ thread_prepare_delete_message (gpointer userdata)
                g_object_unref (account);
 
        if (!msg) {
-               g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
+               g_debug ("%s: Could not find message '%s'", __FUNCTION__, uri);
                g_idle_add (notify_error_in_dbus_callback, NULL);
                g_free (uri);
                return FALSE; 
@@ -779,7 +815,7 @@ thread_prepare_delete_message (gpointer userdata)
 
        folder = tny_msg_get_folder (msg);
        if (!folder) {
-               g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
+               g_debug ("%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);
@@ -1166,20 +1202,15 @@ on_idle_open_account (gpointer user_data)
        ModestWindow *top;
        ModestWindowMgr *mgr;
        gchar *acc_name;
-       gboolean retval = TRUE;
 
        gdk_threads_enter ();
 
        acc_name = (gchar *) user_data;
        mgr = modest_runtime_get_window_mgr ();
 
-       /* If Modest is already launched then just ignore this call */
-       if (modest_window_mgr_get_current_top (mgr)) {
-               retval = FALSE;
-               goto end;
-       }
-
-       top = modest_window_mgr_show_initial_window (mgr);
+       top = modest_window_mgr_get_current_top (mgr);
+       if (!top)
+               top = modest_window_mgr_show_initial_window (mgr);
 
 #ifdef MODEST_TOOLKIT_HILDON2
        if (MODEST_IS_ACCOUNTS_WINDOW (top)) {
@@ -1194,7 +1225,6 @@ on_idle_open_account (gpointer user_data)
                                                                        store_protocol,
                                                                        MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS);
 
-#ifdef MODEST_TOOLKIT_HILDON2
                if (mailboxes_protocol) {
                        new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name));
                } else {
@@ -1202,11 +1232,6 @@ on_idle_open_account (gpointer user_data)
                        modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
                                                          acc_name);
                }
-#else
-               new_window = GTK_WIDGET (modest_folder_window_new (NULL));
-               modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window),
-                                                 acc_name);
-#endif
 
                if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) {
                        gtk_widget_show (new_window);
@@ -1231,9 +1256,8 @@ on_idle_open_account (gpointer user_data)
                }
        }
 #endif
-       gdk_threads_leave ();
 
- end:
+       gdk_threads_leave ();
        g_free (acc_name);
        return FALSE;
 }
@@ -1368,14 +1392,17 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
        if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
                if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT)
                        goto param_error;
+               modest_runtime_set_allow_shutdown (TRUE);
                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;
+               modest_runtime_set_allow_shutdown (TRUE);
                return on_open_message (arguments, data, retval);
        } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_ACCOUNT) == 0) {
                if (arguments->len != MODEST_DBUS_OPEN_ACCOUNT_ARGS_COUNT)
                        goto param_error;
+               modest_runtime_set_allow_shutdown (TRUE);
                return on_open_account (arguments, data, retval);
        } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) {
                if (arguments->len != 0)
@@ -1384,6 +1411,7 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
        } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) {
                if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT)
                        goto param_error;
+               modest_runtime_set_allow_shutdown (TRUE);
                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)
@@ -1392,10 +1420,12 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method,
        } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) {
                if (arguments->len != 0)
                        goto param_error;
+               modest_runtime_set_allow_shutdown (TRUE);
                return on_open_default_inbox (arguments, data, retval);
        } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) {
                if (arguments->len != 0)
                        goto param_error;
+               modest_runtime_set_allow_shutdown (TRUE);
                return on_top_application (arguments, data, retval); 
        } else { 
                /* We need to return INVALID here so