Changeset 1817

Timestamp:

04/22/07 13:46:08

Author:

pvanhoof

Message:

Further implementing of queues

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (2 diffs)
• trunk/libtinymail-queues/tny-generic-send-queue-priv.h (modified) (1 diff)
• trunk/libtinymail-queues/tny-generic-send-queue.c (modified) (8 diffs)
• trunk/po/Makefile.in.in (modified) (3 diffs)

trunk/ChangeLog

@@ -3 +3 @@
-        * Created a TnyGenericSendQueue which implements TnySendQueue in a
-        generic way (doesn't strictly depend on the libtinymail-camel impl
-)             * unfinished implementation *
+ like the TnyCamelSendQueue type)
-
-        * This was a minor API change (new type added)

trunk/libtinymail-camel/tny-camel-send-queue.c

@@ -40 +40 @@
-        (G_TYPE_INSTANCE_GET_PRIVATE ((o), TNY_TYPE_CAMEL_SEND_QUEUE, TnyCamelSendQueuePriv))
-
-
-
+
-        TnySendQueue *self;
-        TnyMsg *msg;
-        GError *error;
-        gint i, total;
-
-} ErrorInfo;
-
@@ -53 +51 @@
-{
-        ErrorInfo *info = data;
-
-        g_signal_emit (info->self, tny_send_queue_signals [TNY_SEND_QUEUE_ERROR_HAPPENED], 
-                                0, info->msg, info->error, info->i, info->total);
-
-        return FALSE;
-}

trunk/libtinymail-queues/tny-generic-send-queue-priv.h

@@ -29 +29 @@
-        TnyFolder *outbox, *sentbox;
-        TnyTransportAccount *account;
+        gboolean cancelled;
-};
-

trunk/libtinymail-queues/tny-generic-send-queue.c

@@ -31 +31 @@
-#include "tny-generic-send-queue-priv.h"
-
+
+typedef struct {
+        TnySendQueue *self;
+        TnyMsg *msg;
+        GError *error;
+        gint i, total;
+} ErrorInfo;
+
+static gboolean 
+emit_error_on_mainloop (gpointer data)
+{
+        ErrorInfo *info = data;
+        g_signal_emit (info->self, tny_send_queue_signals [TNY_SEND_QUEUE_ERROR_HAPPENED], 
+                0, info->msg, info->error, info->i, info->total);
+        return FALSE;
+}
+
+
+static void
+destroy_error_info (gpointer data)
+{
+        ErrorInfo *info = data;
+        if (info->msg)
+                g_object_unref (G_OBJECT (info->msg));
+        if (info->self)
+                g_object_unref (G_OBJECT (info->self));
+        if (info->error)
+                g_error_free (info->error);
+        g_slice_free (ErrorInfo, info);
+}
+
+static void
+emit_error (TnySendQueue *self, TnyMsg *msg, GError *error, int i, int total)
+{
+        ErrorInfo *info = g_slice_new0 (ErrorInfo);
+        if (error != NULL)
+                info->error = g_error_copy ((const GError *) error);
+        if (self)
+                info->self = TNY_SEND_QUEUE (g_object_ref (G_OBJECT (self)));
+        if (msg)
+                info->msg = TNY_MSG (g_object_ref (G_OBJECT (msg)));
+        info->i = i;
+        info->total = total;
+        g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                emit_error_on_mainloop, info, destroy_error_info);
+        return;
+}
+
-typedef struct {
-        TnyGenericSendQueue *self;
-        TnyMsg *msg;
-GError **err
+gint i, total
-} GenericSendInfo;
-
@@ -42 +90 @@
-{
-        GenericSendInfo *info = (GenericSendInfo *) arguments;
+        TnySendQueue *self = (TnySendQueue *) info->self;
-        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (info->self);
-
+
+
-
-        g_mutex_lock (priv->lock);
-
-
-
-
-
+
-        {
+                g_mutex_unlock (priv->lock);
+                return;
+        }
+
+        list = tny_simple_list_new ();
+        tny_transport_account_send (priv->account, info->msg, &err);
+        if (err != NULL) {
+                emit_error (self, info->msg, err, info->i, info->total);
+                g_error_free (err);
+        } else {
+                TnyFolder *outbox, *sentbox;
+
+                outbox = tny_send_queue_get_outbox (TNY_SEND_QUEUE (info->self));
+                sentbox = tny_send_queue_get_sentbox (TNY_SEND_QUEUE (info->self));
+
-                tny_list_prepend (list, G_OBJECT (info->msg));
-priv->outbox, list, priv->sentbox, TRUE, info->
+outbox, list, sentbox, TRUE, &
-                g_object_unref (list);
-
-
-
+
+
+
+
+
+
+
+
-        g_object_unref (info->msg);
-
@@ -69 +136 @@
-{
-        GenericSendInfo *info = o_async_worker_task_get_arguments (task);
+        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (info->self);
-
-        g_object_unref (info->self);
@@ -79 +147 @@
-        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (self);
-        TnyIterator *iter;
-
+
+
+
+
-
-        g_mutex_lock (priv->lock);
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        iter = tny_list_create_iterator (list);
-
@@ -96 +183 @@
-                GenericSendInfo *info = g_slice_new (GenericSendInfo);
-                TnyHeader *header = TNY_HEADER (tny_iterator_get_current (iter));
-
+
+
+
+
+
-                info->self = TNY_GENERIC_SEND_QUEUE (g_object_ref (self));
-                info->msg = tny_folder_get_msg (priv->outbox, header, err);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                o_async_worker_task_set_arguments (task, info);
-                o_async_worker_task_set_func (task, generic_send_task);
-                o_async_worker_task_set_callback (task, generic_send_callback);
-
-
+item = 
-
-                g_object_unref (header);
-
+
+
-        }
-
-        g_object_unref (iter);
-        g_object_unref (list);
+        g_object_unref (G_OBJECT (outbox));
-
-        g_mutex_unlock (priv->lock);
@@ -124 +229 @@
-tny_generic_send_queue_cancel (TnySendQueue *self, gboolean remove, GError **err)
-{
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -173 +335 @@
-        TnyGenericSendQueuePriv *priv = TNY_GENERIC_SEND_QUEUE_GET_PRIVATE (object);
-
+        priv->cancelled = TRUE;
+        o_async_worker_join (priv->queue);
+
-        g_mutex_lock (priv->lock);
-        o_async_worker_join (priv->queue);
-        g_object_unref (G_OBJECT (priv->queue));
-        g_object_unref (G_OBJECT (priv->sentbox));
@@ -198 +362 @@
-        priv->sentbox = NULL;
-        priv->outbox = NULL;
+        priv->cancelled = FALSE;
-        g_mutex_unlock (priv->lock);
-

trunk/po/Makefile.in.in

@@ -26 +26 @@
-prefix = @prefix@
-exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
-datadir = @datadir@
-libdir = @libdir@
@@ -41 +42 @@
-GMSGFMT = @GMSGFMT@
-MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
-XGETTEXT = @XGETTEXT@
-MSGMERGE = msgmerge
@@ -79 +81 @@
-.po.gmo:
-        file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \
--c
+$(MSGFMT_OPTS)
-
-.po.cat: