X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=64bca8e84e88cc02c2197e715fb3421361eff086;hp=97edc9876827343a3cc78d883c292bb34c685dc1;hb=ceb738aa17582bc899c28c4df84719db60975144;hpb=f3d0a6c5a9dd68e70ce914d66814330aabf33d37 diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 97edc98..64bca8e 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -38,6 +38,7 @@ #include "modest-debug.h" #include "modest-search.h" #include "widgets/modest-msg-edit-window.h" +#include "widgets/modest-window-mgr.h" #include "modest-tny-msg.h" #include "modest-platform.h" #include "modest-defs.h" @@ -59,6 +60,8 @@ #include #include #include +#include +#include #endif #include @@ -285,7 +288,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); } @@ -498,6 +501,7 @@ find_msg_async_cb (TnyFolder *folder, /* Drafts will be opened in the editor, and others will be opened in the viewer */ if (is_draft) { gchar *modest_account_name = NULL; + gchar *mailbox = NULL; gchar *from_header; /* we cannot edit without a valid account... */ @@ -510,14 +514,16 @@ find_msg_async_cb (TnyFolder *folder, } from_header = tny_header_dup_from (header); - modest_account_name = modest_utils_get_account_name_from_recipient (from_header); + modest_account_name = modest_utils_get_account_name_from_recipient (from_header, &mailbox); g_free (from_header); if (modest_account_name == NULL) { 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, mailbox, TRUE); + if (mailbox) + g_free (mailbox); g_free (modest_account_name); } else { TnyHeader *header; @@ -531,7 +537,7 @@ find_msg_async_cb (TnyFolder *folder, } header = tny_msg_get_header (msg); - msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid); + 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; @@ -573,10 +579,17 @@ on_open_message_performer (gboolean canceled, { OpenMsgPerformerInfo *info; TnyFolder *folder = NULL; + 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)); info = (OpenMsgPerformerInfo *) user_data; if (canceled || err) { - modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE); + if (!canceled) + 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; @@ -584,23 +597,46 @@ on_open_message_performer (gboolean canceled, /* 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 { + } else if (account == TNY_ACCOUNT (local_folders_account)) { folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL); + } else { + folder = NULL; + } + if (!(folder && 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; + 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)); + } + } + if (account) + g_object_unref (account); + + } + on_find_msg_async_destroy (info); + return; } - 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 @@ -656,6 +692,8 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) if (is_merge || account) { OpenMsgPerformerInfo *info; TnyFolder *folder = NULL; + ModestTnyAccountStore *account_store; + ModestTnyLocalFoldersAccount *local_folders_account; info = g_slice_new0 (OpenMsgPerformerInfo); if (account) @@ -665,36 +703,35 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) info->animation = NULL; info->animation_timeout = 0; + 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)); + /* Try to get the message, if it's already downloaded we don't need to connect */ if (account) { - folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL); - } else { - ModestTnyAccountStore *account_store; - ModestTnyLocalFoldersAccount *local_folders_account; + TnyDevice *device; + gboolean device_online; - 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)); + device = modest_runtime_get_device (); + device_online = tny_device_is_online (device); + if (!device_online || TNY_ACCOUNT (local_folders_account) == account) { + folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL); + } else { + folder = NULL; + } + } else { folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account); g_object_unref (local_folders_account); + info->connect = FALSE; } if (folder) { - TnyDevice *device; - gboolean device_online; - - device = modest_runtime_get_device(); - device_online = tny_device_is_online (device); - if (device_online) { - info->connect = TRUE; + TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL); + if (msg) { + info->connect = FALSE; + g_object_unref (msg); } else { - TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL); - if (msg) { - info->connect = FALSE; - g_object_unref (msg); - } else { - info->connect = TRUE; - } + info->connect = TRUE; } g_object_unref (folder); } @@ -765,7 +802,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; @@ -775,7 +812,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); @@ -889,9 +926,9 @@ static gboolean on_idle_send_receive(gpointer user_data) { gboolean auto_update; - ModestWindow *top_win = NULL; + ModestMailOperation *mail_op = (ModestMailOperation *) user_data; + ModestConnectedVia connect_when; - top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ()); gdk_threads_enter (); /* CHECKED */ @@ -899,12 +936,29 @@ on_idle_send_receive(gpointer user_data) auto_update = modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_AUTO_UPDATE, NULL); - if (auto_update) - /* Do send receive */ - modest_ui_actions_do_send_receive_all (top_win, FALSE, FALSE, FALSE); - else + if (auto_update) { + /* Do send receive. Never set the current top window + as we always assume that DBus send/receive requests + are not user driven */ + + connect_when = modest_conf_get_int (modest_runtime_get_conf (), + MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL); + /* Perform a send and receive if the user selected to connect + via any mean or if the current connection method is the + same as the one specified by the user */ + if (connect_when == MODEST_CONNECTED_VIA_ANY || + connect_when == modest_platform_get_current_connection ()) { + modest_ui_actions_do_send_receive_all (NULL, FALSE, FALSE, FALSE); + } + } else { /* Disable auto update */ modest_platform_set_update_interval (0); + } + + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), + mail_op); + + g_object_unref (mail_op); gdk_threads_leave (); /* CHECKED */ @@ -1111,26 +1165,17 @@ on_send_receive_performer(gboolean canceled, TnyAccount *account, gpointer user_data) { - ModestConnectedVia connect_when; + ModestMailOperation *mail_op; if (err || canceled) { g_idle_add (notify_error_in_dbus_callback, NULL); return; } - connect_when = modest_conf_get_int (modest_runtime_get_conf (), - MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL); - - /* Perform a send and receive if the user selected to connect - via any mean or if the current connection method is the - same as the one specified by the user */ - if (connect_when == MODEST_CONNECTED_VIA_ANY || - connect_when == modest_platform_get_current_connection ()) { - g_idle_add (on_idle_send_receive, NULL); - } else { - /* We need this to allow modest to finish */ - g_idle_add (notify_error_in_dbus_callback, NULL); - } + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_heartbeat_add (on_idle_send_receive, mail_op); } @@ -1162,34 +1207,41 @@ 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; - - folder_window = (GtkWidget *) modest_folder_window_new (NULL); - modest_folder_window_set_account (MODEST_FOLDER_WINDOW (folder_window), + 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); - if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (folder_window), NULL)) { - gtk_widget_show (folder_window); - } else { - gtk_widget_destroy (folder_window); - folder_window = NULL; - } + } + + if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) { + gtk_widget_show (new_window); + } else { + gtk_widget_destroy (new_window); + new_window = NULL; } #else if (MODEST_IS_MAIN_WINDOW (top)) { @@ -1207,9 +1259,8 @@ on_idle_open_account (gpointer user_data) } } #endif - gdk_threads_leave (); - end: + gdk_threads_leave (); g_free (acc_name); return FALSE; } @@ -1329,29 +1380,52 @@ on_idle_show_memory_low (gpointer user_data) return FALSE; } +static gboolean +on_idle_present_modal (gpointer user_data) +{ + gdk_threads_enter (); + gtk_window_present (user_data); + gdk_threads_leave (); + + return FALSE; +} + + /* Callback for normal D-BUS messages */ gint modest_dbus_req_handler(const gchar * interface, const gchar * method, GArray * arguments, gpointer data, osso_rpc_t * retval) { + GtkWindow *dialog; + /* Check memory low conditions */ if (modest_platform_check_memory_low (NULL, FALSE)) { g_idle_add (on_idle_show_memory_low, NULL); goto param_error; } + /* Check if there is already a dialog or note open */ + dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); + if (dialog) { + g_idle_add (on_idle_present_modal, dialog); + return OSSO_OK; + } + 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) @@ -1360,6 +1434,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) @@ -1368,10 +1443,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 @@ -1385,7 +1462,7 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method, g_idle_add (notify_error_in_dbus_callback, NULL); return OSSO_ERROR; } - + /* A complex D-Bus type (like a struct), * used to return various information about a search hit. */