Changeset 3295

Timestamp:

01/26/08 13:15:20

Author:

pvanhoof

Message:

2008-01-26 Philip Van Hoof <pvanhoof@gnome.org>

• • • • Workaround for a known problem that ain't easy to solve right now:
        

expunged headers stay around for too long. When this is detected, a
dummy header is returned (with as flags TNY_HEADER_FLAG_EXPUNGED)

• • • • Finished Sergio's API change
        

• • • • This was a major API change
        

Files:

• trunk/ChangeLog (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c (modified) (2 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.c (modified) (3 diffs)
• trunk/libtinymail-camel/tny-camel-send-queue.h (modified) (2 diffs)
• trunk/libtinymail/Makefile.am (modified) (1 diff)
• trunk/libtinymail/tny-common-priv.h (modified) (1 diff)
• trunk/libtinymail/tny-expunged-header.c (added)
• trunk/libtinymailui-gtk/tny-gtk-header-list-model.c (modified) (5 diffs)

trunk/ChangeLog

@@ +1 @@
+2008-01-26  Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Workaround for a known problem that ain't easy to solve right now:
+        expunged headers stay around for too long. When this is detected, a
+        dummy header is returned (with as flags TNY_HEADER_FLAG_EXPUNGED)
+        * Finished Sergio's API change
+
+        * This was a major API change
+
-2008-01-25  Philip Van Hoof <pvanhoof@gnome.org>
-
@@ -28 +37 @@
-        (thread_main): added the "queue-start" and "queue-stop" signals that
-        are emitted before and after the queue processes the messages
+
+        * This was a major API change
-
-2008-01-22  Philip Van Hoof <pvanhoof@gnome.org>

trunk/libtinymail-camel/camel-lite/camel/providers/imap/camel-imap-folder.c

@@ -1275 +1275 @@
-        camel_operation_end (NULL);
-
-
-
+
-                for (i = 0; i < summary_len && new[i].uid; i++)
-                        g_free (new[i].uid);
@@ -1357 +1356 @@
-        }
-
-
-
+
-                camel_object_trigger_event(CAMEL_OBJECT (folder), "folder_changed", changes);
-                camel_folder_change_info_free(changes);

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

@@ -294 +294 @@
-        if (apriv)
-                tny_lockable_lock (apriv->session->priv->ui_lock);
-       
+
-        if (apriv)
-                tny_lockable_unlock (apriv->session->priv->ui_lock);
-
-NULL
+FALSE
-}
-
@@ -752 +752 @@
-
-
-
-Camel
+static 
+
-{
-        TNY_CAMEL_SEND_QUEUE_GET_CLASS (self)->add_async_func (self, msg, callback, status_callback, user_data);
@@ -760 +760 @@
-
-static void
-Camel
+
-{
-        TnyCamelSendQueuePriv *priv = TNY_CAMEL_SEND_QUEUE_GET_PRIVATE (self);

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

@@ -54 +54 @@
-        TnyFolder* (*get_outbox_func) (TnySendQueue *self);
-        void (*cancel_func) (TnySendQueue *self, TnySendQueueCancelAction cancel_action, GError **err);
-
-
+
-};
-
@@ -69 +68 @@
-                                                 TnyCamelTransportAccount *trans_account);
-
-void tny_camel_send_queue_add_async (TnyCamelSendQueue *self, TnyMsg *msg, TnySendQueueAddCallback callback, TnyStatusCallback status_callback, gpointer user_data);
-
-G_END_DECLS

trunk/libtinymail/Makefile.am

@@ -50 +50 @@
-        tny-merge-folder.h \
-        tny-combined-account.h \
-
+ 
-
-libtinymail_1_0_la_SOURCES = \
-        $(libtinymail_1_0_headers) \
+        tny-expunged-header.c \
-        tny-signals-marshal.c \
-        tny-error.c \

trunk/libtinymail/tny-common-priv.h

@@ -48 +48 @@
-gboolean tny_idle_stopper_is_stopped (TnyIdleStopper* stopper);
-
+
+
+
+
+#define TNY_TYPE_EXPUNGED_HEADER             (tny_expunged_header_get_type ())
+#define TNY_EXPUNGED_HEADER(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), TNY_TYPE_EXPUNGED_HEADER, TnyExpungedHeader))
+#define TNY_EXPUNGED_HEADER_CLASS(vtable)    (G_TYPE_CHECK_CLASS_CAST ((vtable), TNY_TYPE_EXPUNGED_HEADER, TnyExpungedHeaderClass))
+#define TNY_IS_EXPUNGED_HEADER(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_EXPUNGED_HEADER))
+#define TNY_IS_EXPUNGED_HEADER_CLASS(vtable) (G_TYPE_CHECK_CLASS_TYPE ((vtable), TNY_TYPE_EXPUNGED_HEADER))
+#define TNY_EXPUNGED_HEADER_GET_CLASS(inst)  (G_TYPE_INSTANCE_GET_CLASS ((inst), TNY_TYPE_EXPUNGED_HEADER, TnyExpungedHeaderClass))
+
+typedef struct _TnyExpungedHeader TnyExpungedHeader;
+typedef struct _TnyExpungedHeaderClass TnyExpungedHeaderClass;
+
+struct _TnyExpungedHeader {
+        GObject parent;
+};
+
+struct _TnyExpungedHeaderClass {
+        GObjectClass parent;
+};
+
+GType tny_expunged_header_get_type (void);
+TnyHeader* tny_expunged_header_new (void);
+
+
-G_END_DECLS
-

trunk/libtinymailui-gtk/tny-gtk-header-list-model.c

@@ -58 +58 @@
-
-#include "tny-gtk-header-list-iterator-priv.h"
+
+#define TINYMAIL_ENABLE_PRIVATE_API
+#include "tny-common-priv.h"
+#undef TINYMAIL_ENABLE_PRIVATE_API
-
-
@@ -301 +305 @@
-}
-
+
+static void 
+set_dummy (gint column, GValue *value)
+{
+        switch (column) 
+        {
+                case TNY_GTK_HEADER_LIST_MODEL_TO_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_SUBJECT_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_FROM_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_CC_COLUMN:
+                        g_value_init (value, G_TYPE_STRING);
+                        g_value_set_string (value, "Expunged");
+                        break;
+                case TNY_GTK_HEADER_LIST_MODEL_DATE_SENT_TIME_T_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_DATE_RECEIVED_TIME_T_COLUMN:
+                case TNY_GTK_HEADER_LIST_MODEL_MESSAGE_SIZE_COLUMN:
+                        g_value_init (value, G_TYPE_INT);
+                        g_value_set_int (value, -1);
+                        break;
+                case TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN: {
+                        static TnyHeader *header = NULL;
+                        if (!header) 
+                                header = tny_expunged_header_new ();
+                        g_value_init (value, G_TYPE_OBJECT);
+                        g_value_set_object (value, header);
+                        } break;
+                case TNY_GTK_HEADER_LIST_MODEL_FLAGS_COLUMN:
+                        g_value_init (value, G_TYPE_INT);
+                        g_value_set_int (value, TNY_HEADER_FLAG_EXPUNGED);
+                        break;
+                default:
+                        break;
+        }
+}
+
-static void
-tny_gtk_header_list_model_get_value (GtkTreeModel *self, GtkTreeIter *iter, gint column, GValue *value)
@@ -310 +351 @@
-        gint i;
-
-
+
+
+
-                return;
+        }
-
-        g_static_rec_mutex_lock (priv->iterator_lock);
@@ -326 +370 @@
-        if (i < 0 || i >= priv->items->len)
-        {
+                set_dummy (column, value);
-                g_warning ("GtkTreeModel in invalid state\n");
-                g_static_rec_mutex_unlock (priv->iterator_lock);
@@ -331 +376 @@
-        }
-
-
+
+
+
-                return;
+        }
+
+        if (!TNY_IS_HEADER (priv->items->pdata[i])) {
+                g_warning ("GtkTreeModel in invalid state\n");
+                set_dummy (column, value);
+                return;
+        }
-
-        switch (column)