Changeset 2917

Timestamp:

11/07/07 04:19:21

Author:

pvanhoof

Message:

Bugfixes

Files:

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

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

@@ -2927 +2927 @@
-notify_folder_observers_about_copy (GList *adds, GList *rems, gboolean del, gboolean in_idle)
-{
- if (rems) 
- {
-        rems = g_list_first (rems);
-        while (rems)
-        {
-                CpyEvent *evt = rems->data;
-                if (del) {
-                        TnyFolderStoreChange *change = tny_folder_store_change_new (evt->str);
-
-                        tny_folder_store_change_add_removed_folder (change, evt->fol);
-
-                        if (TNY_IS_CAMEL_STORE_ACCOUNT (evt->str)) {
-                                if (in_idle)
-                                        notify_folder_store_observers_about_for_store_acc_in_idle (evt->str, change);
-                                else
-                                        notify_folder_store_observers_about_for_store_acc (evt->str, change);
-                        } else {
-                                if (in_idle)
-                                        notify_folder_store_observers_about_in_idle (evt->str, change);
-                                else
-                                        notify_folder_store_observers_about (evt->str, change);
-                        }
-
-                        g_object_unref (change);
-
-                }
-                cpy_event_free (evt);
-                rems = g_list_next (rems);
-        }
-        g_list_free (rems);
- }
-
- if (adds)
- {
@@ -2989 +2957 @@
-        }
-        g_list_free (adds);
+ }
+
+ if (rems) 
+ {
+        rems = g_list_first (rems);
+        while (rems)
+        {
+                CpyEvent *evt = rems->data;
+                if (del) {
+                        TnyFolderStoreChange *change = tny_folder_store_change_new (evt->str);
+
+                        tny_folder_store_change_add_removed_folder (change, evt->fol);
+
+                        if (TNY_IS_CAMEL_STORE_ACCOUNT (evt->str)) {
+                                if (in_idle)
+                                        notify_folder_store_observers_about_for_store_acc_in_idle (evt->str, change);
+                                else
+                                        notify_folder_store_observers_about_for_store_acc (evt->str, change);
+                        } else {
+                                if (in_idle)
+                                        notify_folder_store_observers_about_in_idle (evt->str, change);
+                                else
+                                        notify_folder_store_observers_about (evt->str, change);
+                        }
+
+                        g_object_unref (change);
+
+                }
+                cpy_event_free (evt);
+                rems = g_list_next (rems);
+        }
+        g_list_free (rems);
- }
-

trunk/libtinymail-camel/tny-camel-store-account.c

@@ -780 +780 @@
-                        camel_store_unsubscribe_folder (store, cpriv->folder_name, &subex);
-                tny_folder_store_change_add_removed_folder (change, folder);
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        g_static_rec_mutex_unlock (aspriv->factory_lock);

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

@@ -822 +822 @@
-}
-
+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 
@@ -987 +1022 @@
-        }
-
-
+
+
-                gtk_tree_model_foreach (model, foreach_if_store_add_created, change);
+                gtk_tree_model_foreach (model, do_nothinger, change);
+        }
-
-        if (changed & TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS)