Changeset 2918

Timestamp:

11/07/07 19:27:36

Author:

pvanhoof

Message:

• • • • Minor corrections when creating and moving folders
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (2 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (8 diffs)

trunk/ChangeLog

@@ -3 +3 @@
-        * Some problems fixed in TnyGtkFolderStoreTreeModel when moving
-        folders around into newly created folders
+        * Minor corrections when creating and moving folders
-
-2007-11-06  Philip Van Hoof  <pvanhoof@gnome.org>

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

@@ -4590 +4590 @@
-        TnyFolderStoreChange *change;
-        CamelException subex = CAMEL_EXCEPTION_INITIALISER;
+        TnyCamelFolderPriv *rpriv = NULL;
-
-        if (!_tny_session_check_operation (TNY_FOLDER_PRIV_GET_SESSION(priv), 
@@ -4647 +4648 @@
-        folder = _tny_camel_folder_new ();
-        _tny_camel_folder_set_folder_info (self, TNY_CAMEL_FOLDER (folder), info);
+        rpriv = TNY_CAMEL_FOLDER_GET_PRIVATE (folder);
+        _tny_camel_folder_set_parent (TNY_CAMEL_FOLDER (folder), TNY_FOLDER_STORE (self));
+        rpriv->folder = NULL; /* This might be a leak */
+        rpriv->loaded = 0;
+        load_folder_no_lock (rpriv);
-
-        /* So that the next call to get_folders includes the newly

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

@@ -146 +146 @@
-                        {
-                                TnyFolder *folder = TNY_FOLDER (instance);
-
-
+
+ 
-                                        TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
-                                        tny_folder_get_name (TNY_FOLDER (folder)),
@@ -823 +823 @@
-
-static gboolean 
-do_nothinger (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data)
-{
-        TnyFolderStoreChange *change = (TnyFolderStoreChange *) user_data;
-        TnyFolderStore *parent_store = tny_folder_store_change_get_folder_store (change);
-        TnyFolderStore *folder = NULL;
-
-        gtk_tree_model_get (model, iter, 
-                TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
-                &folder, -1);
-
-        if (folder && folder == parent_store && TNY_IS_FOLDER (folder)) 
-        {
-
-                gtk_tree_store_set (GTK_TREE_STORE (model), iter,
-                                TNY_GTK_FOLDER_STORE_TREE_MODEL_NAME_COLUMN, 
-                                tny_folder_get_name (TNY_FOLDER (folder)),
-                                TNY_GTK_FOLDER_STORE_TREE_MODEL_UNREAD_COLUMN, 
-                                tny_folder_get_unread_count (TNY_FOLDER (folder)),
-                                TNY_GTK_FOLDER_STORE_TREE_MODEL_ALL_COLUMN, 
-                                tny_folder_get_all_count (TNY_FOLDER (folder)),
-                                TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN,
-                                tny_folder_get_folder_type (TNY_FOLDER (folder)),
-                                TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN,
-                                folder, -1);
-        }
-
-        if (parent_store)
-                g_object_unref (parent_store);
-
-        if (folder)
-                g_object_unref (folder);
-
-        return FALSE;
-}
-
-static gboolean 
-deleter (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, gpointer user_data1)
-{
@@ -894 +858 @@
-
-static gboolean
-foreach_if_store_add_created
+creater
-{
-        TnyGtkFolderStoreTreeModel *me = (TnyGtkFolderStoreTreeModel*) model;
+        TnyGtkFolderStoreTreeModel *self = (TnyGtkFolderStoreTreeModel*) model;
-        TnyFolderStore *fol = NULL;
-        gboolean found = FALSE;
@@ -903 +868 @@
-        TnyFolderStore *parent_store;
-        GtkTreeIter iter;
+
+        /* This creater will get the store out of the model, compare with 
+         * the change's store pointer, and if there's a match it will add the
+         * the created folders to the model at that location. */
-
-        if (!gtk_tree_model_get_iter (model, &iter, path)) {
@@ -942 +911 @@
-                        me->store_observables = g_list_prepend (me->store_observables, folder);
-
-                        gtk_tree_store_append (GTK_TREE_STORE (model), &newiter, &iter);
-
-                        /* This adds a reference count to folder_store too. When it gets 
-                           removed, that reference count is decreased automatically by 
-                           the gtktreestore infrastructure. */
+
+                        gtk_tree_store_prepend (GTK_TREE_STORE (model), &newiter, in_iter);
-
-                        gtk_tree_store_set (GTK_TREE_STORE (model), &newiter,
@@ -960 +929 @@
-                                folder, -1);
-
+                                tny_folder_add_observer (TNY_FOLDER (folder), TNY_FOLDER_OBSERVER (self));
+                                tny_folder_store_add_observer (TNY_FOLDER_STORE (folder), TNY_FOLDER_STORE_OBSERVER (self));
+
-                        g_object_unref (folder);
-                        tny_iterator_next (miter);
@@ -1003 +975 @@
-
-        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS)
@@ -1046 +995 @@
-                g_object_unref (removed);
-        }
-
-
-        return;