X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=a41f4eab104fa2a87eba2d799ad9deddcb69c1dd;hp=eb63e6c8fb3b1c1851a3559ad5c95de9a4ca005d;hb=933732f81601fe26dae04147d56a9c0ef151271e;hpb=fc741ebc372d1c8d4756641b96cb7cc37f986e47 diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c index eb63e6c..a41f4ea 100644 --- a/src/dbus_api/modest-dbus-callbacks.c +++ b/src/dbus_api/modest-dbus-callbacks.c @@ -546,7 +546,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); @@ -922,10 +922,28 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval) 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; + SendReceivePerformerData *data = (SendReceivePerformerData *) user_data; + ModestConnectedVia connect_when; + gboolean right_connection = FALSE; gdk_threads_enter (); /* CHECKED */ @@ -933,14 +951,37 @@ 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) + 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 */ - modest_ui_actions_do_send_receive_all (NULL, FALSE, FALSE, FALSE); - else + + 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 */ @@ -1147,25 +1188,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 ()) { - modest_heartbeat_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); } } @@ -1174,11 +1213,49 @@ 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, 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 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, srp_data); + else + on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data); return OSSO_OK; } @@ -1422,6 +1499,10 @@ modest_dbus_req_handler(const gchar * interface, const gchar * method, 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_COMPOSE_MAIL) == 0) { if (arguments->len != MODEST_DBUS_COMPOSE_MAIL_ARGS_COUNT) goto param_error;