X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fgoto-case-dialog.c;h=dfb059a4aabb21a9420399f966926a1ad4429920;hb=b525a9596e60d5ae4c6c464b4a426b77ade3dd72;hp=1b5e39a45dfd204628a0f676df5baf1fd950254c;hpb=e1c4d5d0f0c63ef20927ac2cd7f9ff4e7e4cf5c5;p=pspp

diff --git a/src/ui/gui/goto-case-dialog.c b/src/ui/gui/goto-case-dialog.c
index 1b5e39a45d..dfb059a4aa 100644
--- a/src/ui/gui/goto-case-dialog.c
+++ b/src/ui/gui/goto-case-dialog.c
@@ -19,7 +19,6 @@
 #include "goto-case-dialog.h"
 #include "builder-wrapper.h"
 #include "psppire-dialog.h"
-#include "psppire-data-window.h"
 #include "psppire-data-store.h"
 #include "psppire-data-sheet.h"
 
@@ -27,11 +26,12 @@
 static void
 refresh (PsppireDataSheet *ds, GtkBuilder *xml)
 {
-  PsppireDataStore *store = NULL;
-  g_object_get (ds, "data-model", &store, NULL);
+  GtkTreeModel *tm = NULL;
+  g_object_get (ds, "data-model", &tm, NULL);
 
   GtkWidget *case_num_entry = get_widget_assert (xml, "goto-case-case-num-entry");
-  casenumber case_count =  gtk_tree_model_iter_n_children (GTK_TREE_MODEL (store), NULL);
+  gint case_count =  gtk_tree_model_iter_n_children (tm, NULL);
+  g_object_unref (tm);
 
   gtk_spin_button_set_range (GTK_SPIN_BUTTON (case_num_entry), 1, case_count);
 }
@@ -53,21 +53,23 @@ goto_case_dialog (PsppireDataSheet *ds)
 
   if (response == PSPPIRE_RESPONSE_GOTO)
     {
-      PsppireDataStore *store = NULL;
-      g_object_get (ds, "data-model", &store, NULL);
+      GtkTreeModel *tm  = NULL;
+      g_object_get (ds, "data-model", &tm, NULL);
 
       GtkWidget *case_num_entry =
   	get_widget_assert (xml, "goto-case-case-num-entry");
 
-      glong case_num =
+      gint case_num =
 	gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (case_num_entry))
   	- FIRST_CASE_NUMBER ;
 
-      if (case_num >= 0 &&
-	  case_num < gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ds), NULL))
+      gint case_count = gtk_tree_model_iter_n_children (tm, NULL);
+      g_object_unref (tm);
+
+      if (case_num >= 0 && case_num < case_count)
       {
-	ssw_sheet_scroll_to (ds, -1, case_num);
-	ssw_sheet_set_active_cell (ds, -1, case_num, 0);
+	ssw_sheet_scroll_to (SSW_SHEET (ds), -1, case_num);
+	ssw_sheet_set_active_cell (SSW_SHEET (ds), -1, case_num, 0);
       }
     }
 }