#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"
#include <hildon/hildon.h>
#include <modest-accounts-window.h>
#include <modest-folder-window.h>
+#include <modest-mailboxes-window.h>
+#include <modest-maemo-utils.h>
#endif
#include <tny-list.h>
/* Note that we cannot report failures during sending,
* because that would be asynchronous. */
- return OSSO_OK;
+ return OSSO_OK;
}
gchar **list = g_strsplit(idle_data->attachments, ",", 0);
gint i = 0;
for (i=0; list[i] != NULL; i++) {
- attachments = g_slist_append(attachments, g_strdup(list[i]));
+ attachments = g_slist_append(attachments, g_uri_unescape_string (list[i], NULL));
}
g_strfreev(list);
}
/* 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 *
GError *err,
gpointer user_data)
{
- TnyHeader *header;
- gchar *msg_uid;
+ TnyHeader *header = NULL;
+ gchar *msg_uid = NULL;
ModestWindowMgr *win_mgr;
ModestWindow *msg_view = NULL;
gboolean is_draft = FALSE;
}
header = tny_msg_get_header (msg);
- if (header && (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
- g_object_unref (header);
+ if (!header || (tny_header_get_flags (header) & TNY_HEADER_FLAG_DELETED)) {
modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
g_idle_add (notify_error_in_dbus_callback, NULL);
goto end;
} else {
modest_account_name = NULL;
}
-
+
/* Drafts will be opened in the editor, and others will be opened in the viewer */
if (is_draft) {
gchar *modest_account_name = NULL;
+ gchar *mailbox = NULL;
gchar *from_header;
-
+
/* we cannot edit without a valid account... */
if (!modest_account_mgr_has_accounts(modest_runtime_get_account_mgr (), TRUE)) {
if (!modest_ui_actions_run_account_setup_wizard(NULL)) {
modest_window_mgr_unregister_header (win_mgr,
header);
- goto cleanup;
+ goto end;
}
}
from_header = tny_header_dup_from (header);
- modest_account_name = modest_utils_get_account_name_from_recipient (from_header);
+ modest_account_name = modest_utils_get_account_name_from_recipient (from_header, &mailbox);
g_free (from_header);
if (modest_account_name == NULL) {
ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
modest_account_name = modest_account_mgr_get_default_account (mgr);
}
- msg_view = modest_msg_edit_window_new (msg, modest_account_name, TRUE);
+ msg_view = modest_msg_edit_window_new (msg, modest_account_name, mailbox, TRUE);
+ if (mailbox)
+ g_free (mailbox);
g_free (modest_account_name);
} else {
TnyHeader *header;
}
header = tny_msg_get_header (msg);
- msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, msg_uid);
+ msg_view = modest_msg_view_window_new_for_search_result (msg, modest_account_name, NULL, msg_uid);
if (! (tny_header_get_flags (header) & TNY_HEADER_FLAG_SEEN)) {
ModestMailOperation *mail_op;
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);
}
}
-cleanup:
- g_object_unref (header);
-
end:
+ if (header)
+ g_object_unref (header);
+ if (msg_uid)
+ g_free (msg_uid);
on_find_msg_async_destroy (info);
}
{
OpenMsgPerformerInfo *info;
TnyFolder *folder = NULL;
+ ModestTnyAccountStore *account_store;
+ ModestTnyLocalFoldersAccount *local_folders_account;
+
+ account_store = modest_runtime_get_account_store ();
+ local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
+ modest_tny_account_store_get_local_folders_account (account_store));
info = (OpenMsgPerformerInfo *) user_data;
if (canceled || err) {
- modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
+ if (!canceled)
+ modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
g_idle_add (notify_error_in_dbus_callback, NULL);
on_find_msg_async_destroy (info);
return;
/* Get folder */
if (!account) {
- ModestTnyAccountStore *account_store;
- ModestTnyLocalFoldersAccount *local_folders_account;
-
- account_store = modest_runtime_get_account_store ();
- local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
- modest_tny_account_store_get_local_folders_account (account_store));
folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
g_object_unref (local_folders_account);
- } else {
+ } else if (account == TNY_ACCOUNT (local_folders_account)) {
folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), info->uri, NULL);
+ } else {
+ folder = NULL;
+ }
+ if (!(folder && modest_tny_folder_is_local_folder (folder) &&
+ (modest_tny_folder_get_local_or_mmc_folder_type (folder) == TNY_FOLDER_TYPE_DRAFTS))) {
+ ModestWindowMgr *win_mgr;
+ ModestWindow *msg_view;
+
+ win_mgr = modest_runtime_get_window_mgr ();
+ if (modest_window_mgr_find_registered_message_uid (win_mgr, info->uri, &msg_view)) {
+ gtk_window_present (GTK_WINDOW(msg_view));
+ } else {
+ const gchar *modest_account_name;
+ if (account) {
+ modest_account_name =
+ modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ } else {
+ modest_account_name = NULL;
+ }
+
+ msg_view = modest_msg_view_window_new_from_uid (modest_account_name, NULL, info->uri);
+ if (msg_view != NULL) {
+ if (!modest_window_mgr_register_window (win_mgr, msg_view, NULL)) {
+ gtk_widget_destroy (GTK_WIDGET (msg_view));
+ } else {
+ gtk_widget_show_all (GTK_WIDGET (msg_view));
+ }
+ }
+ if (account)
+ g_object_unref (account);
+
+ }
+ on_find_msg_async_destroy (info);
+ return;
}
- if (!folder) {
- modest_platform_run_information_dialog (NULL, _("mail_ni_ui_folder_get_msg_folder_error"), TRUE);
- g_idle_add (notify_error_in_dbus_callback, NULL);
- on_find_msg_async_destroy (info);
- return;
- }
+
#ifndef MODEST_TOOLKIT_HILDON2
info->animation_timeout = g_timeout_add (1000, on_show_opening_animation, info);
#endif
if (is_merge || account) {
OpenMsgPerformerInfo *info;
TnyFolder *folder = NULL;
+ ModestTnyAccountStore *account_store;
+ ModestTnyLocalFoldersAccount *local_folders_account;
info = g_slice_new0 (OpenMsgPerformerInfo);
if (account)
info->animation = NULL;
info->animation_timeout = 0;
+ account_store = modest_runtime_get_account_store ();
+ local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT
+ (modest_tny_account_store_get_local_folders_account (account_store));
+
/* Try to get the message, if it's already downloaded
we don't need to connect */
if (account) {
- folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
- } else {
- ModestTnyAccountStore *account_store;
- ModestTnyLocalFoldersAccount *local_folders_account;
+ TnyDevice *device;
+ gboolean device_online;
- account_store = modest_runtime_get_account_store ();
- local_folders_account = MODEST_TNY_LOCAL_FOLDERS_ACCOUNT (
- modest_tny_account_store_get_local_folders_account (account_store));
+ device = modest_runtime_get_device ();
+ device_online = tny_device_is_online (device);
+ if (!device_online || TNY_ACCOUNT (local_folders_account) == account) {
+ folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
+ } else {
+ folder = NULL;
+ }
+ } else {
folder = modest_tny_local_folders_account_get_merged_outbox (local_folders_account);
g_object_unref (local_folders_account);
+ info->connect = FALSE;
}
if (folder) {
- TnyDevice *device;
- gboolean device_online;
-
- device = modest_runtime_get_device();
- device_online = tny_device_is_online (device);
- if (device_online) {
- info->connect = TRUE;
+ TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
+ if (msg) {
+ info->connect = FALSE;
+ g_object_unref (msg);
} else {
- TnyMsg *msg = tny_folder_find_msg (folder, uri, NULL);
- if (msg) {
- info->connect = FALSE;
- g_object_unref (msg);
- } else {
- info->connect = TRUE;
- }
+ info->connect = TRUE;
}
g_object_unref (folder);
}
g_object_unref (account);
if (!msg) {
- g_warning ("%s: Could not find message '%s'", __FUNCTION__, uri);
+ g_debug ("%s: Could not find message '%s'", __FUNCTION__, uri);
g_idle_add (notify_error_in_dbus_callback, NULL);
g_free (uri);
return FALSE;
folder = tny_msg_get_folder (msg);
if (!folder) {
- g_warning ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
+ g_debug ("%s: Could not find folder (uri:'%s')", __FUNCTION__, uri);
g_object_unref (msg);
g_idle_add (notify_error_in_dbus_callback, NULL);
g_free (uri);
/* 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 */
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 */
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);
}
}
-static gint
+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);
-
- return OSSO_OK;
+ on_send_receive_performer (FALSE, NULL, NULL, NULL, srp_data);
+
+ return OSSO_OK;
}
-static gint
+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;
+}
+
+static gint
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;
+}
+
+
+static gboolean
+on_idle_open_account (gpointer user_data)
+{
+ ModestWindow *top;
+ ModestWindowMgr *mgr;
+ gchar *acc_name;
+
+ gdk_threads_enter ();
+
+ acc_name = (gchar *) user_data;
+ mgr = modest_runtime_get_window_mgr ();
+
+ top = modest_window_mgr_get_current_top (mgr);
+ if (!top)
+ top = modest_window_mgr_show_initial_window (mgr);
+
+#ifdef MODEST_TOOLKIT_HILDON2
+ 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;
+ }
+#else
+ if (MODEST_IS_MAIN_WINDOW (top)) {
+ gchar *server_name;
+ GtkWidget *folder_view;
+
+ folder_view = modest_main_window_get_child_widget (MODEST_MAIN_WINDOW (top),
+ MODEST_MAIN_WINDOW_WIDGET_TYPE_FOLDER_VIEW);
+ server_name = modest_account_mgr_get_server_account_name (modest_runtime_get_account_mgr (),
+ acc_name, TNY_ACCOUNT_TYPE_STORE);
+ if (server_name) {
+ modest_folder_view_set_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (folder_view),
+ server_name);
+ g_free (server_name);
+ }
+ }
+#endif
+
+ gdk_threads_leave ();
+ g_free (acc_name);
+ return FALSE;
+}
+
+static gint
+on_open_account (GArray *arguments, gpointer data, osso_rpc_t *retval)
+{
+ osso_rpc_t val;
+ gchar *account_id;
+
+ /* Get the arguments: */
+ val = g_array_index(arguments, osso_rpc_t, MODEST_DBUS_OPEN_MESSAGE_ARG_URI);
+ account_id = g_strdup (val.value.s);
+
+ g_idle_add (on_idle_open_account, account_id);
+
+ return OSSO_OK;
}
#ifdef MODEST_TOOLKIT_HILDON2
}
gdk_threads_leave (); /* CHECKED */
-
+
return FALSE; /* Do not call this callback again. */
}
#else
-static gboolean
+static gboolean
on_idle_top_application (gpointer user_data)
{
ModestWindow *main_win;
gboolean new_window = FALSE;
-
+
/* This is a GDK lock because we are an idle callback and
* the code below is or does Gtk+ code */
gdk_threads_enter (); /* CHECKED */
-
+
main_win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
FALSE);
}
gdk_threads_leave (); /* CHECKED */
-
+
return FALSE; /* Do not call this callback again. */
}
#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
dgettext("ke-recv","memr_ib_operation_disabled"),
TRUE);
gdk_threads_leave ();
-
+
+ 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
+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;
- return on_mail_to (arguments, data, retval);
+ 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_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)
} 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;
- return on_top_application (arguments, data, retval);
- } else {
+ modest_runtime_set_allow_shutdown (TRUE);
+ 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.
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.
*/
projects / modest / blobdiff