X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=b0c4f04fefcf23d83ee134f7b9409a92006cffaa;hp=b04c9ee5ca36af5fa4d9bb698b4363969bd5b697;hb=10135c887c0c30ddefa85716b06d3e5795a17651;hpb=84bdab3fb33ca726cf54ad2cc5ce8d7d1f2bb77c diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index b04c9ee..b0c4f04 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -34,10 +34,11 @@ #include "modest-tny-account.h" #include "modest-tny-folder.h" #include "modest-ui-actions.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 #include #include @@ -54,16 +55,9 @@ #include #include #include +#include -typedef struct -{ - gchar *to; - gchar *cc; - gchar *bcc; - gchar *subject; - gchar *body; - gchar *attachments; -} SendMailIdleData; +#include typedef struct { @@ -75,6 +69,12 @@ typedef struct gchar *attachments; } ComposeMailIdleData; + +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); + /** uri_unescape: * @uri An escaped URI. URIs should always be escaped. * @len The length of the @uri string, or -1 if the string is null terminated. @@ -84,7 +84,8 @@ typedef struct * * Return value: An unescaped string. This should be freed with g_free(). */ -static gchar* uri_unescape(const gchar* uri, size_t len) +static gchar* +uri_unescape(const gchar* uri, size_t len) { if (!uri) return NULL; @@ -112,72 +113,49 @@ static gchar* uri_unescape(const gchar* uri, size_t len) * * Return value: The to address, unescaped. This should be freed with g_free(). */ -static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_values) +static gchar* +uri_parse_mailto (const gchar* mailto, GSList** list_items_and_values) { - const gchar* start_to = NULL; - /* Remove the mailto: prefix: - * 7 is the length of "mailto:": */ - if (strncmp (mailto, "mailto:", 7) == 0) { - start_to = mailto + 7; - } - - if (!start_to) + /* The URL must begin with mailto: */ + if (strncmp (mailto, "mailto:", 7) != 0) { return NULL; - + } + const gchar* start_to = mailto + 7; + /* Look for ?, or the end of the string, marking the end of the to address: */ const size_t len_to = strcspn (start_to, "?"); gchar* result_to = uri_unescape (start_to, len_to); printf("debug: result_to=%s\n", result_to); - + + if (list_items_and_values == NULL) { + return result_to; + } + /* Get any other items: */ const size_t len_mailto = strlen (start_to); const gchar* p = start_to + len_to + 1; /* parsed so far. */ const gchar* end = start_to + len_mailto; - /* GSList *items = NULL; */ - const gchar* start_item_name = p; - size_t len_item_name = 0; - const gchar* start_item_value = NULL; while (p < end) { - - /* Looking for the end of a name; */ - if (start_item_name) { - const size_t len = strcspn (p, "="); /* Returns whole string if none found. */ - if (len) { - /* This marks the end of a name and the start of the value: */ - len_item_name = len; - - /* Skip over the name and mark the start of the value: */ - p += (len + 1); /* Skip over the = */ - start_item_value = p; - } + const gchar *name, *value, *name_start, *name_end, *value_start, *value_end; + name_start = p; + name_end = strchr (name_start, '='); /* Separator between name and value */ + if (name_end == NULL) { + g_debug ("Malformed URI: %s\n", mailto); + return result_to; } - - /* Looking for the end of a value: */ - if (start_item_value) { - const size_t len = strcspn (p, "?"); /* Returns whole string if none found. */ - /* ? marks the start of a new item: */ - if (len) { - if (start_item_name && len_item_name) { - /* Finish the previously-started item: */ - gchar *item_value = uri_unescape (start_item_value, len); - gchar *item_name = g_strndup (start_item_name, len_item_name); - /* printf ("debug: item name=%s, value=%s\n", item_name, item_value); */ - - /* Append the items to the list */ - if(list_items_and_values) { - *list_items_and_values = g_slist_append (*list_items_and_values, item_name); - *list_items_and_values = g_slist_append (*list_items_and_values, item_value); - } - } - - /* Skip over the value and mark the start of a possible new name/value pair: */ - p += (len + 1); /* Skip over the ? */ - start_item_name = p; - len_item_name = 0; - start_item_value = NULL; - } + value_start = name_end + 1; + value_end = strchr (value_start, '&'); /* Separator between value and next parameter */ + + name = g_strndup(name_start, name_end - name_start); + if (value_end != NULL) { + value = uri_unescape(value_start, value_end - value_start); + p = value_end + 1; + } else { + value = uri_unescape(value_start, -1); + p = end; } - + *list_items_and_values = g_slist_append (*list_items_and_values, (gpointer) name); + *list_items_and_values = g_slist_append (*list_items_and_values, (gpointer) value); } return result_to; @@ -186,146 +164,87 @@ static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_val static gboolean check_and_offer_account_creation() { + gboolean result = TRUE; + + /* This is called from idle handlers, so lock gdk: */ + gdk_threads_enter (); + if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { - const gboolean created = modest_run_account_setup_wizard (NULL); + const gboolean created = modest_ui_actions_run_account_setup_wizard (NULL); if (!created) { - g_debug ("modest: %s: No account exists even after offering.\n", __FUNCTION__); - return FALSE; + g_debug ("modest: %s: no account exists even after offering, " + "or account setup was already underway.\n", __FUNCTION__); + result = FALSE; } } - return TRUE; + gdk_threads_leave (); + + return result; } - static gboolean on_idle_mail_to(gpointer user_data) { - /* This is based on the implemenation of main.c:start_uil(): */ - - if (!check_and_offer_account_creation ()) - return FALSE; - gchar *uri = (gchar*)user_data; GSList *list_names_and_values = NULL; - - /* Get the TnyTransportAccount so we can instantiate a mail operation: */ - ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); - gchar *account_name = modest_account_mgr_get_default_account (account_mgr); - if (!account_name) { - g_printerr ("modest: no account found\n"); - } - - TnyAccount *account = NULL; - if (account_mgr) { - account = modest_tny_account_store_get_transport_account_for_open_connection ( - modest_runtime_get_account_store(), account_name); + gchar *to = NULL; + const gchar *cc = NULL; + const gchar *bcc = NULL; + const gchar *subject = NULL; + const gchar *body = NULL; + + if (!check_and_offer_account_creation ()) { + g_idle_add (notify_error_in_dbus_callback, NULL); + goto cleanup; } - - if (!account) { - g_printerr ("modest: failed to get tny account folder'\n", account_name); - } else { - gchar * from = modest_account_mgr_get_from_string (account_mgr, - account_name); - if (!from) { - g_printerr ("modest: no from address for account '%s'\n", account_name); - } else { - const gchar *cc = NULL; - const gchar *bcc = NULL; - const gchar *subject = NULL; - const gchar *body = NULL; - - /* Get the relevant items from the list: */ - GSList *list = list_names_and_values; - while (list) { - const gchar * name = (const gchar*)list->data; - GSList *list_value = g_slist_next (list); - const gchar * value = (const gchar*)list_value->data; - - if (strcmp (name, "cc") == 0) { - cc = value; - } else if (strcmp (name, "bcc") == 0) { - bcc = value; - } else if (strcmp (name, "subject") == 0) { - subject = value; - } else if (strcmp (name, "body") == 0) { - body = value; - } - - /* Go to the next pair: */ - if (list_value) { - list = g_slist_next (list_value); - } else - list = NULL; - } - - /* Create the message: */ - gchar *to = uri_parse_mailto (uri, &list_names_and_values); - TnyMsg *msg = modest_tny_msg_new (to, from, - cc, bcc, subject, body, - NULL /* attachments */); - g_free(to); - to = NULL; - - if (!msg) { - g_printerr ("modest: failed to create message\n"); - } else - { - /* Add the message to a folder and show its UI for editing: */ - TnyFolder *folder = modest_tny_account_get_special_folder (account, - TNY_FOLDER_TYPE_DRAFTS); - if (!folder) { - g_printerr ("modest: failed to find Drafts folder\n"); - } else { - - tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */ - /* This is a GDK lock because we are an idle callback and - * the code below is or does Gtk+ code */ + /* Get the relevant items from the list: */ + to = uri_parse_mailto (uri, &list_names_and_values); + GSList *list = list_names_and_values; + while (list) { + GSList *list_value = g_slist_next (list); + const gchar * name = (const gchar*)list->data; + const gchar * value = (const gchar*)list_value->data; + + if (strcmp (name, "cc") == 0) { + cc = value; + } else if (strcmp (name, "bcc") == 0) { + bcc = value; + } else if (strcmp (name, "subject") == 0) { + subject = value; + } else if (strcmp (name, "body") == 0) { + body = value; + } - gdk_threads_enter (); /* CHECKED */ + list = g_slist_next (list_value); + } - ModestWindow *win = modest_msg_edit_window_new (msg, account_name, FALSE); - modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win); - gtk_widget_show_all (GTK_WIDGET (win)); + gdk_threads_enter (); /* CHECKED */ + modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL, FALSE); + gdk_threads_leave (); /* CHECKED */ + +cleanup: + /* Free the to: and the list, as required by uri_parse_mailto() */ + g_free(to); + g_slist_foreach (list_names_and_values, (GFunc)g_free, NULL); + g_slist_free (list_names_and_values); - gdk_threads_leave (); /* CHECKED */ - - g_object_unref (G_OBJECT(folder)); - g_object_unref (win); - } - - g_object_unref (G_OBJECT(msg)); - } - - g_object_unref (G_OBJECT(account)); - } - } - - g_free (account_name); - - /* Free the list, as required by the uri_parse_mailto() documentation: */ - if (list_names_and_values) - g_slist_foreach (list_names_and_values, (GFunc)g_free, NULL); - g_slist_free (list_names_and_values); - g_free(uri); - + return FALSE; /* Do not call this callback again. */ } -static gint on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) +static gint +on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) { - if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT) - return OSSO_ERROR; - - /* Use g_idle to context-switch into the application's thread: */ - - /* Get the arguments: */ - osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_MAIL_TO_ARG_URI); - gchar *uri = g_strdup (val.value.s); + osso_rpc_t val; + gchar *uri; + + /* Get arguments */ + val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_MAIL_TO_ARG_URI); + uri = g_strdup (val.value.s); - /* printf(" debug: to=%s\n", idle_data->to); */ g_idle_add(on_idle_mail_to, (gpointer)uri); /* Note that we cannot report failures during sending, @@ -337,120 +256,74 @@ static gint on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) static gboolean on_idle_compose_mail(gpointer user_data) { - if (!check_and_offer_account_creation ()) - return FALSE; - + GSList *attachments = NULL; ComposeMailIdleData *idle_data = (ComposeMailIdleData*)user_data; - gchar **list = NULL; - gint i = 0; - /* Get the TnyTransportAccount so we can instantiate a mail operation: */ - ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); - gchar *account_name = modest_account_mgr_get_default_account (account_mgr); - if (!account_name) { - g_printerr ("modest: no account found.\n"); - - /* TODO: If the call to this D-Bus method caused the application to start - * then the new-account wizard will now be shown, and we need to wait - * until the account exists instead of just failing. - */ - } - - TnyAccount *account = NULL; - if (account_name && account_mgr) { - account = modest_tny_account_store_get_transport_account_for_open_connection ( - modest_runtime_get_account_store(), account_name); + if (!check_and_offer_account_creation ()) { + g_idle_add (notify_error_in_dbus_callback, NULL); + goto cleanup; } - - if (!account) { - g_printerr ("modest: failed to get tny account folder'%s'\n", account_name); - } else { - gchar * from = modest_account_mgr_get_from_string (account_mgr, - account_name); - if (!from) { - g_printerr ("modest: no from address for account '%s'\n", account_name); - } else { - - /* Create the message: */ - TnyMsg *msg = modest_tny_msg_new (idle_data->to, from, - idle_data->cc, idle_data->bcc, idle_data->subject, idle_data->body, - NULL); /* NULL because m_t_m_n doesn't use it */ - - if (!msg) { - g_printerr ("modest: failed to create message\n"); - } else - { - /* Add the message to a folder and show its UI for editing: */ - TnyFolder *folder = modest_tny_account_get_special_folder (account, - TNY_FOLDER_TYPE_DRAFTS); - if (!folder) { - g_printerr ("modest: failed to find Drafts folder\n"); - } else { - - tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */ - /* This is a GDK lock because we are an idle callback and - * the code below is or does Gtk+ code */ + /* it seems Sketch at least sends a leading ',' -- take that into account, + * ie strip that ,*/ + if (idle_data->attachments && idle_data->attachments[0]==',') { + gchar *tmp = g_strdup (idle_data->attachments + 1); + g_free(idle_data->attachments); + idle_data->attachments = tmp; + } - gdk_threads_enter (); /* CHECKED */ - - ModestWindow *win = modest_msg_edit_window_new (msg, account_name, FALSE); - - /* it seems Sketch at least sends a leading ',' -- take that into account, - * ie strip that ,*/ - if (idle_data->attachments && idle_data->attachments[0]==',') { - gchar *tmp = g_strdup (idle_data->attachments + 1); - g_free(idle_data->attachments); - idle_data->attachments = tmp; - } - - list = g_strsplit(idle_data->attachments, ",", 0); - for (i=0; list[i] != NULL; i++) { - modest_msg_edit_window_attach_file_one( - (ModestMsgEditWindow *)win, list[i]); - } - g_strfreev(list); - - modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win); - gtk_widget_show_all (GTK_WIDGET (win)); - - gdk_threads_leave (); /* CHECKED */ - - g_object_unref (G_OBJECT(folder)); - g_object_unref (win); - } - - g_object_unref (G_OBJECT(msg)); - } - - g_object_unref (G_OBJECT(account)); + if (idle_data->attachments != NULL) { + 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])); } - } + g_strfreev(list); + } - /* Free the idle data: */ + /* 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 */ + 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); + g_slist_free(attachments); g_free (idle_data->to); g_free (idle_data->cc); g_free (idle_data->bcc); g_free (idle_data->subject); g_free (idle_data->body); g_free (idle_data->attachments); - g_free (idle_data); - - g_free (account_name); - + g_free(idle_data); + return FALSE; /* Do not call this callback again. */ } -static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval) +static gint +on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval) { - if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT) - return OSSO_ERROR; + ComposeMailIdleData *idle_data; + osso_rpc_t val; - /* Use g_idle to context-switch into the application's thread: */ - ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */ + idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */ /* Get the arguments: */ - osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_TO); + val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_TO); idle_data->to = g_strdup (val.value.s); val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_CC); @@ -468,251 +341,328 @@ static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retv val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_ATTACHMENTS); idle_data->attachments = g_strdup (val.value.s); + /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_compose_mail, (gpointer)idle_data); - /* Note that we cannot report failures during sending, - * because that would be asynchronous. */ return OSSO_OK; } - 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); + } 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; - } - - g_debug ("%s: Found account.\n", __FUNCTION__); - - if ( ! TNY_IS_STORE_ACCOUNT (account)) { + if (account == NULL || !TNY_IS_STORE_ACCOUNT (account)) goto out; - } - - 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; - } - - g_debug ("%s: Found folder. (%s)\n", __FUNCTION__, uri); - msg = tny_folder_find_msg (folder, uri, &err); + msg = tny_folder_find_msg (folder, uri, NULL); - if (!msg) { - 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; } +typedef struct { + TnyAccount *account; + gchar *uri; + gboolean connect; + guint animation_timeout; + GtkWidget *animation; +} OpenMsgPerformerInfo; + static gboolean -on_idle_open_message (gpointer user_data) +on_show_opening_animation (gpointer userdata) { - TnyMsg *msg = NULL; - TnyAccount *account = NULL; - TnyHeader *header = NULL; - const char *msg_uid = NULL; - char *uri = NULL; - ModestWindowMgr *win_mgr = NULL; - TnyFolder *folder = NULL; + OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata; + info->animation = modest_platform_animation_banner (NULL, NULL, _("mail_me_opening")); + info->animation_timeout = 0; + + return FALSE; +} - uri = (char *) user_data; +static gboolean +on_hide_opening_animation (gpointer userdata) +{ + OpenMsgPerformerInfo *info = (OpenMsgPerformerInfo *) userdata; - /* g_debug ("modest: %s: Trying to find msg by url: %s", __FUNCTION__, uri); */ - msg = find_message_by_url (uri, &account); - g_free (uri); + if (info->animation_timeout>0) { + g_source_remove (info->animation_timeout); + info->animation_timeout = 0; + } - if (msg == NULL) { - g_debug ("modest: %s: message not found.", __FUNCTION__); - return FALSE; + if (info->animation) { + gtk_widget_destroy (info->animation); + info->animation = NULL; } - g_debug ("modest: %s: Found message.", __FUNCTION__); - - 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 */ + 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) +{ + OpenMsgPerformerInfo *info; + gchar *uri; + TnyHeader *header; + gchar *msg_uid; + ModestWindowMgr *win_mgr; + ModestWindow *msg_view = NULL; gboolean is_draft = FALSE; - if (folder && modest_tny_folder_is_local_folder (folder) && - (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) { + 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 (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); - - /* 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 */ + 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; - gdk_threads_enter (); /* CHECKED */ + /* g_debug ("creating new window for this msg"); */ + modest_window_mgr_register_header (win_mgr, header, NULL); - gboolean already_opened = FALSE; - ModestWindow *msg_view = NULL; - 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 (account) { + modest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + } else { + modest_account_name = NULL; } - } - - if (!already_opened) { - /* g_debug ("creating new window for this msg"); */ - modest_window_mgr_register_header (win_mgr, header); - - const gchar *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 (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); + if (info->account) + g_object_unref (info->account); + g_idle_add (on_hide_opening_animation, info); } -static gint on_open_message(GArray * arguments, gpointer data, osso_rpc_t * retval) +static gboolean +on_idle_open_message_performer (gpointer user_data) { - if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT) - return OSSO_ERROR; - - /* Use g_idle to context-switch into the application's thread: */ + 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 (); + 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; +} + +static gint +on_open_message (GArray * arguments, gpointer data, osso_rpc_t * retval) +{ + osso_rpc_t val; + 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 */ + if (!is_merge) + account = tny_account_store_find_account (TNY_ACCOUNT_STORE (modest_runtime_get_account_store ()), + uri); - /* Get the arguments: */ - osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI); - gchar *uri = g_strdup (val.value.s); - - /* printf(" debug: to=%s\n", idle_data->to); */ - g_idle_add(on_idle_open_message, (gpointer)uri); - /* Note that we cannot report failures during sending, - * because that would be asynchronous. */ - return OSSO_OK; + if (is_merge || account) { + OpenMsgPerformerInfo *info; + TnyFolder *folder = NULL; + + 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); + + /* 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 + 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); + } + + if (account) + g_object_unref (account); + return osso_retval; } static gboolean on_idle_delete_message (gpointer user_data) { - TnyList *headers = NULL; - TnyFolder *folder = NULL; - TnyIterator *iter = NULL; - TnyHeader *header = NULL; - TnyHeader *msg_header = NULL; - TnyMsg *msg = NULL; - TnyAccount *account = NULL; - GError *error = NULL; - const char *uri = NULL; - const char *uid = NULL; - gint res = 0; + TnyList *headers = NULL; + TnyFolder *folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL, *msg_header = NULL; + TnyMsg *msg = NULL; + TnyAccount *account = NULL; + const char *uri = NULL, *uid = NULL; + gint res = 0; + ModestMailOperation *mail_op = NULL; + ModestWindow *main_win = NULL, *msg_view = NULL; uri = (char *) user_data; - - /* g_debug ("modest: %s Searching for message (delete message)"); */ msg = find_message_by_url (uri, &account); - if (msg == NULL) { - return OSSO_ERROR; + if (!msg) { + g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri); + g_idle_add (notify_error_in_dbus_callback, NULL); + return OSSO_ERROR; } - - g_debug ("modest: %s: Found message", __FUNCTION__); + + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr(), + FALSE); /* don't create */ msg_header = tny_msg_get_header (msg); uid = tny_header_get_uid (msg_header); folder = tny_msg_get_folder (msg); + if (!folder) { + g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri); + g_object_unref (msg); + g_idle_add (notify_error_in_dbus_callback, NULL); + return OSSO_ERROR; + } - /* tny_msg_get_header () flaw: - * From tinythingy doc: You can't use the returned instance with the - * TnyFolder operations - * - * To get a header instance that will work with these folder methods, - * you can use tny_folder_get_headers. - * - * Ok, we will do so then. Sigh. - * */ headers = tny_simple_list_new (); - tny_folder_get_headers (folder, headers, TRUE, NULL); iter = tny_list_create_iterator (headers); header = NULL; - /* g_debug ("Searching header for msg in folder"); */ while (!tny_iterator_is_done (iter)) { const char *cur_id = NULL; @@ -746,34 +696,28 @@ on_idle_delete_message (gpointer user_data) if (header == NULL) { if (folder) g_object_unref (folder); - + g_idle_add (notify_error_in_dbus_callback, NULL); return OSSO_ERROR; - } + } - error = NULL; res = OSSO_OK; - + /* This is a GDK lock because we are an idle callback and * the code below is or does Gtk+ code */ - gdk_threads_enter (); /* CHECKED */ - ModestWindow *win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - modest_do_message_delete (header, win); - if (error != NULL) { - res = OSSO_ERROR; - g_error_free (error); - } - - + mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); + modest_mail_operation_remove_msg (mail_op, header, FALSE); + g_object_unref (G_OBJECT (mail_op)); - ModestWindowMgr *win_mgr = modest_runtime_get_window_mgr (); - ModestWindow *msg_view = NULL; - if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { - if (MODEST_IS_MSG_VIEW_WINDOW (msg_view)) - modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view)); + if (main_win) { /* no need if there's no window */ + if (modest_window_mgr_find_registered_header (modest_runtime_get_window_mgr(), + header, &msg_view)) { + if (MODEST_IS_MSG_VIEW_WINDOW (msg_view)) + modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view)); + } } - gdk_threads_leave (); /* CHECKED */ if (header) @@ -798,10 +742,18 @@ on_idle_delete_message (gpointer user_data) * (They are not really deleted until contact is made with the server, * so they would appear with a strike-through until then): */ - ModestHeaderView *header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget ( - MODEST_MAIN_WINDOW(win), MODEST_WIDGET_TYPE_HEADER_VIEW)); - if (header_view && MODEST_IS_HEADER_VIEW (header_view)) - modest_header_view_refilter (header_view); + if (main_win) { /* only needed when there's a mainwindow / UI */ + + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ + gdk_threads_enter (); /* CHECKED */ + ModestHeaderView *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); + gdk_threads_leave (); + } return res; } @@ -812,86 +764,272 @@ on_idle_delete_message (gpointer user_data) static gint on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) { - if (arguments->len != MODEST_DBUS_DELETE_MESSAGE_ARGS_COUNT) - return OSSO_ERROR; - - /* Use g_idle to context-switch into the application's thread: */ - - /* Get the arguments: */ + /* Get the arguments: */ osso_rpc_t val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_DELETE_MESSAGE_ARG_URI); gchar *uri = g_strdup (val.value.s); - /* printf(" debug: to=%s\n", idle_data->to); */ + /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_delete_message, (gpointer)uri); - /* Note that we cannot report failures during sending, - * because that would be asynchronous. */ return OSSO_OK; } static gboolean on_idle_send_receive(gpointer user_data) { - ModestWindow *win; + gboolean auto_update; + ModestWindow *main_win = NULL; - /* This is a GDK lock because we are an idle callback and - * the code below is or does Gtk+ code */ + main_win = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE); /* don't create */ gdk_threads_enter (); /* CHECKED */ - /* Pick the main window if it exists */ - win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + /* Check if the autoupdate feature is on */ + auto_update = modest_conf_get_bool (modest_runtime_get_conf (), + MODEST_CONF_AUTO_UPDATE, NULL); - /* This seems to be necessary to show new messages in the current window. - * I would expect this to be after the send_receive, but maybe - * this makes a connection too. murrayc. */ - modest_do_refresh_current_folder (win); + 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); - /* Send & receive all if "Update automatically" is set */ - /* TODO: check the auto-update parameter in the configuration */ - modest_ui_actions_do_send_receive_all (win); - gdk_threads_leave (); /* CHECKED */ - return FALSE; /* Do not call this callback again. */ + 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) + + + +static gint +on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval) { - printf("DEBUG: modest: %s\n", __FUNCTION__); - /* Use g_idle to context-switch into the application's thread: */ + ModestConnectedVia connect_when; - /* This method has no arguments. */ - - /* printf(" debug: to=%s\n", idle_data->to); */ - g_idle_add(on_idle_send_receive, NULL); + 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); + } - /* Note that we cannot report failures during send/receive, - * because that would be asynchronous. */ return OSSO_OK; } -static gboolean on_idle_top_application (gpointer user_data); - static gboolean on_idle_open_default_inbox(gpointer user_data) { - if (!check_and_offer_account_creation ()) - return FALSE; + 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 */ - - ModestWindow *win = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + 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 */ - GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_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 */ @@ -903,84 +1041,95 @@ on_idle_open_default_inbox(gpointer user_data) return FALSE; /* Do not call this callback again. */ } -static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval) +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: */ - - /* This method has no arguments. */ - + /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_open_default_inbox, NULL); - /* Note that we cannot report failures during send/receive, - * because that would be asynchronous. */ return OSSO_OK; } -static gboolean on_idle_top_application (gpointer user_data) +static gboolean +on_idle_top_application (gpointer user_data) { - + ModestWindow *main_win; + /* This is a GDK lock because we are an idle callback and * the code below is or does Gtk+ code */ gdk_threads_enter (); /* CHECKED */ - - ModestWindow *win = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - if (win) { + + main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + TRUE); /* create if non-existent */ + 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 (win)); - gtk_window_present (GTK_WINDOW (win)); - } + 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. */ } -static gint on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval) +static gint +on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval) { - /* Use g_idle to context-switch into the application's thread: */ - - /* This method has no arguments. */ - + /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_top_application, NULL); return OSSO_OK; } /* Callback for normal D-BUS messages */ -gint modest_dbus_req_handler(const gchar * interface, const gchar * method, - GArray * arguments, gpointer data, - osso_rpc_t * retval) +gint +modest_dbus_req_handler(const gchar * interface, const gchar * method, + GArray * arguments, gpointer data, + osso_rpc_t * retval) { - - /* g_debug ("debug: %s\n", __FUNCTION__); */ - g_debug ("debug: %s: method received: %s\n", __FUNCTION__, method); - if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) { - return on_mail_to (arguments, data, retval); + if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT) + goto param_error; + 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_SEND_RECEIVE) == 0) { + if (arguments->len != 0) + goto param_error; return on_send_receive (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) { + if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT) + goto param_error; 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) + goto param_error; return on_delete_message (arguments,data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) { + if (arguments->len != 0) + goto param_error; return on_open_default_inbox (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) { - return on_top_application (arguments, data, retval); - } - else { + if (arguments->len != 0) + goto param_error; + return on_top_application (arguments, data, retval); + } else { /* We need to return INVALID here so * libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED, * so that our modest_dbus_req_filter will then be tried instead. * */ return OSSO_INVALID; } + param_error: + /* Notify error in D-Bus method */ + g_idle_add (notify_error_in_dbus_callback, NULL); + return OSSO_ERROR; } /* A complex D-Bus type (like a struct), @@ -1014,7 +1163,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; @@ -1024,7 +1173,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; @@ -1082,7 +1231,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); @@ -1122,7 +1271,7 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) DBUS_TYPE_INT32, &flags_v, DBUS_TYPE_UINT32, &size_v, DBUS_TYPE_INVALID); - + dbus_flags = (ModestDBusSearchFlags) flags_v; start_date = (time_t) sd_v; end_date = (time_t) ed_v; @@ -1135,7 +1284,15 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) * Note that we don't copy the strings, * because this struct will only be used for the lifetime of this function. */ - search.folder = folder; + if (folder && g_str_has_prefix (folder, "MAND:")) { + search.folder = folder + strlen ("MAND:"); + } else if (folder && g_str_has_prefix (folder, "USER:")) { + search.folder = folder + strlen ("USER:"); + } else if (folder && g_str_has_prefix (folder, "MY:")) { + search.folder = folder + strlen ("MY:"); + } else { + search.folder = folder; + } /* Remember the text to search for: */ #ifdef MODEST_HAVE_OGS @@ -1143,8 +1300,8 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) #endif /* Other criteria: */ - search.before = start_date; - search.after = end_date; + search.start_date = start_date; + search.end_date = end_date; search.flags = 0; /* Text to serach for in various parts of the message: */ @@ -1170,12 +1327,12 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) if (sd_v > 0) { search.flags |= MODEST_SEARCH_BEFORE; - search.before = start_date; + search.start_date = start_date; } if (ed_v > 0) { search.flags |= MODEST_SEARCH_AFTER; - search.after = end_date; + search.end_date = end_date; } if (size_v > 0) { @@ -1275,6 +1432,7 @@ add_single_folder_to_list (TnyFolder *folder, GList** list) return; if (TNY_IS_MERGE_FOLDER (folder)) { + const gchar * folder_name; /* Ignore these because their IDs ares * a) not always unique or sensible. * b) not human-readable, and currently need a human-readable @@ -1285,7 +1443,11 @@ add_single_folder_to_list (TnyFolder *folder, GList** list) * We could hack our D-Bus API to understand "outbox" as the merged outboxes, * but that seems unwise. murrayc. */ - return; + folder_name = tny_folder_get_name (folder); + if (folder_name && !strcmp (folder_name, "Outbox")) { + *list = g_list_append(*list, g_strdup ("MAND:outbox")); + } + return; } /* Add this folder to the list: */ @@ -1300,16 +1462,37 @@ add_single_folder_to_list (TnyFolder *folder, GList** list) * TODO: osso-global search should probably be changed to * take an ID and a Name. */ - const gchar * id = tny_folder_get_id (folder); - if (id && strlen(id)) - *list = g_list_append(*list, g_strdup (id)); - /* - else { - g_warning ("DEBUG: %s: folder has no name or ID.\n", __FUNCTION__); + const gchar * id = tny_folder_get_id (folder); + if (id && strlen(id)) { + const gchar *prefix = NULL; + TnyFolderType folder_type; + + /* dbus global search api expects a prefix identifying the type of + * folder here. Mandatory folders should have MAND: prefix, and + * other user created folders should have USER: prefix + */ + folder_type = modest_tny_folder_guess_folder_type (folder); + switch (folder_type) { + case TNY_FOLDER_TYPE_INBOX: + prefix = "MY:"; + break; + case TNY_FOLDER_TYPE_OUTBOX: + case TNY_FOLDER_TYPE_DRAFTS: + case TNY_FOLDER_TYPE_SENT: + case TNY_FOLDER_TYPE_ARCHIVE: + prefix = "MAND:"; + break; + case TNY_FOLDER_TYPE_INVALID: + g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__); + return; /* don't add it */ + default: + prefix = "USER:"; + } + + *list = g_list_append(*list, g_strdup_printf ("%s%s", prefix, id)); } - */ } static void @@ -1365,51 +1548,106 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list) g_object_unref (G_OBJECT (iter)); } + +/* return >1 for a special folder, 0 for a user-folder */ +static gint +get_rank (const gchar *folder) +{ + if (strcmp (folder, "INBOX") == 0) + return 1; + if (strcmp (folder, modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_SENT)) == 0) + return 2; + if (strcmp (folder, modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_DRAFTS)) == 0) + return 3; + if (strcmp (folder, modest_local_folder_info_get_type_name(TNY_FOLDER_TYPE_OUTBOX)) == 0) + return 4; + return 0; +} + +static gint +folder_name_compare_func (const gchar* folder1, const gchar* folder2) +{ + gint r1 = get_rank (folder1); + gint r2 = get_rank (folder2); + + if (r1 > 0 && r2 > 0) + return r1 - r2; + if (r1 > 0 && r2 == 0) + return -1; + if (r1 == 0 && r2 > 0) + return 1; + else + return modest_text_utils_utf8_strcmp (folder1, folder2, TRUE); +} + +/* FIXME: */ +/* - we're still missing the outbox */ +/* - we need to take care of localization (urgh) */ +/* - what about 'All mail folders'? */ static void on_dbus_method_get_folders (DBusConnection *con, DBusMessage *message) { DBusMessage *reply = NULL; + ModestAccountMgr *account_mgr = NULL; + gchar *account_name = NULL; + GList *folder_names = NULL; + TnyAccount *account_local = NULL; + TnyAccount *account_mmc = NULL; - /* Get the TnyStoreAccount so we can get the folders: */ - ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr(); - gchar *account_name = modest_account_mgr_get_default_account (account_mgr); + account_mgr = modest_runtime_get_account_mgr(); + account_name = modest_account_mgr_get_default_account (account_mgr); if (!account_name) { g_printerr ("modest: no account found\n"); } - TnyAccount *account = NULL; - if (account_mgr) { - account = modest_tny_account_store_get_server_account ( - modest_runtime_get_account_store(), account_name, - TNY_ACCOUNT_TYPE_STORE); - } - - if (!account) { - g_printerr ("modest: failed to get tny account folder'%s'\n", account_name); - } + if (account_name) { + TnyAccount *account = NULL; + if (account_mgr) { + account = modest_tny_account_store_get_server_account ( + modest_runtime_get_account_store(), account_name, + TNY_ACCOUNT_TYPE_STORE); + } - printf("DEBUG: %s: Getting folders for account name=%s\n", __FUNCTION__, account_name); - g_free (account_name); - account_name = NULL; + if (!account) { + g_printerr ("modest: failed to get tny account folder'%s'\n", account_name); + } + + printf("DEBUG: %s: Getting folders for account name=%s\n", __FUNCTION__, account_name); + g_free (account_name); + account_name = NULL; + + add_folders_to_list (TNY_FOLDER_STORE (account), &folder_names); - GList *folder_names = NULL; - add_folders_to_list (TNY_FOLDER_STORE (account), &folder_names); - - g_object_unref (account); - account = NULL; + g_object_unref (account); + account = NULL; + } /* Also add the folders from the local folders account, * because they are (currently) used with all accounts: * TODO: This is not working. It seems to get only the Merged Folder (with an ID of "" (not NULL)). */ - TnyAccount *account_local = + account_local = modest_tny_account_store_get_local_folders_account (modest_runtime_get_account_store()); add_folders_to_list (TNY_FOLDER_STORE (account_local), &folder_names); g_object_unref (account_local); account_local = NULL; + /* Obtain the mmc account */ + account_mmc = + modest_tny_account_store_get_mmc_folders_account (modest_runtime_get_account_store()); + if (account_mmc) { + add_folders_to_list (TNY_FOLDER_STORE (account_mmc), &folder_names); + g_object_unref (account_mmc); + account_mmc = NULL; + } + + /* specs require us to sort the folder names, although + * this is really not the place to do that... + */ + folder_names = g_list_sort (folder_names, + (GCompareFunc)folder_name_compare_func); /* Put the result in a DBus reply: */ reply = dbus_message_new_method_return (message); @@ -1447,17 +1685,29 @@ modest_dbus_req_filter (DBusConnection *con, if (dbus_message_is_method_call (message, MODEST_DBUS_IFACE, MODEST_DBUS_METHOD_SEARCH)) { - printf (" DEBUG1: %s\n", __FUNCTION__); on_dbus_method_search (con, message); handled = TRUE; } else if (dbus_message_is_method_call (message, - MODEST_DBUS_IFACE, - MODEST_DBUS_METHOD_GET_FOLDERS)) { - printf (" DEBUG2: %s\n", __FUNCTION__); + 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", @@ -1471,23 +1721,28 @@ modest_dbus_req_filter (DBusConnection *con, DBUS_HANDLER_RESULT_NOT_YET_HANDLED); } +static gboolean +notify_error_in_dbus_callback (gpointer user_data) +{ + ModestMailOperation *mail_op; + ModestMailOperationQueue *mail_op_queue; + + mail_op = modest_mail_operation_new (NULL); + mail_op_queue = modest_runtime_get_mail_operation_queue (); -void -modest_osso_cb_hw_state_handler(osso_hw_state_t *state, gpointer data) + /* Issues a noop operation in order to force the queue to emit + the "queue-empty" signal to allow modest to quit */ + modest_mail_operation_queue_add (mail_op_queue, mail_op); + modest_mail_operation_noop (mail_op); + g_object_unref (mail_op); + + return FALSE; +} + +static gboolean +notify_msg_not_found_in_idle (gpointer user_data) { - /* TODO? */ - /* printf("%s()\n", __PRETTY_FUNCTION__); */ - - if(state->system_inactivity_ind) - { - } - else if(state->save_unsaved_data_ind) - { - } - else - { - - } - - /* printf("debug: %s(): return\n", __PRETTY_FUNCTION__); */ + modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error")); + + return FALSE; }