X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=1d8bcc945d5cc1b0079d6730e9a545b8925f9d54;hp=d7b24ce7def6b6c4ce50945168ddce99420b5caa;hb=98936b16511d3ca4b7e0c09908eed8392c7d869e;hpb=a4e8821c4dd117ede537ab7d5a5fb9992dd62df5

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index d7b24ce..1d8bcc9 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -805,6 +805,7 @@ create_msg_thread (gpointer thread_data)
 
 	g_object_unref (info->mail_op);
 	g_slice_free (CreateMsgInfo, info);
+	if (new_msg) g_object_unref(new_msg);
 	return NULL;
 }
 
@@ -1589,6 +1590,14 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	modest_account_mgr_set_account_busy (modest_runtime_get_account_mgr (), account_name, TRUE);
 	modest_mail_operation_notify_start (self);
 
+	/* notify about the start of the operation */ 
+	ModestMailOperationState *state;
+	state = modest_mail_operation_clone_state (self);
+	state->done = 0;
+	state->total = 0;
+	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+			0, state, NULL);
+	
 	/* Get all folders and continue in the callback */    
 	folders = tny_simple_list_new ();
 	tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
@@ -1639,17 +1648,62 @@ compare_headers_by_date (gconstpointer a,
 /* ************************** STORE  ACTIONS ************************* */
 /* ******************************************************************* */
 
+typedef struct {
+	ModestMailOperation *mail_op;
+	CreateFolderUserCallback callback;
+	gpointer user_data;
+} CreateFolderInfo;
+
+
+static void
+create_folder_cb (TnyFolderStore *parent_folder, 
+		  gboolean canceled, 
+		  TnyFolder *new_folder, 
+		  GError *err, 
+		  gpointer user_data)
+{
+	ModestMailOperationPrivate *priv;
+	CreateFolderInfo *info;
+
+	info = (CreateFolderInfo *) user_data;
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
+
+	if (canceled || err) {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+		if (err)
+			priv->error = g_error_copy (err);
+		else
+			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+				     MODEST_MAIL_OPERATION_ERROR_OPERATION_CANCELED,
+				     "canceled");		
+	} else {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	}
+
+	/* The user will unref the new_folder */
+	if (info->callback)
+		info->callback (info->mail_op, parent_folder, 
+				new_folder, info->user_data);
+	
+	/* Notify about operation end */
+	modest_mail_operation_notify_end (info->mail_op);
+
+	/* Frees */
+	g_object_unref (info->mail_op);
+	g_slice_free (CreateFolderInfo, info);
+}
 
-TnyFolder *
+void
 modest_mail_operation_create_folder (ModestMailOperation *self,
 				     TnyFolderStore *parent,
-				     const gchar *name)
+				     const gchar *name,
+				     CreateFolderUserCallback callback,
+				     gpointer user_data)
 {
 	ModestMailOperationPrivate *priv;
-	TnyFolder *new_folder = NULL;
 
-	g_return_val_if_fail (TNY_IS_FOLDER_STORE (parent), NULL);
-	g_return_val_if_fail (name, NULL);
+	g_return_if_fail (TNY_IS_FOLDER_STORE (parent));
+	g_return_if_fail (name);
 	
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 	priv->op_type = MODEST_MAIL_OPERATION_TYPE_INFO;
@@ -1686,18 +1740,25 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 	}
 
 	if (!priv->error) {
-		/* Create the folder */
-		modest_mail_operation_notify_start (self);
-		new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
-		CHECK_EXCEPTION (priv, MODEST_MAIL_OPERATION_STATUS_FAILED);
-		if (!priv->error)
-			priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
-	}
+		CreateFolderInfo *info;
 
-	/* Notify about operation end */
-	modest_mail_operation_notify_end (self);
+		info = g_slice_new0 (CreateFolderInfo);
+		info->mail_op = g_object_ref (self);
+		info->callback = callback;
+		info->user_data = user_data;
 
-	return new_folder;
+		modest_mail_operation_notify_start (self);
+
+		/* Create the folder */
+		tny_folder_store_create_folder_async (parent, name, create_folder_cb, 
+						      NULL, info);
+	} else {
+		/* Call the user callback anyway */
+		if (callback)
+			callback (self, parent, NULL, user_data);
+		/* Notify about operation end */
+		modest_mail_operation_notify_end (self);
+	}
 }
 
 void
@@ -2101,6 +2162,15 @@ modest_mail_operation_get_msg (ModestMailOperation *self,
 	helper->total_bytes = tny_header_get_message_size (header);
 
 	modest_mail_operation_notify_start (self);
+	
+	/* notify about the start of the operation */ 
+	ModestMailOperationState *state;
+	state = modest_mail_operation_clone_state (self);
+	state->done = 0;
+	state->total = 0;
+	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+				0, state, NULL);
+	
 	tny_folder_get_msg_async (folder, header, get_msg_async_cb, get_msg_status_cb, helper);
 
 	g_object_unref (G_OBJECT (folder));
@@ -2249,6 +2319,14 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		modest_mail_operation_notify_start (self);
 		iter = tny_list_create_iterator (header_list);
 		while (!tny_iterator_is_done (iter)) { 
+			/* notify about the start of the operation */ 
+			ModestMailOperationState *state;
+			state = modest_mail_operation_clone_state (self);
+			state->done = 0;
+			state->total = 0;
+			g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+					0, state, NULL);
+			
 			GetMsgInfo *msg_info = NULL;
 			TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
 			TnyFolder *folder = tny_header_get_folder (header);
@@ -2316,6 +2394,7 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 		gboolean expunge, leave_on_server;
 		const gchar *account_name;
 		TnyAccount *account;
+		ModestTransportStoreProtocol account_proto;
 
 		tny_header_set_flag (header, TNY_HEADER_FLAG_DELETED);
 		tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
@@ -2329,7 +2408,10 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 			modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
 								account_name);
 
-		if (TNY_IS_CAMEL_POP_FOLDER (folder) && !leave_on_server)
+		account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+
+		if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+		    modest_tny_folder_is_remote_folder (folder) == FALSE)
 			expunge = TRUE;
 		else
 			expunge = FALSE;
@@ -2423,12 +2505,29 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 
 	tny_folder_remove_msgs (folder, remove_headers, &(priv->error));
 	if (!priv->error) {
-		if (TNY_IS_CAMEL_IMAP_FOLDER (folder) || 
-		    TNY_IS_CAMEL_POP_FOLDER (folder))
- 			tny_folder_sync_async(folder, FALSE, NULL, NULL, NULL); /* FALSE --> don't expunge */ 
+		gboolean expunge, leave_on_server;
+		const gchar *account_name;
+		TnyAccount *account;
+		ModestTransportStoreProtocol account_proto;
+		
+		account = tny_folder_get_account (folder);
+		account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+		leave_on_server =
+			modest_account_mgr_get_leave_on_server (modest_runtime_get_account_mgr (),
+					account_name);
+
+		account_proto = modest_protocol_info_get_transport_store_protocol (tny_account_get_proto (account));
+
+		if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+		    modest_tny_folder_is_remote_folder (folder) == FALSE)
+			expunge = TRUE;
 		else
-			/* local folders */
- 			tny_folder_sync_async(folder, TRUE, NULL, NULL, NULL); /* TRUE --> expunge */
+			expunge = FALSE;
+
+		/* Sync folder */
+		tny_folder_sync_async(folder, expunge, NULL, NULL, NULL);
+		
+		g_object_unref (account);
 	}
 	
 	
@@ -2832,6 +2931,15 @@ modest_mail_operation_refresh_folder  (ModestMailOperation *self,
 	   updates before the callback call then this could happen. We
 	   must review the design */
 	modest_mail_operation_notify_start (self);
+	
+	/* notify that the operation was started */
+	ModestMailOperationState *state;
+	state = modest_mail_operation_clone_state (self);
+	state->done = 0;
+	state->total = 0;
+	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+			0, state, NULL);
+	
 	tny_folder_refresh_async (folder,
 				  on_refresh_folder,
 				  on_refresh_folder_status_update,