X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=b1216beeb6a9d0363539184ae4c742cb77b3de19;hb=6aa04a4745825df25bc83dcccc764acce2803f5f;hp=dee812703ad710d15afb82c39867bb15a72da207;hpb=98df4aae51f0f37b7fd1158e86f132d528aaf3b3;p=modest

diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c
index dee8127..b1216be 100644
--- a/src/modest-tny-send-queue.c
+++ b/src/modest-tny-send-queue.c
@@ -47,6 +47,7 @@ enum {
 	LAST_SIGNAL
 };
 
+#if 0
 typedef struct _ModestTnySendQueuePrivate ModestTnySendQueuePrivate;
 struct _ModestTnySendQueuePrivate {
 	/* empty */
@@ -54,6 +55,8 @@ struct _ModestTnySendQueuePrivate {
 #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;
 
@@ -74,13 +77,9 @@ modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
 static void
 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));
 	
-	priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self);
-
 	/* FIXME: do something smart here... */
 	
 	TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg, err); /* FIXME */
@@ -169,7 +168,7 @@ 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
@@ -188,12 +187,10 @@ 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);
 	
 	tny_camel_send_queue_set_transport_account (TNY_CAMEL_SEND_QUEUE(self),
 						    account); 
@@ -203,7 +200,9 @@ modest_tny_send_queue_new (TnyCamelTransportAccount *account)
 
 
 void
-modest_tny_send_queue_flush (ModestTnySendQueue* self)
+modest_tny_send_queue_try_to_send (ModestTnySendQueue* self)
 {
-	tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(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)); */
 }