Changeset 1428

Timestamp:

01/17/07 22:15:30

Author:

pvanhoof

Message:

Introduction of folder observers and folder monitors

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/bindings/python/Makefile.am (modified) (3 diffs)
• trunk/bindings/python/tinymail-camel.override (modified) (1 diff)
• trunk/bindings/python/tinymail.override (modified) (1 diff)
• trunk/bindings/python/tinymailui-gtk.override (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder-priv.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (7 diffs)
• trunk/libtinymail-camel/tny-camel-folder.h (modified) (1 diff)
• trunk/libtinymail/Makefile.am (modified) (2 diffs)
• trunk/libtinymail/tny-folder-change.c (added)
• trunk/libtinymail/tny-folder-change.h (added)
• trunk/libtinymail/tny-folder-monitor.c (added)
• trunk/libtinymail/tny-folder-monitor.h (added)
• trunk/libtinymail/tny-folder-observer.c (added)
• trunk/libtinymail/tny-folder-observer.h (added)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-folder.h (modified) (3 diffs)
• trunk/libtinymail/tny-shared.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-01-17   Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Introduction of TnyFolderChange, TnyFolderObserver, TnyFolderMonitor
+        * Updated Python bindings
+
+        * This was a major API change in all
+
-2007-01-17  Sergio Villar Senin <svillar@igalia.com>
-

trunk/bindings/python/Makefile.am

@@ -106 +106 @@
-        $(top_srcdir)/libtinymail/tny-msg-remove-strategy.h \
-        $(top_srcdir)/libtinymail/tny-msg-receive-strategy.h \
-
+
+
+
+
+
+
+
-
-tinymail.defs: $(tinymail_h_files) tinymail.defs.extra $(top_srcdir)/bindings/python/filter.py 
@@ -149 +155 @@
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-msg-window.h \
-        $(top_srcdir)/libtinymailui-gtk/tny-gtk-text-buffer-stream.h \
-
+
+
-
-tinymailui-gtk.defs: $(tinymailui_gtk_h_files) tinymailui-gtk.defs.extra $(top_srcdir)/bindings/python/filter.py
@@ -191 +198 @@
-        $(top_srcdir)/libtinymail-camel/tny-camel-store-account.h \
-        $(top_srcdir)/libtinymail-camel/tny-camel-stream.h \
-
+
+
-
-tinymail-camel.defs : $(tinymail_camel_h_files) tinymail-camel.defs.extra $(top_srcdir)/bindings/python/filter.py

trunk/bindings/python/tinymail-camel.override

@@ -47 +47 @@
-#include <tny-camel-full-msg-receive-strategy.h>
-#include <tny-camel-partial-msg-receive-strategy.h>
-
+
-
-#define NO_IMPORT_PYGOBJECT

trunk/bindings/python/tinymail.override

@@ -27 +27 @@
-#include <tny-msg-receive-strategy.h>
-#include <tny-pair.h>
+#include <tny-folder-monitor.h>
+#include <tny-folder-change.h>
+#include <tny-lockable.h>
+#include <tny-noop-lockable.h>
+#include <tny-folder-observer.h>
-
-#define NO_IMPORT_PYGOBJECT

trunk/bindings/python/tinymailui-gtk.override

@@ -20 +20 @@
-#include <tny-gtk-text-buffer-stream.h>
-#include <tny-gtk-text-mime-part-view.h>
+#include <tny-gtk-lockable.h>
-
-%%

trunk/libtinymail-camel/tny-camel-folder-priv.h

@@ -47 +47 @@
-        TnyMsgRemoveStrategy *remove_strat;
-        TnyMsgReceiveStrategy *receive_strat;
+        TnyList *observers;
-
-#ifdef HEALTHY_CHECK

trunk/libtinymail-camel/tny-camel-folder.c

@@ -35 +35 @@
-#include <tny-list.h>
-#include <tny-error.h>
+#include <tny-folder-change.h>
+#include <tny-folder-observer.h>
+#include <tny-simple-list.h>
-
-#include <camel/camel-folder.h>
@@ -2125 +2128 @@
-}
-
+
+static void 
+tny_camel_folder_poke_recent_changes (TnyFolder *self)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->poke_recent_changes_func (self);
+        return;
+}
+
+static gboolean
+tny_camel_folder_poke_recent_changes_callback (gpointer data)
+{
+        TnyFolder *self = data;
+        TnyFolderChange *change = tny_folder_change_new (self);
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        TnyIterator *iter;
+
+        /* TNY TODO: Implement getting the latest changes */
+
+        iter = tny_list_create_iterator (priv->observers);
+        while (!tny_iterator_is_done (iter))
+        {
+                TnyFolderObserver *observer = TNY_FOLDER_OBSERVER (tny_iterator_get_current (iter));
+                tny_folder_observer_update (observer, change);
+                g_object_unref (G_OBJECT (observer));
+        }
+        g_object_unref (G_OBJECT (iter));
+
+        g_object_unref (G_OBJECT (change));
+
+        return FALSE;
+}
+
+static void
+tny_camel_folder_poke_recent_changes_destroyer (gpointer data)
+{
+        g_object_unref (G_OBJECT (data));
+}
+
+static void 
+tny_camel_folder_poke_recent_changes_default (TnyFolder *self)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        GObject *info = g_object_ref (G_OBJECT (self));
+
+        if (g_main_depth () > 0)
+        {
+                g_idle_add_full (G_PRIORITY_HIGH, 
+                                tny_camel_folder_poke_recent_changes_callback, 
+                                info, tny_camel_folder_poke_recent_changes_destroyer);
+        } else 
+        {
+                tny_camel_folder_poke_recent_changes_callback (info);
+                tny_camel_folder_poke_recent_changes_destroyer (info);
+        }
+
+        return;
+}
+
+static void
+tny_camel_folder_add_observer (TnyFolder *self, TnyFolderObserver *observer)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->add_observer_func (self, observer);
+}
+
+static void
+tny_camel_folder_add_observer_default (TnyFolder *self, TnyFolderObserver *observer)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        g_assert (TNY_IS_FOLDER_OBSERVER (observer));
+
+        tny_list_prepend (priv->observers, G_OBJECT (observer));
+
+        return;
+}
+
+
+static void
+tny_camel_folder_remove_observer (TnyFolder *self, TnyFolderObserver *observer)
+{
+        TNY_CAMEL_FOLDER_GET_CLASS (self)->remove_observer_func (self, observer);
+}
+
+static void
+tny_camel_folder_remove_observer_default (TnyFolder *self, TnyFolderObserver *observer)
+{
+        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+
+        g_assert (TNY_IS_FOLDER_OBSERVER (observer));
+
+        tny_list_remove (priv->observers, G_OBJECT (observer));
+
+        return;
+}
+
+
-/**
- * tny_camel_folder_new_with_folder:
@@ -2169 +2268 @@
-
-        g_mutex_lock (priv->folder_lock);
+
+        g_object_unref (priv->observers);
-
-        if (priv->account && TNY_IS_CAMEL_STORE_ACCOUNT (priv->account))
@@ -2248 +2349 @@
-        klass->transfer_msgs_async_func = tny_camel_folder_transfer_msgs_async;
-        klass->copy_func = tny_camel_folder_copy;
+        klass->poke_recent_changes_func = tny_camel_folder_poke_recent_changes;
+        klass->add_observer_func = tny_camel_folder_add_observer;
+        klass->remove_observer_func = tny_camel_folder_remove_observer;
-
-        return;
@@ -2297 +2401 @@
-        class->transfer_msgs_async_func = tny_camel_folder_transfer_msgs_async_default;
-        class->copy_func = tny_camel_folder_copy_default;
+        class->poke_recent_changes_func = tny_camel_folder_poke_recent_changes_default;
+        class->add_observer_func = tny_camel_folder_add_observer_default;
+        class->remove_observer_func = tny_camel_folder_remove_observer_default;
-
-        class->get_folders_async_func = tny_camel_folder_get_folders_async_default;
@@ -2316 +2423 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-
+        priv->observers = tny_simple_list_new ();
-        priv->iter = NULL;
-        priv->iter_parented = FALSE;
@@ -2328 +2436 @@
-        priv->cached_name = NULL;
-        priv->cached_folder_type = TNY_FOLDER_TYPE_UNKNOWN;
-
-        priv->remove_strat = tny_camel_msg_remove_strategy_new ();
-        priv->receive_strat = tny_camel_full_msg_receive_strategy_new ();

trunk/libtinymail-camel/tny-camel-folder.h

@@ -77 +77 @@
-        void (*transfer_msgs_async_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data);
-        TnyFolder* (*copy_func) (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err);
+        void (*poke_recent_changes_func) (TnyFolder *self);
+        void (*add_observer_func) (TnyFolder *self, TnyFolderObserver *observer);
+        void (*remove_observer_func) (TnyFolder *self, TnyFolderObserver *observer);
-
-        void (*get_folders_async_func) (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data);

trunk/libtinymail/Makefile.am

@@ -12 +12 @@
-        tny-header.h \
-        tny-pair.h \
+        tny-folder-change.h \
+        tny-folder-observer.h \
+        tny-folder-monitor.h \
-        tny-msg.h \
-        tny-device.h \
@@ -37 +40 @@
-        tny-header.c \
-        tny-pair.c \
+        tny-folder-change.c \
+        tny-folder-observer.c \
+        tny-folder-monitor.c \
-        tny-mime-part.c \
-        tny-folder.c \

trunk/libtinymail/tny-folder.c

@@ -26 +26 @@
-guint tny_folder_signals [TNY_FOLDER_LAST_SIGNAL];
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-

trunk/libtinymail/tny-folder.h

@@ -64 +64 @@
-        TNY_FOLDER_TYPE_SENT,
-        TNY_FOLDER_TYPE_ROOT,
-
-        /* below:not really TnyFolderTypes,
-         * but useful for clients */
-        TNY_FOLDER_TYPE_NOTES,
-        TNY_FOLDER_TYPE_DRAFTS,
@@ -101 +98 @@
-        void (*transfer_msgs_async_func) (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data);
-        TnyFolder* (*copy_func) (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err);
+        void (*poke_recent_changes_func) (TnyFolder *self);
+        void (*add_observer_func) (TnyFolder *self, TnyFolderObserver *observer);
+        void (*remove_observer_func) (TnyFolder *self, TnyFolderObserver *observer);
+
-};
-
@@ -129 +130 @@
-void tny_folder_transfer_msgs_async (TnyFolder *self, TnyList *header_list, TnyFolder *folder_dst, gboolean delete_originals, TnyTransferMsgsCallback callback, gpointer user_data);
-TnyFolder* tny_folder_copy (TnyFolder *self, TnyFolderStore *into, const gchar *new_name, gboolean del, GError **err);
+void tny_folder_poke_recent_changes (TnyFolder *self);
+void tny_folder_add_observer (TnyFolder *self, TnyFolderObserver *observer);
+void tny_folder_remove_observer (TnyFolder *self, TnyFolderObserver *observer);
+
-
-G_END_DECLS

trunk/libtinymail/tny-shared.h

@@ -87 +87 @@
-typedef struct _TnyNoopLockable TnyNoopLockable;
-typedef struct _TnyNoopLockableClass TnyNoopLockableClass;
+typedef struct _TnyFolderObserver TnyFolderObserver;
+typedef struct _TnyFolderObserverIface TnyFolderObserverIface;
+typedef struct _TnyFolderChange TnyFolderChange;
+typedef struct _TnyFolderChangeClass TnyFolderChangeClass;
+typedef struct _TnyFolderMonitor TnyFolderMonitor;
+typedef struct _TnyFolderMonitorClass TnyFolderMonitorClass;
-
-G_END_DECLS