sync up white space/variable names to match tree_store equiv.

Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
	white space/variable names to match tree_store equiv.

	* gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
	set the value.

diff --git a/ChangeLog b/ChangeLog
index d25662a948fc508db800f1c27ef0dd9b7aa4428d..d300035daedb8e17f2ac4b226bf091e469a6cc7f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
+       white space/variable names to match tree_store equiv.
+
+       * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
+       set the value.
+
 Mon Jul 01 17:19:00 2002  Bill Haneman <bill.haneman@sun.com>
 
        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d25662a948fc508db800f1c27ef0dd9b7aa4428d..d300035daedb8e17f2ac4b226bf091e469a6cc7f 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
+       white space/variable names to match tree_store equiv.
+
+       * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
+       set the value.
+
 Mon Jul 01 17:19:00 2002  Bill Haneman <bill.haneman@sun.com>
 
        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d25662a948fc508db800f1c27ef0dd9b7aa4428d..d300035daedb8e17f2ac4b226bf091e469a6cc7f 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
+       white space/variable names to match tree_store equiv.
+
+       * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
+       set the value.
+
 Mon Jul 01 17:19:00 2002  Bill Haneman <bill.haneman@sun.com>
 
        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d25662a948fc508db800f1c27ef0dd9b7aa4428d..d300035daedb8e17f2ac4b226bf091e469a6cc7f 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
+       white space/variable names to match tree_store equiv.
+
+       * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
+       set the value.
+
 Mon Jul 01 17:19:00 2002  Bill Haneman <bill.haneman@sun.com>
 
        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d25662a948fc508db800f1c27ef0dd9b7aa4428d..d300035daedb8e17f2ac4b226bf091e469a6cc7f 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
+       white space/variable names to match tree_store equiv.
+
+       * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
+       set the value.
+
 Mon Jul 01 17:19:00 2002  Bill Haneman <bill.haneman@sun.com>
 
        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d25662a948fc508db800f1c27ef0dd9b7aa4428d..d300035daedb8e17f2ac4b226bf091e469a6cc7f 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Mon Jul  1 17:04:09 2002  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtkliststore.c (gtk_list_store_real_set_value): sync up
+       white space/variable names to match tree_store equiv.
+
+       * gtk/gtktreestore.c (gtk_tree_store_real_set_value): sort if we
+       set the value.
+
 Mon Jul 01 17:19:00 2002  Bill Haneman <bill.haneman@sun.com>
 
        * contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c

diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index c25fa01ebe86f676c455c08d79e00fd9be896a8f..b029efbeaa744e8be8dbdfb7c137b56160e91c39 100644 (file)
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -659,9 +659,9 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
 {
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
+  gint old_column = column;
   GValue real_value = {0, };
   gboolean converted = FALSE;
-  gint orig_column = column;
   gboolean retval = FALSE;
 
   g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
@@ -736,12 +736,13 @@ gtk_list_store_real_set_value (GtkListStore *list_store,
     _gtk_tree_data_list_value_to_node (list, &real_value);
   else
     _gtk_tree_data_list_value_to_node (list, value);
+
   retval = TRUE;
   if (converted)
     g_value_unset (&real_value);
 
   if (sort && GTK_LIST_STORE_IS_SORTED (list_store))
-    gtk_list_store_sort_iter_changed (list_store, iter, orig_column);
+    gtk_list_store_sort_iter_changed (list_store, iter, old_column);
 
   return retval;
 }
@@ -1771,7 +1772,6 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
       cmp_b = (* func) (GTK_TREE_MODEL (list_store), iter, &tmp_iter, data);
     }
 
-
   if (list_store->order == GTK_SORT_DESCENDING)
     {
       if (cmp_a < 0)

diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index 579c8f394681196681f59277a4b0bb542ec2fda6..e26f1fa41f5471bf9d178d4d3f050e1fca7568ba 100644 (file)
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -778,11 +778,16 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
 {
   GtkTreeDataList *list;
   GtkTreeDataList *prev;
-  GtkTreePath *path = NULL;
+  gint old_column = column;
   GValue real_value = {0, };
   gboolean converted = FALSE;
   gboolean retval = FALSE;
 
+  g_return_val_if_fail (GTK_IS_TREE_STORE (tree_store), FALSE);
+  g_return_val_if_fail (VALID_ITER (iter, tree_store), FALSE);
+  g_return_val_if_fail (column >= 0 && column < tree_store->n_columns, FALSE);
+  g_return_val_if_fail (G_IS_VALUE (value), FALSE);
+
   if (! g_type_is_a (G_VALUE_TYPE (value), tree_store->column_headers[column]))
     {
       if (! (g_value_type_compatible (G_VALUE_TYPE (value), tree_store->column_headers[column]) &&
@@ -808,8 +813,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
 
   prev = list = G_NODE (iter->user_data)->data;
 
-  path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
-
   while (list != NULL)
     {
       if (column == 0)
@@ -819,7 +822,6 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
          else
            _gtk_tree_data_list_value_to_node (list, value);
          retval = TRUE;
-         gtk_tree_path_free (path);
          if (converted)
            g_value_unset (&real_value);
          return retval;
@@ -848,16 +850,19 @@ gtk_tree_store_real_set_value (GtkTreeStore *tree_store,
       list->next = NULL;
       column --;
     }
+
   if (converted)
     _gtk_tree_data_list_value_to_node (list, &real_value);
   else
     _gtk_tree_data_list_value_to_node (list, value);
   
   retval = TRUE;
-  gtk_tree_path_free (path);
   if (converted)
     g_value_unset (&real_value);
 
+  if (sort && GTK_TREE_STORE_IS_SORTED (tree_store))
+    gtk_tree_store_sort_iter_changed (tree_store, iter, old_column);
+
   return retval;
 }
 
@@ -2067,7 +2072,6 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
       cmp_b = (* func) (GTK_TREE_MODEL (tree_store), iter, &tmp_iter, data);
     }
 
-
   if (tree_store->order == GTK_SORT_DESCENDING)
     {
       if (cmp_a < 0)

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 07501c81eb6c438062bf8f6d85c8c36794d0090e..fe30f83d9d5259b09333840f9fa27e2a32cb031a 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -4182,8 +4182,8 @@ validate_rows (GtkTreeView *tree_view)
       tree_view->priv->validate_rows_timer = 0;
     }
   
-    return retval;
-  }
+  return retval;
+}
 
 static gboolean
 validate_rows_handler (GtkTreeView *tree_view)