2007-04-05 Murray Cumming <murrayc@murrayc.com>

[modest] / src / widgets / modest-account-view.c

diff --git a/src/widgets/modest-account-view.c b/src/widgets/modest-account-view.c
index e2864d7..9c4f9e6 100644 (file)
--- a/src/widgets/modest-account-view.c
+++ b/src/widgets/modest-account-view.c
@@ -123,6 +123,8 @@ modest_account_view_init (ModestAccountView *obj)
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
        
        priv->account_mgr = NULL; 
+       priv->sig1 = 0;
+       priv->sig2 = 0;
 }
 
 static void
@@ -133,6 +135,12 @@ modest_account_view_finalize (GObject *obj)
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
 
        if (priv->account_mgr) {
+               if (priv->sig1)
+                       g_signal_handler_disconnect (priv->account_mgr, priv->sig1);
+
+               if (priv->sig2)
+                       g_signal_handler_disconnect (priv->account_mgr, priv->sig2);
+
                g_object_unref (G_OBJECT(priv->account_mgr));
                priv->account_mgr = NULL; 
        }
@@ -152,6 +160,11 @@ update_account_view (ModestAccountMgr *account_mgr, ModestAccountView *view)
        gtk_list_store_clear (model);
 
        cursor = account_names = modest_account_mgr_account_names (account_mgr);
+       
+       if(account_names == NULL)
+       {
+         printf ("debug: modest_account_mgr_account_names() returned  NULL\n");
+       }
 
        while (cursor) {
                gchar *account_name;
@@ -260,7 +273,6 @@ bold_if_default_cell_data  (GtkTreeViewColumn *column,  GtkCellRenderer *rendere
                      NULL);
 }
 
-
 static void
 init_view (ModestAccountView *self)
 {
@@ -281,6 +293,7 @@ init_view (ModestAccountView *self)
                ); 
 
        gtk_tree_view_set_model (GTK_TREE_VIEW(self), GTK_TREE_MODEL(model));
+       g_object_unref (G_OBJECT (model));
 
        toggle_renderer = gtk_cell_renderer_toggle_new ();
        text_renderer = gtk_cell_renderer_text_new ();
@@ -315,9 +328,9 @@ init_view (ModestAccountView *self)
        gtk_tree_view_column_set_cell_data_func(column, text_renderer, bold_if_default_cell_data,
                                                NULL, NULL);
 
-       g_signal_connect (G_OBJECT(priv->account_mgr),"account_removed",
+       priv->sig1 = g_signal_connect (G_OBJECT(priv->account_mgr),"account_removed",
                                       G_CALLBACK(on_account_removed), self);
-       g_signal_connect (G_OBJECT(priv->account_mgr), "account_changed",
+       priv->sig2 = g_signal_connect (G_OBJECT(priv->account_mgr), "account_changed",
                                       G_CALLBACK(on_account_changed), self);
 }
 
@@ -334,19 +347,19 @@ modest_account_view_new (ModestAccountMgr *account_mgr)
        obj  = g_object_new(MODEST_TYPE_ACCOUNT_VIEW, NULL);
        priv = MODEST_ACCOUNT_VIEW_GET_PRIVATE(obj);
        
-       g_object_ref (G_OBJECT(account_mgr));
+       g_object_ref (G_OBJECT (account_mgr));
        priv->account_mgr = account_mgr;
 
        init_view (MODEST_ACCOUNT_VIEW (obj));
-       update_account_view (account_mgr, MODEST_ACCOUNT_VIEW(obj));
+       update_account_view (account_mgr, MODEST_ACCOUNT_VIEW (obj));
        
-       return MODEST_ACCOUNT_VIEW(obj);
+       return MODEST_ACCOUNT_VIEW (obj);
 }
 
-const gchar *
+gchar *
 modest_account_view_get_selected_account (ModestAccountView *self)
 {
-       const gchar *account_name = NULL;
+       gchar *account_name = NULL;
        GtkTreeSelection *sel;
        GtkTreeModel *model;
        GtkTreeIter iter;
@@ -355,8 +368,9 @@ modest_account_view_get_selected_account (ModestAccountView *self)
        
        sel = gtk_tree_view_get_selection (GTK_TREE_VIEW (self));
        if (gtk_tree_selection_get_selected (sel, &model, &iter)) {
-               gtk_tree_model_get (model, &iter, MODEST_ACCOUNT_VIEW_NAME_COLUMN, &account_name,
-                                   -1);
+               gtk_tree_model_get (model, &iter, 
+                                   MODEST_ACCOUNT_VIEW_NAME_COLUMN, 
+                                   &account_name, -1);
        }
 
        return account_name;