X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation-queue.c;h=c4611bfa3d2821de341a8a9fa84f43b63d6239c4;hp=22bbd539d6d97cbb4fc00af7f9ba40536b280b84;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=4db44f57690ed2e6f418a12a2e0eeddf4cf22084

diff --git a/src/modest-mail-operation-queue.c b/src/modest-mail-operation-queue.c
index 22bbd53..c4611bf 100644
--- a/src/modest-mail-operation-queue.c
+++ b/src/modest-mail-operation-queue.c
@@ -228,6 +228,28 @@ modest_mail_operation_queue_new (void)
 }
 
 static void
+on_operation_started (ModestMailOperation *mail_op,
+		       gpointer user_data)
+{
+	ModestMailOperationQueue *self = MODEST_MAIL_OPERATION_QUEUE (user_data);
+	ModestMailOperationTypeOperation op_type;
+	ModestMailOperationQueuePrivate *priv;
+	TnyDevice *device;
+
+	priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
+
+	op_type = modest_mail_operation_get_type_operation (mail_op);
+	device = modest_runtime_get_device ();
+
+	if ((op_type != MODEST_MAIL_OPERATION_TYPE_SHUTDOWN) &&
+	    priv->running_final_sync &&
+	    tny_device_is_forced (device))
+		tny_device_reset (device);
+
+	priv->running_final_sync = (op_type == MODEST_MAIL_OPERATION_TYPE_SHUTDOWN);
+}
+
+static void
 on_operation_finished (ModestMailOperation *mail_op,
 		       gpointer user_data)
 {
@@ -248,21 +270,24 @@ modest_mail_operation_queue_add (ModestMailOperationQueue *self,
 
 	priv = MODEST_MAIL_OPERATION_QUEUE_GET_PRIVATE(self);
 
-	priv->running_final_sync = (modest_mail_operation_get_type_operation (mail_op) == MODEST_MAIL_OPERATION_TYPE_SHUTDOWN);
-
 	g_mutex_lock (priv->queue_lock);
 	g_queue_push_tail (priv->op_queue, g_object_ref (mail_op));
 	g_mutex_unlock (priv->queue_lock);
 
 	MODEST_DEBUG_BLOCK (print_queue_item (mail_op, "add"););
 
+	g_signal_connect (G_OBJECT (mail_op),
+			  "operation-started",
+			  G_CALLBACK (on_operation_started),
+			  self);
+
 	/* Get notified when the operation ends to remove it from the
 	   queue. We connect it using the *after* because we want to
 	   let the other handlers for the finish function happen
 	   before this */
-	g_signal_connect_after (G_OBJECT (mail_op), 
+	g_signal_connect_after (G_OBJECT (mail_op),
 				"operation-finished",
-				G_CALLBACK (on_operation_finished), 
+				G_CALLBACK (on_operation_finished),
 				self);
 
 	/* Notify observers */