X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=9832c3c7a66af967dfe395addb2abdec6438a84f;hp=c515c6bfc097ae3a2ac096e1cc3ccc9d3bab05ca;hb=94bf2a181e8b2644f037246b2fc3a70c865c22e2;hpb=25809b1fab3c3e78f97c332131dab4d517187eac diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index c515c6b..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" @@ -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); @@ -552,14 +537,16 @@ find_msg_async_cb (TnyFolder *folder, } 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); end: on_find_msg_async_destroy (info); @@ -748,8 +735,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 +744,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 +758,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 +770,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 +813,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 +841,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; + +} + @@ -932,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), 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); } @@ -1147,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); + new_window = TRUE; +#else 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; + } +#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 */