X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=cdce41d6e7aefbc48bda14865d4a25fa6bc05e16;hb=a7b68a999450233f395a763d39db2c2d2dc5036f;hp=38a92cb49a187c35c1404eb231208d63f59c1e19;hpb=9ef56d6da803af967c2a5ecd32ff4895519c35c2;p=modest diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 38a92cb..cdce41d 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 @@ -451,8 +452,8 @@ find_msg_async_cb (TnyFolder *folder, GError *err, gpointer user_data) { - TnyHeader *header; - gchar *msg_uid; + TnyHeader *header = NULL; + gchar *msg_uid = NULL; ModestWindowMgr *win_mgr; ModestWindow *msg_view = NULL; gboolean is_draft = FALSE; @@ -465,8 +466,7 @@ find_msg_async_cb (TnyFolder *folder, } header = tny_msg_get_header (msg); - if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) { - g_object_unref (header); + 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; @@ -495,30 +495,33 @@ find_msg_async_cb (TnyFolder *folder, } 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 cleanup; + goto end; } } 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; @@ -532,7 +535,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; @@ -556,10 +559,11 @@ find_msg_async_cb (TnyFolder *folder, } } -cleanup: - g_object_unref (header); - end: + if (header) + g_object_unref (header); + if (msg_uid) + g_free (msg_uid); on_find_msg_async_destroy (info); } @@ -1120,7 +1124,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 */ @@ -1134,27 +1138,121 @@ 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 +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_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); + +#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); + +#ifdef MODEST_TOOLKIT_HILDON2 + 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); + } +#else + new_window = GTK_WIDGET (modest_folder_window_new (NULL)); + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window), + acc_name); +#endif + + 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)) { + 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 (); + + end: + g_free (acc_name); + return FALSE; +} + +static gint +on_open_account (GArray *arguments, gpointer data, osso_rpc_t *retval) +{ + 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) @@ -1185,21 +1283,21 @@ on_idle_top_application (gpointer user_data) } gdk_threads_leave (); /* CHECKED */ - + return FALSE; /* Do not call this callback again. */ } #else -static gboolean +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 (), FALSE); @@ -1226,7 +1324,7 @@ on_idle_top_application (gpointer user_data) } gdk_threads_leave (); /* CHECKED */ - + return FALSE; /* Do not call this callback again. */ } #endif @@ -1251,12 +1349,12 @@ on_idle_show_memory_low (gpointer user_data) 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) @@ -1270,11 +1368,15 @@ 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; - return on_mail_to (arguments, data, retval); + 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; 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; + 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;