X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=51cc6d1c5d79b7d9fa79f4049a729db857e0f753;hp=c0e95ae2f727ad9ca24af42b7036d06868123243;hb=9a1eccdf02d2a541688c4d5e4f53310e81d8b6fe;hpb=23e19d82e2114b7906e7c0c721fc59c097eddec1 diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index c0e95ae..51cc6d1 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -55,15 +55,7 @@ #include #include -typedef struct -{ - gchar *to; - gchar *cc; - gchar *bcc; - gchar *subject; - gchar *body; - gchar *attachments; -} SendMailIdleData; +#include typedef struct { @@ -75,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. @@ -114,185 +108,130 @@ 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 (); + return result; +} - 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)); +static gboolean +on_idle_mail_to(gpointer user_data) +{ + gchar *uri = (gchar*)user_data; + GSList *list_names_and_values = NULL; - 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)); + const gchar *cc = NULL; + const gchar *bcc = NULL; + const gchar *subject = NULL; + const gchar *body = NULL; + + /* Get the relevant items from the list: */ + gchar *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); + } + + ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */ + + idle_data->to = g_strdup (to); + idle_data->cc = g_strdup (cc); + idle_data->bcc = g_strdup (bcc); + idle_data->subject = g_strdup (subject); + idle_data->body = g_strdup (body); + idle_data->attachments = NULL; + + /* 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); - + + on_idle_compose_mail((gpointer)idle_data); + 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; @@ -315,6 +254,9 @@ 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; + ComposeMailIdleData *idle_data = (ComposeMailIdleData*)user_data; gchar **list = NULL; gint i = 0; @@ -345,12 +287,36 @@ on_idle_compose_mail(gpointer user_data) if (!from) { g_printerr ("modest: no from address for account '%s'\n", account_name); } else { - + /* Get the signature. + * TODO: This, like much of this function is copy/pasted from + * modest_ui_actions_on_new_msg(): */ + gboolean use_signature = FALSE; + gchar *signature = modest_account_mgr_get_signature (modest_runtime_get_account_mgr (), account_name, &use_signature); + + gchar* blank_and_signature = NULL; + if (use_signature) { + blank_and_signature = g_strconcat ("\n", signature, NULL); + } else { + blank_and_signature = g_strdup (""); + } + g_free (signature); + + /* Add it to the body. */ + gchar *body_with_sig = NULL; + if (!(idle_data->body)) + body_with_sig = g_strdup (blank_and_signature); + else { + body_with_sig = g_strconcat (idle_data->body, blank_and_signature, NULL); + } + /* 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, + idle_data->cc, idle_data->bcc, idle_data->subject, body_with_sig, NULL); /* NULL because m_t_m_n doesn't use it */ + g_free (body_with_sig); + g_free (blank_and_signature); + if (!msg) { g_printerr ("modest: failed to create message\n"); } else @@ -364,9 +330,12 @@ on_idle_compose_mail(gpointer user_data) tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */ - 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 */ - ModestWindow *win = modest_msg_edit_window_new (msg, account_name); + 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 ,*/ @@ -376,17 +345,19 @@ on_idle_compose_mail(gpointer user_data) 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( + if (idle_data->attachments != NULL) { + 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); } - g_strfreev(list); modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win); gtk_widget_show_all (GTK_WIDGET (win)); - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ g_object_unref (G_OBJECT(folder)); g_object_unref (win); @@ -447,7 +418,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) { @@ -466,6 +436,20 @@ 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); @@ -545,9 +529,11 @@ on_idle_open_message (gpointer user_data) 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 */ gboolean is_draft = FALSE; if (folder && modest_tny_folder_is_local_folder (folder) && - (modest_tny_folder_get_local_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) { + (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS)) { is_draft = TRUE; } @@ -561,8 +547,11 @@ on_idle_open_message (gpointer user_data) msg_uid = modest_tny_folder_get_header_unique_id(header); 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; @@ -584,7 +573,7 @@ on_idle_open_message (gpointer user_data) 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); @@ -594,9 +583,9 @@ on_idle_open_message (gpointer user_data) 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); + 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_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid); } @@ -604,7 +593,7 @@ on_idle_open_message (gpointer user_data) gtk_widget_show_all (GTK_WIDGET (msg_view)); } - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ g_object_unref (header); g_object_unref (account); @@ -642,7 +631,6 @@ on_idle_delete_message (gpointer user_data) TnyHeader *msg_header = NULL; TnyMsg *msg = NULL; TnyAccount *account = NULL; - GError *error = NULL; const char *uri = NULL; const char *uid = NULL; gint res = 0; @@ -717,20 +705,14 @@ on_idle_delete_message (gpointer user_data) return OSSO_ERROR; } - error = NULL; res = OSSO_OK; - 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 */ 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); - } - - - ModestWindowMgr *win_mgr = modest_runtime_get_window_mgr (); ModestWindow *msg_view = NULL; if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { @@ -738,7 +720,7 @@ on_idle_delete_message (gpointer user_data) modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view)); } - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ if (header) g_object_unref (header); @@ -747,22 +729,25 @@ on_idle_delete_message (gpointer user_data) /* 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(), - but it does not seem to solve the stricken-out-but-not-removed problem here. + though I don't know why. */ tny_folder_poke_status (folder); g_object_unref (folder); } - if (account) { - /* Do a refresh so that stricken-out emails are really removed from the treeview. - * TODO: Why is this necessary here, but not when doing a delete from the menu or toolbar? */ - const gchar *modest_account_name = - modest_tny_account_get_parent_modest_account_name_for_server_account (account); - modest_ui_actions_do_send_receive (modest_account_name, MODEST_WINDOW (win)); - + 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): + */ + ModestHeaderView *header_view = MODEST_HEADER_VIEW(modest_main_window_get_child_widget ( + MODEST_MAIN_WINDOW(win), MODEST_MAIN_WINDOW_WIDGET_TYPE_HEADER_VIEW)); + if (header_view && MODEST_IS_HEADER_VIEW (header_view)) + modest_header_view_refilter (header_view); return res; } @@ -797,22 +782,31 @@ on_idle_send_receive(gpointer user_data) { ModestWindow *win; - 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 */ /* Pick the main window if it exists */ win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + /* 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); + /* 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 (); + 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. */ @@ -830,17 +824,23 @@ static gboolean on_idle_top_application (gpointer user_data); static gboolean on_idle_open_default_inbox(gpointer user_data) { - gdk_threads_enter (); + if (!check_and_offer_account_creation ()) + 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 ()); /* Get the folder view */ GtkWidget *folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (win), - MODEST_WIDGET_TYPE_FOLDER_VIEW); + 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: */ @@ -865,7 +865,11 @@ static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t static gboolean on_idle_top_application (gpointer user_data) { - 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 */ ModestWindow *win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); @@ -876,7 +880,7 @@ static gboolean on_idle_top_application (gpointer user_data) gtk_window_present (GTK_WINDOW (win)); } - gdk_threads_leave (); + gdk_threads_leave (); /* CHECKED */ return FALSE; /* Do not call this callback again. */ } @@ -1064,7 +1068,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; @@ -1077,7 +1081,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 @@ -1085,8 +1097,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: */ @@ -1112,12 +1124,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) { @@ -1217,6 +1229,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 @@ -1227,7 +1240,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: */ @@ -1242,9 +1259,33 @@ 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)); + 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; + default: + prefix = "USER:"; + } + + + *list = g_list_append(*list, g_strdup_printf ("%s%s", prefix, id)); + } /* else { g_warning ("DEBUG: %s: folder has no name or ID.\n", __FUNCTION__); @@ -1307,52 +1348,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); + } + + 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; + 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 = - 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); @@ -1385,24 +1480,26 @@ modest_dbus_req_filter (DBusConnection *con, DBusMessage *message, void *user_data) { - printf ("DEBUG: %s\n", __FUNCTION__); gboolean handled = FALSE; 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__); on_dbus_method_get_folders (con, message); handled = TRUE; } else { - g_debug (" debug: %s: Unexpected D-Bus method\n", __FUNCTION__); + /* 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 ?