X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=3fc3bdaae9b001e1fd7393cd3b46fdd29e147887;hp=480d4eaacb69a9b59effc6cf9617b83e1647aae3;hb=d68cbedf16d65a87c290ecee24bb18fe9a1eb359;hpb=fc79bc0cc051e3b5654e85106c1ac150715e620c

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 480d4ea..3fc3bda 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -105,6 +105,9 @@ struct _ModestTnySendQueuePrivate {
 	/* Special folders */
 	TnyFolder *outbox;
 	TnyFolder *sentbox;
+
+	/* last was send receive operation?*/
+	gboolean requested_send_receive;
 };
 
 #define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
@@ -207,7 +210,10 @@ _on_added_to_outbox (TnySendQueue *self,
 
 	header = tny_msg_get_header (msg);
 	msg_id = modest_tny_send_queue_get_msg_id (header);
-	g_return_if_fail(msg_id != NULL);
+	if (!msg_id) {
+		g_warning ("%s: No msg_id returned for header", __FUNCTION__);
+		goto end;
+	}
 
 	/* Put newly added message in WAITING state */
 	existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
@@ -223,7 +229,8 @@ _on_added_to_outbox (TnySendQueue *self,
 
 	g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
 
-	g_object_unref(G_OBJECT(header));
+ end:
+	g_object_unref (G_OBJECT(header));
 }
 
 static void
@@ -424,6 +431,8 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 	priv->sentbox = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
 							       TNY_FOLDER_TYPE_SENT);
 
+	priv->requested_send_receive = FALSE;
+
 
 	headers = tny_simple_list_new ();	
 	tny_folder_get_headers (priv->outbox, headers, TRUE, NULL);
@@ -497,16 +506,17 @@ gchar *
 modest_tny_send_queue_get_msg_id (TnyHeader *header)
 {
 	gchar* msg_uid = NULL;
-	const gchar *subject;
+	gchar *subject;
 	time_t date_received;
 		
 	g_return_val_if_fail (header && TNY_IS_HEADER(header), NULL);
 
 	/* Get message uid */
-	subject = tny_header_get_subject (header);
+	subject = tny_header_dup_subject (header);
 	date_received = tny_header_get_date_received (header);
 
 	msg_uid = g_strdup_printf ("%s %d", subject, (int) date_received);
+	g_free (subject);
 
 	return msg_uid;
 }
@@ -562,6 +572,8 @@ _on_msg_has_been_sent (TnySendQueue *self,
 
 	tny_header_set_flag (header, TNY_HEADER_FLAG_SEEN);
 
+	tny_folder_sync_async (priv->sentbox, FALSE, NULL, NULL, NULL);
+
 	/* Get status info */
 	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
 
@@ -594,19 +606,11 @@ _on_msg_error_happened (TnySendQueue *self,
 	
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 
-	/* Keep in queue so that we remember that the opertion has failed */
-	/* and was not just cancelled */
-	if (err->code == TNY_SYSTEM_ERROR_CANCEL)
-		info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
-	else
-		info->status = MODEST_TNY_SEND_QUEUE_FAILED;
-	priv->current = NULL;
-
 	/* Note that header could be NULL. Tinymail notifies about
 	   generic send queue errors with this signal as well, and
 	   those notifications are not bound to any particular header
 	   or message */
-	if (header) {
+	if (header && TNY_IS_HEADER (header)) {
 		SendInfo *info = NULL;
 		GList *item = NULL;
 		gchar* msg_uid = NULL;
@@ -614,9 +618,26 @@ _on_msg_error_happened (TnySendQueue *self,
 		/* Get sending info (create new if it doesn not exist) */
 		msg_uid = modest_tny_send_queue_get_msg_id (header);
 		item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), 
-							  msg_uid);	
+							  msg_uid);
+
+		/* TODO: this should not happen (but it does), so the
+		   problem should be located in the way we generate
+		   the message uids */
+		if (!item) {
+			g_warning ("%s: could not find item with id '%s'", __FUNCTION__, msg_uid);
+			g_free(msg_uid);
+			return;
+		}
 		
 		info = item->data;
+
+		/* Keep in queue so that we remember that the opertion has failed */
+		/* and was not just cancelled */
+		if (err->code == TNY_SYSTEM_ERROR_CANCEL)
+			info->status = MODEST_TNY_SEND_QUEUE_SUSPENDED;
+		else
+			info->status = MODEST_TNY_SEND_QUEUE_FAILED;
+		priv->current = NULL;
 		
 		/* Notify status has changed */
 		g_signal_emit (self, signals[STATUS_CHANGED_SIGNAL], 0, info->msg_id, info->status);
@@ -681,7 +702,7 @@ modest_tny_all_send_queues_get_msg_status (TnyHeader *header)
 		iter = tny_list_create_iterator (accounts);
 		while (!tny_iterator_is_done (iter)) {			
 			account = TNY_TRANSPORT_ACCOUNT(tny_iterator_get_current (iter));
-			send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account));
+			send_queue = modest_runtime_get_send_queue(TNY_TRANSPORT_ACCOUNT(account), TRUE);
 			g_object_unref(account);
 
 			queue_status = modest_tny_send_queue_get_msg_status (send_queue, msg_uid);
@@ -761,3 +782,25 @@ modest_tny_send_queue_wakeup (ModestTnySendQueue *self)
 	g_object_unref (iter);
 	g_object_unref (G_OBJECT (headers));
 }
+
+gboolean 
+modest_tny_send_queue_get_requested_send_receive (ModestTnySendQueue *self)
+{
+	ModestTnySendQueuePrivate *priv;
+
+	g_return_val_if_fail (MODEST_IS_TNY_SEND_QUEUE (self), FALSE);
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+	return priv->requested_send_receive;
+}
+
+void 
+modest_tny_send_queue_set_requested_send_receive (ModestTnySendQueue *self, gboolean requested_send_receive)
+{
+	ModestTnySendQueuePrivate *priv;
+
+	g_return_if_fail (MODEST_IS_TNY_SEND_QUEUE (self));
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+
+	priv->requested_send_receive = requested_send_receive;
+}