X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=0c155b30199847a7430a4acaa0a1d844a08f2d5b;hp=d1feca93e6d89094fd8559f31c77d822de6ee539;hb=732e5a039a74024b353936e3626f6180db3516f5;hpb=e56bd8e68a2a8c6185f6b8465dfc30f47b3de2ca diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index d1feca9..0c155b3 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -71,7 +71,6 @@ typedef struct static gboolean notify_error_in_dbus_callback (gpointer user_data); -static gboolean notify_msg_not_found_in_idle (gpointer user_data); static gboolean on_idle_compose_mail(gpointer user_data); static gboolean on_idle_top_application (gpointer user_data); @@ -409,7 +408,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,85 +422,71 @@ 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 -on_open_message_performer (gboolean canceled, - GError *err, - GtkWindow *parent_window, - TnyAccount *account, - gpointer user_data) +static void +find_msg_async_cb (TnyFolder *folder, + gboolean cancelled, + TnyMsg *msg, + GError *err, + 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 { - - /* g_debug ("creating new window for this msg"); */ - modest_window_mgr_register_header (win_mgr, header, NULL); - - /* Drafts will be opened in the editor, and others will be opened in the viewer */ - if (is_draft) { + TnyHeader *header; + gchar *msg_uid; + ModestWindowMgr *win_mgr; + ModestWindow *msg_view = NULL; + gboolean is_draft = FALSE; + OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data; + + if (err || cancelled) { + 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; + } + + 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; + } + + 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; @@ -513,7 +498,7 @@ on_open_message_performer (gboolean canceled, 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); @@ -528,19 +513,19 @@ on_open_message_performer (gboolean canceled, 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); + msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE); g_free (modest_account_name); } else { - TnyHeader *header; + TnyHeader *header; const gchar *modest_account_name; if (account) { @@ -549,30 +534,80 @@ on_open_message_performer (gboolean canceled, } 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)) - tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN); - g_object_unref (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)) { + 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); - g_object_unref (folder); + g_object_unref (header); + g_object_unref (msg); - frees: - g_free (info->uri); - if (info->account) - g_object_unref (info->account); - g_idle_add (on_hide_opening_animation, info); +end: + on_find_msg_async_destroy (info); +} + + +static void +on_open_message_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) +{ + OpenMsgPerformerInfo *info; + TnyFolder *folder = NULL; + + info = (OpenMsgPerformerInfo *) user_data; + if (canceled || err) { + 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; + } + + /* 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) { + 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; + } + + info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info); + /* Get message */ + tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info); + g_object_unref (folder); } static gboolean @@ -627,7 +662,8 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) info->account = g_object_ref (account); info->uri = uri; info->connect = TRUE; - info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info); + info->animation = NULL; + info->animation_timeout = 0; /* Try to get the message, if it's already downloaded we don't need to connect */ @@ -644,10 +680,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); } @@ -1087,46 +1134,10 @@ on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval) return OSSO_OK; } -static gboolean -on_idle_open_default_inbox(gpointer user_data) -{ - ModestWindow *main_win; - GtkWidget *folder_view; - - if (!check_and_offer_account_creation ()) /* this has it's only lock already */ - return 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 */ - - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - TRUE); /* create if non-existent */ - if (!main_win) { - g_warning ("%s: BUG: no main window", __FUNCTION__); - gdk_threads_leave (); /* CHECKED */ - return FALSE; /* don't call me again */ - } - - /* Get the 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)); - - gdk_threads_leave (); /* CHECKED */ - - /* This D-Bus method is obviously meant to result in the UI being visible, - * so show it, by calling this idle handler directly: */ - on_idle_top_application(user_data); - - return FALSE; /* Do not call this callback again. */ -} - static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval) { - /* Use g_idle to context-switch into the application's thread: */ - g_idle_add(on_idle_open_default_inbox, NULL); + g_idle_add(on_idle_top_application, NULL); return OSSO_OK; } @@ -1798,7 +1809,7 @@ modest_dbus_req_filter (DBusConnection *con, MODEST_DBUS_METHOD_SEARCH)) { /* don't try to search when there not enough mem */ - if (modest_platform_check_memory_low (NULL)) { + if (modest_platform_check_memory_low (NULL, TRUE)) { g_warning ("%s: not enough memory for searching", __FUNCTION__); reply_empty_results (con, message); @@ -1860,11 +1871,3 @@ notify_error_in_dbus_callback (gpointer user_data) return FALSE; } - -static gboolean -notify_msg_not_found_in_idle (gpointer user_data) -{ - modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), FALSE); - - return FALSE; -}