X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=f91311112d73b7da36cfff2dfee26b5fc94acd3e;hb=c5056e3e497823d10d0ddcd16dd2f2730292d76d;hp=b7a0437a64bc46e925ba1d2bd3078edab35494ac;hpb=1928e560fa179d8a6427ff3a1300f739b6fb847a;p=modest diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index b7a0437..f913111 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -32,6 +32,7 @@ #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" @@ -42,12 +43,17 @@ #include #include #include +#ifdef MODEST_HAVE_HILDON0_WIDGETS +#include +#else #include +#endif #include #include #include #include +#include typedef struct { @@ -69,109 +75,6 @@ typedef struct gchar *attachments; } ComposeMailIdleData; -static gboolean -on_idle_send_mail(gpointer user_data) -{ - 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_TYPE_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, - NULL, - 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->attachments); - g_free (idle_data); - - return FALSE; /* Do not call this callback again. */ -} - -/* TODO: Is this actually used by anything? - * I guess that everything uses *_compose_mail() instead. murrayc. - */ -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); - - val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_SEND_MAIL_ARG_ATTACHMENTS); - idle_data->attachments = 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; -} - /** 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. @@ -280,7 +183,6 @@ static gchar* uri_parse_mailto (const gchar* mailto, GSList** list_items_and_val return result_to; } - static gboolean on_idle_mail_to(gpointer user_data) { @@ -357,11 +259,16 @@ on_idle_mail_to(gpointer user_data) } else { tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */ - + gdk_threads_enter (); + ModestWindow *win = modest_msg_edit_window_new (msg, account_name); + modest_window_mgr_register_window (modest_runtime_get_window_mgr (), win); gtk_widget_show_all (GTK_WIDGET (win)); + + gdk_threads_leave (); g_object_unref (G_OBJECT(folder)); + g_object_unref (win); } g_object_unref (G_OBJECT(msg)); @@ -381,19 +288,19 @@ on_idle_mail_to(gpointer user_data) 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) { - if (arguments->len != MODEST_DEBUS_MAIL_TO_ARGS_COUNT) + 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_DEBUS_MAIL_TO_ARG_URI); + 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); */ @@ -405,9 +312,6 @@ static gint on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) } - - - static gboolean on_idle_compose_mail(gpointer user_data) { @@ -419,11 +323,16 @@ on_idle_compose_mail(gpointer user_data) 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); } @@ -454,19 +363,33 @@ on_idle_compose_mail(gpointer user_data) } else { tny_folder_add_msg (folder, msg, NULL); /* TODO: check err */ - + + gdk_threads_enter (); + ModestWindow *win = modest_msg_edit_window_new (msg, account_name); + /* it seems Sketch at least sends a leading ',' -- take that into account, + * ie strip that ,*/ + if (idle_data->attachments && idle_data->attachments[0]==',') { + gchar *tmp = g_strdup (idle_data->attachments + 1); + g_free(idle_data->attachments); + idle_data->attachments = tmp; + } + list = g_strsplit(idle_data->attachments, ",", 0); for (i=0; list[i] != NULL; i++) { - modest_msg_edit_window_attach_file_noninteractive( + 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 (); g_object_unref (G_OBJECT(folder)); + g_object_unref (win); } g_object_unref (G_OBJECT(msg)); @@ -486,36 +409,35 @@ on_idle_compose_mail(gpointer user_data) g_free (idle_data); g_free (account_name); + return FALSE; /* Do not call this callback again. */ } static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval) { - - - if (arguments->len != MODEST_DEBUS_COMPOSE_MAIL_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: */ ComposeMailIdleData *idle_data = g_new0(ComposeMailIdleData, 1); /* Freed in the idle callback. */ /* Get the arguments: */ - osso_rpc_t val = g_array_index(arguments, osso_rpc_t, MODEST_DEBUS_COMPOSE_MAIL_ARG_TO); + 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_DEBUS_COMPOSE_MAIL_ARG_CC); + 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_DEBUS_COMPOSE_MAIL_ARG_BCC); + 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_DEBUS_COMPOSE_MAIL_ARG_SUBJECT); + 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_DEBUS_COMPOSE_MAIL_ARG_BODY); + 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_DEBUS_COMPOSE_MAIL_ARG_ATTACHMENTS); + 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); @@ -527,7 +449,7 @@ static gint on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retv static TnyMsg * -find_message_by_url (const char *uri, TnyAccount **ac_out) +find_message_by_url (const char *uri, TnyAccount **ac_out) { ModestTnyAccountStore *astore; TnyAccount *account; @@ -548,7 +470,8 @@ find_message_by_url (const char *uri, TnyAccount **ac_out) uri); if (account == NULL) { - g_debug ("%s: tny_account_store_find_account() failed.\n", __FUNCTION__); + g_debug ("%s: tny_account_store_find_account() failed for\n uri=%s\n", + __FUNCTION__, uri); return NULL; } @@ -559,7 +482,6 @@ find_message_by_url (const char *uri, TnyAccount **ac_out) } g_debug ("%s: Account is store account.\n", __FUNCTION__); - *ac_out = account; folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), @@ -567,13 +489,13 @@ find_message_by_url (const char *uri, TnyAccount **ac_out) &err); if (folder == NULL) { - g_debug ("%s: tny_store_account_find_folder() failed\naccount=%s, uri=%s.\n", __FUNCTION__, + g_debug ("%s: tny_store_account_find_folder() failed for\n account=%s, uri=%s.\n", __FUNCTION__, tny_account_get_id (TNY_ACCOUNT(account)), uri); goto out; } + g_debug ("%s: Found folder. (%s)\n", __FUNCTION__, uri); - msg = tny_folder_find_msg (folder, uri, &err); if (!msg) { @@ -590,9 +512,8 @@ out: *ac_out = NULL; } - if (folder) { + if (folder) g_object_unref (folder); - } return msg; } @@ -600,52 +521,107 @@ out: static gboolean on_idle_open_message (gpointer user_data) { - ModestWindow *msg_view; - TnyMsg *msg; - TnyAccount *account; - TnyHeader *header; - const char *msg_uid; - const char *account_name; - char *uri; - + 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 ("%s: Trying to find msg by url: %s", __FUNCTION__, uri); + /* 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 (" %s: message not found.", __FUNCTION__); + g_debug ("modest: %s: message not found.", __FUNCTION__); return FALSE; } - g_debug (" %s: Found message.", __FUNCTION__); + g_debug ("modest: %s: Found message.", __FUNCTION__); + + + folder = tny_msg_get_folder (msg); + + /* Drafts will be opened in the editor, instead of the viewer, as per the UI spec: */ + 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)) { + is_draft = TRUE; + } header = tny_msg_get_header (msg); - account_name = tny_account_get_name (account); - msg_uid = tny_header_get_uid (header); - msg_view = modest_msg_view_window_new (msg, - account_name, - msg_uid); - /* TODO: does that leak the msg_view ?! */ + /* 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 (); + + gdk_threads_enter (); + + 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 (!already_opened) { + /* g_debug ("creating new window for this msg"); */ + modest_window_mgr_register_header (win_mgr, header); + + const gchar *modest_account_name = + modest_tny_account_get_parent_modest_account_name_for_server_account (account); + + /* Drafts will be opened in the editor, and others will be opened in the viewer, + * as per the UI spec: */ + 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); + } else { + msg_view = modest_msg_view_window_new (msg, modest_account_name, + msg_uid); + } + + modest_window_mgr_register_window (win_mgr, msg_view); + gtk_widget_show_all (GTK_WIDGET (msg_view)); + } - gtk_widget_show_all (GTK_WIDGET (msg_view)); + gdk_threads_leave (); 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); */ @@ -656,34 +632,24 @@ static gint on_open_message(GArray * arguments, gpointer data, osso_rpc_t * retv return OSSO_OK; } - -static gint -on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) +static gboolean +on_idle_delete_message (gpointer user_data) { - TnyList *headers; - TnyFolder *folder; - TnyIterator *iter; - TnyHeader *header; - TnyHeader *msg_header; - TnyMsg *msg; - TnyAccount *account; - GError *error; - osso_rpc_t val; - const char *uri; - const char *uid; - gint res; - - if (arguments->len != MODEST_DEBUS_DELETE_MESSAGE_ARGS_COUNT) { - return OSSO_ERROR; - } + TnyList *headers = NULL; + TnyFolder *folder = NULL; + TnyIterator *iter = NULL; + TnyHeader *header = NULL; + TnyHeader *msg_header = NULL; + TnyMsg *msg = NULL; + TnyAccount *account = NULL; + GError *error = NULL; + const char *uri = NULL; + const char *uid = NULL; + gint res = 0; - val = g_array_index (arguments, - osso_rpc_t, - MODEST_DEBUS_DELETE_MESSAGE_ARG_URI); - - uri = (const char *) val.value.s; + uri = (char *) user_data; - g_debug ("Searching message (delete message)"); + /* g_debug ("modest: %s Searching for message (delete message)"); */ msg = find_message_by_url (uri, &account); @@ -691,7 +657,7 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) return OSSO_ERROR; } - g_debug ("Found message"); + g_debug ("modest: %s: Found message", __FUNCTION__); msg_header = tny_msg_get_header (msg); uid = tny_header_get_uid (msg_header); @@ -713,53 +679,129 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) iter = tny_list_create_iterator (headers); header = NULL; - g_debug ("Searching header for msg in folder"); + /* g_debug ("Searching header for msg in folder"); */ while (!tny_iterator_is_done (iter)) { - const char *cur_id; + const char *cur_id = NULL; header = TNY_HEADER (tny_iterator_get_current (iter)); - cur_id = tny_header_get_uid (header); + if (header) + cur_id = tny_header_get_uid (header); if (cur_id && uid && g_str_equal (cur_id, uid)) { - g_debug ("Found correspoding header from folder"); + /* g_debug ("Found corresponding header from folder"); */ break; } - header = NULL; - g_object_unref (header); + if (header) { + g_object_unref (header); + header = NULL; + } + tny_iterator_next (iter); } 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) { - g_object_unref (folder); + if (folder) + g_object_unref (folder); + return OSSO_ERROR; - } - - + } + error = NULL; res = OSSO_OK; - tny_folder_remove_msg (folder, header, &error); + + gdk_threads_enter (); + ModestWindow *win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); + modest_do_message_delete (header, win); if (error != NULL) { res = OSSO_ERROR; g_error_free (error); } - - g_object_unref (folder); + + + + ModestWindowMgr *win_mgr = modest_runtime_get_window_mgr (); + ModestWindow *msg_view = NULL; + if (modest_window_mgr_find_registered_header (win_mgr, header, &msg_view)) { + if (MODEST_IS_MSG_VIEW_WINDOW (msg_view)) + modest_ui_actions_refresh_message_window_after_delete (MODEST_MSG_VIEW_WINDOW (msg_view)); + } + + gdk_threads_leave (); + + 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_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; + gdk_threads_enter (); + /* Pick the main window if it exists */ win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()); @@ -767,11 +809,14 @@ on_idle_send_receive(gpointer user_data) /* TODO: check the auto-update parameter in the configuration */ modest_ui_actions_do_send_receive_all (win); + gdk_threads_leave (); + 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. */ @@ -784,17 +829,26 @@ static gint on_send_receive(GArray * arguments, gpointer data, osso_rpc_t * retv return OSSO_OK; } +static gboolean on_idle_top_application (gpointer user_data); + static gboolean on_idle_open_default_inbox(gpointer user_data) { + gdk_threads_enter (); + ModestWindow *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_folder_view_select_first_inbox_or_local ( - MODEST_FOLDER_VIEW (folder_view)); + modest_folder_view_select_first_inbox_or_local (MODEST_FOLDER_VIEW (folder_view)); + + gdk_threads_leave (); + + /* 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. */ } @@ -811,6 +865,36 @@ static gint on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * because that would be asynchronous. */ return OSSO_OK; } + + +static gboolean on_idle_top_application (gpointer user_data) +{ + gdk_threads_enter (); + + 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 (); + + 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, @@ -818,23 +902,23 @@ gint modest_dbus_req_handler(const gchar * interface, const gchar * method, osso_rpc_t * retval) { - g_debug ("debug: %s\n", __FUNCTION__); + /* g_debug ("debug: %s\n", __FUNCTION__); */ g_debug ("debug: %s: method received: %s\n", __FUNCTION__, 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) { + 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) { + } 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) { + } 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) { + } 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 @@ -957,15 +1041,14 @@ static void on_dbus_method_search (DBusConnection *con, DBusMessage *message) { ModestDBusSearchFlags dbus_flags; - ModestSearch search; 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; - char *folder; - char *query; + const char *folder; + const char *query; time_t start_date; time_t end_date; GList *hits; @@ -979,7 +1062,7 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) res = dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &query, - DBUS_TYPE_STRING, &folder, + 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, @@ -990,14 +1073,27 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) 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. + */ + search.folder = folder; + + /* Remember the text to search for: */ #ifdef MODEST_HAVE_OGS search.query = query; #endif + + /* Other criteria: */ search.before = start_date; search.after = 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; @@ -1037,6 +1133,10 @@ on_dbus_method_search (DBusConnection *con, DBusMessage *message) 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); @@ -1083,9 +1183,9 @@ get_folders_result_to_message (DBusMessage *reply, GList *list_iter = folder_ids; for (list_iter = folder_ids; list_iter; list_iter = list_iter->next) { - const gchar *folder_id = (const gchar*)list_iter->data; - if (folder_id) { - g_debug ("DEBUG: %s: Adding folder: %s", __FUNCTION__, folder_id); + 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, @@ -1093,12 +1193,7 @@ get_folders_result_to_message (DBusMessage *reply, NULL, &struct_iter); - dbus_message_iter_append_basic (&struct_iter, - DBUS_TYPE_STRING, - &folder_id); - /* name: */ - const gchar *folder_name = (const gchar*)list_iter->data; dbus_message_iter_append_basic (&struct_iter, DBUS_TYPE_STRING, &folder_name); /* The string will be copied. */ @@ -1119,35 +1214,97 @@ get_folders_result_to_message (DBusMessage *reply, return reply; } -void add_folders_to_list (TnyFolderStore *folder_store, GList** list) +static void +add_single_folder_to_list (TnyFolder *folder, GList** list) { - if (!folder_store) + if (!folder) return; + if (TNY_IS_MERGE_FOLDER (folder)) { + /* 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. + */ + return; + } + /* Add this folder to the list: */ - if (TNY_IS_FOLDER (folder_store)) { - const gchar * folder_name = tny_folder_get_name (TNY_FOLDER (folder_store)); - if (folder_name) - *list = g_list_append(*list, g_strdup (folder_name)); + /* + 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)) + *list = g_list_append(*list, g_strdup (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, - query, + NULL /* query */, NULL /* error */); TnyIterator *iter = tny_list_create_iterator (all_folders); while (!tny_iterator_is_done (iter)) { - TnyFolderStore *folder = TNY_FOLDER_STORE (tny_iterator_get_current (iter)); - - add_folders_to_list (folder, list); + + /* 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); } @@ -1178,15 +1335,28 @@ on_dbus_method_get_folders (DBusConnection *con, DBusMessage *message) 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; GList *folder_names = NULL; add_folders_to_list (TNY_FOLDER_STORE (account), &folder_names); - g_object_unref (account); account = NULL; + + /* Also add the folders from the local folders account, + * because they are (currently) used with all accounts: + * TODO: This is not working. It seems to get only the Merged Folder (with an ID of "" (not NULL)). + */ + TnyAccount *account_local = + modest_tny_account_store_get_local_folders_account ( + TNY_ACCOUNT_STORE (modest_runtime_get_account_store())); + add_folders_to_list (TNY_FOLDER_STORE (account_local), &folder_names); + + g_object_unref (account_local); + account_local = NULL; + /* Put the result in a DBus reply: */ reply = dbus_message_new_method_return (message); @@ -1219,19 +1389,25 @@ 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__); + } return (handled ? DBUS_HANDLER_RESULT_HANDLED :