X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-tny-send-queue.c;h=ebdb823b24dfa8467729cc1471985863a6e0f2a2;hb=18e2fbaf1e8f82b90becd8e8425018b2e7b09c18;hp=11d31af01e1df9a94a7f83ab79dcf44382e021b4;hpb=fd54149b68b3777ce63ebf25346bbc485cd84ec8;p=modest diff --git a/src/modest-tny-send-queue.c b/src/modest-tny-send-queue.c index 11d31af..ebdb823 100644 --- a/src/modest-tny-send-queue.c +++ b/src/modest-tny-send-queue.c @@ -40,6 +40,11 @@ static void modest_tny_send_queue_class_init (ModestTnySendQueueClass *klass); 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, guint processed, guint total); +static void _on_msg_has_been_sent (TnySendQueue *self, TnyMsg *msg, guint processed, guint total); + + /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -49,69 +54,81 @@ enum { typedef struct _ModestTnySendQueuePrivate ModestTnySendQueuePrivate; struct _ModestTnySendQueuePrivate { - TnyCamelTransportAccount *account; + gchar *current_msg_id; + }; + #define MODEST_TNY_SEND_QUEUE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_TNY_SEND_QUEUE, \ ModestTnySendQueuePrivate)) + /* globals */ 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 +150,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 +168,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,25 +179,21 @@ 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; + ModestTnySendQueuePrivate *priv; + + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (instance); + priv->current_msg_id = NULL; + } static void modest_tny_send_queue_finalize (GObject *obj) { - ModestTnySendQueuePrivate *priv; + ModestTnySendQueuePrivate *priv; + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (obj); - - if (priv->account) { - g_object_unref (priv->account); - priv->account = NULL; - } + if (priv->current_msg_id != NULL) + g_free(priv->current_msg_id); G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -189,16 +202,99 @@ 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)); + + tny_camel_send_queue_set_transport_account (TNY_CAMEL_SEND_QUEUE(self), + 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); + } + + g_signal_connect (G_OBJECT(self), "msg-sent", + G_CALLBACK(_on_msg_has_been_sent), + NULL); + 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)); */ +} + +gboolean +modest_tny_send_queue_msg_is_being_sent (ModestTnySendQueue* self, + const gchar *msg_id) +{ + ModestTnySendQueuePrivate *priv; + + g_return_val_if_fail (msg_id != NULL, FALSE); priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); + + if (modest_tny_send_queue_sending_in_progress(self)) + return g_ascii_strcasecmp(priv->current_msg_id, msg_id); + else + return FALSE; +} - priv->account = account; - g_object_ref (G_OBJECT(priv->account)); +gboolean +modest_tny_send_queue_sending_in_progress (ModestTnySendQueue* self) +{ + ModestTnySendQueuePrivate *priv; - return self; + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); + + return priv->current_msg_id != NULL; } + +static void +_on_msg_start_sending (TnySendQueue *self, + TnyMsg *msg, + guint processed, + guint total) +{ + ModestTnySendQueuePrivate *priv; + TnyHeader *header = NULL; + + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); + + /* Delete previous msg_id */ + if (priv->current_msg_id != NULL) + g_free(priv->current_msg_id); + + /* Set current msg_id */ + header = tny_msg_get_header(msg); + priv->current_msg_id = g_strdup(tny_header_get_message_id (header)); +} + +static void +_on_msg_has_been_sent (TnySendQueue *self, + TnyMsg *msg, + guint processed, + guint total) +{ + ModestTnySendQueuePrivate *priv; + + priv = MODEST_TNY_SEND_QUEUE_GET_PRIVATE (self); + + /* Delete previous msg_id */ + if (priv->current_msg_id != NULL) + g_free(priv->current_msg_id); + + /* Unset current msg_id */ + priv->current_msg_id = NULL; +}