X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=8d0acaacb6fae33129708c4fbd8a2bf2f87b29c9;hb=28f2206c21738a94d6a41de73abba693c7ff323d;hp=6c92281803cd08cd02c1986c92eee92e3e619bb8;hpb=0cc78ab6510b62165262bb1bca8408c28a7dcb73;p=modest diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 6c92281..8d0acaa 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -29,11 +29,17 @@ #include +#include +#include +#include +#include +#include /* 'private'/'protected' functions */ static void modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass); -static void modest_tny_send_queue_init (ModestTnySendQueue *obj); static void modest_tny_send_queue_finalize (GObject *obj); +static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class); + /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -43,105 +49,91 @@ enum { typedef struct _ModestTnySendQueuePrivate ModestTnySendQueuePrivate; struct _ModestTnySendQueuePrivate { - TnyTransportAccount *account; - + /* empty */ }; #define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_SEND_QUEUE, \ ModestTnySendQueuePrivate)) /* globals */ -static TnySendQueueClass *parent_class = NULL; +static TnyCamelSendQueueClass *parent_class = NULL; /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ - -static void -modest_tny_send_queue_cancel (TnySendQueue *self, gboolean remove) -{ - MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->cancel_func (self, remove); -} - -static void -modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg) -{ - MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->add_func (self, msg); -} - - -static void -modest_tny_send_queue_get_sentbox (TnySendQueue *self) -{ - MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->get_sentbox (self); -} - - -static void -modest_tny_send_queue_get_outbox (TnySendQueue *self, TnyMsg *msg) -{ - MODEST_TNY_SENT_QUEUE_GET_CLASS(self)->get_outbox (self); -} - - +/* + * this thread actually tries to send all the mails in the outbox + */ static void -modest_tny_send_queue_cancel_default (TnySendQueue *self, gboolean remove) -{ - /* FIXME */ +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_default (TnySendQueue *self, TnyMsg *msg) +modest_tny_send_queue_add (TnySendQueue *self, TnyMsg *msg, GError **err) { - ModestTnySendQueuePriv *priv; - - g_return_if_fail (self, NULL); - g_return_if_fail (TNY_IS_CAMEL_MSG(msg), NULL); + 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 */ + /* FIXME: do something smart here... */ + TNY_CAMEL_SEND_QUEUE_CLASS(parent_class)->add_func (self, msg, err); /* FIXME */ } - static TnyFolder* -modest_tny_send_queue_get_sentbox_default (TnySendQueue *self) +modest_tny_send_queue_get_sentbox (TnySendQueue *self) { - ModestTnySendQueuePriv *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 (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_default (TnySendQueue *self) +modest_tny_send_queue_get_outbox (TnySendQueue *self) { - ModestTnySendQueuePriv *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 (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; +} GType modest_tny_send_queue_get_type (void) { static GType my_type = 0; - if (!my_type) { + + if (my_type == 0) { static const GTypeInfo my_info = { sizeof(ModestTnySendQueueClass), NULL, /* base init */ @@ -150,32 +142,19 @@ modest_tny_send_queue_get_type (void) NULL, /* class finalize */ NULL, /* class data */ sizeof(ModestTnySendQueue), - 1, /* n_preallocs */ - (GInstanceInitFunc) modest_tny_send_queue_init, + 0, /* n_preallocs */ + (GInstanceInitFunc) modest_tny_send_queue_instance_init, NULL }; - my_type = g_type_register_static (TNY__TYPE__SEND_QUEUE, - "ModestTnySendQueue", - &my_info, 0); + my_type = g_type_register_static (TNY_TYPE_CAMEL_SEND_QUEUE, + "ModestTnySendQueue", + &my_info, 0); } return my_type; } static void -modest_tny_send_queue_init (gpointer g, gpointer iface_data) -{ - TnySendQueueIface *klass = (TnySendQueueIface*)g; - - klass->add_func = modest_tny_send_queue_add; - klass->get_outbox_func = modest_tny_send_queue_get_outbox; - klass->get_sentbox_func = modest_tny_send_queue_get_sentbox; - klass->cancel_func = modest_tny_send_queue_cancel; -} - - - -static void modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass) { GObjectClass *gobject_class; @@ -185,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; - klass->add_func = modest_tny_send_queue_add_default; - klass->get_outbox_func = modest_tny_send_queue_get_outbox_default; - klass->get_sentbox_func = modest_tny_send_queue_get_sentbox_default; - klass->cancel_func = modest_tny_send_queue_cancel_default; + 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)); } @@ -196,43 +175,35 @@ modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass) static void modest_tny_send_queue_instance_init (GTypeInstance *instance, gpointer g_class) { - ModestTnySendQueue *self; - ModestTnySendQueuePriv *priv; - - self = (ModestTnySendQueue*)instance; - priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); - - priv->account = NULL; + } static void modest_tny_send_queue_finalize (GObject *obj) { - ModestTnySendQueuePriv *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); } ModestTnySendQueue* -modest_tny_send_queue_new (TnyTransportAccount *account) +modest_tny_send_queue_new (TnyCamelTransportAccount *account) { ModestTnySendQueue *self; ModestTnySendQueuePrivate *priv; - - g_return_val_if_fail (account, NULL); + + 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_flush (ModestTnySendQueue* self) +{ +/* tny_camel_send_queue_flush (TNY_CAMEL_SEND_QUEUE(self)); */ +}