X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=d6882a94fb5e9bdba92173d1e84073750092c3e3;hb=9102255b85bbf4588d9e8fb41d404e58c5b15174;hp=12944e627a0ba2716646d52bb45d6231f83ee746;hpb=7769dda1dc103ee149d6a495b081e2274d9dd12f;p=modest

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 12944e6..d6882a9 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -223,6 +223,12 @@ typedef struct _XFerFolderAsyncHelper
 	gpointer user_data;
 } XFerFolderAsyncHelper;
 
+typedef struct _SyncFolderHelper {
+	ModestMailOperation *mail_op;
+	SyncFolderCallback user_callback;
+	gpointer user_data;
+} SyncFolderHelper;
+
 typedef void (*ModestMailOperationCreateMsgCallback) (ModestMailOperation *mail_op,
 						      TnyMsg *msg,
 						      gpointer userdata);
@@ -2012,7 +2018,7 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	/* Get all folders and continue in the callback */ 
 	folders = tny_simple_list_new ();
 	tny_folder_store_get_folders_async (TNY_FOLDER_STORE (priv->account),
-					    folders, NULL, FALSE,
+					    folders, NULL, TRUE,
 					    recurse_folders_async_cb, 
 					    NULL, info);
 	g_object_unref (folders);
@@ -2462,7 +2468,7 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 	priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 	g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 		     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
-		     error_msg);
+		     "%s", error_msg);
 
 	/* Call the user callback if exists */
 	if (user_callback)
@@ -2734,7 +2740,7 @@ get_msg_async_cb (TnyFolder *folder,
 		} else {
 			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 				     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
-				     err->message);
+				     "%s", err->message);
 		}
 	} else if (finished && priv->status == MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS) {
 		/* Set the success status before calling the user callback */
@@ -2907,6 +2913,7 @@ remove_msgs_async_cb (TnyFolder *folder,
 	ModestMailOperation *self;
 	ModestMailOperationPrivate *priv;
 	ModestProtocolRegistry *protocol_registry;
+	SyncFolderHelper *helper;
 
 	self = (ModestMailOperation *) user_data;
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
@@ -2942,9 +2949,17 @@ remove_msgs_async_cb (TnyFolder *folder,
 	else
 		expunge = FALSE;
 
+	/* Create helper */
+	helper = g_slice_new0 (SyncFolderHelper);
+	helper->mail_op = g_object_ref (self);
+	helper->user_callback = NULL;
+	helper->user_data = NULL;
+
 	/* Sync folder */
-	tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, 
-			      NULL, self);
+	tny_folder_sync_async(folder, expunge, sync_folder_finish_callback, NULL, helper);
+
+	/* Remove the extra reference */
+	g_object_unref (self);
 }
 
 void 
@@ -3673,17 +3688,17 @@ modest_mail_operation_shutdown (ModestMailOperation *self, ModestTnyAccountStore
 }
 
 static void
-sync_folder_finish_callback (TnyFolder *self, 
-			     gboolean cancelled, 
-			     GError *err, 
+sync_folder_finish_callback (TnyFolder *self,
+			     gboolean cancelled,
+			     GError *err,
 			     gpointer user_data)
 
 {
-	ModestMailOperation *mail_op;
 	ModestMailOperationPrivate *priv;
+	SyncFolderHelper *helper;
 
-	mail_op = (ModestMailOperation *) user_data;
-	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (mail_op);
+	helper = (SyncFolderHelper *) user_data;
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (helper->mail_op);
 
 	/* If canceled by the user, ignore the error given by Tinymail */
 	if (cancelled) {
@@ -3702,15 +3717,26 @@ sync_folder_finish_callback (TnyFolder *self,
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 	}
 
-	modest_mail_operation_notify_end (mail_op);
-	g_object_unref (mail_op);
+	/* User callback */
+	if (helper->user_callback)
+		helper->user_callback (helper->mail_op, self, helper->user_data);
+
+	modest_mail_operation_notify_end (helper->mail_op);
+
+	/* Frees */
+	g_object_unref (helper->mail_op);
+	g_slice_free (SyncFolderHelper, helper);
 }
 
 void
 modest_mail_operation_sync_folder (ModestMailOperation *self,
-				   TnyFolder *folder, gboolean expunge)
+				   TnyFolder *folder,
+				   gboolean expunge,
+				   SyncFolderCallback callback,
+				   gpointer user_data)
 {
 	ModestMailOperationPrivate *priv;
+	SyncFolderHelper *helper;
 
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_FOLDER (folder));
@@ -3720,11 +3746,16 @@ modest_mail_operation_sync_folder (ModestMailOperation *self,
 	priv->account = modest_tny_folder_get_account (folder);
 	priv->op_type = MODEST_MAIL_OPERATION_TYPE_SYNC_FOLDER;
 
+	/* Create helper */
+	helper = g_slice_new0 (SyncFolderHelper);
+	helper->mail_op = g_object_ref (self);
+	helper->user_callback = callback;
+	helper->user_data = user_data;
+
 	modest_mail_operation_notify_start (self);
-	g_object_ref (self);
-	tny_folder_sync_async (folder, expunge, 
-			       (TnyFolderCallback) sync_folder_finish_callback, 
-			       NULL, self);
+	tny_folder_sync_async (folder, expunge,
+			       (TnyFolderCallback) sync_folder_finish_callback,
+			       NULL, helper);
 }
 
 static void