X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=adf3f5a8e2f9ff4e3184651ef2d6ff2da2247194;hp=24cd7a86898cdcf439be97603e3c6a20cd5b98e2;hb=15653b82b80a0905f45315e241e525b1b6524a4a;hpb=2b6c4fa7f90c2e9e24627eba531e3f03f7a6391f diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 24cd7a8..adf3f5a 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -34,23 +34,34 @@ #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" #include "modest-tny-msg.h" #include "modest-platform.h" +#include "modest-defs.h" #include #include #include #include #include #ifdef MODEST_HAVE_HILDON0_WIDGETS +#include #include #else +#include #include #endif #include +#ifdef MODEST_TOOLKIT_HILDON2 +#include +#include +#include +#include +#endif + #include #include #include @@ -71,7 +82,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); @@ -276,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); } @@ -398,18 +408,20 @@ typedef struct { GtkWidget *animation; } OpenMsgPerformerInfo; +#ifndef MODEST_TOOLKIT_HILDON2 static gboolean on_show_opening_animation (gpointer userdata) { OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata; info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening")); info->animation_timeout = 0; - + return FALSE; } +#endif static gboolean -on_hide_opening_animation (gpointer userdata) +on_find_msg_async_destroy (gpointer userdata) { OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata; @@ -423,10 +435,139 @@ 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 = NULL; + gchar *msg_uid = NULL; + 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)) { + 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 *mailbox = 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 end; + } + } + + from_header = tny_header_dup_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, mailbox, TRUE); + if (mailbox) + g_free (mailbox); + 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, NULL, 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) { + 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)); + } + } + } + +end: + if (header) + g_object_unref (header); + if (msg_uid) + g_free (msg_uid); + on_find_msg_async_destroy (info); +} + + static void on_open_message_performer (gboolean canceled, GError *err, @@ -435,121 +576,89 @@ 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; + 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; - 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; + if (canceled || err) { + 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; + } + + /* Get folder */ + if (!account) { + folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account); + g_object_unref (local_folders_account); + } else if (account == TNY_ACCOUNT (local_folders_account)) { + folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL); + } else { + folder = NULL; } - 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); + 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 { - 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); + 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; + } - } - 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); + 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); - frees: - g_free (info->uri); - if (info->account) - g_object_unref (info->account); - g_idle_add (on_hide_opening_animation, info); + } + on_find_msg_async_destroy (info); + return; + } + +#ifndef MODEST_TOOLKIT_HILDON2 + info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info); +#endif + /* Get message */ + tny_folder_find_msg_async (folder, info->uri, find_msg_async_cb, NULL, info); + g_object_unref (folder); } static gboolean on_idle_open_message_performer (gpointer user_data) { - ModestWindow *main_win = NULL; + ModestWindow *top_win = NULL; OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data; - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), - FALSE); /* don't create */ + top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr()); /* Lock before the call as we're in an idle handler */ gdk_threads_enter (); if (info->connect) { - modest_platform_connect_and_perform (GTK_WINDOW (main_win), TRUE, info->account, + modest_platform_connect_and_perform (GTK_WINDOW (top_win), TRUE, + info->account, on_open_message_performer, info); } else { - on_open_message_performer (FALSE, NULL, GTK_WINDOW (main_win), info->account, info); + on_open_message_performer (FALSE, NULL, GTK_WINDOW (top_win), + info->account, info); } gdk_threads_leave (); @@ -580,33 +689,46 @@ 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) 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; + + 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); + TnyDevice *device; + gboolean device_online; + + 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 { - 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); + info->connect = FALSE; } if (folder) { 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); } @@ -632,15 +754,13 @@ on_remove_msgs_finished (ModestMailOperation *mail_op, gpointer user_data) { TnyHeader *header; - ModestWindow *main_win = NULL, *msg_view = NULL; - ModestHeaderView *header_view; + ModestWindow *top_win = NULL, *msg_view = NULL; header = (TnyHeader *) user_data; /* Get the main window if exists */ - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), - FALSE); /* don't create */ - if (!main_win) { + top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr()); + if (!top_win) { g_object_unref (header); return; } @@ -652,16 +772,14 @@ on_remove_msgs_finished (ModestMailOperation *mail_op, } g_object_unref (header); - /* Refilter the header view explicitly */ - header_view = (ModestHeaderView *) - modest_main_window_get_child_widget (MODEST_MAIN_WINDOW(main_win), - MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW); - if (header_view && MODEST_IS_HEADER_VIEW (header_view)) - modest_header_view_refilter (header_view); + /* Refilter the header views explicitely */ + + /* TODO: call modest_window_mgr_refilter_header_views */ + /* this call will go through all the windows, get the header views and refilter them */ } -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; @@ -669,31 +787,32 @@ 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; + ModestWindow *top_win = NULL; + + uri = (char *) userdata; - uri = (char *) user_data; - msg = find_message_by_url (uri, &account); if (account) 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; } - - main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), - FALSE); /* don't create */ - + + top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr()); + 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); return FALSE; } @@ -736,6 +855,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; } @@ -743,7 +863,7 @@ on_idle_delete_message (gpointer user_data) * the code below is or does Gtk+ code */ gdk_threads_enter (); /* CHECKED */ - mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL); + mail_op = modest_mail_operation_new (top_win ? G_OBJECT(top_win) : NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); g_signal_connect (G_OBJECT (mail_op), @@ -763,10 +883,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; + +} + @@ -789,11 +923,9 @@ static gboolean on_idle_send_receive(gpointer user_data) { gboolean auto_update; - ModestWindow *main_win = NULL; + ModestWindow *top_win = NULL; - main_win = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), - FALSE); /* don't create */ + top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ()); gdk_threads_enter (); /* CHECKED */ @@ -803,7 +935,7 @@ on_idle_send_receive(gpointer user_data) if (auto_update) /* Do send receive */ - modest_ui_actions_do_send_receive_all (main_win, FALSE, FALSE, FALSE); + modest_ui_actions_do_send_receive_all (top_win, FALSE, FALSE, FALSE); else /* Disable auto update */ modest_platform_set_update_interval (0); @@ -844,18 +976,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); } @@ -1019,7 +1154,7 @@ on_send_receive_performer(gboolean canceled, 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 */ @@ -1033,88 +1168,184 @@ on_send_receive_performer(gboolean canceled, } -static gint +static gint on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval) -{ +{ TnyDevice *device = modest_runtime_get_device (); if (!tny_device_is_online (device)) modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL); else on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL); - + return OSSO_OK; } +static gint +on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval) +{ + g_idle_add(on_idle_top_application, NULL); + + return OSSO_OK; +} + + static gboolean -on_idle_open_default_inbox(gpointer user_data) +on_idle_open_account (gpointer user_data) { - ModestWindow *main_win; - GtkWidget *folder_view; - - if (!check_and_offer_account_creation ()) /* this has it's only lock already */ - return FALSE; + ModestWindow *top; + ModestWindowMgr *mgr; + gchar *acc_name; - /* This is a GDK lock because we are an idle callback and - * the code below is or does Gtk+ code */ - gdk_threads_enter (); /* CHECKED */ + gdk_threads_enter (); - 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 */ + acc_name = (gchar *) user_data; + mgr = modest_runtime_get_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 *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 (new_window), NULL)) { + gtk_widget_show (new_window); + } else { + gtk_widget_destroy (new_window); + new_window = NULL; + } } - - /* 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. */ +#else + if (MODEST_IS_MAIN_WINDOW (top)) { + gchar *server_name; + GtkWidget *folder_view; + + folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top), + MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW); + server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (), + acc_name, TNY_ACCOUNT_TYPE_STORE); + if (server_name) { + modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view), + server_name); + g_free (server_name); + } + } +#endif + + gdk_threads_leave (); + g_free (acc_name); + return FALSE; } -static gint -on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval) +static gint +on_open_account (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); - - return OSSO_OK; + osso_rpc_t val; + gchar *account_id; + + /* Get the arguments: */ + val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI); + account_id = g_strdup (val.value.s); + + g_idle_add (on_idle_open_account, account_id); + + return OSSO_OK; } +#ifdef MODEST_TOOLKIT_HILDON2 +static gboolean +on_idle_top_application (gpointer user_data) +{ + HildonWindowStack *stack; + GtkWidget *window; + + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ -static gboolean + gdk_threads_enter (); /* CHECKED */ + + stack = hildon_window_stack_get_default (); + window = GTK_WIDGET (hildon_window_stack_peek (stack)); + + if (window) { + gtk_window_present (GTK_WINDOW (window)); + } else { + ModestWindowMgr *mgr; + + mgr = modest_runtime_get_window_mgr (); + window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr); + if (window) { + modest_platform_remove_new_mail_notifications (FALSE); + } else { + g_printerr ("modest: failed to get main window instance\n"); + } + } + + gdk_threads_leave (); /* CHECKED */ + + return FALSE; /* Do not call this callback again. */ +} +#else +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 */ - + 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; + } + + 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)); + } + } + 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__); + } gdk_threads_leave (); /* CHECKED */ - + return FALSE; /* Do not call this callback again. */ } +#endif static gint on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval) @@ -1124,21 +1355,49 @@ on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval) return OSSO_OK; } - + +static gboolean +on_idle_show_memory_low (gpointer user_data) +{ + ModestWindow *main_win = NULL; + + gdk_threads_enter (); + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); + modest_platform_run_information_dialog (GTK_WINDOW (main_win), + dgettext("ke-recv","memr_ib_operation_disabled"), + TRUE); + gdk_threads_leave (); + + return FALSE; +} + /* Callback for normal D-BUS messages */ -gint +gint modest_dbus_req_handler(const gchar * interface, const gchar * method, GArray * arguments, gpointer data, osso_rpc_t * retval) { + /* Check memory low conditions */ + if (modest_platform_check_memory_low (NULL, FALSE)) { + g_idle_add (on_idle_show_memory_low, NULL); + goto param_error; + } + if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) { if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT) goto param_error; - return on_mail_to (arguments, data, retval); + 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) goto param_error; @@ -1146,6 +1405,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) @@ -1154,10 +1414,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 @@ -1390,12 +1652,12 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) } if (sd_v > 0) { - search->flags |= MODEST_SEARCH_BEFORE; + search->flags |= MODEST_SEARCH_AFTER; search->start_date = start_date; } if (ed_v > 0) { - search->flags |= MODEST_SEARCH_AFTER; + search->flags |= MODEST_SEARCH_BEFORE; search->end_date = end_date; } @@ -1569,6 +1831,7 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list) tny_folder_store_get_folders (folder_store, all_folders, NULL /* query */, + FALSE, NULL /* error */); TnyIterator *iter = tny_list_create_iterator (all_folders); @@ -1757,7 +2020,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); @@ -1819,11 +2082,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; -}