X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=295c359bb8e3a742d671774804bb4eae46cc918a;hp=d341be12c9f654be233ccaf229dfa0c901c088c6;hb=0638f028b32698761d1e064ad0c0c5283dc4f8b9;hpb=17d7865c512d65aca2b12dc0a980c3309742319a diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index d341be1..295c359 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" @@ -292,13 +293,13 @@ on_idle_mail_to(gpointer user_data) 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); */ @@ -310,9 +311,6 @@ static gint on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) } - - - static gboolean on_idle_compose_mail(gpointer user_data) { @@ -324,11 +322,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); } @@ -411,29 +414,29 @@ on_idle_compose_mail(gpointer user_data) 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); @@ -445,7 +448,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; @@ -466,7 +469,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; } @@ -477,7 +481,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), @@ -485,13 +488,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) { @@ -508,9 +511,8 @@ out: *ac_out = NULL; } - if (folder) { + if (folder) g_object_unref (folder); - } return msg; } @@ -518,57 +520,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); - gdk_threads_enter (); + /* 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); - msg_view = modest_msg_view_window_new (msg, - account_name, - msg_uid); + win_mgr = modest_runtime_get_window_mgr (); + + gdk_threads_enter (); - modest_window_mgr_register_window (modest_runtime_get_window_mgr (), msg_view); - gtk_widget_show_all (GTK_WIDGET (msg_view)); + 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)); + } gdk_threads_leave (); g_object_unref (header); g_object_unref (account); - g_object_unref (msg_view); - + 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); */ @@ -579,9 +631,8 @@ 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; @@ -591,22 +642,13 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) 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; - } - - 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); @@ -614,7 +656,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); @@ -636,7 +678,7 @@ 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; @@ -644,7 +686,7 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) 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; } @@ -654,30 +696,70 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) } 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); 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); } - + + + + 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 (); + + g_object_unref (header); g_object_unref (folder); 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) { @@ -711,6 +793,8 @@ 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) { @@ -726,6 +810,10 @@ on_idle_open_default_inbox(gpointer user_data) 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. */ } @@ -741,6 +829,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, @@ -748,23 +866,27 @@ 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_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 { + g_debug (" debug: %s: Unexpected D-Bus method: %s\n", __FUNCTION__, method); + /* We need to return INVALID here so * libosso will return DBUS_HANDLER_RESULT_NOT_YET_HANDLED, * so that our modest_dbus_req_filter will then be tried instead.