X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-delimited-text.c;h=c999f220eb1afb376d1b89578d2b5483403c6637;hb=bbebcf3f9d827d8c68aeaf90b65c88ad1b77ba8e;hp=98f76b4301953f330f881d37b193111eb8893f52;hpb=74efe9d6abd58f6fff46b61cb22b0c8614c9ee2a;p=pspp

diff --git a/src/ui/gui/psppire-delimited-text.c b/src/ui/gui/psppire-delimited-text.c
index 98f76b4301..c999f220eb 100644
--- a/src/ui/gui/psppire-delimited-text.c
+++ b/src/ui/gui/psppire-delimited-text.c
@@ -68,7 +68,6 @@ count_delims (PsppireDelimitedText *tf)
 	  g_free (foo);
 	}
     }
-  //  g_print ("Max Number of delimiters per row: %d\n", tf->max_delimiters);
 }
 
 static void
@@ -98,6 +97,7 @@ psppire_delimited_text_set_property (GObject         *object,
       break;
     case PROP_CHILD:
       tf->child = g_value_get_object (value);
+      g_return_if_fail (PSPPIRE_IS_TEXT_FILE (tf->child));
       break;
     case PROP_DELIMITERS:
       g_slist_free (tf->delimiters);
@@ -143,6 +143,13 @@ static void psppire_delimited_text_dispose        (GObject           *object);
 
 static GObjectClass *parent_class = NULL;
 
+static gint
+n_lines (PsppireDelimitedText *file)
+{
+  PsppireTextFile *child = PSPPIRE_TEXT_FILE (file->child);
+
+  return child->maximum_lines;
+}
 
 static gboolean
 __tree_get_iter (GtkTreeModel *tree_model,
@@ -153,7 +160,6 @@ __tree_get_iter (GtkTreeModel *tree_model,
   if (path == NULL)
     return FALSE;
 
-  //  g_print ("%s:%d %s %s\n", __FILE__, __LINE__, __FUNCTION__, gtk_tree_path_to_string (path));
 
   gint *indices = gtk_tree_path_get_indices (path);
 
@@ -162,12 +168,11 @@ __tree_get_iter (GtkTreeModel *tree_model,
 
   gint n = *indices;
 
-  gint children = gtk_tree_model_iter_n_children (file->child, NULL);
+  gint children = n_lines (file);
 
   if (n >= children - file->first_line)
     return FALSE;
 
-  //  g_print ("%s:%d %s  %d Children: %d\n", __FILE__, __LINE__, __FUNCTION__, n, children);
 
   iter->user_data = GINT_TO_POINTER (n);
   iter->stamp = file->stamp;
@@ -185,9 +190,8 @@ __tree_iter_next (GtkTreeModel *tree_model,
 
   gint n = GPOINTER_TO_INT (iter->user_data);
 
-  //  g_print ("%s:%d %s %d\n", __FILE__, __LINE__, __FUNCTION__, n);
 
-  gint children = gtk_tree_model_iter_n_children (file->child, NULL);
+  gint children = n_lines (file);
 
   if (n + 1 >= children - file->first_line)
     return FALSE;
@@ -202,7 +206,6 @@ static GType
 __tree_get_column_type (GtkTreeModel *tree_model,
 			gint          index)
 {
-  //  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   if (index == 0)
     return G_TYPE_INT;
 
@@ -213,7 +216,6 @@ static gboolean
 __iter_has_child (GtkTreeModel *tree_model,
 		  GtkTreeIter  *iter)
 {
-  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   return 0;
 }
 
@@ -223,7 +225,6 @@ __iter_parent     (GtkTreeModel *tree_model,
 		   GtkTreeIter  *iter,
 		   GtkTreeIter  *child)
 {
-  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   return 0;
 }
 
@@ -231,13 +232,12 @@ static GtkTreePath *
 __tree_get_path (GtkTreeModel *tree_model,
 		 GtkTreeIter  *iter)
 {
-  //  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   PsppireDelimitedText *file  = PSPPIRE_DELIMITED_TEXT (tree_model);
   g_return_val_if_fail (file->stamp == iter->stamp, FALSE);
 
   gint n = GPOINTER_TO_INT (iter->user_data);
 
-  gint children = gtk_tree_model_iter_n_children (file->child, NULL);
+  gint children = n_lines (file);
 
   if (n >= children - file->first_line)
     return NULL;
@@ -251,7 +251,6 @@ __iter_children (GtkTreeModel *tree_model,
                               GtkTreeIter *iter,
                               GtkTreeIter *parent)
 {
-  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   return 0;
 }
 
@@ -261,10 +260,9 @@ __tree_model_iter_n_children (GtkTreeModel *tree_model,
 			      GtkTreeIter *iter)
 {
   PsppireDelimitedText *file  = PSPPIRE_DELIMITED_TEXT (tree_model);
-  //  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   g_assert (iter == NULL);
 
-  gint children = gtk_tree_model_iter_n_children (file->child, NULL);
+  gint children = n_lines (file);
 
   return children - file->first_line;
 }
@@ -272,7 +270,6 @@ __tree_model_iter_n_children (GtkTreeModel *tree_model,
 static GtkTreeModelFlags
 __tree_model_get_flags (GtkTreeModel *model)
 {
-  //  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   g_return_val_if_fail (PSPPIRE_IS_DELIMITED_TEXT (model), (GtkTreeModelFlags) 0);
 
   return GTK_TREE_MODEL_LIST_ONLY;
@@ -281,7 +278,6 @@ __tree_model_get_flags (GtkTreeModel *model)
 static gint
 __tree_model_get_n_columns (GtkTreeModel *tree_model)
 {
-  //  g_print ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
   PsppireDelimitedText *tf  = PSPPIRE_DELIMITED_TEXT (tree_model);
 
   /* + 1 for the trailing field and +1 for the leading line number column */
@@ -295,7 +291,6 @@ __iter_nth_child (GtkTreeModel *tree_model,
 		  GtkTreeIter *parent,
 		  gint n)
 {
-  //  g_print ("%s:%d %s %d\n", __FILE__, __LINE__, __FUNCTION__, n);
   PsppireDelimitedText *file  = PSPPIRE_DELIMITED_TEXT (tree_model);
 
   g_assert (parent == NULL);
@@ -382,14 +377,12 @@ __get_value (GtkTreeModel *tree_model,
 	     gint column,
 	     GValue *value)
 {
-  //  g_print ("%s:%d %s Col: %d\n", __FILE__, __LINE__, __FUNCTION__, column);
   PsppireDelimitedText *file  = PSPPIRE_DELIMITED_TEXT (tree_model);
 
   g_return_if_fail (iter->stamp == file->stamp);
 
   gint n = GPOINTER_TO_INT (iter->user_data) + file->first_line;
 
-  //  g_print ("%s:%d Row: %d\n", __FILE__, __LINE__, n);
 
   if (column == 0)
     {