X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=7b9f16c88172a3d7ea05284f50bdaae15e964c77;hp=24cd7a86898cdcf439be97603e3c6a20cd5b98e2;hb=bfb568f6e942fb8f386f5bd65dd07099eab0a2f5;hpb=2b6c4fa7f90c2e9e24627eba531e3f03f7a6391f diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 24cd7a8..7b9f16c 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -409,7 +409,7 @@ on_show_opening_animation (gpointer userdata) } static gboolean -on_hide_opening_animation (gpointer userdata) +on_find_msg_async_destroy (gpointer userdata) { OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata; @@ -423,10 +423,148 @@ on_hide_opening_animation (gpointer userdata) info->animation = NULL; } + if (info->uri) + g_free (info->uri); + + if (info->account) + g_object_unref (info->account); + g_slice_free (OpenMsgPerformerInfo, info); return FALSE; } +static void +find_msg_async_cb (TnyFolder *folder, + gboolean cancelled, + TnyMsg *msg, + GError *err, + gpointer user_data) +{ + TnyHeader *header; + gchar *msg_uid; + ModestWindowMgr *win_mgr; + ModestWindow *msg_view = NULL; + gboolean is_draft = FALSE; + OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data; + + if (err || cancelled) { + g_idle_add (notify_msg_not_found_in_idle, NULL); + goto end; + } + + 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); + g_idle_add (notify_msg_not_found_in_idle, NULL); + goto end; + } + + msg_uid = modest_tny_folder_get_header_unique_id (header); + win_mgr = modest_runtime_get_window_mgr (); + + if (modest_tny_folder_is_local_folder (folder) && + (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) { + is_draft = TRUE; + } + + if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { + gtk_window_present (GTK_WINDOW(msg_view)); + } else { + const gchar *modest_account_name; + TnyAccount *account; + + modest_window_mgr_register_header (win_mgr, header, NULL); + + 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; + } + + /* Drafts will be opened in the editor, and others will be opened in the viewer */ + if (is_draft) { + gchar *modest_account_name = NULL; + gchar *from_header; + + /* we cannot edit without a valid account... */ + if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) { + if (!modest_ui_actions_run_account_setup_wizard(NULL)) { + modest_window_mgr_unregister_header (win_mgr, + header); + goto cleanup; + } + } + + 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); + } + + if (modest_account_name == NULL) { + modest_account_name = modest_account_mgr_get_default_account (modest_runtime_get_account_mgr ()); + } + msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE); + g_free (modest_account_name); + } else { + TnyHeader *header; + 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; + } + + header = tny_msg_get_header (msg); + msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid); + if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) { + ModestMailOperation *mail_op; + + tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); + /* Sync folder, we need this to save the seen flag */ + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_sync_folder (mail_op, folder, FALSE); + g_object_unref (mail_op); + } + g_object_unref (header); + } + + if (msg_view != NULL) { + modest_window_mgr_register_window (win_mgr, msg_view); + gtk_widget_show_all (GTK_WIDGET (msg_view)); + } + } + +cleanup: + g_object_unref (header); + g_object_unref (msg); + +end: + on_find_msg_async_destroy (info); +} + + static void on_open_message_performer (gboolean canceled, GError *err, @@ -435,103 +573,37 @@ on_open_message_performer (gboolean canceled, gpointer user_data) { OpenMsgPerformerInfo *info; - gchar *uri; - TnyHeader *header; - gchar *msg_uid; - ModestWindowMgr *win_mgr; - ModestWindow *msg_view = NULL; - gboolean is_draft = FALSE; TnyFolder *folder = NULL; - TnyMsg *msg = NULL; info = (OpenMsgPerformerInfo *) user_data; - uri = info->uri; - - if (canceled || err) { - goto frees; - } - - /* 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 { - folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL); - } - - - if (!folder) { - g_idle_add (notify_msg_not_found_in_idle, NULL); - goto frees; - } - - if (modest_tny_folder_is_local_folder (folder) && - (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) { - is_draft = TRUE; - } - - /* Get message */ - msg = tny_folder_find_msg (folder, uri, NULL); - if (!msg) { - g_idle_add (notify_msg_not_found_in_idle, NULL); - goto frees; - } - - 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); - g_idle_add (notify_msg_not_found_in_idle, NULL); - goto frees; - } - msg_uid = modest_tny_folder_get_header_unique_id (header); - win_mgr = modest_runtime_get_window_mgr (); - - if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { - gtk_window_present (GTK_WINDOW(msg_view)); - } else { - const gchar *modest_account_name; - - /* g_debug ("creating new window for this msg"); */ - modest_window_mgr_register_header (win_mgr, header, NULL); - - if (account) { - modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - } else { - modest_account_name = NULL; - } - - /* Drafts will be opened in the editor, and others will be opened in the viewer */ - if (is_draft) { - msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE); - } else { - TnyHeader *header; - header = tny_msg_get_header (msg); - msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid); - if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) - tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); - g_object_unref (header); - - } - modest_window_mgr_register_window (win_mgr, msg_view); - gtk_widget_show_all (GTK_WIDGET (msg_view)); - } - g_object_unref (header); - g_object_unref (msg); - g_object_unref (folder); - - frees: - g_free (info->uri); - if (info->account) - g_object_unref (info->account); - g_idle_add (on_hide_opening_animation, info); + if (canceled || err) { + g_idle_add (notify_msg_not_found_in_idle, NULL); + on_find_msg_async_destroy (info); + return; + } + + /* 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 { + folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL); + } + if (!folder) { + g_idle_add (notify_msg_not_found_in_idle, NULL); + on_find_msg_async_destroy (info); + return; + } + + /* Get message */ + tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info); + g_object_unref (folder); } static gboolean @@ -603,10 +675,21 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) g_object_unref (local_folders_account); } if (folder) { - TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL); - if (msg) { - info->connect = FALSE; - g_object_unref (msg); + TnyDevice *device; + gboolean device_online; + + device = modest_runtime_get_device(); + device_online = tny_device_is_online (device); + if (device_online) { + info->connect = TRUE; + } else { + TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL); + if (msg) { + info->connect = FALSE; + g_object_unref (msg); + } else { + info->connect = TRUE; + } } g_object_unref (folder); } @@ -1825,5 +1908,7 @@ notify_msg_not_found_in_idle (gpointer user_data) { modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), FALSE); + g_idle_add (notify_error_in_dbus_callback, NULL); + return FALSE; }