X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=d0af1b7f8948a7ee6127a1c2b1e54fc0dd5170ef;hp=df517c9d05be517065fcc705415d333c9aee71e6;hb=bb98dc6e990d99c85660214459347e7e5bd7dbf0;hpb=1f49ac9df5635e0427ef1c2e1b2cc0c30c7c0cd2 diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index df517c9..d0af1b7 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -59,6 +59,7 @@ #include #include #include +#include #endif #include @@ -285,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); } @@ -534,7 +535,6 @@ find_msg_async_cb (TnyFolder *folder, } header = tny_msg_get_header (msg); - /* TODO: fetch mailbox */ msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, NULL, msg_uid); if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) { ModestMailOperation *mail_op; @@ -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,35 +1202,42 @@ 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)) { - GtkWidget *folder_window; - - /* TODO: should show the mailboxes window in multi mailboxes account */ + GtkWidget *new_window; + ModestProtocolType store_protocol; + gboolean mailboxes_protocol; + + store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), + acc_name); + mailboxes_protocol = + modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), + store_protocol, + MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS); + + if (mailboxes_protocol) { + new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name)); + } else { + new_window = GTK_WIDGET (modest_folder_window_new (NULL)); + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window), + acc_name); + } - folder_window = (GtkWidget *) modest_folder_window_new (NULL); - modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), - acc_name); - if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (folder_window), NULL)) { - gtk_widget_show (folder_window); + if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) { + gtk_widget_show (new_window); } else { - gtk_widget_destroy (folder_window); - folder_window = NULL; + gtk_widget_destroy (new_window); + new_window = NULL; } } #else @@ -1213,9 +1256,8 @@ on_idle_open_account (gpointer user_data) } } #endif - gdk_threads_leave (); - end: + gdk_threads_leave (); g_free (acc_name); return FALSE; } @@ -1350,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) @@ -1366,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) @@ -1374,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