X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=a8e1025e77461fbdade4e3f3afa258b24bfce815;hb=2cf033d1c7ff0cc8a0c6e723ecda0cff03d1e531;hp=0862a688c4bc353a239e0e15e83dd4488b65aec7;hpb=dbc2004ba5584358cf39709530ec315fefe14bf9;p=modest

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 0862a68..a8e1025 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -644,13 +644,17 @@ modest_mail_operation_save_to_drafts (ModestMailOperation *self,
 		header = tny_msg_get_header (draft_msg);
 		/* Remove the old draft expunging it */
 		tny_folder_remove_msg (folder, header, NULL);
-		tny_folder_sync (folder, TRUE, NULL);
+		tny_folder_sync (folder, TRUE, &(priv->error));
 		g_object_unref (header);
 	}
 	
-	tny_folder_add_msg (folder, msg, &(priv->error));
+	if (!priv->error)
+		tny_folder_add_msg (folder, msg, &(priv->error));
+
 	if (!priv->error)
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	else
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 
 end:
 	if (msg)
@@ -795,6 +799,8 @@ recurse_folders (TnyFolderStore *store, TnyFolderStoreQuery *query, TnyList *all
 static gboolean
 idle_notify_progress (gpointer data)
 {
+	gdk_threads_enter ();
+
 	ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
 	ModestMailOperationState *state;
 
@@ -802,6 +808,8 @@ idle_notify_progress (gpointer data)
 	g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
 	g_slice_free (ModestMailOperationState, state);
 	
+	gdk_threads_leave ();
+
 	return TRUE;
 }
 
@@ -813,6 +821,8 @@ idle_notify_progress (gpointer data)
 static gboolean
 idle_notify_progress_once (gpointer data)
 {
+	gdk_threads_enter ();
+
 	ModestPair *pair;
 
 	pair = (ModestPair *) data;
@@ -823,6 +833,8 @@ idle_notify_progress_once (gpointer data)
 	g_slice_free (ModestMailOperationState, (ModestMailOperationState*)pair->second);
 	g_object_unref (pair->first);
 
+	gdk_threads_leave ();
+
 	return FALSE;
 }
 
@@ -880,6 +892,8 @@ set_last_updated_idle (gpointer data)
 				    time(NULL), 
 				    TRUE);
 
+	gdk_threads_leave ();
+
 	return FALSE;
 }
 
@@ -1093,7 +1107,7 @@ update_account_thread (gpointer thr_user_data)
 	/* Notify about operation end. Note that the info could be
 	   freed before this idle happens, but the mail operation will
 	   be still alive */
-	g_idle_add (notify_update_account_queue, g_object_ref (info->mail_op));
+	g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op));
 
 	if (info->callback) {
 		/* This thread is not in the main lock */
@@ -1250,6 +1264,13 @@ modest_mail_operation_create_folder (ModestMailOperation *self,
 		}
 	}
 
+	if (!strcmp (name, " ") || strchr (name, '/')) {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+			     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+			     _("mail_in_ui_folder_create_error"));
+	}
+
 	if (!priv->error) {
 		/* Create the folder */
 		new_folder = tny_folder_store_create_folder (parent, name, &(priv->error));
@@ -1389,11 +1410,10 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 				   gboolean delete_original)
 {
 	ModestMailOperationPrivate *priv = NULL;
-	ModestTnyFolderRules parent_rules, rules;
+	ModestTnyFolderRules parent_rules = 0, rules = 0;
 
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
 	g_return_if_fail (TNY_IS_FOLDER (folder));
-	g_return_if_fail (TNY_IS_FOLDER (parent));
 
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 
@@ -1403,11 +1423,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 
 	/* Get folder rules */
 	rules = modest_tny_folder_get_rules (TNY_FOLDER (folder));
-	parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
-
-	if (!TNY_IS_FOLDER_STORE (parent)) {
-		
-	}
+	if (TNY_IS_FOLDER (parent))
+		parent_rules = modest_tny_folder_get_rules (TNY_FOLDER (parent));
 	
 	/* The moveable restriction is applied also to copy operation */
 	if ((!TNY_IS_FOLDER_STORE (parent)) || (rules & MODEST_FOLDER_RULES_FOLDER_NON_MOVEABLE)) {
@@ -1419,7 +1436,8 @@ modest_mail_operation_xfer_folder (ModestMailOperation *self,
 
 		/* Notify the queue */
 		modest_mail_operation_notify_end (self, FALSE);
-	} else if (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE) {
+	} else if (TNY_IS_FOLDER (parent) && 
+		   (parent_rules & MODEST_FOLDER_RULES_FOLDER_NON_WRITEABLE)) {
  		/* Set status failed and set an error */
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -1472,18 +1490,24 @@ modest_mail_operation_rename_folder (ModestMailOperation *self,
 
 		/* Notify about operation end */
 		modest_mail_operation_notify_end (self, FALSE);
+	} else if (!strcmp (name, " ") || strchr (name, '/')) {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
+		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+			     MODEST_MAIL_OPERATION_ERROR_FOLDER_RULES,
+			     _("FIXME: unable to rename"));
+		/* Notify about operation end */
+		modest_mail_operation_notify_end (self, FALSE);
 	} else {
-		/* Rename. Camel handles folder subscription/unsubscription */
 		TnyFolderStore *into;
 
+		/* Rename. Camel handles folder subscription/unsubscription */
 		into = tny_folder_get_folder_store (folder);
 		tny_folder_copy_async (folder, into, name, TRUE,
 				 transfer_folder_cb,
 				 transfer_folder_status_cb,
 				 self);
 		if (into)
-			g_object_unref (into);
-		
+			g_object_unref (into);		
 	}
  }
 
@@ -1519,6 +1543,11 @@ void modest_mail_operation_get_msg (ModestMailOperation *self,
 		helper->user_data = user_data;
 		helper->header = g_object_ref (header);
 
+		// The callback's reference so that the mail op is not
+		// finalized until the async operation is completed even if
+		// the user canceled the request meanwhile.
+		g_object_ref (G_OBJECT (helper->mail_op));
+
 		tny_folder_get_msg_async (folder, header, get_msg_cb, get_msg_status_cb, helper);
 
 		g_object_unref (G_OBJECT (folder));
@@ -1566,15 +1595,19 @@ get_msg_cb (TnyFolder *folder,
 		goto out;
 	}
 
-	priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
+	/* The mail operation might have been canceled in which case we do not
+	   want to notify anyone anymore. */
+	if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED) {
+		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
-	/* If user defined callback function was defined, call it */
-	if (helper->user_callback) {
-		/* This callback is called into an iddle by tinymail,
-		   and idles are not in the main lock */
-		gdk_threads_enter ();
-		helper->user_callback (self, helper->header, msg, helper->user_data);
-		gdk_threads_leave ();
+		/* If user defined callback function was defined, call it */
+		if (helper->user_callback) {
+			/* This callback is called into an iddle by tinymail,
+			   and idles are not in the main lock */
+			gdk_threads_enter ();
+			helper->user_callback (self, helper->header, msg, helper->user_data);
+			gdk_threads_leave ();
+		}
 	}
 
  out:
@@ -1583,7 +1616,10 @@ get_msg_cb (TnyFolder *folder,
 	g_slice_free (GetMsgAsyncHelper, helper);
 		
 	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, TRUE);
+	if(priv->status != MODEST_MAIL_OPERATION_STATUS_CANCELED)
+		modest_mail_operation_notify_end (self, TRUE);
+
+	g_object_unref (G_OBJECT (self));
 }
 
 static void     
@@ -1605,6 +1641,9 @@ get_msg_status_cb (GObject *obj,
 	self = helper->mail_op;
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
+	if(priv->status == MODEST_MAIL_OPERATION_STATUS_CANCELED)
+		return;
+
 	if ((status->position == 1) && (status->of_total == 100))
 		return;
 
@@ -1750,7 +1789,7 @@ get_msgs_full_thread (gpointer thr_user_data)
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 
 	/* Notify about operation end */
-	g_idle_add (notify_update_account_queue, g_object_ref (info->mail_op));
+	g_idle_add (idle_notify_update_account_queue, g_object_ref (info->mail_op));
 
 	/* Free thread resources. Will be called after all previous idles */
 	g_idle_add_full (G_PRIORITY_DEFAULT_IDLE + 1, get_msgs_full_destroyer, info, NULL);
@@ -1899,8 +1938,10 @@ modest_mail_operation_remove_msg (ModestMailOperation *self,
 		g_object_unref (G_OBJECT (store_account));
 	} else {
 		tny_folder_remove_msg (folder, header, &(priv->error));
-		if (!priv->error)
+		if (!priv->error) {
+			tny_header_set_flags (header, TNY_HEADER_FLAG_DELETED);
 			tny_folder_sync(folder, TRUE, &(priv->error));
+		}
 	}
 
 	/* Set status */
@@ -1975,6 +2016,9 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
 		priv->status = MODEST_MAIL_OPERATION_STATUS_SUCCESS;
 	}
 
+	/* Notify about operation end */
+	modest_mail_operation_notify_end (self, TRUE);
+
 	/* If user defined callback function was defined, call it */
 	if (helper->user_callback) {
 		gdk_threads_enter ();
@@ -1989,8 +2033,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError **err, gpointer
 	g_slice_free   (XFerMsgAsyncHelper, helper);
 	g_object_unref (folder);
 
-	/* Notify about operation end */
-	modest_mail_operation_notify_end (self, TRUE);
 }
 
 void