X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=57468a8cdfeaa7db10870547421bd76c6e45d12d;hb=edc519ae28b5934b62922563fd57407e678d8ff3;hp=d3c5db990b67d415e13c4cd87e84f4f23e383b8f;hpb=41bbafe351ec044e9e8f7abedf0747751e464b9d;p=modest

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index d3c5db9..57468a8 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -43,7 +43,7 @@ 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_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_error_happened (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
 
@@ -211,6 +211,12 @@ modest_tny_send_queue_get_outbox (TnySendQueue *self)
 	}
 	folder  = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
 							 TNY_FOLDER_TYPE_OUTBOX);
+
+	/* This vfunc's tinymail contract does not allow it to return NULL. */
+	if (!folder) {
+		g_warning("%s: Returning NULL.\n", __FUNCTION__);
+	}
+
 	g_object_unref (G_OBJECT(account));
 
 	return folder;
@@ -308,11 +314,11 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *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);
-	}
+/* 	if (FALSE) { */
+/* 		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), 
@@ -363,31 +369,31 @@ modest_tny_send_queue_get_msg_status (ModestTnySendQueue *self, const gchar *msg
   return ((SendInfo*)item->data)->status;
 }
 
-static void 
-_on_msg_start_sending (TnySendQueue *self,
-		       TnyMsg *msg,
-		       gpointer user_data)
-{
-	ModestTnySendQueuePrivate *priv;
-	TnyHeader *header;
-	GList *item;
-	SendInfo *info;
+/* 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);
+/* 	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));
+/* 	header = tny_msg_get_header(msg); */
+/* 	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header)); */
 
-	if (item != NULL)
-	{
-		info = item->data;
-		info->status = MODEST_TNY_SEND_QUEUE_SENDING;
+/* 	if (item != NULL) */
+/* 	{ */
+/* 		info = item->data; */
+/* 		info->status = MODEST_TNY_SEND_QUEUE_SENDING; */
 
-		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
-	}
+/* 		g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */
+/* 	} */
 
-	priv->current = item;
-}
+/* 	priv->current = item; */
+/* } */
 
 static void 
 _on_msg_has_been_sent (TnySendQueue *self,
@@ -423,29 +429,33 @@ static void _on_msg_error_happened (TnySendQueue *self,
 				    GError *err,
 				    gpointer user_data)
 {
-	ModestTnySendQueuePrivate *priv;
-	SendInfo *info;
-	GList *item;
+/* 	ModestTnySendQueuePrivate *priv; */
+/* 	SendInfo *info; */
+/* 	GList *item; */
+/* 	TnyHeader *msg_header; */
 
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+/* 	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); */
 
 	/* TODO: Use this version as soon as the msg-sending
 	 *  notification works */
-#if 0
-	item = priv->current;
-	g_assert(item != NULL);
-	info = priv->current->data;
-#else
-	/* TODO: Why do we get the msg and its header separately? The docs
-	 * don't really tell. */
-	g_assert(header == tny_msg_get_header (msg)); // ????
-	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self), tny_header_get_message_id (header));
-	g_assert(item != NULL);
-	info = item->data;
-#endif
+/* #if 0 */
+/* 	item = priv->current; */
+/* 	g_assert(item != NULL); */
+/* 	info = priv->current->data; */
+/* #else */
+/* 	/\* TODO: Why do we get the msg and its header separately? The docs */
+/* 	 * don't really tell. *\/ */
+/* 	g_assert(header == tny_msg_get_header (msg)); // ???? */
+/* 	msg_header = tny_msg_get_header (msg); */
+/* 	item = modest_tny_send_queue_lookup_info (MODEST_TNY_SEND_QUEUE (self),  */
+/* 						  tny_header_get_message_id (msg_header)); */
+/* 	g_object_unref (msg_header); */
+/* 	g_assert(item != NULL); */
+/* 	info = item->data; */
+/* #endif */
 
 	/* Keep in queue so that we remember that the opertion has failed
 	 * and was not just cancelled */
-	info->status = MODEST_TNY_SEND_QUEUE_FAILED;
-	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status);
+/* 	info->status = MODEST_TNY_SEND_QUEUE_FAILED; */
+/* 	g_signal_emit (self, signals[STATUS_CHANGED], 0, info->msg_id, info->status); */
 }