X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=112a0a21e29352318844fea89d39d6a1e40564f2;hp=adf3f5a8e2f9ff4e3184651ef2d6ff2da2247194;hb=527ab5d715bf2302443e229919b0f33cc6c03eed;hpb=24316ebf63212f185e7f6bf70a0e04f3f52e0fa4 diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index adf3f5a..112a0a2 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -38,6 +38,7 @@ #include "modest-debug.h" #include "modest-search.h" #include "widgets/modest-msg-edit-window.h" +#include "widgets/modest-window-mgr.h" #include "modest-tny-msg.h" #include "modest-platform.h" #include "modest-defs.h" @@ -46,13 +47,8 @@ #include #include #include -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#include -#else #include #include -#endif #include #ifdef MODEST_TOOLKIT_HILDON2 @@ -60,6 +56,7 @@ #include #include #include +#include #endif #include @@ -259,7 +256,7 @@ on_mail_to(GArray * arguments, gpointer data, osso_rpc_t * retval) /* Note that we cannot report failures during sending, * because that would be asynchronous. */ - return OSSO_OK; + return OSSO_OK; } @@ -354,7 +351,7 @@ on_compose_mail(GArray * arguments, gpointer data, osso_rpc_t * retval) /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_compose_mail, (gpointer)idle_data); - return OSSO_OK; + return OSSO_OK; } static TnyMsg * @@ -544,7 +541,7 @@ find_msg_async_cb (TnyFolder *folder, mail_op = modest_mail_operation_new (NULL); modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), mail_op); - modest_mail_operation_sync_folder (mail_op, folder, FALSE); + modest_mail_operation_sync_folder (mail_op, folder, FALSE, NULL, NULL); g_object_unref (mail_op); } g_object_unref (header); @@ -627,7 +624,8 @@ on_open_message_performer (gboolean canceled, gtk_widget_show_all (GTK_WIDGET (msg_view)); } } - g_object_unref (account); + if (account) + g_object_unref (account); } on_find_msg_async_destroy (info); @@ -916,16 +914,31 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_delete_message, (gpointer)uri); - return OSSO_OK; + return OSSO_OK; +} + +typedef struct _SendReceivePerformerData { + gchar *account_id; + gboolean manual; + ModestMailOperation *mail_op; +} SendReceivePerformerData; + +static void send_receive_performer_data_free (SendReceivePerformerData *data) +{ + if (data->mail_op) { + g_object_unref (data->mail_op); + } + g_free (data->account_id); + g_slice_free (SendReceivePerformerData, data); } static gboolean on_idle_send_receive(gpointer user_data) { gboolean auto_update; - ModestWindow *top_win = NULL; - - top_win = modest_window_mgr_get_current_top (modest_runtime_get_window_mgr ()); + SendReceivePerformerData *data = (SendReceivePerformerData *) user_data; + ModestConnectedVia connect_when; + gboolean right_connection = FALSE; gdk_threads_enter (); /* CHECKED */ @@ -933,20 +946,43 @@ on_idle_send_receive(gpointer user_data) auto_update = modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_AUTO_UPDATE, NULL); - if (auto_update) - /* Do send receive */ - modest_ui_actions_do_send_receive_all (top_win, FALSE, FALSE, FALSE); - else + if (auto_update) { + /* Do send receive. Never set the current top window + as we always assume that DBus send/receive requests + are not user driven */ + + connect_when = modest_conf_get_int (modest_runtime_get_conf (), + MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL); + /* Perform a send and receive if the user selected to connect + via any mean or if the current connection method is the + same as the one specified by the user */ + if (connect_when == MODEST_CONNECTED_VIA_ANY || + connect_when == modest_platform_get_current_connection ()) { + right_connection = TRUE; + } + } else { /* Disable auto update */ modest_platform_set_update_interval (0); + } + + if ((auto_update && right_connection) || data->manual) { + if (data->account_id) { + modest_ui_actions_do_send_receive (data->account_id, data->manual, FALSE, data->manual, NULL); + } else { + modest_ui_actions_do_send_receive_all (NULL, data->manual, FALSE, data->manual); + } + } + + modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (), + data->mail_op); + + send_receive_performer_data_free (data); gdk_threads_leave (); /* CHECKED */ return FALSE; } - - static gint on_dbus_method_dump_send_queues (DBusConnection *con, DBusMessage *message) { @@ -1145,25 +1181,23 @@ on_send_receive_performer(gboolean canceled, TnyAccount *account, gpointer user_data) { - ModestConnectedVia connect_when; + SendReceivePerformerData *data = (SendReceivePerformerData *) user_data; - if (err || canceled) { + if (err || canceled || data == NULL) { g_idle_add (notify_error_in_dbus_callback, NULL); + if (data) { + send_receive_performer_data_free (data); + } return; } - connect_when = modest_conf_get_int (modest_runtime_get_conf (), - MODEST_CONF_UPDATE_WHEN_CONNECTED_BY, NULL); - - /* Perform a send and receive if the user selected to connect - via any mean or if the current connection method is the - same as the one specified by the user */ - if (connect_when == MODEST_CONNECTED_VIA_ANY || - connect_when == modest_platform_get_current_connection ()) { - g_idle_add (on_idle_send_receive, NULL); + data->mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + data->mail_op); + if (data->manual) { + g_idle_add (on_idle_send_receive, data); } else { - /* We need this to allow modest to finish */ - g_idle_add (notify_error_in_dbus_callback, NULL); + modest_heartbeat_add (on_idle_send_receive, data); } } @@ -1172,13 +1206,86 @@ static gint on_send_receive(GArray *arguments, gpointer data, osso_rpc_t * retval) { TnyDevice *device = modest_runtime_get_device (); + SendReceivePerformerData *srp_data; + + srp_data = g_slice_new0 (SendReceivePerformerData); + srp_data->account_id = NULL; + srp_data->manual = FALSE; + srp_data->mail_op = NULL; + + if (!tny_device_is_online (device)) + modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data); + else + on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data); + + return OSSO_OK; +} +static gint +on_send_receive_full (GArray *arguments, gpointer data, osso_rpc_t * retval) +{ + osso_rpc_t val; + gchar *account_id; + gboolean manual; + TnyDevice *device; + SendReceivePerformerData *srp_data; + + val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_ACCOUNT_ID); + account_id = g_strdup (val.value.s); + val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_MANUAL); + manual = val.value.b; + + srp_data = g_slice_new0 (SendReceivePerformerData); + srp_data->manual = manual; + if (account_id && account_id[0] != '\0') { + srp_data->account_id = account_id; + } else { + srp_data->account_id = NULL; + g_free (account_id); + } + srp_data->mail_op = NULL; + device = modest_runtime_get_device (); if (!tny_device_is_online (device)) - modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, NULL); + modest_platform_connect_and_perform (NULL, FALSE, NULL, on_send_receive_performer, srp_data); else - on_send_receive_performer (FALSE, NULL, NULL, NULL, NULL); + on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data); + + return OSSO_OK; +} + +static gboolean +on_idle_update_folder_counts (gpointer userdata) +{ + ModestMailOperation *mail_op; + gchar *account_id = (gchar *) userdata; + + mail_op = modest_mail_operation_new (NULL); + modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (), + mail_op); + modest_mail_operation_update_folder_counts (mail_op, account_id); + g_object_unref (mail_op); + g_free (account_id); + + return FALSE; - return OSSO_OK; +} + +static gint +on_update_folder_counts (GArray *arguments, gpointer data, osso_rpc_t * retval) +{ + osso_rpc_t val; + gchar *account_id; + + val = g_array_index (arguments, osso_rpc_t, MODEST_DBUS_SEND_RECEIVE_FULL_ARG_ACCOUNT_ID); + account_id = g_strdup (val.value.s); + + if (account_id != NULL) { + g_idle_add (on_idle_update_folder_counts, g_strdup (account_id)); + } + + g_free (account_id); + + return OSSO_OK; } static gint @@ -1186,7 +1293,7 @@ on_open_default_inbox(GArray * arguments, gpointer data, osso_rpc_t * retval) { g_idle_add(on_idle_top_application, NULL); - return OSSO_OK; + return OSSO_OK; } @@ -1207,32 +1314,30 @@ on_idle_open_account (gpointer user_data) top = modest_window_mgr_show_initial_window (mgr); #ifdef MODEST_TOOLKIT_HILDON2 - if (MODEST_IS_ACCOUNTS_WINDOW (top)) { - GtkWidget *new_window; - ModestProtocolType store_protocol; - gboolean mailboxes_protocol; - - store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), - acc_name); - mailboxes_protocol = - modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), - store_protocol, - MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS); - - if (mailboxes_protocol) { - new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name)); - } else { - new_window = GTK_WIDGET (modest_folder_window_new (NULL)); - modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window), - acc_name); - } + GtkWidget *new_window; + ModestProtocolType store_protocol; + gboolean mailboxes_protocol; + + store_protocol = modest_account_mgr_get_store_protocol (modest_runtime_get_account_mgr (), + acc_name); + mailboxes_protocol = + modest_protocol_registry_protocol_type_has_tag (modest_runtime_get_protocol_registry (), + store_protocol, + MODEST_PROTOCOL_REGISTRY_MULTI_MAILBOX_PROVIDER_PROTOCOLS); + + if (mailboxes_protocol) { + new_window = GTK_WIDGET (modest_mailboxes_window_new (acc_name)); + } else { + new_window = GTK_WIDGET (modest_folder_window_new (NULL)); + modest_folder_window_set_account (MODEST_FOLDER_WINDOW (new_window), + acc_name); + } - if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) { - gtk_widget_show (new_window); - } else { - gtk_widget_destroy (new_window); - new_window = NULL; - } + if (modest_window_mgr_register_window (mgr, MODEST_WINDOW (new_window), NULL)) { + gtk_widget_show (new_window); + } else { + gtk_widget_destroy (new_window); + new_window = NULL; } #else if (MODEST_IS_MAIN_WINDOW (top)) { @@ -1293,11 +1398,6 @@ on_idle_top_application (gpointer user_data) mgr = modest_runtime_get_window_mgr (); window = (GtkWidget *) modest_window_mgr_show_initial_window (mgr); - if (window) { - modest_platform_remove_new_mail_notifications (FALSE); - } else { - g_printerr ("modest: failed to get main window instance\n"); - } } gdk_threads_leave (); /* CHECKED */ @@ -1347,13 +1447,67 @@ on_idle_top_application (gpointer user_data) } #endif -static gint +static gint on_top_application(GArray * arguments, gpointer data, osso_rpc_t * retval) { /* Use g_idle to context-switch into the application's thread: */ g_idle_add(on_idle_top_application, NULL); - - return OSSO_OK; + + return OSSO_OK; +} + +static gboolean +on_idle_open_edit_accounts_dialog (gpointer user_data) +{ + ModestWindow *top; + ModestWindowMgr *mgr; + gboolean closed; + + /* This is a GDK lock because we are an idle callback and + * the code below is or does Gtk+ code */ + + gdk_threads_enter (); /* CHECKED */ + + mgr = modest_runtime_get_window_mgr (); + closed = modest_window_mgr_close_all_but_initial (mgr); + top = modest_window_mgr_get_current_top (mgr); + + if (closed) { + /* Show edit accounts dialog */ + modest_ui_actions_on_accounts (NULL, top); + } else { + gboolean has_accounts; + + has_accounts = modest_account_mgr_has_accounts (modest_runtime_get_account_mgr (), + TRUE); + + /* Present the current top window */ + gdk_threads_leave (); + on_idle_top_application (NULL); + gdk_threads_enter (); + + /* Show edit accounts dialog if we're launching the + program and there is no account (if there is at + least one account then on_idle_top_application will + show the accounts wizard */ + if (!top && has_accounts) { + top = modest_window_mgr_get_current_top (mgr); + modest_ui_actions_on_accounts (NULL, top); + } + } + + gdk_threads_leave (); /* CHECKED */ + + return FALSE; /* Do not call this callback again. */ +} + +static gint +on_open_edit_accounts_dialog (GArray * arguments, gpointer data, osso_rpc_t * retval) +{ + /* Use g_idle to context-switch into the application's thread: */ + g_idle_add (on_idle_open_edit_accounts_dialog, NULL); + + return OSSO_OK; } static gboolean @@ -1371,41 +1525,65 @@ on_idle_show_memory_low (gpointer user_data) return FALSE; } +static gboolean +on_idle_present_modal (gpointer user_data) +{ + gdk_threads_enter (); + gtk_window_present (user_data); + gdk_threads_leave (); + + return FALSE; +} + + /* 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) { + GtkWindow *dialog; + /* Check memory low conditions */ if (modest_platform_check_memory_low (NULL, FALSE)) { g_idle_add (on_idle_show_memory_low, NULL); goto param_error; } + /* Check if there is already a dialog or note open */ + dialog = modest_window_mgr_get_modal (modest_runtime_get_window_mgr()); + if (dialog) { + g_idle_add (on_idle_present_modal, dialog); + return OSSO_OK; + } + if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_MAIL_TO) == 0) { if (arguments->len != MODEST_DBUS_MAIL_TO_ARGS_COUNT) goto param_error; - modest_runtime_set_allow_shutdown (TRUE); return on_mail_to (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_MESSAGE) == 0) { if (arguments->len != MODEST_DBUS_OPEN_MESSAGE_ARGS_COUNT) goto param_error; - modest_runtime_set_allow_shutdown (TRUE); return on_open_message (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_ACCOUNT) == 0) { if (arguments->len != MODEST_DBUS_OPEN_ACCOUNT_ARGS_COUNT) goto param_error; - modest_runtime_set_allow_shutdown (TRUE); return on_open_account (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE) == 0) { if (arguments->len != 0) goto param_error; return on_send_receive (arguments, data, retval); + } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_SEND_RECEIVE_FULL) == 0) { + if (arguments->len != MODEST_DBUS_SEND_RECEIVE_FULL_ARGS_COUNT) + goto param_error; + return on_send_receive_full (arguments, data, retval); + } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_UPDATE_FOLDER_COUNTS) == 0) { + if (arguments->len != MODEST_DBUS_UPDATE_FOLDER_COUNTS_ARGS_COUNT) + goto param_error; + return on_update_folder_counts (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_COMPOSE_MAIL) == 0) { if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT) goto param_error; - modest_runtime_set_allow_shutdown (TRUE); return on_compose_mail (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_DELETE_MESSAGE) == 0) { if (arguments->len != MODEST_DBUS_DELETE_MESSAGE_ARGS_COUNT) @@ -1414,14 +1592,16 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method, } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_DEFAULT_INBOX) == 0) { if (arguments->len != 0) goto param_error; - modest_runtime_set_allow_shutdown (TRUE); return on_open_default_inbox (arguments, data, retval); } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_TOP_APPLICATION) == 0) { if (arguments->len != 0) goto param_error; - modest_runtime_set_allow_shutdown (TRUE); - return on_top_application (arguments, data, retval); - } else { + return on_top_application (arguments, data, retval); + } else if (g_ascii_strcasecmp (method, MODEST_DBUS_METHOD_OPEN_EDIT_ACCOUNTS_DIALOG) == 0) { + if (arguments->len != 0) + goto param_error; + return on_open_edit_accounts_dialog (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. @@ -1433,7 +1613,7 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method, g_idle_add (notify_error_in_dbus_callback, NULL); return OSSO_ERROR; } - + /* A complex D-Bus type (like a struct), * used to return various information about a search hit. */