From: John Darrington <john@darrington.wattle.id.au>
Date: Wed, 14 Mar 2012 18:42:49 +0000 (+0100)
Subject: Fix GtkCritical in recode dialog.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abf0b37af5e18c165c6673bcd7455dfff0b44bea;p=pspp

Fix GtkCritical in recode dialog.

Commit 2b4fb7e846d62f1a70656bb42a0f769363ed0832 changed the internals of PsppireVarView.
Unfortunately recode-dialog.c was directly accessing the implementation instead of
using the interface.  This change fixes that.

Reported-by: kai hansen <kaiowesen@gmail.com>
---

diff --git a/src/ui/gui/psppire-var-view.h b/src/ui/gui/psppire-var-view.h
index 0029ae2224..090966b526 100644
--- a/src/ui/gui/psppire-var-view.h
+++ b/src/ui/gui/psppire-var-view.h
@@ -44,6 +44,7 @@ struct _PsppireVarView
 {
   GtkTreeView parent;
 
+  /* Private */
   GtkListStore **list;
   
   GType *cols;
diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c
index 7e85eca3f6..97a25cf232 100644
--- a/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@ -243,7 +243,7 @@ dialog_state_valid (gpointer data)
 
   if ( rd->different )
     {
-      GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->variable_treeview)->list);
+      GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
 
       if (g_hash_table_size (rd->varmap) != gtk_tree_model_iter_n_children (model, NULL) )
 	return FALSE;
@@ -435,7 +435,7 @@ on_selection_change (GtkTreeSelection *selection, gpointer data)
 {
   struct recode_dialog *rd = data;
 
-  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->variable_treeview)->list);
+  GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
 
   GList *rows = gtk_tree_selection_get_selected_rows (selection, &model);
 
@@ -514,7 +514,9 @@ on_change_clicked (GObject *obj, gpointer data)
   struct recode_dialog *rd = data;
   struct variable *var = NULL;
   struct nlp *nlp;
-  GtkTreeModel *model = GTK_TREE_MODEL (PSPPIRE_VAR_VIEW (rd->variable_treeview)->list);
+
+  GtkTreeModel *model =  gtk_tree_view_get_model (GTK_TREE_VIEW (rd->variable_treeview));
+
   GtkTreeIter iter;
   GtkTreeSelection *selection =
     gtk_tree_view_get_selection (GTK_TREE_VIEW (rd->variable_treeview));