X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Frecode-dialog.c;h=eddb4f0d62072aac2c119b266df00dcd30184079;hb=a0bac37037e42c7c9b90cb702866b297dbcab79e;hp=7e85eca3f693288b6962b48810a30d16bcc5ed55;hpb=d46430e7458fcd65dfdf7928f52f2d06fa60127d;p=pspp

diff --git a/src/ui/gui/recode-dialog.c b/src/ui/gui/recode-dialog.c
index 7e85eca3f6..eddb4f0d62 100644
--- a/src/ui/gui/recode-dialog.c
+++ b/src/ui/gui/recode-dialog.c
@@ -37,7 +37,6 @@
 #include <ui/gui/builder-wrapper.h>
 #include "helper.h"
 #include <ui/gui/psppire-dialog.h>
-#include <ui/gui/psppire-var-store.h>
 
 #include "psppire-val-chooser.h"
 
@@ -243,7 +242,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 +434,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 +513,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));
@@ -609,9 +610,6 @@ recode_dialog (PsppireDataWindow *de, gboolean diff)
 
   GtkWidget *output_variable_box = get_widget_assert (builder,"frame4");
 
-  PsppireVarStore *vs = NULL;
-  g_object_get (de->data_editor, "var-store", &vs, NULL);
-
   rd.change_button = get_widget_assert (builder, "change-button");
   rd.varmap = NULL;
   rd.dialog = get_widget_assert   (builder, "recode-dialog");
@@ -620,7 +618,7 @@ recode_dialog (PsppireDataWindow *de, gboolean diff)
   rd.new_name_entry = get_widget_assert (builder, "dest-name-entry");
   rd.new_label_entry = get_widget_assert (builder, "dest-label-entry");
 
-  g_object_get (vs, "dictionary", &rd.dict, NULL);
+  g_object_get (de->data_editor, "dictionary", &rd.dict, NULL);
 
   rd.value_map = gtk_list_store_new (2,
 				     old_value_get_type (),
@@ -1076,8 +1074,15 @@ generate_syntax (const struct recode_dialog *rd)
       while (g_hash_table_iter_next (&iter, (void**) &var, (void**) &nlp))
 	{
 	  if (nlp->label)
-	    g_string_append_printf (str, "\nVARIABLE LABELS %s %s.",
-				    nlp->name, nlp->label);
+	    {
+	      struct string sl;
+	      ds_init_empty (&sl);
+	      syntax_gen_string (&sl, ss_cstr (nlp->label));
+	      g_string_append_printf (str, "\nVARIABLE LABELS %s %s.",
+				      nlp->name, ds_cstr (&sl));
+
+	      ds_destroy (&sl);
+	    }
 	}
     }