Changeset 556

Timestamp:

07/05/06 11:39:03

Author:

pvanhoof

Message:

The TnyAccountTreeModel? as a TnyListIface?

Files:

• trunk/libtinymailui-gtk/Makefile.am (modified) (1 diff)
• trunk/libtinymailui-gtk/tny-account-tree-model-iterator-priv.h (added)
• trunk/libtinymailui-gtk/tny-account-tree-model-iterator.c (added)
• trunk/libtinymailui-gtk/tny-account-tree-model-priv.h (added)
• trunk/libtinymailui-gtk/tny-account-tree-model.c (modified) (7 diffs)
• trunk/libtinymailui-gtk/tny-account-tree-model.h (modified) (2 diffs)
• trunk/tinymail/tny-summary-window.c (modified) (2 diffs)

trunk/libtinymailui-gtk/Makefile.am

@@ -20 +20 @@
-        tny-msg-header-view.h
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        tny-msg-header-view.c
-

trunk/libtinymailui-gtk/tny-account-tree-model.c

@@ -29 +29 @@
-#include <tny-msg-folder-iface.h>
-
+#include "tny-account-tree-model-priv.h"
+
-static GObjectClass *parent_class = NULL;
-
+typedef void (*treeaddfunc) (GtkTreeStore *tree_store, GtkTreeIter *iter, GtkTreeIter *parent);
-
-static void
@@ -83 +86 @@
-}
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-{
-        GtkTreeStore *model = GTK_TREE_STORE (self);
@@ -101 +97 @@
-                TNY_STORE_ACCOUNT_FOLDER_TYPE_SUBSCRIBED);
-
-gtk_tree_store_append
+func
-
-        gtk_tree_store_set (model, &name_iter,
@@ -135 +131 @@
-tny_account_tree_model_finalize (GObject *object)
-{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*) object;
+
+        g_mutex_free (me->iterator_lock);
+        me->iterator_lock = NULL;
+
-        (*parent_class->finalize) (object);
-}
@@ -155 +156 @@
-{
-        GtkTreeStore *store = (GtkTreeStore*) instance;
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*) instance;
-        static GType types[] = { G_TYPE_STRING, G_TYPE_UINT, G_TYPE_INT, G_TYPE_POINTER };
+
+        me->iterator_lock = g_mutex_new ();
-
-        gtk_tree_store_set_column_types (store, 
@@ -163 +167 @@
-}
-
+
+
+static TnyIteratorIface*
+tny_account_tree_model_create_iterator (TnyListIface *self)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+
+        /* Return a new iterator */
+
+        return TNY_ITERATOR_IFACE (_tny_account_tree_model_iterator_new (me));
+}
+
+
+
+static void
+tny_account_tree_model_prepend (TnyListIface *self, gpointer item)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+
+        g_mutex_lock (me->iterator_lock);
+
+        /* Prepend something to the list */
+        me->first = g_list_prepend (me->first, item);
+        tny_account_tree_model_add (me, TNY_STORE_ACCOUNT_IFACE (item), gtk_tree_store_prepend);
+
+        g_mutex_unlock (me->iterator_lock);
+}
+
+static void
+tny_account_tree_model_append (TnyListIface *self, gpointer item)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+
+        g_mutex_lock (me->iterator_lock);
+
+        /* Append something to the list */
+        me->first = g_list_append (me->first, item);
+
+        tny_account_tree_model_add (me, TNY_STORE_ACCOUNT_IFACE (item), gtk_tree_store_append);
+
+        g_mutex_unlock (me->iterator_lock);
+}
+
+static guint
+tny_account_tree_model_length (TnyListIface *self)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+        guint retval = 0;
+
+        g_mutex_lock (me->iterator_lock);
+
+        retval = me->first?g_list_length (me->first):0;
+
+        g_mutex_unlock (me->iterator_lock);
+
+        return retval;
+}
+
+static void
+tny_account_tree_model_remove (TnyListIface *self, gpointer item)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+        GtkTreeModel *model = GTK_TREE_MODEL (me);
+        GtkTreeIter iter;
+
+        g_return_if_fail (G_IS_OBJECT (item));
+        g_return_if_fail (G_IS_OBJECT (me));
+
+        /* Remove something from the list */
+
+        g_mutex_lock (me->iterator_lock);
+
+        me->first = g_list_remove (me->first, (gconstpointer)item);
+
+        gtk_tree_model_get_iter_first (model, &iter);
+        while (gtk_tree_model_iter_next (model, &iter))
+        {
+                TnyAccountIface *curaccount;
+
+                gtk_tree_model_get (model, &iter, 
+                        TNY_ACCOUNT_TREE_MODEL_INSTANCE_COLUMN, 
+                        &curaccount, -1);
+
+                if (curaccount == item)
+                {
+                        gtk_tree_store_remove (GTK_TREE_STORE (me), &iter);
+                        g_object_unref (G_OBJECT (item));
+
+                        break;
+                }
+        }
+
+        g_mutex_unlock (me->iterator_lock);
+}
+
+
+static TnyListIface*
+tny_account_tree_model_copy_the_list (TnyListIface *self)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+        TnyAccountTreeModel *copy = g_object_new (TNY_TYPE_ACCOUNT_TREE_MODEL, NULL);
+
+        /* This only copies the TnyListIface pieces. The result is not a
+           correct or good TnyMsgHeaderListModel. But it will be a correct
+           TnyListIface instance. It is the only thing the user of this
+           method expects.
+
+           The new list will point to the same instances, of course. It's
+           only a copy of the list-nodes of course. */
+
+        g_mutex_lock (me->iterator_lock);
+        GList *list_copy = g_list_copy (me->first);
+        copy->first = list_copy;
+        g_mutex_unlock (me->iterator_lock);
+
+        return TNY_LIST_IFACE (copy);
+}
+
+static void 
+tny_account_tree_model_foreach_in_the_list (TnyListIface *self, GFunc func, gpointer user_data)
+{
+        TnyAccountTreeModel *me = (TnyAccountTreeModel*)self;
+
+        /* Foreach item in the list (without using a slower iterator) */
+
+        g_mutex_lock (me->iterator_lock);
+        g_list_foreach (me->first, func, user_data);
+        g_mutex_unlock (me->iterator_lock);
+
+        return;
+}
+
+
+static void
+tny_list_iface_init (TnyListIfaceClass *klass)
+{
+        klass->length_func = tny_account_tree_model_length;
+        klass->prepend_func = tny_account_tree_model_prepend;
+        klass->append_func = tny_account_tree_model_append;
+        klass->remove_func = tny_account_tree_model_remove;
+        klass->create_iterator_func = tny_account_tree_model_create_iterator;
+        klass->copy_func = tny_account_tree_model_copy_the_list;
+        klass->foreach_func = tny_account_tree_model_foreach_in_the_list;
+
+        return;
+}
-
-GType
@@ -186 +336 @@
-                type = g_type_register_static (GTK_TYPE_TREE_STORE, "TnyAccountTreeModel",
-                                            &info, 0);
+
+                static const GInterfaceInfo tny_list_iface_info = {
+                        (GInterfaceInitFunc) tny_list_iface_init,
+                        NULL,
+                        NULL
+                };
+
+                g_type_add_interface_static (type, TNY_TYPE_LIST_IFACE,
+                                             &tny_list_iface_info);
-        }
-

trunk/libtinymailui-gtk/tny-account-tree-model.h

@@ -47 +47 @@
-};
-
-struct _TnyAccountTreeModel
-{
-        GtkTreeStore parent;
-};
-
-struct _TnyAccountTreeModelClass
-{
-        GtkTreeStoreClass parent_class;
-};
-
-
@@ -61 +52 @@
-TnyAccountTreeModel*    tny_account_tree_model_new       (void);
-
-void                    tny_account_tree_model_add       (TnyAccountTreeModel *self, TnyStoreAccountIface *account);
-
-G_END_DECLS
-

trunk/tinymail/tny-summary-window.c

@@ -101 +101 @@
-{
-        TnyAccountStoreIface *account_store = priv->account_store;
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        if (G_UNLIKELY (!empty_model))
-
-
-
-
-
-
+
-        set_header_view_model (GTK_TREE_VIEW (priv->header_view), empty_model);
-
@@ -121 +120 @@
-        }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        sortable = gtk_tree_model_sort_new_with_model (mailbox_model);