X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=b1216beeb6a9d0363539184ae4c742cb77b3de19;hp=46755d9b20550bbcd33025b7f5aef6efdcbf53b3;hb=c3fa140bae7b51e3bca3ae33bf2b6f924cd9386f;hpb=8cb5d470d68036f3fc73156897144bafb83c78ef

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index 46755d9..b1216be 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -47,13 +47,16 @@ enum {
 	LAST_SIGNAL
 };
 
+#if 0
 typedef struct _ModestTnySendQueuePrivate ModestTnySendQueuePrivate;
 struct _ModestTnySendQueuePrivate {
-	TnyCamelTransportAccount *account;	
+	/* empty */
 };
 #define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o)      (G_TYPE_INSTANCE_GET_PRIVATE((o), \
                                                    MODEST_TYPE_TNY_SEND_QUEUE, \
                                                    ModestTnySendQueuePrivate))
+#endif
+
 /* globals */
 static TnyCamelSendQueueClass *parent_class = NULL;
 
@@ -66,59 +69,61 @@ static TnyCamelSendQueueClass *parent_class = NULL;
 
 
 static void
-modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove)
-{
-	g_warning (__FUNCTION__);
-
-	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove);
+modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
+{	
+	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->cancel_func (self, remove, err); /* FIXME */
 }
 
 static void
-modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg)
+modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err)
 {
-	ModestTnySendQueuePrivate *priv; 
-	
 	g_return_if_fail (TNY_IS_SEND_QUEUE(self));
 	g_return_if_fail (TNY_IS_CAMEL_MSG(msg));
-
-	g_warning (__FUNCTION__);
 	
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
 	/* FIXME: do something smart here... */
 	
-	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg);
+	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg, err); /* FIXME */
 }
 
 static TnyFolder*
 modest_tny_send_queue_get_sentbox (TnySendQueue *self)
 {
-	ModestTnySendQueuePrivate *priv; 
-
-	g_warning (__FUNCTION__);
+	TnyFolder *folder;
+	TnyCamelTransportAccount *account;
 
 	g_return_val_if_fail (self, NULL);
 
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-	
-	return  modest_tny_account_get_special_folder (TNY_ACCOUNT(priv->account),
-						       TNY_FOLDER_TYPE_SENT);
+	account = tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE(self));
+	if (!account) {
+		g_printerr ("modest: no account for send queue\n");
+		return NULL;
+	}
+	folder  = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
+							 TNY_FOLDER_TYPE_SENT);
+	g_object_unref (G_OBJECT(account));
+
+	return folder;
 }
 
 
 static TnyFolder*
 modest_tny_send_queue_get_outbox (TnySendQueue *self)
 {
-	ModestTnySendQueuePrivate *priv; 
+	TnyFolder *folder;
+	TnyCamelTransportAccount *account;
 
 	g_return_val_if_fail (self, NULL);
 
-	g_warning (__FUNCTION__);
-	
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
+	account = tny_camel_send_queue_get_transport_account (TNY_CAMEL_SEND_QUEUE(self));
+	if (!account) {
+		g_printerr ("modest: no account for send queue\n");
+		return NULL;
+	}
+	folder  = modest_tny_account_get_special_folder (TNY_ACCOUNT(account),
+							 TNY_FOLDER_TYPE_OUTBOX);
+	g_object_unref (G_OBJECT(account));
 
-	return modest_tny_account_get_special_folder (TNY_ACCOUNT(priv->account),
-						      TNY_FOLDER_TYPE_OUTBOX);
+	return folder;
 }
 
 
@@ -163,32 +168,18 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass)
         TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_sentbox_func = modest_tny_send_queue_get_sentbox;
         TNY_CAMEL_SEND_QUEUE_CLASS(klass)->cancel_func      = modest_tny_send_queue_cancel;
 
-	g_type_class_add_private (gobject_class, sizeof(ModestTnySendQueuePrivate));
+	/* g_type_class_add_private (gobject_class, sizeof(ModestTnySendQueuePrivate)); */
 }
 
 static void
 modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class)
 {
-	ModestTnySendQueue *self;  
-        ModestTnySendQueuePrivate *priv; 
-
-	self = (ModestTnySendQueue*)instance;
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
-	priv->account = NULL;
+   
 }
 
 static void
 modest_tny_send_queue_finalize (GObject *obj)
 {
-	ModestTnySendQueuePrivate *priv; 
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (obj);
-	
-	if (priv->account) {
-		g_object_unref (priv->account);
-		priv->account = NULL;
-	}
-
 	G_OBJECT_CLASS(parent_class)->finalize (obj);
 }
 
@@ -196,16 +187,22 @@ ModestTnySendQueue*
 modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 {
 	ModestTnySendQueue *self;
-	ModestTnySendQueuePrivate *priv;
-
+	
 	g_return_val_if_fail (TNY_IS_CAMEL_TRANSPORT_ACCOUNT(account), NULL);
 	
 	self = MODEST_TNY_SEND_QUEUE(g_object_new(MODEST_TYPE_TNY_SEND_QUEUE, NULL));
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
-	priv->account = account;
-	g_object_ref (G_OBJECT(priv->account));
 	
+	tny_camel_send_queue_set_transport_account (TNY_CAMEL_SEND_QUEUE(self),
+						    account); 
 	return self;
 }
 
+
+
+void
+modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
+{
+	/* TODO: Rename this to tny_camel_send_queue_try_to_send() in tinymail 
+	and check that it works, without creating a second worker. */
+/* 	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */
+}