X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=8f7e2caaa06356e8816db531c8c596361ba9a7b4;hb=07537ed7ca26f7512195af5dd6bd31b41cc0589a;hp=76f9532825dd136198e7d66785f32179446cf6d7;hpb=51599182dd639c256fea10a3648db2c42baa677b;p=modest

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 76f95328..8f7e2ca 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -43,8 +43,8 @@ static void modest_tny_send_queue_finalize   (GObject *obj);
 static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class);
 
 /* Signal handlers */ 
-/* static void _on_msg_start_sending (TnySendQueue *self, TnyMsg *msg, gpointer user_data); */
-static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, gpointer user_data);
+static void _on_msg_start_sending (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data);
+static void _on_msg_has_been_sent (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, int done, int total, gpointer user_data);
 static void _on_msg_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
 
 static TnyFolder*modest_tny_send_queue_get_outbox (TnySendQueue *self);
@@ -187,7 +187,8 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 
 	/* Check whether the mail is already in the queue */
 /* 	msg_id = tny_header_get_message_id (header); */
-	msg_id = tny_header_get_uid (header);
+	msg_id = tny_header_get_uid (header);	
+	g_return_if_fail (msg_id != NULL);
 	existing = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE(self), msg_id);
 	if(existing != NULL)
 	{
@@ -208,6 +209,9 @@ modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 	}
 
 	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+
+	/* free */
+	g_object_unref (header);
 }
 
 static void
@@ -387,14 +391,9 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 						    account); 
 
 	/* Connect signals to control when a msg is being or has been sent */
-	/* TODO: this signal was implemented in tinymail camel send queue, but im
-	   waiting for implement some unit tests nbefore commited changes */
-/* 	if (FALSE) { */
-/* 		g_signal_connect (G_OBJECT(self), "msg-sending", */
-/* 				  G_CALLBACK(_on_msg_start_sending),  */
-/* 				  NULL); */
-/* 	} */
-			  
+	g_signal_connect (G_OBJECT(self), "msg-sending",
+			  G_CALLBACK(_on_msg_start_sending),
+			  NULL);			  
 	g_signal_connect (G_OBJECT(self), "msg-sent",
 			  G_CALLBACK(_on_msg_has_been_sent), 
 			  NULL);
@@ -490,65 +489,74 @@ modest_tny_send_queue_get_msg_id (TnyHeader *header)
 }
 
 
-/* static void  */
-/* _on_msg_start_sending (TnySendQueue *self, */
-/* 		       TnyMsg *msg, */
-/* 		       gpointer user_data) */
-/* { */
-/* 	ModestTnySendQueuePrivate *priv; */
-/* 	TnyHeader *header; */
-/* 	GList *item; */
-/* 	SendInfo *info; */
-
-/* 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); */
-
-/* 	header = tny_msg_get_header(msg); */
-/* 	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); */
+static void
+_on_msg_start_sending (TnySendQueue *self,
+		       TnyHeader *header,
+		       TnyMsg *msg,
+		       int done, 
+		       int total,
+		       gpointer user_data)
+{
+	ModestTnySendQueuePrivate *priv = NULL;
+	GList *item = NULL;
+	SendInfo *info = NULL;
+	gchar *msg_id = NULL;
 
-/* 	if (item != NULL) */
-/* 	{ */
-/* 		info = item->data; */
-/* 		info->status = MODEST_TNY_SEND_QUEUE_SENDING; */
+	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+	
+	/* Get message uid */
+	msg_id = modest_tny_send_queue_get_msg_id (header);
 
-/* 		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */
-/* 	} */
+	/* Get status info */
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+	g_return_if_fail (item != NULL);
+	info = item->data;
+	info->status = MODEST_TNY_SEND_QUEUE_SENDING;
+	
+	/* Set current status item */
+	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+	priv->current = item;
 
-/* 	priv->current = item; */
-/* } */
+	/* free */
+	g_free (msg_id);
+}
 
 static void 
 _on_msg_has_been_sent (TnySendQueue *self,
+		       TnyHeader *header,
 		       TnyMsg *msg, 
+		       int done, 
+		       int total,
 		       gpointer user_data)
 {
 	ModestTnySendQueuePrivate *priv;
-	TnyHeader *header;
 	GList *item;
+	gchar *msg_id = NULL;
 
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 
-	header = tny_msg_get_header (msg);
-
-	/* TODO: Use this version as soon as the msg-sending
-	 *  notification works */
-#if 0
-	item = priv->current;
-	g_assert(item != NULL);
-#else
-	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id(header));
-	g_assert(item != NULL);
-#endif
+	/* Get message uid */
+	msg_id = modest_tny_send_queue_get_msg_id (header);
+	
+	/* Get status info */
+	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
+	g_return_if_fail(item != NULL);
 
+	/* Remove status info */
 	modest_tny_send_queue_info_free (item->data);
 	g_queue_delete_link (priv->queue, item);
 	priv->current = NULL;
+
+	/* free */
+	g_free(msg_id);
 }
 
-static void _on_msg_error_happened (TnySendQueue *self,
-                                    TnyHeader *header,
-				    TnyMsg *msg,
-				    GError *err,
-				    gpointer user_data)
+static void 
+_on_msg_error_happened (TnySendQueue *self,
+			TnyHeader *header,
+			TnyMsg *msg,
+			GError *err,
+			gpointer user_data)
 {
 	ModestTnySendQueuePrivate *priv = NULL;
 	SendInfo *info = NULL;