X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=9fb59847f631cb40b03598c9d21b8ebedab7686e;hb=e75cb10b60c465a19c5f7fced8a48bf30ae3e9a2;hp=b7c9af36355380a72e90fcb2e9d7ac328b64ebe4;hpb=703965f6f52fab28c9762f1b5603c6feeec5a680;p=modest diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index b7c9af3..9fb5984 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -53,16 +53,9 @@ #include #include #include +#include -typedef struct -{ - gchar *to; - gchar *cc; - gchar *bcc; - gchar *subject; - gchar *body; - gchar *attachments; -} SendMailIdleData; +#include typedef struct { @@ -74,6 +67,8 @@ typedef struct gchar *attachments; } ComposeMailIdleData; +static gboolean on_idle_compose_mail(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. @@ -113,185 +108,127 @@ static gchar* uri_unescape(const gchar* uri, size_t len) */ 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; } static gboolean -on_idle_mail_to(gpointer user_data) +check_and_offer_account_creation() { - /* This is based on the implemenation of main.c:start_uil(): */ + gboolean result = TRUE; - gchar *uri = (gchar*)user_data; - GSList *list_names_and_values = NULL; - gchar *to = uri_parse_mailto (uri, &list_names_and_values); + /* This is called from idle handlers, so lock gdk: */ + gdk_threads_enter (); - /* 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"); + if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE)) { + printf ("DEBUG1: %s\n", __FUNCTION__); + const gboolean created = modest_ui_actions_run_account_setup_wizard (NULL); + printf ("DEBUG1: %s\n", __FUNCTION__); + if (!created) { + g_debug ("modest: %s: no account exists even after offering, " + "or account setup was already underway.\n", __FUNCTION__); + result = FALSE; + } } - TnyAccount *account = NULL; - if (account_mgr) { - account = modest_tny_account_store_get_transport_account_for_open_connection ( - modest_runtime_get_account_store(), account_name); - } + gdk_threads_leave (); - 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: */ - TnyMsg *msg = modest_tny_msg_new (to, from, - cc, bcc, subject, body, - NULL /* attachments */); - - 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 */ - gdk_threads_enter (); - - ModestWindow *win = modest_msg_edit_window_new (msg, account_name); - modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win); - gtk_widget_show_all (GTK_WIDGET (win)); - - gdk_threads_leave (); - - g_object_unref (G_OBJECT(folder)); - g_object_unref (win); - } - - g_object_unref (G_OBJECT(msg)); - } - - g_object_unref (G_OBJECT(account)); + return result; +} + +static gboolean +on_idle_mail_to(gpointer user_data) +{ + gchar *uri = (gchar*)user_data; + GSList *list_names_and_values = NULL; + 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 ()) { + goto cleanup; + } + + /* 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; } - } - - 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(to); - + + list = g_slist_next (list_value); + } + + gdk_threads_enter (); /* CHECKED */ + modest_ui_actions_compose_msg(NULL, to, cc, bcc, subject, body, NULL); + 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); + 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; @@ -314,101 +251,43 @@ static gint on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) static gboolean on_idle_compose_mail(gpointer user_data) { + 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 ()) { + 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 */ - gdk_threads_enter (); - - ModestWindow *win = modest_msg_edit_window_new (msg, account_name); - - /* 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_noninteractive( - (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 (); - - g_object_unref (G_OBJECT(folder)); - g_object_unref (win); - } - - g_object_unref (G_OBJECT(msg)); - } - - g_object_unref (G_OBJECT(account)); + /* 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; + } + 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])); } - } - - /* Free the idle data: */ + g_strfreev(list); + } + 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); + 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. */ } @@ -446,7 +325,6 @@ static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retv return OSSO_OK; } - static TnyMsg * find_message_by_url (const char *uri, TnyAccount **ac_out) { @@ -465,11 +343,26 @@ find_message_by_url (const char *uri, TnyAccount **ac_out) 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); + } + + printf ("DEBUG: %s: uri=%s\n", __FUNCTION__, uri); + /* 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.\n", __FUNCTION__); + g_debug ("%s: tny_account_store_find_account() failed for\n uri=%s\n", + __FUNCTION__, uri); return NULL; } @@ -487,7 +380,7 @@ find_message_by_url (const char *uri, TnyAccount **ac_out) &err); if (folder == NULL) { - g_debug ("%s: tny_store_account_find_folder() failed\naccount=%s, uri=%s.\n", __FUNCTION__, + 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); goto out; } @@ -519,7 +412,6 @@ out: static gboolean on_idle_open_message (gpointer user_data) { - ModestWindow *msg_view = NULL; TnyMsg *msg = NULL; TnyAccount *account = NULL; TnyHeader *header = NULL; @@ -540,39 +432,75 @@ on_idle_open_message (gpointer user_data) } g_debug ("modest: %s: Found message.", __FUNCTION__); + folder = tny_msg_get_folder (msg); - if (modest_tny_folder_get_local_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS) { - g_debug ("TODO: draft messages should be opened in edit mode... "); + + /* 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 */ + 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)) { + is_draft = TRUE; } 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); -/* FIXME: modest_tny_folder_get_header_unique_id warns against this */ + win_mgr = modest_runtime_get_window_mgr (); - - gdk_threads_enter (); + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ + + gdk_threads_enter (); /* CHECKED */ + + gboolean already_opened = FALSE; + ModestWindow *msg_view = NULL; if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { - g_debug ("modest: %s: A window for this messsage is open already.", __FUNCTION__); - if (!MODEST_IS_MSG_VIEW_WINDOW(msg_view)) - g_debug (" DEBUG: But the window is not a 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; } - } else { + } + + if (!already_opened) { /* g_debug ("creating new window for this msg"); */ - modest_window_mgr_register_header (win_mgr, header); + modest_window_mgr_register_header (win_mgr, header, NULL); const gchar *modest_account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account); - msg_view = modest_msg_view_window_new (msg, modest_account_name, + + /* Drafts will be opened in the editor, and others will be opened in the viewer, + * as per the UI spec: */ + 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); + } + modest_window_mgr_register_window (win_mgr, msg_view); gtk_widget_show_all (GTK_WIDGET (msg_view)); } - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ g_object_unref (header); g_object_unref (account); @@ -603,17 +531,16 @@ static gint on_open_message(GArray * arguments, gpointer data, osso_rpc_t * retv static gboolean on_idle_delete_message (gpointer user_data) { - TnyList *headers; - TnyFolder *folder; - TnyIterator *iter; - TnyHeader *header; - TnyHeader *msg_header; - TnyMsg *msg; - TnyAccount *account; - GError *error; - const char *uri; - const char *uid; - gint res; + 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; @@ -621,17 +548,18 @@ on_idle_delete_message (gpointer user_data) msg = find_message_by_url (uri, &account); - if (msg == NULL) { - return OSSO_ERROR; + if (!msg) { + g_warning ("modest: %s: Could not find message '%s'", __FUNCTION__, uri); + return OSSO_ERROR; /* FIXME: is this TRUE or FALSE?! */ } - - 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); - /* tny_msg_get_header () flaw: * From tinythingy doc: You can't use the returned instance with the * TnyFolder operations @@ -649,18 +577,22 @@ on_idle_delete_message (gpointer user_data) /* g_debug ("Searching header for msg in folder"); */ while (!tny_iterator_is_done (iter)) { - const char *cur_id; + const char *cur_id = NULL; header = TNY_HEADER (tny_iterator_get_current (iter)); - cur_id = tny_header_get_uid (header); + if (header) + cur_id = tny_header_get_uid (header); if (cur_id && uid && g_str_equal (cur_id, uid)) { /* g_debug ("Found corresponding header from folder"); */ break; } - header = NULL; - g_object_unref (header); + if (header) { + g_object_unref (header); + header = NULL; + } + tny_iterator_next (iter); } @@ -675,38 +607,73 @@ on_idle_delete_message (gpointer user_data) msg = NULL; if (header == NULL) { - g_object_unref (folder); + if (folder) + g_object_unref (folder); + return OSSO_ERROR; } - error = NULL; res = OSSO_OK; - - gdk_threads_enter (); - 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); + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ + gdk_threads_enter (); /* CHECKED */ + + mail_op = modest_mail_operation_new (main_win ? G_OBJECT(main_win) : NULL); + 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)); + + 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) + g_object_unref (header); + if (folder) { + /* Trick: do a poke status in order to speed up the signaling + of observers. + A delete via the menu does this, in do_headers_action(), + though I don't know why. + */ + tny_folder_poke_status (folder); - 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)); + g_object_unref (folder); } - gdk_threads_leave (); + if (account) + g_object_unref (account); + + /* Refilter the header view explicitly, to make sure that + * deleted emails are really removed from view. + * (They are not really deleted until contact is made with the server, + * so they would appear with a strike-through until then): + */ + 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 (); + } - g_object_unref (header); - g_object_unref (folder); return res; } + + + static gint on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) { @@ -732,24 +699,26 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) static gboolean on_idle_send_receive(gpointer user_data) { - ModestWindow *win; + ModestWindow *main_win = + modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (), + FALSE); /* don't create */ - gdk_threads_enter (); - - /* Pick the main window if it exists */ - win = modest_window_mgr_get_main_window (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 */ /* 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); + modest_ui_actions_do_send_receive_all (main_win); - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ return FALSE; /* Do not call this callback again. */ } 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: */ /* This method has no arguments. */ @@ -762,25 +731,45 @@ static gint on_send_receive(GArray * arguments, gpointer data, osso_rpc_t * retv return OSSO_OK; } +static gboolean on_idle_top_application (gpointer user_data); + static gboolean on_idle_open_default_inbox(gpointer user_data) { - gdk_threads_enter (); + ModestWindow *main_win; + GtkWidget *folder_view; - ModestWindow *win = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + 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 */ + 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 (); + gdk_threads_leave (); /* CHECKED */ + + /* This D-Bus method is obviously meant to result in the UI being visible, + * so show it, by calling this idle handler directly: */ + on_idle_top_application(user_data); return FALSE; /* Do not call this callback again. */ } -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: */ @@ -794,20 +783,27 @@ static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t } -static gboolean on_idle_top_application (gpointer user_data) +static gboolean +on_idle_top_application (gpointer user_data) { - gdk_threads_enter (); + ModestWindow *main_win; + + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ - ModestWindow *win = - modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); - if (win) { + gdk_threads_enter (); /* CHECKED */ + + 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 (); + gdk_threads_leave (); /* CHECKED */ return FALSE; /* Do not call this callback again. */ } @@ -848,8 +844,6 @@ gint modest_dbus_req_handler(const gchar * interface, const gchar * method, return on_top_application (arguments, data, retval); } else { - g_debug (" debug: %s: Unexpected D-Bus method: %s\n", __FUNCTION__, method); - /* 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. @@ -997,7 +991,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; @@ -1010,7 +1004,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 @@ -1018,8 +1020,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: */ @@ -1045,12 +1047,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) { @@ -1149,6 +1151,25 @@ add_single_folder_to_list (TnyFolder *folder, GList** list) if (!folder) 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 + * ID here, because the osso-email-interface API does not allow + * us to return both an ID and a display name. + * + * This is actually the merged outbox folder. + * We could hack our D-Bus API to understand "outbox" as the merged outboxes, + * but that seems unwise. murrayc. + */ + 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: */ /* const gchar * folder_name = tny_folder_get_name (folder); @@ -1161,16 +1182,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 @@ -1206,68 +1248,126 @@ add_folders_to_list (TnyFolderStore *folder_store, GList** list) * be generally unsuitable for Modest. */ TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter)); - add_single_folder_to_list (TNY_FOLDER (folder), list); - - #if 0 - if (TNY_IS_FOLDER_STORE (folder)) - add_folders_to_list (TNY_FOLDER_STORE (folder), list); - else { + if (folder) { add_single_folder_to_list (TNY_FOLDER (folder), list); + + #if 0 + if (TNY_IS_FOLDER_STORE (folder)) + add_folders_to_list (TNY_FOLDER_STORE (folder), list); + else { + add_single_folder_to_list (TNY_FOLDER (folder), list); + } + #endif + + /* tny_iterator_get_current() gave us a reference. */ + g_object_unref (folder); } - #endif tny_iterator_next (iter); } 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; - - GList *folder_names = NULL; - add_folders_to_list (TNY_FOLDER_STORE (account), &folder_names); - - g_object_unref (account); - account = 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); + 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 = - modest_tny_account_store_get_local_folders_account ( - TNY_ACCOUNT_STORE (modest_runtime_get_account_store())); + 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); @@ -1313,6 +1413,14 @@ modest_dbus_req_filter (DBusConnection *con, on_dbus_method_get_folders (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", + __FUNCTION__, dbus_message_get_interface (message), + dbus_message_get_member(message)); + */ + } return (handled ? DBUS_HANDLER_RESULT_HANDLED :