#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 <modest-accounts-window.h>
#include <modest-folder-window.h>
#include <modest-mailboxes-window.h>
+#include <modest-maemo-utils.h>
#endif
#include <tny-list.h>
on_idle_send_receive(gpointer user_data)
{
gboolean auto_update;
+ ModestMailOperation *mail_op = (ModestMailOperation *) user_data;
+ ModestConnectedVia connect_when;
+
gdk_threads_enter (); /* CHECKED */
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 ()) {
+ modest_ui_actions_do_send_receive_all (NULL, FALSE, FALSE, FALSE);
+ }
+ } else {
/* Disable auto update */
modest_platform_set_update_interval (0);
+ }
+
+ modest_mail_operation_queue_remove (modest_runtime_get_mail_operation_queue (),
+ mail_op);
+
+ g_object_unref (mail_op);
gdk_threads_leave (); /* CHECKED */
TnyAccount *account,
gpointer user_data)
{
- ModestConnectedVia connect_when;
+ ModestMailOperation *mail_op;
if (err || canceled) {
g_idle_add (notify_error_in_dbus_callback, NULL);
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);
- } else {
- /* We need this to allow modest to finish */
- g_idle_add (notify_error_in_dbus_callback, NULL);
- }
+ 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);
}
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;
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.
*/