Simplified the code of the dbus 'mailto:' handler, to remove redundant
[modest] / src / dbus_api / modest-dbus-callbacks.c
index e4bd774..61ebb4c 100644 (file)
 #include "modest-account-mgr.h"
 #include "modest-account-mgr-helpers.h"
 #include "modest-tny-account.h"
+#include "modest-tny-folder.h"
 #include "modest-ui-actions.h"
+
+#include "modest-search.h"
 #include "widgets/modest-msg-edit-window.h"
 #include "modest-tny-msg.h"
+#include <libmodest-dbus-client/libmodest-dbus-client.h>
 #include <libgnomevfs/gnome-vfs-utils.h>
 #include <stdio.h>
 #include <string.h>
+#include <glib/gstdio.h>
+#ifdef MODEST_HAVE_HILDON0_WIDGETS
+#include <libgnomevfs/gnome-vfs-mime-utils.h>
+#else
+#include <libgnomevfs/gnome-vfs-mime.h>
+#endif
+#include <tny-fs-stream.h>
+
+#include <tny-list.h>
+#include <tny-iterator.h>
+#include <tny-simple-list.h>
+#include <tny-merge-folder.h>
+
+#include <modest-text-utils.h>
 
 typedef struct 
 {
@@ -46,102 +64,20 @@ typedef struct
        gchar *bcc;
        gchar *subject;
        gchar *body;
+       gchar *attachments;
 } SendMailIdleData;
 
-static gboolean
-on_idle_send_mail(gpointer user_data)
+typedef struct 
 {
-       SendMailIdleData *idle_data = (SendMailIdleData*)user_data;
-       
-       /* 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");
-       }
-       
-       TnyTransportAccount *transport_account = NULL;
-       if (account_mgr) {
-               transport_account = TNY_TRANSPORT_ACCOUNT(modest_tny_account_store_get_transport_account_for_open_connection
-                                     (modest_runtime_get_account_store(),
-                                      account_name));
-       }
-       
-       if (!transport_account) {
-               g_printerr ("modest: no transport account found for '%s'\n", account_name);
-       }
-       
-       /* Create the mail operation: */
-       if (transport_account) {        
-               /* Use the mail operation: */
-               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 {
-                       ModestMailOperation *mail_operation = modest_mail_operation_new (MODEST_MAIL_OPERATION_ID_SEND, NULL);
-                       modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_operation);
-                       
-                       modest_mail_operation_send_new_mail (mail_operation,
-                                            transport_account,
-                                            from, /* from */
-                                            idle_data->to, idle_data->cc, idle_data->bcc, idle_data->subject, 
-                                            idle_data->body, /* plain_body */
-                                            NULL, /* html_body */
-                                            NULL, /* attachments_list, GSList of TnyMimePart. */
-                                            (TnyHeaderFlags)0);
-                                            
-                       g_free (from);
-                       g_object_unref (G_OBJECT (mail_operation));
-               }
-                                    
-               g_object_unref (G_OBJECT (transport_account));
-       }
-       
-       g_free (account_name);
-       
-       /* Free the idle data: */
-       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);
-       
-       return FALSE; /* Do not call this callback again. */
-}
+       gchar *to;
+       gchar *cc;
+       gchar *bcc;
+       gchar *subject;
+       gchar *body;
+       gchar *attachments;
+} ComposeMailIdleData;
 
-static gint on_send_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
-{
-       if (arguments->len != MODEST_DEBUS_SEND_MAIL_ARGS_COUNT)
-       return OSSO_ERROR;
-       
-    /* Use g_idle to context-switch into the application's thread: */
-       SendMailIdleData *idle_data = g_new0(SendMailIdleData, 1); /* Freed in the idle callback. */
-       
-    /* Get the arguments: */
-       osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_TO);
-       idle_data->to = g_strdup (val.value.s);
-       
-       val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_CC);
-       idle_data->cc = g_strdup (val.value.s);
-       
-       val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_BCC);
-       idle_data->bcc = g_strdup (val.value.s);
-       
-       val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_SUBJECT);
-       idle_data->subject = g_strdup (val.value.s);
-       
-       val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_BODY);
-       idle_data->body = g_strdup (val.value.s);
-       
-       /* printf("  debug: to=%s\n", idle_data->to); */
-       g_idle_add(on_idle_send_mail, (gpointer)idle_data);
-       
-       /* Note that we cannot report failures during sending, 
-        * because that would be asynchronous. */
-       return OSSO_OK;
-}
+static gboolean on_idle_compose_mail(gpointer user_data);
 
 /** uri_unescape:
  * @uri An escaped URI. URIs should always be escaped.
@@ -251,70 +187,169 @@ static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_val
        return result_to;
 }
 
+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)) {
+               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;
+               }
+       }
+       
+       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(): */
-       
        gchar *uri = (gchar*)user_data;
        GSList *list_names_and_values = NULL;
+
+       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;
+               }
+
+               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)
+{
+       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);
+       
+       /* 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, 
+        * because that would be asynchronous. */
+       return OSSO_OK;
+}
+
+
+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;
+
        /* 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");
+               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_mgr) {
+       if (account_name && account_mgr) {
                account = modest_tny_account_store_get_transport_account_for_open_connection (
                        modest_runtime_get_account_store(), account_name);
        }
        
        if (!account) {
-               g_printerr ("modest: failed to get tny account folder'\n", account_name);
+               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 {
-                       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;
+                       /* 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 (to, from, 
-                               cc, bcc, subject, body, 
-                               NULL /* attachments */);
+                       TnyMsg *msg  = modest_tny_msg_new (idle_data->to, from, 
+                               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");
@@ -328,11 +363,38 @@ on_idle_mail_to(gpointer user_data)
                                } else {
                        
                                        tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */
-               
-                                       ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
+
+                                       /* 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, 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;
+                                       }
+
+                                       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);
+                                       }
+
+                                       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));
@@ -341,120 +403,248 @@ on_idle_mail_to(gpointer user_data)
                        g_object_unref (G_OBJECT(account));
                }
        }
-       
+
+       /* Free the idle data: */
+       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);
        
-       /* 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);
-               
-       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_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-       if (arguments->len != MODEST_DEBUS_MAIL_TO_ARGS_COUNT)
+       if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_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_DEBUS_MAIL_TO_ARG_URI);
-       gchar *uri = g_strdup (val.value.s);
+       /* Use g_idle to context-switch into the application's thread: */
+       ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */
        
-       /* printf("  debug: to=%s\n", idle_data->to); */
-       g_idle_add(on_idle_mail_to, (gpointer)uri);
+       /* Get the arguments: */
+       osso_rpc_t 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);
+       idle_data->cc = g_strdup (val.value.s);
+       
+       val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_BCC);
+       idle_data->bcc = g_strdup (val.value.s);
+       
+       val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_SUBJECT);
+       idle_data->subject = g_strdup (val.value.s);
+       
+       val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_BODY);
+       idle_data->body = g_strdup (val.value.s);
+       
+       val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_COMPOSE_MAIL_ARG_ATTACHMENTS);
+       idle_data->attachments = g_strdup (val.value.s);
+
+       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;
+
+       astore = modest_runtime_get_account_store ();
+       
+       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);
+       }
+       
+       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 for\n  uri=%s\n", 
+                       __FUNCTION__, uri);
+               return NULL;
+       }
+
+       g_debug ("%s: Found account.\n", __FUNCTION__);
+
+       if ( ! 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);
+
+       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);
+               goto out;
+       }
+       
+       g_debug ("%s: Found folder. (%s)\n",  __FUNCTION__, uri);
+       
+       msg = tny_folder_find_msg (folder, uri, &err);
+       
+       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;
+}
 
 static gboolean
-on_idle_open_message(gpointer user_data)
+on_idle_open_message (gpointer user_data)
 {
-       gchar *uri = (gchar*)user_data;
+       TnyMsg       *msg = NULL;
+       TnyAccount   *account = NULL;
+       TnyHeader    *header = NULL; 
+       const char   *msg_uid = NULL;
+       char         *uri = NULL;
+       ModestWindowMgr *win_mgr = NULL;
+       TnyFolder    *folder = NULL;
+
+       uri = (char *) user_data;
+
+       /* g_debug ("modest: %s: Trying to find msg by url: %s", __FUNCTION__, uri); */
+       msg = find_message_by_url (uri, &account);
+       g_free (uri);
+
+       if (msg == NULL) {
+               g_debug ("modest:  %s: message not found.", __FUNCTION__);
+               return FALSE;
+       }
+       g_debug ("modest:  %s: Found message.", __FUNCTION__);
+
        
+       folder = tny_msg_get_folder (msg);
        
-       /* 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");
+       /* 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);
        
-       TnyAccount *account = NULL;
-       if (account_mgr) {
-               account = modest_tny_account_store_get_transport_account_for_open_connection (
-                       modest_runtime_get_account_store(), account_name);
+       /* 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); 
+       
+       win_mgr = modest_runtime_get_window_mgr ();
+
+       /* This is a GDK lock because we are an idle callback and
+        * the code below is or does Gtk+ code */
+
+       gdk_threads_enter (); /* CHECKED */
+
+       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) {
-               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 *subject = NULL;
-                       const gchar *body = NULL;
-                       
-                       subject = uri;
-                       body = uri;
-                       
-                       
-                       /* Create the message: */
-                       TnyMsg *msg  = modest_tny_msg_new (NULL, from, 
-                               NULL, NULL, 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 */
+       if (!already_opened) {
+               /* g_debug ("creating new window for this msg"); */
+               modest_window_mgr_register_header (win_mgr, header, NULL);
                
-                                       ModestWindow *win = modest_msg_edit_window_new (msg, account_name);
-                                       gtk_widget_show_all (GTK_WIDGET (win));
-                               
-                                       g_object_unref (G_OBJECT(folder));
-                               }
-                       
-                               g_object_unref (G_OBJECT(msg));
-                       }
+               const gchar *modest_account_name = 
+                       modest_tny_account_get_parent_modest_account_name_for_server_account (account);
                        
-                       g_object_unref (G_OBJECT(account));
+               /* 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);
                }
-       }
-       
-       g_free (account_name);
-       g_free(uri);
+               
+               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 (folder);
+
        return FALSE; /* Do not call this callback again. */
 }
 
 static gint on_open_message(GArray * arguments, gpointer data, osso_rpc_t * retval)
 {
-       if (arguments->len != MODEST_DEBUS_OPEN_MESSAGE_ARGS_COUNT)
+       if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_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_DEBUS_OPEN_MESSAGE_ARG_URI);
+       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); */
@@ -466,22 +656,191 @@ static gint on_open_message(GArray * arguments, gpointer data, osso_rpc_t * retv
 }
 
 static gboolean
-on_idle_send_receive(gpointer user_data)
+on_idle_delete_message (gpointer user_data)
 {
-       ModestWindow *win;
+       TnyList      *headers = NULL;
+       TnyFolder    *folder = NULL;
+       TnyIterator  *iter = NULL; 
+       TnyHeader    *header = NULL;
+       TnyHeader    *msg_header = NULL;
+       TnyMsg       *msg = NULL;
+       TnyAccount   *account = NULL;
+       const char   *uri = NULL;
+       const char   *uid = NULL;
+       gint          res = 0;
 
-       /* Pick the main window if it exists */
+       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;
+       }
+
+       g_debug ("modest: %s: Found message", __FUNCTION__);
+       
+       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
+        *
+        * 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;
+
+               header = TNY_HEADER (tny_iterator_get_current (iter));
+               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;
+               }
+
+               if (header) {
+                       g_object_unref (header);
+                       header = NULL;
+               }
+               
+               tny_iterator_next (iter);
+       }
+
+       g_object_unref (iter);
+       iter = NULL;
+       g_object_unref (headers);
+       headers = NULL;
+       
+       g_object_unref (msg_header);
+       msg_header = NULL;
+       g_object_unref (msg);
+       msg = NULL;
+
+       if (header == NULL) {
+               if (folder)
+                       g_object_unref (folder);
+                       
+               return OSSO_ERROR;
+       }       
+               
+       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);
+       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));
+       }
+       
+       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);
+       
+               g_object_unref (folder);
+       }
+       
+       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;
+}
+
+
+
+
+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: */
+       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); */
+       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;
+
+       /* 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 (); /* 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. */
@@ -493,29 +852,696 @@ static gint on_send_receive(GArray * arguments, gpointer data, osso_rpc_t * retv
         * 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;
+       
+       /* 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_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+       modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view));
+       
+       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)
+{
+    /* Use g_idle to context-switch into the application's thread: */
+
+    /* This method has no arguments. */
+       
+       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)
+{
+
+       /* 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) {
+               /* 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));
+       }
+
+       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)
+{
+    /* Use g_idle to context-switch into the application's thread: */
+
+    /* This method has no arguments. */
+       
+       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)
 {
-       /*
-       printf("debug: modest_dbus_req_handler()\n");
-       printf("debug: method received: %s\n", method);
-       */
-       if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_SEND_MAIL) == 0) {
-               return on_send_mail (arguments, data, retval);
-       } else if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_MAIL_TO) == 0) {
+       
+       /* 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);
-       } else if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) {
+       } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) {
                return on_open_message (arguments, data, retval);
-       } else if (g_ascii_strcasecmp(method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) {
+       } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) {
                return on_send_receive (arguments, data, retval);
+       } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) {
+               return on_compose_mail (arguments, data, retval);
+       } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_DELETE_MESSAGE) == 0) {
+               return on_delete_message (arguments,data, retval);
+       } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) {
+               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 { 
+               /* 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;
+       }
+}
+                                        
+/* A complex D-Bus type (like a struct),
+ * used to return various information about a search hit.
+ */
+#define SEARCH_HIT_DBUS_TYPE \
+       DBUS_STRUCT_BEGIN_CHAR_AS_STRING \
+       DBUS_TYPE_STRING_AS_STRING /* msgid */ \
+       DBUS_TYPE_STRING_AS_STRING /* subject */ \
+       DBUS_TYPE_STRING_AS_STRING /* folder */ \
+       DBUS_TYPE_STRING_AS_STRING /* sender */ \
+       DBUS_TYPE_UINT64_AS_STRING /* msize */ \
+       DBUS_TYPE_BOOLEAN_AS_STRING /* has_attachment */ \
+       DBUS_TYPE_BOOLEAN_AS_STRING /* is_unread */ \
+       DBUS_TYPE_INT64_AS_STRING /* timestamp */ \
+       DBUS_STRUCT_END_CHAR_AS_STRING
+
+static DBusMessage *
+search_result_to_message (DBusMessage *reply,
+                          GList       *hits)
+{
+       DBusMessageIter iter;
+       DBusMessageIter array_iter;
+       GList          *hit_iter;
+
+       dbus_message_iter_init_append (reply, &iter); 
+       dbus_message_iter_open_container (&iter,
+                                         DBUS_TYPE_ARRAY,
+                                         SEARCH_HIT_DBUS_TYPE,
+                                         &array_iter); 
+
+       for (hit_iter = hits; hit_iter; hit_iter = hit_iter->next) {
+               DBusMessageIter  struct_iter;
+               ModestSearchHit *hit;
+               char            *msg_url;
+               const char      *subject;
+               const char      *folder;
+               const char      *sender;
+               guint64          size;
+               gboolean         has_attachment;
+               gboolean         is_unread;
+               gint64           ts;
+
+               hit = (ModestSearchHit *) hit_iter->data;
+
+               msg_url = hit->msgid;
+               subject = hit->subject;
+               folder  = hit->folder;
+               sender  = hit->sender;
+               size           = hit->msize;
+               has_attachment = hit->has_attachment;
+               is_unread      = hit->is_unread;
+               ts             = hit->timestamp;
+
+               g_debug ("DEBUG: %s: Adding hit: %s", __FUNCTION__, msg_url);   
+               
+               dbus_message_iter_open_container (&array_iter,
+                                                 DBUS_TYPE_STRUCT,
+                                                 NULL,
+                                                 &struct_iter);
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_STRING,
+                                               &msg_url);
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_STRING,
+                                               &subject); 
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_STRING,
+                                               &folder);
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_STRING,
+                                               &sender);
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_UINT64,
+                                               &size);
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_BOOLEAN,
+                                               &has_attachment);
+
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_BOOLEAN,
+                                               &is_unread);
+               
+               dbus_message_iter_append_basic (&struct_iter,
+                                               DBUS_TYPE_INT64,
+                                               &ts);
+
+               dbus_message_iter_close_container (&array_iter,
+                                                  &struct_iter); 
+
+               g_free (hit->msgid);
+               g_free (hit->subject);
+               g_free (hit->folder);
+               g_free (hit->sender);
+
+               g_slice_free (ModestSearchHit, hit);
+       }
+
+       dbus_message_iter_close_container (&iter, &array_iter);
+
+       return reply;
+}
+
+
+static void
+on_dbus_method_search (DBusConnection *con, DBusMessage *message)
+{
+       ModestDBusSearchFlags dbus_flags;
+       DBusMessage  *reply = NULL;
+       dbus_bool_t  res;
+       dbus_int64_t sd_v;
+       dbus_int64_t ed_v;
+       dbus_int32_t flags_v;
+       dbus_uint32_t size_v;
+       const char *folder;
+       const char *query;
+       time_t start_date;
+       time_t end_date;
+       GList *hits;
+
+       DBusError error;
+       dbus_error_init (&error);
+
+       sd_v = ed_v = 0;
+       flags_v = 0;
+
+       res = dbus_message_get_args (message,
+                                    &error,
+                                    DBUS_TYPE_STRING, &query,
+                                    DBUS_TYPE_STRING, &folder, /* e.g. "INBOX/drafts": TODO: Use both an ID and a display name. */
+                                    DBUS_TYPE_INT64, &sd_v,
+                                    DBUS_TYPE_INT64, &ed_v,
+                                    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;
+
+       ModestSearch search;
+       memset (&search, 0, sizeof (search));
+       
+       /* Remember what folder we are searching in:
+        *
+        * Note that we don't copy the strings, 
+        * because this struct will only be used for the lifetime of this function.
+        */
+       if (folder && g_str_has_prefix (folder, "MAND:")) {
+               search.folder = folder + strlen ("MAND:");
+       } 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
+       search.query  = query;
+#endif
+
+       /* Other criteria: */
+       search.start_date = start_date;
+       search.end_date  = end_date;
+       search.flags  = 0;
+
+       /* Text to serach for in various parts of the message: */
+       if (dbus_flags & MODEST_DBUS_SEARCH_SUBJECT) {
+               search.flags |= MODEST_SEARCH_SUBJECT;
+               search.subject = query;
+       }
+
+       if (dbus_flags & MODEST_DBUS_SEARCH_SENDER) {
+               search.flags |=  MODEST_SEARCH_SENDER;
+               search.from = query;
+       }
+
+       if (dbus_flags & MODEST_DBUS_SEARCH_RECIPIENT) {
+               search.flags |= MODEST_SEARCH_RECIPIENT; 
+               search.recipient = query;
+       }
+
+       if (dbus_flags & MODEST_DBUS_SEARCH_BODY) {
+               search.flags |=  MODEST_SEARCH_BODY; 
+               search.body = query;
+       }
+
+       if (sd_v > 0) {
+               search.flags |= MODEST_SEARCH_BEFORE;
+               search.start_date = start_date;
+       }
+
+       if (ed_v > 0) {
+               search.flags |= MODEST_SEARCH_AFTER;
+               search.end_date = end_date;
+       }
+
+       if (size_v > 0) {
+               search.flags |= MODEST_SEARCH_SIZE;
+               search.minsize = size_v;
+       }
+
+#ifdef MODEST_HAVE_OGS
+       search.flags |= MODEST_SEARCH_USE_OGS;
+       g_debug ("%s: Starting search for %s", __FUNCTION__, search.query);
+#endif
+
+       /* Note that this currently gets folders and messages from the servers, 
+        * which can take a long time. libmodest_dbus_client_search() can timeout, 
+        * reporting no results, if this takes a long time: */
+       hits = modest_search_all_accounts (&search);
+
+       reply = dbus_message_new_method_return (message);
+
+       search_result_to_message (reply, hits);
+
+       if (reply == NULL) {
+               g_warning ("%s: Could not create reply.", __FUNCTION__);
+       }
+
+       if (reply) {
+               dbus_uint32_t serial = 0;
+               dbus_connection_send (con, reply, &serial);
+       dbus_connection_flush (con);
+       dbus_message_unref (reply);
+       }
+
+       g_list_free (hits);
+}
+
+
+/* A complex D-Bus type (like a struct),
+ * used to return various information about a folder.
+ */
+#define GET_FOLDERS_RESULT_DBUS_TYPE \
+       DBUS_STRUCT_BEGIN_CHAR_AS_STRING \
+       DBUS_TYPE_STRING_AS_STRING /* Folder Name */ \
+       DBUS_TYPE_STRING_AS_STRING /* Folder URI */ \
+       DBUS_STRUCT_END_CHAR_AS_STRING
+
+static DBusMessage *
+get_folders_result_to_message (DBusMessage *reply,
+                          GList *folder_ids)
+{
+       DBusMessageIter iter;   
+       dbus_message_iter_init_append (reply, &iter); 
+       
+       DBusMessageIter array_iter;
+       dbus_message_iter_open_container (&iter,
+                                         DBUS_TYPE_ARRAY,
+                                         GET_FOLDERS_RESULT_DBUS_TYPE,
+                                         &array_iter); 
+
+       GList *list_iter = folder_ids;
+       for (list_iter = folder_ids; list_iter; list_iter = list_iter->next) {
+               
+               const gchar *folder_name = (const gchar*)list_iter->data;
+               if (folder_name) {
+                       /* g_debug ("DEBUG: %s: Adding folder: %s", __FUNCTION__, folder_name); */
+                       
+                       DBusMessageIter struct_iter;
+                       dbus_message_iter_open_container (&array_iter,
+                                                         DBUS_TYPE_STRUCT,
+                                                         NULL,
+                                                         &struct_iter);
+       
+                       /* name: */
+                       dbus_message_iter_append_basic (&struct_iter,
+                                                       DBUS_TYPE_STRING,
+                                                       &folder_name); /* The string will be copied. */
+                                                       
+                       /* URI: This is maybe not needed by osso-global-search: */
+                       const gchar *folder_uri = "TODO:unimplemented";
+                       dbus_message_iter_append_basic (&struct_iter,
+                                                       DBUS_TYPE_STRING,
+                                                       &folder_uri); /* The string will be copied. */
+       
+                       dbus_message_iter_close_container (&array_iter,
+                                                          &struct_iter); 
+               }
+       }
+
+       dbus_message_iter_close_container (&iter, &array_iter);
+
+       return reply;
+}
+
+static void
+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);
+       if (folder_name)
+               *list = g_list_append(*list, g_strdup (folder_name));
+       else {
+       */
+               /* osso-global-search only uses one string,
+                * so ID is the only thing that could possibly identify a folder.
+                * 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)) {
+               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__);     
+               }
+               
+       }
+       */
+}
+
+static void
+add_folders_to_list (TnyFolderStore *folder_store, GList** list)
+{
+       if (!folder_store)
+               return;
+       
+       /* Add this folder to the list: */
+       if (TNY_IS_FOLDER (folder_store)) {
+               add_single_folder_to_list (TNY_FOLDER (folder_store), list);
+       }       
+               
+       /* Recurse into child folders: */
+               
+       /* Get the folders list: */
+       /*
+       TnyFolderStoreQuery *query = tny_folder_store_query_new ();
+       tny_folder_store_query_add_item (query, NULL, 
+               TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+       */
+       TnyList *all_folders = tny_simple_list_new ();
+       tny_folder_store_get_folders (folder_store,
+                                     all_folders,
+                                     NULL /* query */,
+                                     NULL /* error */);
+
+       TnyIterator *iter = tny_list_create_iterator (all_folders);
+       while (!tny_iterator_is_done (iter)) {
+               
+               /* Do not recurse, because the osso-global-search UI specification 
+                * does not seem to want the sub-folders, though that spec seems to 
+                * be generally unsuitable for Modest.
+                */
+               TnyFolder *folder = TNY_FOLDER (tny_iterator_get_current (iter));
+               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);
+               }
+               
+               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 OSSO_ERROR;
+               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: */
+       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");
+       }
+       
+       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;
+               
+               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)).
+        */
+       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);
+
+       get_folders_result_to_message (reply, folder_names);
+
+       if (reply == NULL) {
+               g_warning ("%s: Could not create reply.", __FUNCTION__);
+       }
+
+       if (reply) {
+               dbus_uint32_t serial = 0;
+               dbus_connection_send (con, reply, &serial);
+       dbus_connection_flush (con);
+       dbus_message_unref (reply);
+       }
+
+       g_list_foreach (folder_names, (GFunc)g_free, NULL);
+       g_list_free (folder_names);
+}
+
+
+/** This D-Bus handler is used when the main osso-rpc 
+ * D-Bus handler has not handled something.
+ * We use this for D-Bus methods that need to use more complex types 
+ * than osso-rpc supports.
+ */
+DBusHandlerResult
+modest_dbus_req_filter (DBusConnection *con,
+                       DBusMessage    *message,
+                       void           *user_data)
+{
+       gboolean handled = FALSE;
+
+       if (dbus_message_is_method_call (message,
+                                        MODEST_DBUS_IFACE,
+                                        MODEST_DBUS_METHOD_SEARCH)) {
+               on_dbus_method_search (con, message);
+               handled = TRUE;                         
+       } else if (dbus_message_is_method_call (message,
+                                        MODEST_DBUS_IFACE,
+                                        MODEST_DBUS_METHOD_GET_FOLDERS)) {
+               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 :
+               DBUS_HANDLER_RESULT_NOT_YET_HANDLED);
+}
+
+
 void
 modest_osso_cb_hw_state_handler(osso_hw_state_t *state, gpointer data)
 {