X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=929cfba40385abd8f95d40cadcb9f4d2382cd3fa;hp=9589b58c258b2c12d126228051b43307432b73f7;hb=992ef09f398036a80713c2e4f91146806d2aa75a;hpb=47ec97dc5b74de88b9a5f29c6d167244db03242a diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 9589b58..929cfba 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -38,6 +38,7 @@ #include "modest-search.h" #include "widgets/modest-msg-edit-window.h" #include "modest-tny-msg.h" +#include "modest-platform.h" #include #include #include @@ -54,6 +55,7 @@ #include #include #include +#include #include @@ -69,6 +71,7 @@ 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); @@ -332,156 +335,101 @@ static TnyMsg * find_message_by_url (const char *uri, TnyAccount **ac_out) { ModestTnyAccountStore *astore; - TnyAccount *account; - TnyFolder *folder; - TnyMsg *msg; - GError *err = NULL; - account = NULL; - msg = NULL; - folder = NULL; + TnyAccount *account = NULL; + TnyFolder *folder = NULL; + TnyMsg *msg = NULL; astore = modest_runtime_get_account_store (); - if (astore == NULL) { + if (astore == NULL) return NULL; - } if (uri && g_str_has_prefix (uri, "merge://")) { /* we assume we're talking about outbox folder, as this * is the only merge folder we work with in modest */ return modest_tny_account_store_find_msg_in_outboxes (astore, uri, ac_out); } - - /* TODO: When tinymail is built with the extra DBC assertion checks, - * this will crash for local folders (such as drafts), - * because tny_folder_get_url_string() (in add_hit()) - * returns mail:/home/murrayc/yaddayadda - * instead of mail://localhost/home/murrayc/yaddayadd, - * but I'm not sure where that folder URI is built. murrayc. - */ account = tny_account_store_find_account (TNY_ACCOUNT_STORE (astore), uri); - if (account == NULL) { - g_debug ("%s: tny_account_store_find_account() failed for\n uri=%s\n", - __FUNCTION__, uri); - return NULL; - } - - MODEST_DEBUG_BLOCK (g_debug ("%s: Found account.\n", __FUNCTION__);); - - if ( ! TNY_IS_STORE_ACCOUNT (account)) { + if (account == NULL || !TNY_IS_STORE_ACCOUNT (account)) goto out; - } - - MODEST_DEBUG_BLOCK (g_debug ("%s: Account is store account.\n", __FUNCTION__);); *ac_out = account; - folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), - uri, - &err); + folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL); - if (folder == NULL) { - g_debug ("%s: tny_store_account_find_folder() failed for\n account=%s, uri=%s.\n", __FUNCTION__, - tny_account_get_id (TNY_ACCOUNT(account)), uri); + if (folder == NULL) goto out; - } - MODEST_DEBUG_BLOCK (g_debug ("%s: Found folder. (%s)\n", __FUNCTION__, uri);); + msg = tny_folder_find_msg (folder, uri, NULL); - msg = tny_folder_find_msg (folder, uri, &err); - - if (!msg) - MODEST_DEBUG_BLOCK ( - g_debug ("%s: tny_folder_find_msg() failed for "\ - "folder %s\n with error=%s.\n", - __FUNCTION__, tny_folder_get_id (folder), - err->message); - ); - out: - if (err) - g_error_free (err); - if (account && !msg) { g_object_unref (account); *ac_out = NULL; } - if (folder) g_object_unref (folder); return msg; } -static gboolean -on_idle_open_message (gpointer user_data) +typedef struct { + TnyAccount *account; + gchar *uri; +} OpenMsgPerformerInfo; + +static void +on_open_message_performer (gboolean canceled, + GError *err, + GtkWindow *parent_window, + TnyAccount *account, + gpointer user_data) { - TnyMsg *msg = NULL; - TnyAccount *account = NULL; - TnyHeader *header = NULL; - const char *msg_uid = NULL; - char *uri = NULL; - ModestWindowMgr *win_mgr = NULL; - TnyFolder *folder = NULL; - gboolean is_draft = FALSE; - gboolean already_opened = FALSE; + 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; - uri = (char *) user_data; - - msg = find_message_by_url (uri, &account); - g_free (uri); + info = (OpenMsgPerformerInfo *) user_data; + uri = info->uri; - if (msg == NULL) { - g_warning ("modest: %s: message not found.", __FUNCTION__); - g_idle_add (notify_error_in_dbus_callback, NULL); - return FALSE; + if (canceled || err) { + goto frees; } - - folder = tny_msg_get_folder (msg); - - /* Drafts will be opened in the editor, instead of the viewer, as per the UI spec: */ - /* FIXME: same should happen for Outbox; not enabling that, as the handling - * of edited messages is not clear in that case */ - if (folder && modest_tny_folder_is_local_folder (folder) && - (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) { + + /* Get message */ + folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL); + msg = tny_folder_find_msg (folder, uri, NULL); + + 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 (!msg) { + g_idle_add (notify_msg_not_found_in_idle, NULL); + goto frees; + } + header = tny_msg_get_header (msg); - - /* TODO: The modest_tny_folder_get_header_unique_id() documentation warns against - * using it with tny_msg_get_header(), and there is a - * " camel_folder_get_full_name: assertion `CAMEL_IS_FOLDER (folder)' failed" runtime warning, - * but it seems to work. - */ - msg_uid = modest_tny_folder_get_header_unique_id(header); - + 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 (); - /* This is a GDK lock because we are an idle callback and - * the code below is or does Gtk+ code */ - - gdk_threads_enter (); /* CHECKED */ - if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { - if (msg_view) { - g_debug ("modest: %s: A window for this message is open already: type=%s", - __FUNCTION__, G_OBJECT_TYPE_NAME (msg_view)); - } - - if (!msg_view) - g_debug ("modest_window_mgr_find_registered_header(): Returned TRUE, but msg_view is NULL"); - else if (!MODEST_IS_MSG_VIEW_WINDOW (msg_view) && !MODEST_IS_MSG_EDIT_WINDOW (msg_view)) - g_debug (" DEBUG: But the window is not a msg view or edit window."); - else { - gtk_window_present (GTK_WINDOW(msg_view)); - already_opened = TRUE; - } - } - - if (!already_opened) { + gtk_window_present (GTK_WINDOW(msg_view)); + } else { const gchar *modest_account_name; /* g_debug ("creating new window for this msg"); */ @@ -490,27 +438,43 @@ on_idle_open_message (gpointer user_data) modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - /* Drafts will be opened in the editor, and others will be opened in the viewer, - * as per the UI spec: */ + /* Drafts will be opened in the editor, and others will be opened in the viewer */ if (is_draft) { - /* TODO: Maybe the msg_uid should be registered for edit windows too, - * so we can open the same window again next time: */ msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE); } else { - msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, - msg_uid); + 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)); } - - gdk_threads_leave (); /* CHECKED */ - g_object_unref (header); - g_object_unref (account); + g_object_unref (msg); g_object_unref (folder); - return FALSE; /* Do not call this callback again. */ + frees: + g_free (info->uri); + g_object_unref (info->account); + g_slice_free (OpenMsgPerformerInfo, info); +} + +static gboolean +on_idle_open_message_performer (gpointer user_data) +{ + OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data; + + /* Lock before the call as we're in an idle handler */ + gdk_threads_enter (); + modest_platform_connect_and_perform (NULL, info->account, + on_open_message_performer, info); + gdk_threads_leave (); + + return FALSE; } static gint @@ -518,15 +482,38 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) { osso_rpc_t val; gchar *uri; + TnyAccount *account = NULL; + gint osso_retval; /* Get the arguments: */ val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI); uri = g_strdup (val.value.s); + + /* Get the account */ + account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()), + uri); + - /* Use g_idle to context-switch into the application's thread */ - g_idle_add(on_idle_open_message, (gpointer)uri); - - return OSSO_OK; + if (account) { + OpenMsgPerformerInfo *info; + + info = g_slice_new0 (OpenMsgPerformerInfo); + info->account = g_object_ref (account); + info->uri = uri; + + /* We need to call it into an idle to get + modest_platform_connect_and_perform into the main + loop */ + g_idle_add (on_idle_open_message_performer, info); + osso_retval = OSSO_OK; + } else { + g_free (uri); + osso_retval = OSSO_ERROR; + g_idle_add (notify_error_in_dbus_callback, NULL); + } + + g_object_unref (account); + return osso_retval; } static gboolean @@ -688,18 +675,213 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) static gboolean on_idle_send_receive(gpointer user_data) { - ModestWindow *main_win = + gboolean auto_update; + ModestWindow *main_win = NULL; + + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), FALSE); /* don't create */ - /* Send & receive all */ gdk_threads_enter (); /* CHECKED */ - modest_ui_actions_do_send_receive_all (main_win); + + /* Check if the autoupdate feature is on */ + 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 (main_win); + else + /* Disable auto update */ + modest_platform_set_update_interval (0); + gdk_threads_leave (); /* CHECKED */ return FALSE; } + + +static gint +on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message) +{ + gchar *str; + + DBusMessage *reply; + dbus_uint32_t serial = 0; + + GSList *account_names, *cursor; + + str = g_strdup("\nsend queues\n" + "===========\n"); + + cursor = account_names = modest_account_mgr_account_names + (modest_runtime_get_account_mgr(), TRUE); /* only enabled accounts */ + + while (cursor) { + TnyAccount *acc; + gchar *tmp, *accname = (gchar*)cursor->data; + + tmp = g_strdup_printf ("%s", str); + g_free (str); + str = tmp; + + /* transport */ + acc = modest_tny_account_store_get_server_account ( + modest_runtime_get_account_store(), accname, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (TNY_IS_ACCOUNT(acc)) { + gchar *tmp, *url = tny_account_get_url_string (acc); + ModestTnySendQueue *sendqueue = + modest_runtime_get_send_queue (TNY_TRANSPORT_ACCOUNT(acc)); + 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); + g_free (url); + g_free (str); + str = tmp; + + g_object_unref (acc); + } + + cursor = g_slist_next (cursor); + } + modest_account_mgr_free_account_names (account_names); + + g_printerr (str); + + reply = dbus_message_new_method_return (message); + if (reply) { + dbus_message_append_args (reply, + DBUS_TYPE_STRING, &str, + DBUS_TYPE_INVALID); + dbus_connection_send (con, reply, &serial); + dbus_connection_flush (con); + dbus_message_unref (reply); + } + + g_free (str); + return OSSO_OK; +} + + +static gint +on_dbus_method_dump_operation_queue (DBusConnection *con, DBusMessage *message) +{ + gchar *str; + gchar *op_queue_str; + + DBusMessage *reply; + dbus_uint32_t serial = 0; + + /* operations queue; */ + op_queue_str = modest_mail_operation_queue_to_string + (modest_runtime_get_mail_operation_queue ()); + + str = g_strdup_printf ("\noperation queue\n" + "===============\n" + "status: %s\n" + "%s\n", + tny_device_is_online (modest_runtime_get_device ()) ? "online" : "offline", + op_queue_str); + g_free (op_queue_str); + + g_printerr (str); + + reply = dbus_message_new_method_return (message); + if (reply) { + dbus_message_append_args (reply, + DBUS_TYPE_STRING, &str, + DBUS_TYPE_INVALID); + dbus_connection_send (con, reply, &serial); + dbus_connection_flush (con); + dbus_message_unref (reply); + } + + g_free (str); + return OSSO_OK; +} + + + +static gint +on_dbus_method_dump_accounts (DBusConnection *con, DBusMessage *message) +{ + gchar *str; + + DBusMessage *reply; + dbus_uint32_t serial = 0; + + GSList *account_names, *cursor; + + str = g_strdup ("\naccounts\n========\n"); + + cursor = account_names = modest_account_mgr_account_names + (modest_runtime_get_account_mgr(), TRUE); /* only enabled accounts */ + + while (cursor) { + TnyAccount *acc; + gchar *tmp, *accname = (gchar*)cursor->data; + + tmp = g_strdup_printf ("%s[%s]\n", str, accname); + g_free (str); + str = tmp; + + /* store */ + acc = modest_tny_account_store_get_server_account ( + modest_runtime_get_account_store(), accname, + TNY_ACCOUNT_TYPE_STORE); + if (TNY_IS_ACCOUNT(acc)) { + gchar *tmp, *url = tny_account_get_url_string (acc); + tmp = g_strdup_printf ("%sstore : '%s': %s\n", + str, tny_account_get_id (acc), url); + g_free (str); + str = tmp; + g_free (url); + g_object_unref (acc); + } + + /* transport */ + acc = modest_tny_account_store_get_server_account ( + modest_runtime_get_account_store(), accname, + TNY_ACCOUNT_TYPE_TRANSPORT); + if (TNY_IS_ACCOUNT(acc)) { + gchar *tmp, *url = tny_account_get_url_string (acc); + tmp = g_strdup_printf ("%stransport: '%s': %s\n", + str, tny_account_get_id (acc), url); + g_free (str); + str = tmp; + g_free (url); + g_object_unref (acc); + } + + cursor = g_slist_next (cursor); + } + + modest_account_mgr_free_account_names (account_names); + + g_printerr (str); + + reply = dbus_message_new_method_return (message); + if (reply) { + dbus_message_append_args (reply, + DBUS_TYPE_STRING, &str, + DBUS_TYPE_INVALID); + dbus_connection_send (con, reply, &serial); + dbus_connection_flush (con); + dbus_message_unref (reply); + } + + g_free (str); + return OSSO_OK; +} + + + + static gint on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval) { @@ -821,7 +1003,7 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method, } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) { if (arguments->len != 0) goto param_error; - return on_top_application (arguments, data, retval); + return on_top_application (arguments, data, retval); } else { /* We need to return INVALID here so * libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED, @@ -866,7 +1048,7 @@ search_result_to_message (DBusMessage *reply, for (hit_iter = hits; hit_iter; hit_iter = hit_iter->next) { DBusMessageIter struct_iter; - ModestSearchHit *hit; + ModestSearchResultHit *hit; char *msg_url; const char *subject; const char *folder; @@ -876,7 +1058,7 @@ search_result_to_message (DBusMessage *reply, gboolean is_unread; gint64 ts; - hit = (ModestSearchHit *) hit_iter->data; + hit = (ModestSearchResultHit *) hit_iter->data; msg_url = hit->msgid; subject = hit->subject; @@ -934,7 +1116,7 @@ search_result_to_message (DBusMessage *reply, g_free (hit->folder); g_free (hit->sender); - g_slice_free (ModestSearchHit, hit); + g_slice_free (ModestSearchResultHit, hit); } dbus_message_iter_close_container (&iter, &array_iter); @@ -1391,12 +1573,26 @@ modest_dbus_req_filter (DBusConnection *con, on_dbus_method_search (con, message); handled = TRUE; } else if (dbus_message_is_method_call (message, - MODEST_DBUS_IFACE, - MODEST_DBUS_METHOD_GET_FOLDERS)) { + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_GET_FOLDERS)) { on_dbus_method_get_folders (con, message); handled = TRUE; - } - else { + } else if (dbus_message_is_method_call (message, + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_DUMP_OPERATION_QUEUE)) { + on_dbus_method_dump_operation_queue (con, message); + handled = TRUE; + } else if (dbus_message_is_method_call (message, + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_DUMP_ACCOUNTS)) { + on_dbus_method_dump_accounts (con, message); + handled = TRUE; + } else if (dbus_message_is_method_call (message, + MODEST_DBUS_IFACE, + MODEST_DBUS_METHOD_DUMP_SEND_QUEUES)) { + on_dbus_method_dump_send_queues (con, message); + handled = TRUE; + } else { /* Note that this mentions methods that were already handled in modest_dbus_req_handler(). */ /* g_debug (" debug: %s: Unexpected (maybe already handled) D-Bus method:\n Interface=%s, Member=%s\n", @@ -1427,3 +1623,11 @@ 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")); + + return FALSE; +}