X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-mail-operation.c;h=48f3c14b2fd7530269cc5c92eabee36603c2dc62;hp=d9e31bcf271281d2662fbefd75164bc58c3f4903;hb=8b08d2fd3eebc0584a5c49abdcd26c52b65737f0;hpb=d08fd58a15eb3a02abb305a9315ef48ead85716c

diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index d9e31bc..48f3c14 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -635,20 +635,21 @@ modest_mail_operation_send_mail (ModestMailOperation *self,
 	} else {
 		/* Add the msg to the queue */
 		modest_mail_operation_notify_start (self);
-		modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue), 
-					   msg, 
-					   &(priv->error));
-
-		priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 
 		info = g_slice_new0 (SendMsgInfo);
 
 		info->mail_op = g_object_ref (self);
 		info->msg = g_object_ref (msg);
 		info->msg_sent_handler = g_signal_connect (G_OBJECT (send_queue), "msg-sent",
-							   G_CALLBACK (send_mail_msg_sent_handler), info);
+				G_CALLBACK (send_mail_msg_sent_handler), info);
 		info->error_happened_handler = g_signal_connect (G_OBJECT (send_queue), "error-happened",
-								 G_CALLBACK (send_mail_error_happened_handler), info);
+				G_CALLBACK (send_mail_error_happened_handler), info);
+
+		modest_tny_send_queue_add (MODEST_TNY_SEND_QUEUE(send_queue), 
+				msg, 
+				&(priv->error));
+
+		priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
 	}
 
 }
@@ -707,6 +708,8 @@ send_mail_error_happened_handler (TnySendQueue *queue, TnyHeader *header, TnyMsg
 	if (msgid2 == NULL) msgid2 = "(null)";
 
 	if (!strcmp (msgid1, msgid2)) {
+		if (error != NULL)
+			g_warning ("%s: %s\n", __FUNCTION__, error->message);
 		ModestMailOperationPrivate *priv = MODEST_MAIL_OPERATION_GET_PRIVATE (info->mail_op);
 		priv->status = MODEST_MAIL_OPERATION_STATUS_FAILED;
 		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
@@ -805,6 +808,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;
 }
 
@@ -871,8 +875,16 @@ modest_mail_operation_send_new_mail_cb (ModestMailOperation *self,
 	/* Remove old mail from its source folder */
 	draft_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
 							      TNY_FOLDER_TYPE_DRAFTS);
+	if (!draft_folder) {
+		g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL drafts folder", __FUNCTION__);
+		goto end;
+	}
 	outbox_folder = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
 							       TNY_FOLDER_TYPE_OUTBOX);
+	if (!outbox_folder) {
+		g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL outbox folder", __FUNCTION__);
+		goto end;
+	}
 	if (info->draft_msg != NULL) {
 		TnyFolder *folder = NULL;
 		TnyFolder *src_folder = NULL;
@@ -1050,13 +1062,15 @@ modest_mail_operation_save_to_drafts_cb (ModestMailOperation *self,
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
 
 	if (!msg) {
-		g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
-			     MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
-			     "modest: failed to create a new msg\n");
+		if (!(priv->error)) {
+			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
+				     MODEST_MAIL_OPERATION_ERROR_INSTANCE_CREATION_FAILED,
+				     "modest: failed to create a new msg\n");
+		}
 	} else {
 		drafts = modest_tny_account_get_special_folder (TNY_ACCOUNT (info->transport_account),
 								TNY_FOLDER_TYPE_DRAFTS);
-		if (!drafts) {
+		if (!drafts && !(priv->error)) {
 			g_set_error (&(priv->error), MODEST_MAIL_OPERATION_ERROR,
 				     MODEST_MAIL_OPERATION_ERROR_ITEM_NOT_FOUND,
 				     "modest: failed to create a new msg\n");
@@ -1230,7 +1244,6 @@ typedef struct
 	gint pending_calls;
 	gboolean poke_all;
 	TnyFolderObserver *inbox_observer;
-	guint update_timeout;
 	RetrieveAllCallback retrieve_all_cb;
 } UpdateAccountInfo;
 
@@ -1238,11 +1251,6 @@ typedef struct
 static void
 destroy_update_account_info (UpdateAccountInfo *info)
 {
-	if (info->update_timeout) {
-		g_source_remove (info->update_timeout);
-		info->update_timeout = 0;
-	}
-
 	g_free (info->account_name);
 	g_object_unref (info->folders);
 	g_object_unref (info->mail_op);
@@ -1453,8 +1461,9 @@ recurse_folders_async_cb (TnyFolderStore *folder_store,
 			/* Add pending call */
 			info->pending_calls++;
 			
-			tny_folder_store_get_folders_async (folder, folders, recurse_folders_async_cb, 
-							    NULL, NULL, info);
+			tny_folder_store_get_folders_async (folder, folders, NULL,
+							    recurse_folders_async_cb, 
+							    NULL, info);
 			
 			g_object_unref (G_OBJECT (folder));
 			
@@ -1496,10 +1505,6 @@ recurse_folders_async_cb (TnyFolderStore *folder_store,
 		}
 		g_object_unref (iter_all_folders);
 
-		/* Stop the progress notification */
-		g_source_remove (info->update_timeout);
-		info->update_timeout = 0;
-
 		/* Refresh the INBOX */
 		if (inbox) {
 			/* Refresh the folder. Our observer receives
@@ -1520,30 +1525,6 @@ recurse_folders_async_cb (TnyFolderStore *folder_store,
 	}
 }
 
-/* 
- * Issues the "progress-changed" signal. The timer won't be removed,
- * so you must call g_source_remove to stop the signal emission
- */
-static gboolean
-timeout_notify_progress (gpointer data)
-{
-	ModestMailOperation *mail_op = MODEST_MAIL_OPERATION (data);
-	ModestMailOperationState *state;
-
-	state = modest_mail_operation_clone_state (mail_op);
-
-	/* This is a GDK lock because we are an idle callback and
- 	 * the handlers of this signal can contain Gtk+ code */
-
-	gdk_threads_enter (); /* CHECKED */
-	g_signal_emit (G_OBJECT (mail_op), signals[PROGRESS_CHANGED_SIGNAL], 0, state, NULL);
-	gdk_threads_leave (); /* CHECKED */
-
-	g_slice_free (ModestMailOperationState, state);
-	
-	return TRUE;
-}
-
 void
 modest_mail_operation_update_account (ModestMailOperation *self,
 				      const gchar *account_name,
@@ -1582,18 +1563,29 @@ modest_mail_operation_update_account (ModestMailOperation *self,
 	info->account_name = g_strdup (account_name);
 	info->callback = callback;
 	info->user_data = user_data;
-	info->update_timeout = g_timeout_add (250, timeout_notify_progress, self);
 	info->retrieve_all_cb = retrieve_all_cb;
 
 	/* Set account busy */
 	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;
+
+	/* Start notifying progress */
+	g_signal_emit (G_OBJECT (self), signals[PROGRESS_CHANGED_SIGNAL], 
+			0, state, NULL);
+	g_slice_free (ModestMailOperationState, state);
+	
 	/* Get all folders and continue in the callback */    
 	folders = tny_simple_list_new ();
 	tny_folder_store_get_folders_async (TNY_FOLDER_STORE (store_account),
-				folders, recurse_folders_async_cb, 
-				NULL, NULL, info);
+					    folders, NULL,
+					    recurse_folders_async_cb, 
+					    NULL, info);
 }
 
 /*
@@ -1794,6 +1786,8 @@ modest_mail_operation_remove_folder (ModestMailOperation *self,
 						    TNY_FOLDER_STORE (trash_folder), 
 						    TRUE, NULL, NULL);
 			g_object_unref (trash_folder);
+		} else {
+			g_warning ("%s: modest_tny_account_get_special_folder(..) returned a NULL trash folder", __FUNCTION__);
 		}
 	} else {
 		TnyFolderStore *parent = tny_folder_get_folder_store (folder);
@@ -2153,6 +2147,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));
@@ -2241,7 +2244,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 	TnyIterator *iter = NULL;
 	
 	g_return_if_fail (MODEST_IS_MAIL_OPERATION (self));
-	
+
 	/* Init mail operation */
 	priv = MODEST_MAIL_OPERATION_GET_PRIVATE (self);
 	priv->status = MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS;
@@ -2301,6 +2304,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);
@@ -2337,6 +2348,7 @@ modest_mail_operation_get_msgs_full (ModestMailOperation *self,
 		if (notify)
 			notify (user_data);
 	}
+
 }
 
 
@@ -2368,6 +2380,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);
@@ -2381,7 +2394,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;
@@ -2477,7 +2493,9 @@ modest_mail_operation_remove_msgs (ModestMailOperation *self,
 	if (!priv->error) {
 		gboolean expunge, leave_on_server;
 		const gchar *account_name;
+		const gchar *proto;
 		TnyAccount *account;
+		ModestTransportStoreProtocol account_proto = MODEST_PROTOCOL_TRANSPORT_STORE_UNKNOWN;
 		
 		account = tny_folder_get_account (folder);
 		account_name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
@@ -2485,7 +2503,13 @@ modest_mail_operation_remove_msgs (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)
+		proto = tny_account_get_proto (account);
+		if (proto) {
+			account_proto = modest_protocol_info_get_transport_store_protocol (proto);
+		}
+
+		if (((account_proto == MODEST_PROTOCOL_STORE_POP) && !leave_on_server) ||
+		    modest_tny_folder_is_remote_folder (folder) == FALSE)
 			expunge = TRUE;
 		else
 			expunge = FALSE;
@@ -2625,7 +2649,6 @@ transfer_msgs_cb (TnyFolder *folder, gboolean cancelled, GError *err, gpointer u
 
 			tny_iterator_next (iter);
 		}
-
 	}
 		
 
@@ -2897,6 +2920,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,
@@ -2978,3 +3010,41 @@ modest_mail_operation_noop (ModestMailOperation *self)
 	modest_mail_operation_notify_start (self);
 	modest_mail_operation_notify_end (self);
 }
+
+
+gchar*
+modest_mail_operation_to_string (ModestMailOperation *self)
+{
+	const gchar *type, *status, *account_id;
+	ModestMailOperationPrivate *priv = NULL;
+	
+	g_return_val_if_fail (self, NULL);
+
+	priv = MODEST_MAIL_OPERATION_GET_PRIVATE(self);
+	
+	switch (priv->op_type) {
+	case MODEST_MAIL_OPERATION_TYPE_SEND:    type= "SEND";    break;
+	case MODEST_MAIL_OPERATION_TYPE_RECEIVE: type= "RECEIVE"; break;
+	case MODEST_MAIL_OPERATION_TYPE_OPEN:    type= "OPEN";    break;
+	case MODEST_MAIL_OPERATION_TYPE_DELETE:  type= "DELETE";  break;
+	case MODEST_MAIL_OPERATION_TYPE_INFO:    type= "INFO";    break;
+	case MODEST_MAIL_OPERATION_TYPE_UNKNOWN: type= "UNKNOWN"; break;
+	default: type = "UNEXPECTED"; break;
+	}
+
+	switch (priv->status) {
+	case MODEST_MAIL_OPERATION_STATUS_INVALID:              status= "INVALID"; break;
+	case MODEST_MAIL_OPERATION_STATUS_SUCCESS:              status= "SUCCESS"; break;
+	case MODEST_MAIL_OPERATION_STATUS_FINISHED_WITH_ERRORS: status= "FINISHED-WITH-ERRORS"; break;
+	case MODEST_MAIL_OPERATION_STATUS_FAILED:               status= "FAILED"; break;
+	case MODEST_MAIL_OPERATION_STATUS_IN_PROGRESS:          status= "IN-PROGRESS"; break;
+	case MODEST_MAIL_OPERATION_STATUS_CANCELED:             status= "CANCELLED"; break;
+	default:                                                status= "UNEXPECTED"; break;
+	} 
+
+	account_id = priv->account ? tny_account_get_id (priv->account) : "";
+	
+	return g_strdup_printf ("%p \"%s\" (%s) [%s] {%d/%d} '%s'", self, account_id,type, status,
+				priv->done, priv->total,
+				priv->error && priv->error->message ? priv->error->message : "");
+}