X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=857b13c96c41110adb583019cd1cbbc21dfdc9a7;hp=0d17f213d8368dc51b3bb7066c8e1261363a66cb;hb=3202e152f26d1cd47e4e2d1c03a71ffe308b06ee;hpb=5bc0ecfc8847c957d2e0520b398d6d9bdb713fff diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index 0d17f21..857b13c 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -55,6 +55,7 @@ #include #include #include +#include #include @@ -70,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); @@ -219,7 +221,7 @@ on_idle_mail_to(gpointer user_data) } gdk_threads_enter (); /* CHECKED */ - modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL); + modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL, FALSE); gdk_threads_leave (); /* CHECKED */ cleanup: @@ -269,6 +271,7 @@ on_idle_compose_mail(gpointer user_data) g_free(idle_data->attachments); idle_data->attachments = tmp; } + if (idle_data->attachments != NULL) { gchar **list = g_strsplit(idle_data->attachments, ",", 0); gint i = 0; @@ -277,10 +280,25 @@ on_idle_compose_mail(gpointer user_data) } g_strfreev(list); } + + /* If the message has nothing then mark the buffers as not + modified. This happens in Maemo for example when opening a + new message from Contacts plugin, it sends "" instead of + NULLs */ gdk_threads_enter (); /* CHECKED */ - modest_ui_actions_compose_msg(NULL, idle_data->to, idle_data->cc, - idle_data->bcc, idle_data->subject, - idle_data->body, attachments); + if (!strncmp (idle_data->to, "", 1) && + !strncmp (idle_data->to, "", 1) && + !strncmp (idle_data->cc, "", 1) && + !strncmp (idle_data->bcc, "", 1) && + !strncmp (idle_data->subject, "", 1) && + !strncmp (idle_data->body, "", 1) && + attachments == NULL) { + modest_ui_actions_compose_msg(NULL, NULL, NULL, NULL, NULL, NULL, NULL, FALSE); + } else { + modest_ui_actions_compose_msg(NULL, idle_data->to, idle_data->cc, + idle_data->bcc, idle_data->subject, + idle_data->body, attachments, TRUE); + } gdk_threads_leave (); /* CHECKED */ cleanup: g_slist_foreach(attachments, (GFunc)g_free, NULL); @@ -372,12 +390,43 @@ out: return msg; } - typedef struct { TnyAccount *account; gchar *uri; + gboolean connect; + guint animation_timeout; + GtkWidget *animation; } OpenMsgPerformerInfo; +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; +} + +static gboolean +on_hide_opening_animation (gpointer userdata) +{ + OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata; + + if (info->animation_timeout>0) { + g_source_remove (info->animation_timeout); + info->animation_timeout = 0; + } + + if (info->animation) { + gtk_widget_destroy (info->animation); + info->animation = NULL; + } + + g_slice_free (OpenMsgPerformerInfo, info); + return FALSE; +} + static void on_open_message_performer (gboolean canceled, GError *err, @@ -398,19 +447,42 @@ on_open_message_performer (gboolean canceled, info = (OpenMsgPerformerInfo *) user_data; uri = info->uri; - if (err) + if (canceled || err) { goto frees; + } - /* Get message */ - folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL); - msg = tny_folder_find_msg (folder, uri, NULL); - + /* 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 (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 (); @@ -421,16 +493,25 @@ on_open_message_performer (gboolean canceled, /* g_debug ("creating new window for this msg"); */ modest_window_mgr_register_header (win_mgr, header, NULL); - - modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); + + 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 { - 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)); @@ -441,19 +522,28 @@ on_open_message_performer (gboolean canceled, frees: g_free (info->uri); - g_object_unref (info->account); - g_slice_free (OpenMsgPerformerInfo, info); + if (info->account) + g_object_unref (info->account); + g_idle_add (on_hide_opening_animation, info); } static gboolean on_idle_open_message_performer (gpointer user_data) { + ModestWindow *main_win = NULL; OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) user_data; + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), + FALSE); /* don't create */ + /* 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); + if (info->connect) { + modest_platform_connect_and_perform (GTK_WINDOW (main_win), TRUE, info->account, + on_open_message_performer, info); + } else { + on_open_message_performer (FALSE, NULL, GTK_WINDOW (main_win), info->account, info); + } gdk_threads_leave (); return FALSE; @@ -466,22 +556,53 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) gchar *uri; TnyAccount *account = NULL; gint osso_retval; + gboolean is_merge; /* Get the arguments: */ val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI); uri = g_strdup (val.value.s); + is_merge = g_str_has_prefix (uri, "merge:"); + /* Get the account */ - account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()), - uri); + if (!is_merge) + account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()), + uri); - if (account) { + if (is_merge || account) { OpenMsgPerformerInfo *info; + TnyFolder *folder = NULL; info = g_slice_new0 (OpenMsgPerformerInfo); - info->account = g_object_ref (account); + 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); + + /* 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); + } 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); + } + if (folder) { + TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL); + if (msg) { + info->connect = FALSE; + g_object_unref (msg); + } + g_object_unref (folder); + } /* We need to call it into an idle to get modest_platform_connect_and_perform into the main @@ -494,7 +615,8 @@ on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) g_idle_add (notify_error_in_dbus_callback, NULL); } - g_object_unref (account); + if (account) + g_object_unref (account); return osso_retval; } @@ -657,23 +779,232 @@ 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, FALSE, FALSE, FALSE); + 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) { - /* Use g_idle to context-switch into the application's thread: */ - g_idle_add(on_idle_send_receive, NULL); + ModestConnectedVia connect_when; + + 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 */ + if (connect_when == MODEST_CONNECTED_VIA_ANY || + connect_when == modest_platform_get_current_connection ()) { + /* Use g_idle to context-switch into the application's thread: */ + g_idle_add (on_idle_send_receive, NULL); + } else { + /* We need this to allow modest to finish */ + g_idle_add (notify_error_in_dbus_callback, NULL); + } return OSSO_OK; } @@ -790,7 +1121,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, @@ -911,12 +1242,42 @@ search_result_to_message (DBusMessage *reply, return reply; } +typedef struct +{ + DBusConnection *con; + DBusMessage *message; + ModestSearch *search; +} SearchHelper; + +static void +search_all_cb (GList *hits, gpointer user_data) +{ + DBusMessage *reply; + SearchHelper *helper = (SearchHelper *) user_data; + + reply = dbus_message_new_method_return (helper->message); + + if (reply) { + dbus_uint32_t serial = 0; + + search_result_to_message (reply, hits); + + dbus_connection_send (helper->con, reply, &serial); + dbus_connection_flush (helper->con); + dbus_message_unref (reply); + } + + /* Free the helper */ + dbus_message_unref (helper->message); + modest_search_free (helper->search); + g_slice_free (ModestSearch, helper->search); + g_slice_free (SearchHelper, helper); +} static void on_dbus_method_search (DBusConnection *con, DBusMessage *message) { ModestDBusSearchFlags dbus_flags; - DBusMessage *reply = NULL; dbus_bool_t res; dbus_int64_t sd_v; dbus_int64_t ed_v; @@ -926,9 +1287,9 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) const char *query; time_t start_date; time_t end_date; - GList *hits; - + ModestSearch *search; DBusError error; + dbus_error_init (&error); sd_v = ed_v = 0; @@ -948,96 +1309,77 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) start_date = (time_t) sd_v; end_date = (time_t) ed_v; - ModestSearch search; - memset (&search, 0, sizeof (search)); + search = g_slice_new0 (ModestSearch); - /* Remember what folder we are searching in: - * - * Note that we don't copy the strings, - * because this struct will only be used for the lifetime of this function. - */ if (folder && g_str_has_prefix (folder, "MAND:")) { - search.folder = folder + strlen ("MAND:"); + search->folder = g_strdup (folder + strlen ("MAND:")); } else if (folder && g_str_has_prefix (folder, "USER:")) { - search.folder = folder + strlen ("USER:"); + search->folder = g_strdup (folder + strlen ("USER:")); } else if (folder && g_str_has_prefix (folder, "MY:")) { - search.folder = folder + strlen ("MY:"); + search->folder = g_strdup (folder + strlen ("MY:")); } else { - search.folder = folder; + search->folder = g_strdup (folder); } /* Remember the text to search for: */ #ifdef MODEST_HAVE_OGS - search.query = query; + search->query = g_strdup (query); #endif /* Other criteria: */ - search.start_date = start_date; - search.end_date = end_date; - search.flags = 0; + search->start_date = start_date; + search->end_date = end_date; + search->flags = 0; /* Text to serach for in various parts of the message: */ if (dbus_flags & MODEST_DBUS_SEARCH_SUBJECT) { - search.flags |= MODEST_SEARCH_SUBJECT; - search.subject = query; + search->flags |= MODEST_SEARCH_SUBJECT; + search->subject = g_strdup (query); } if (dbus_flags & MODEST_DBUS_SEARCH_SENDER) { - search.flags |= MODEST_SEARCH_SENDER; - search.from = query; + search->flags |= MODEST_SEARCH_SENDER; + search->from = g_strdup (query); } if (dbus_flags & MODEST_DBUS_SEARCH_RECIPIENT) { - search.flags |= MODEST_SEARCH_RECIPIENT; - search.recipient = query; + search->flags |= MODEST_SEARCH_RECIPIENT; + search->recipient = g_strdup (query); } if (dbus_flags & MODEST_DBUS_SEARCH_BODY) { - search.flags |= MODEST_SEARCH_BODY; - search.body = query; + search->flags |= MODEST_SEARCH_BODY; + search->body = g_strdup (query); } if (sd_v > 0) { - search.flags |= MODEST_SEARCH_BEFORE; - search.start_date = start_date; + search->flags |= MODEST_SEARCH_BEFORE; + search->start_date = start_date; } if (ed_v > 0) { - search.flags |= MODEST_SEARCH_AFTER; - search.end_date = end_date; + search->flags |= MODEST_SEARCH_AFTER; + search->end_date = end_date; } if (size_v > 0) { - search.flags |= MODEST_SEARCH_SIZE; - search.minsize = size_v; + search->flags |= MODEST_SEARCH_SIZE; + search->minsize = size_v; } #ifdef MODEST_HAVE_OGS - search.flags |= MODEST_SEARCH_USE_OGS; - g_debug ("%s: Starting search for %s", __FUNCTION__, search.query); + search->flags |= MODEST_SEARCH_USE_OGS; + g_debug ("%s: Starting search for %s", __FUNCTION__, search->query); #endif - /* Note that this currently gets folders and messages from the servers, - * which can take a long time. libmodest_dbus_client_search() can timeout, - * reporting no results, if this takes a long time: */ - hits = modest_search_all_accounts (&search); - - reply = dbus_message_new_method_return (message); - - search_result_to_message (reply, hits); - - if (reply == NULL) { - g_warning ("%s: Could not create reply.", __FUNCTION__); - } - - if (reply) { - dbus_uint32_t serial = 0; - dbus_connection_send (con, reply, &serial); - dbus_connection_flush (con); - dbus_message_unref (reply); - } + SearchHelper *helper = g_slice_new (SearchHelper); + helper->search = search; + dbus_message_ref (message); + helper->message = message; + helper->con = con; - g_list_free (hits); + /* Search asynchronously */ + modest_search_all_accounts (search, search_all_cb, helper); } @@ -1360,12 +1702,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", @@ -1396,3 +1752,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; +}