Changeset 30

Timestamp:

11/02/07 12:55:52

Author:

pvanhoof

Message:

Bugfixes

Files:

• trunk/src/tmut-folder-view.c (modified) (5 diffs)
• trunk/src/tmut-menu-view.c (modified) (5 diffs)

trunk/src/tmut-folder-view.c

@@ -41 +41 @@
-        TMutShellWindow *shell;
-        TnyAccountStore *account_store;
+        GtkTreeModel *headers_model;
-};
-
@@ -255 +256 @@
-                if (priv->ringtone_player)
-                        tny_folder_remove_observer (priv->folder, priv->ringtone_player);
-
-                if (priv->monitor) {
-                        tny_folder_monitor_stop (priv->monitor);
-                        g_object_unref (priv->monitor);
-                }
-
-                g_object_unref (priv->folder);
+        }
+        if (priv->monitor) {
+                tny_folder_monitor_stop (priv->monitor);
+                g_object_unref (priv->monitor);
-        }
-}
@@ -288 +287 @@
-
-        model = tny_gtk_header_list_model_new ();
+        priv->headers_model = model;
-
-        tny_gtk_header_list_model_set_folder (TNY_GTK_HEADER_LIST_MODEL (model), 
@@ -389 +389 @@
-
-        priv->headers_treeview = GTK_TREE_VIEW (gtk_tree_view_new ());
+        g_object_ref (priv->headers_treeview);
+
-        gtk_tree_view_set_headers_visible (priv->headers_treeview, FALSE);
-        gtk_tree_view_set_rules_hint (priv->headers_treeview, TRUE);
@@ -418 +420 @@
-
-        tmut_folder_view_deactivate_folder (priv);
+
+        if (priv->headers_model)
+                g_object_unref (priv->headers_model);
-
-        if (priv->account_store)

trunk/src/tmut-menu-view.c

@@ -369 +369 @@
-}
-
+static void 
+stop_folders_treeview (TMutMenuView *self)
+{
+        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
+        GtkTreeModel *old_model = gtk_tree_view_get_model (priv->folders_treeview);
+        if (old_model)
+                tny_gtk_folder_store_tree_model_stop_observing (TNY_GTK_FOLDER_STORE_TREE_MODEL (old_model));
+        return;
+}
-
-void 
@@ -375 +384 @@
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
-        TnyFolderStoreQuery *query;
-
+old_model, *
-
-        query = tny_folder_store_query_new ();
@@ -383 +392 @@
-        tny_gtk_folder_store_tree_model_append (TNY_GTK_FOLDER_STORE_TREE_MODEL (model),
-                TNY_FOLDER_STORE (account), tny_account_get_name (account));
+
+        stop_folders_treeview (self);
+
-        gtk_tree_view_set_model (priv->folders_treeview, model);
-
@@ -499 +511 @@
-        gtk_widget_show (sw);
-        priv->folders_treeview = GTK_TREE_VIEW (gtk_tree_view_new ());
+        g_object_ref (priv->folders_treeview);
-        gtk_tree_view_set_headers_visible (priv->folders_treeview, FALSE);
-        gtk_tree_view_set_rules_hint (priv->folders_treeview, TRUE);
@@ -529 +542 @@
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (object);
-
+        if (priv->folders_treeview) {
+                stop_folders_treeview ((TMutMenuView *) object);
+                g_object_unref (priv->folders_treeview);
+        }
+
-        if (priv->account_store)
-                g_object_unref (priv->account_store);