+ 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;
+ ModestSearchResultHit *hit;
+ char *msg_url;
+ const char *subject;
+ const char *folder;
+ const char *sender;
+ guint64 size;
+ gboolean has_attachment;
+ gboolean is_unread;
+ gint64 ts;
+
+ hit = (ModestSearchResultHit *) 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 (ModestSearchResultHit, 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: */