/* Note that we cannot report failures during sending,
* because that would be asynchronous. */
- return OSSO_OK;
+ return OSSO_OK;
}
/* 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 *
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);
/* 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;
- ModestMailOperation *mail_op = (ModestMailOperation *) user_data;
+ SendReceivePerformerData *data = (SendReceivePerformerData *) user_data;
ModestConnectedVia connect_when;
-
+ gboolean right_connection = FALSE;
gdk_threads_enter (); /* CHECKED */
same as the one specified by the user */
if (connect_when == MODEST_CONNECTED_VIA_ANY ||
connect_when == modest_platform_get_current_connection ()) {
- modest_ui_actions_do_send_receive_all (NULL, FALSE, FALSE, FALSE);
+ 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 (),
- mail_op);
+ data->mail_op);
- g_object_unref (mail_op);
+ send_receive_performer_data_free (data);
gdk_threads_leave (); /* CHECKED */
TnyAccount *account,
gpointer user_data)
{
- ModestMailOperation *mail_op;
+ 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;
}
- mail_op = modest_mail_operation_new (NULL);
+ data->mail_op = modest_mail_operation_new (NULL);
modest_mail_operation_queue_add (modest_runtime_get_mail_operation_queue (),
- mail_op);
- modest_heartbeat_add (on_idle_send_receive, mail_op);
+ data->mail_op);
+ if (data->manual) {
+ g_idle_add (on_idle_send_receive, data);
+ } else {
+ modest_heartbeat_add (on_idle_send_receive, data);
+ }
}
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;
+ return OSSO_OK;
}
static gint
{
g_idle_add(on_idle_top_application, NULL);
- return OSSO_OK;
+ return OSSO_OK;
}
}
#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
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;
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;
+ modest_runtime_set_allow_shutdown (TRUE);
+ 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.
projects / modest / blobdiff