Applied patch #6428

[pspp-builds.git] / src / ui / gui / rank-dialog.c

diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index 3e072aec571fe08be72a1b2da14294ae7e53d44c..ee261865b5fff3fc7f2f44bc95fa45ada2216f2e 100644 (file)
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -111,7 +111,7 @@ generate_syntax (const struct rank_dialog *rd)
 
   GString *str = g_string_new ("RANK VARIABLES=");
 
-  append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars));
+  append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars), 0);
 
   g_string_append_printf (str, " (%c)",
                   gtk_toggle_button_get_active (rd->ascending_togglebutton)
@@ -121,7 +121,7 @@ generate_syntax (const struct rank_dialog *rd)
     {
       g_string_append (str, "\n\tBY ");
 
-      append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars));
+      append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars), 0);
     }
 
   g_string_append (str, "\n\t/PRINT = ");
@@ -235,11 +235,9 @@ rank_dialog (GObject *o, gpointer data)
   GtkWidget *types_button = get_widget_assert (xml, "button1");
   GtkWidget *ties_button = get_widget_assert (xml, "button2");
 
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
+  PsppireVarStore *vs = NULL;
 
+  g_object_get (de->data_editor, "var-store", &vs, NULL);
 
   rd.dict = vs->dict;
   rd.rank_vars =   get_widget_assert (xml, "variables-treeview");
@@ -320,6 +318,7 @@ rank_dialog (GObject *o, gpointer data)
                                 vars,
                                 rd.rank_vars,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);
 
   set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict);
@@ -328,6 +327,7 @@ rank_dialog (GObject *o, gpointer data)
                                 vars,
                                 rd.group_vars,
                                 insert_source_row_into_tree_view,
+                                NULL,
                                 NULL);