X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=8fad46eb04ed2d9b417068587fc9a84cb63f5e5d;hb=6bab4bfef92fef73852d6acd51d1ebf381a338e4;hp=11d31af01e1df9a94a7f83ab79dcf44382e021b4;hpb=fd54149b68b3777ce63ebf25346bbc485cd84ec8;p=modest diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 11d31af..8fad46e 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -49,7 +49,7 @@ enum { 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, \ @@ -60,58 +60,71 @@ static TnyCamelSendQueueClass *parent_class = NULL; /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ - /* * this thread actually tries to send all the mails in the outbox */ static void -modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove) -{ - TNY_CAMEL_SEND_QUEUE_GET_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 (self); + 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_GET_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; + 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); - - priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); - return modest_tny_account_get_special_folder (TNY_ACCOUNT(priv->account), - TNY_FOLDER_TYPE_OUTBOX); + 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 folder; } @@ -133,7 +146,7 @@ modest_tny_send_queue_get_type (void) (GInstanceInitFunc) modest_tny_send_queue_instance_init, NULL }; - my_type = g_type_register_static (G_TYPE_OBJECT, + my_type = g_type_register_static (TNY_TYPE_CAMEL_SEND_QUEUE, "ModestTnySendQueue", &my_info, 0); } @@ -151,10 +164,10 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass) parent_class = g_type_class_peek_parent (klass); gobject_class->finalize = modest_tny_send_queue_finalize; - parent_class->add_func = modest_tny_send_queue_add; - parent_class->get_outbox_func = modest_tny_send_queue_get_outbox; - parent_class->get_sentbox_func = modest_tny_send_queue_get_sentbox; - parent_class->cancel_func = modest_tny_send_queue_cancel; + TNY_CAMEL_SEND_QUEUE_CLASS(klass)->add_func = modest_tny_send_queue_add; + TNY_CAMEL_SEND_QUEUE_CLASS(klass)->get_outbox_func = modest_tny_send_queue_get_outbox; + 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)); } @@ -162,26 +175,12 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass) 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); } @@ -190,15 +189,23 @@ 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)); + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE(self); + 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)); */ +}