X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=1e37c43a545b45db8ccef3dbf643e7281faeb4fa;hb=144144517f2d7ee5e19a7fe16bf48a9448a5cff6;hp=87b997e2c2e4d2c7d7dfb91d8a9a6c9cc0c45e7e;hpb=8eb87055216f549c737d2126f33d1fc913f2632d;p=modest

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 87b997e..1e37c43 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -235,10 +235,10 @@ modest_tny_send_queue_add (ModestTnySendQueue *self, TnyMsg *msg, GError **err)
 	g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
 
 	tny_camel_send_queue_add_async (TNY_CAMEL_SEND_QUEUE(self), 
-				  msg, 
-				  _on_added_to_outbox, 
-				  NULL, 
-				  NULL);
+					msg, 
+					_on_added_to_outbox, 
+					NULL, 
+					NULL);
 }
 
 
@@ -516,24 +516,15 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg
 gchar *
 modest_tny_send_queue_get_msg_id (TnyHeader *header)
 {
-	const gchar *uid = NULL;
 	gchar* msg_uid = NULL;
-	gchar **tmp = NULL;
+	const gchar *subject;
+	time_t date_received;
 		
 	/* Get message uid */
-	uid = tny_header_get_uid (header);
-	if (uid)
-		tmp = g_strsplit (uid, "__", 2);
-	
-	if (tmp) {
-		if (tmp[1] != NULL) 
-			msg_uid = g_strconcat (tmp[0], "_", NULL);
-		else 
-			msg_uid = g_strdup(tmp[0]);
-
-		/* free */
-		g_strfreev(tmp);
-	}
+	subject = tny_header_get_subject (header);
+	date_received = tny_header_get_date_received (header);
+
+	msg_uid = g_strdup_printf ("%s %d", subject, (int) date_received);
 
 	return msg_uid;
 }
@@ -583,20 +574,19 @@ _on_msg_has_been_sent (TnySendQueue *self,
 		       gpointer user_data)
 {
 	ModestTnySendQueuePrivate *priv;
-	GList *item;
 	gchar *msg_id = NULL;
-
+	GList *item;
 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
 
 	/* Get message uid */
 	msg_id = modest_tny_send_queue_get_msg_id (header);
-	
+
+	tny_header_set_flags (header, TNY_HEADER_FLAG_SEEN);
+
 	/* Get status info */
 	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), msg_id);
-	if (!item)
-		g_warning ("%s: item should not be NULL", __FUNCTION__);
-	else {
-
+	if (item) {
+		
 		/* Remove status info */
 		modest_tny_send_queue_info_free (item->data);
 		g_queue_delete_link (priv->queue, item);