* Fixes NB#63571, connection dialog is offered if we try to create a folder in...

[modest] / src / dbus_api / modest-dbus-callbacks.c

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index a7c91c0..a30fdfa 100644 (file)
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -398,8 +398,9 @@ on_open_message_performer (gboolean canceled,
        info = (OpenMsgPerformerInfo *) user_data;
        uri = info->uri;
 
-       if (err)
+       if (canceled || err) {
                goto frees;
+       }
 
        /* Get message */
        folder = tny_store_account_find_folder (TNY_STORE_ACCOUNT (account), uri, NULL);
@@ -673,13 +674,26 @@ on_delete_message (GArray *arguments, gpointer data, osso_rpc_t *retval)
 static gboolean
 on_idle_send_receive(gpointer user_data)
 {
-       ModestWindow *main_win =
+       gboolean auto_update;
+       ModestWindow *main_win = NULL;
+
+       main_win =
                modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
                                                   FALSE); /* don't create */
 
-       /* Send & receive all */
        gdk_threads_enter (); /* CHECKED */
-       modest_ui_actions_do_send_receive_all (main_win);
+
+       /* Check if the autoupdate feature is on */
+       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 (main_win);
+       else
+               /* Disable auto update */
+               modest_platform_set_update_interval (0);
+
        gdk_threads_leave (); /* CHECKED */
        
        return FALSE;