Changeset 3291

Timestamp:

01/23/08 23:52:50

Author:

svillar

Message:

• Added queue-start and queue-stop signals to the send queue
  

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (4 diffs)
• trunk/libtinymail/tny-send-queue.c (modified) (1 diff)
• trunk/libtinymail/tny-send-queue.h (modified) (2 diffs)

trunk/ChangeLog

@@ -6 +6 @@
-        (tny_send_queue_add_async): added this method that was available in
-        the Camel implementation to the interface
+        (create_worker)
+        (thread_main): added the "queue-start" and "queue-stop" signals that
+        are emitted before and after the queue processes the messages
-
-2008-01-22  Philip Van Hoof <pvanhoof@gnome.org>

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

@@ -175 +175 @@
-                tny_lockable_lock (apriv->session->priv->ui_lock);
-        g_signal_emit (info->self, tny_send_queue_signals [info->signal_id], 
-0, info->header, info->msg, info->i, info->total);
+       0, info->header, info->msg, info->i, info->total);      
-        if (apriv)
-                tny_lockable_unlock (apriv->session->priv->ui_lock);
@@ -282 +282 @@
-}
-
+
+static gboolean
+emit_queue_control_signals_on_mainloop (gpointer data)
+{
+        ControlInfo *info = data;
+        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (info->self);
+        TnyCamelAccountPriv *apriv = NULL;
+
+        if (priv && priv->trans_account)
+                apriv = TNY_CAMEL_ACCOUNT_GET_PRIVATE (priv->trans_account);
+        if (apriv)
+                tny_lockable_lock (apriv->session->priv->ui_lock);
+        g_signal_emit (info->self, tny_send_queue_signals [info->signal_id], 0);        
+        if (apriv)
+                tny_lockable_unlock (apriv->session->priv->ui_lock);
+
+        return NULL;
+}
+
+static void
+emit_queue_control_signals (TnySendQueue *self, guint signal_id)
+{
+        ControlInfo *info = g_slice_new0 (ControlInfo);
+
+        info->self = g_object_ref (self);
+        info->signal_id = signal_id;
+
+        g_idle_add_full (G_PRIORITY_DEFAULT_IDLE,
+                         emit_queue_control_signals_on_mainloop, info, 
+                         destroy_control_info);
+        
+        return;
+}
+
-typedef struct {
-        TnySendQueue *self;
@@ -528 +562 @@
-        g_slice_free (MainThreadInfo, info);
-
+        /* Emit the queue-stop signal */
+        emit_queue_control_signals (self, TNY_SEND_QUEUE_STOP);
+
-        return NULL;
-}
@@ -542 +579 @@
-
-                if (spriv->device && TNY_IS_DEVICE (spriv->device)) {
-
+
+
+
-                        info->self = g_object_ref (self);
-                        info->device = g_object_ref (spriv->device);
+
+                        emit_queue_control_signals (self, TNY_SEND_QUEUE_START);
+
-                        priv->thread = g_thread_create (thread_main, info, FALSE, NULL);
+
+                        if (priv->thread == NULL)
+                                emit_queue_control_signals (self, TNY_SEND_QUEUE_STOP);
-                }
-        }

trunk/libtinymail/tny-send-queue.c

@@ -242 +242 @@
-                                      tny_marshal_VOID__OBJECT_OBJECT_POINTER,
-                                      G_TYPE_NONE, 3, TNY_TYPE_HEADER, TNY_TYPE_MSG, G_TYPE_POINTER);
+
+/**
+ * TnySendQueue::queue-start
+ * @self: a #TnySendQueue, the object on which the signal is emitted
+ *
+ * Emitted when the queue starts to process messages
+ **/
+                tny_send_queue_signals[TNY_SEND_QUEUE_START] =
+                        g_signal_new ("queue-start",
+                                      TNY_TYPE_SEND_QUEUE,
+                                      G_SIGNAL_RUN_FIRST,
+                                      G_STRUCT_OFFSET (TnySendQueueIface, queue_start),
+                                      NULL, NULL,
+                                      g_cclosure_marshal_VOID__VOID,
+                                      G_TYPE_NONE, 0);
+
+/**
+ * TnySendQueue::queue-stop
+ * @self: a #TnySendQueue, the object on which the signal is emitted
+ *
+ * Emitted when the queue stops to process messages
+ **/
+                tny_send_queue_signals[TNY_SEND_QUEUE_STOP] =
+                        g_signal_new ("queue-stop",
+                                      TNY_TYPE_SEND_QUEUE,
+                                      G_SIGNAL_RUN_FIRST,
+                                      G_STRUCT_OFFSET (TnySendQueueIface, queue_stop),
+                                      NULL, NULL,
+                                      g_cclosure_marshal_VOID__VOID,
+                                      G_TYPE_NONE, 0);
+
-                
-                initialized = TRUE;

trunk/libtinymail/tny-send-queue.h

@@ -46 +46 @@
-        TNY_SEND_QUEUE_MSG_SENT,
-        TNY_SEND_QUEUE_ERROR_HAPPENED,
+        TNY_SEND_QUEUE_START,
+        TNY_SEND_QUEUE_STOP,
-        TNY_SEND_QUEUE_LAST_SIGNAL
-};
@@ -66 +68 @@
-        void (*msg_sent) (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, guint nth, guint total);
-        void (*error_happened) (TnySendQueue *self, TnyHeader *header, TnyMsg *msg, GError *err, gpointer user_data);
+        void (*queue_start) (TnySendQueue *self, gpointer user_data);
+        void (*queue_stop) (TnySendQueue *self, gpointer user_data);
-
-        /* methods */