X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fdbus_api%2Fmodest-dbus-callbacks.c;h=b80d9c254ed94d86955c0d8819c49b217b0540df;hp=a7c91c047128b65a9124d50a910f31512d195ca8;hb=84d1104aa5cee3d80e2b2263d0d3cc0994233642;hpb=90faf79ccd28b6581ff96f20da2e6e4dbd0bc34b

diff --git a/src/dbus_api/modest-dbus-callbacks.c b/src/dbus_api/modest-dbus-callbacks.c
index a7c91c0..b80d9c2 100644
--- a/src/dbus_api/modest-dbus-callbacks.c
+++ b/src/dbus_api/modest-dbus-callbacks.c
@@ -673,13 +673,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;