X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Frank-dialog.c;h=174ac6d04138b9b1dfa9e4914b9ac68ebf7cc8ed;hb=de2439d30fccf4a27e2857657f4680ed9237e8ff;hp=3e072aec571fe08be72a1b2da14294ae7e53d44c;hpb=4c2001f2a436355d68bb513e15d9a44e2fd6ac27;p=pspp

diff --git a/src/ui/gui/rank-dialog.c b/src/ui/gui/rank-dialog.c
index 3e072aec57..174ac6d041 100644
--- a/src/ui/gui/rank-dialog.c
+++ b/src/ui/gui/rank-dialog.c
@@ -19,7 +19,6 @@
 #include "rank-dialog.h"
 
 #include <gtk/gtk.h>
-#include <gtksheet/gtksheet.h>
 #include <stdlib.h>
 
 #include <language/syntax-string-source.h>
@@ -111,7 +110,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 +120,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 +234,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 +317,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 +326,7 @@ rank_dialog (GObject *o, gpointer data)
 				 vars,
 				 rd.group_vars,
 				 insert_source_row_into_tree_view,
+				 NULL,
 				 NULL);