save last minute changes before committing.

Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
	changes before committing.

9 files changed, 78 insertions, 25 deletions

diff --git a/ChangeLog b/ChangeLog
index 99606afde..92252cad1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 99606afde..92252cad1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 99606afde..92252cad1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 99606afde..92252cad1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 99606afde..92252cad1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 99606afde..92252cad1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 99606afde..92252cad1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Jan 30 20:15:49 2002  Jonathan Blandford  <jrb@redhat.com>
+
+	* gtk/gtktreestore.c (gtk_tree_store_set_valist): save last minute
+	changes before committing.
+
+	* gtk/gtkliststore.c (gtk_list_store_set_valist): ditto
+
 Wed Jan 30 18:46:14 2002  Jonathan Blandford  <jrb@redhat.com>
 
 	* gtk/gtkliststore.c (gtk_list_store_set_valist): only emit the
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index 2319d03f5..ec3266020 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -802,19 +802,21 @@ gtk_list_store_set_valist (GtkListStore *list_store,
 
   column = va_arg (var_args, gint);
 
-  if (list_store->sort_column_id != -1)
-    {
-      GtkTreeDataSortHeader *header;
-      header = _gtk_tree_data_list_get_header (list_store->sort_list,
-					       list_store->sort_column_id);
-      g_return_if_fail (header != NULL);
-      g_return_if_fail (header->func != NULL);
-      func = header->func;
-    }
-  else
+  if (GTK_LIST_STORE_IS_SORTED (list_store))
     {
-      g_return_if_fail (list_store->default_sort_func != NULL);
-      func = list_store->default_sort_func;
+      if (list_store->sort_column_id != -1)
+	{
+	  GtkTreeDataSortHeader *header;
+	  header = _gtk_tree_data_list_get_header (list_store->sort_list,
+						   list_store->sort_column_id);
+	  g_return_if_fail (header != NULL);
+	  g_return_if_fail (header->func != NULL);
+	  func = header->func;
+	}
+      else
+	{
+	  func = list_store->default_sort_func;
+	}
     }
 
   if (func != gtk_tree_data_list_compare_func)
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index edcb67a1a..ebe1e6a8d 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -910,26 +910,28 @@ gtk_tree_store_set_valist (GtkTreeStore *tree_store,
   gint column;
   gboolean emit_signal = FALSE;
   gboolean maybe_need_sort = FALSE;
-  GtkTreeIterCompareFunc func;
+  GtkTreeIterCompareFunc func = NULL;
 
   g_return_if_fail (GTK_IS_TREE_STORE (tree_store));
   g_return_if_fail (VALID_ITER (iter, tree_store));
 
   column = va_arg (var_args, gint);
 
-  if (tree_store->sort_column_id != -1)
-    {
-      GtkTreeDataSortHeader *header;
-      header = _gtk_tree_data_list_get_header (tree_store->sort_list,
-					       tree_store->sort_column_id);
-      g_return_if_fail (header != NULL);
-      g_return_if_fail (header->func != NULL);
-      func = header->func;
-    }
-  else
+  if (GTK_TREE_STORE_IS_SORTED (tree_store))
     {
-      g_return_if_fail (tree_store->default_sort_func != NULL);
-      func = tree_store->default_sort_func;
+      if (tree_store->sort_column_id != -1)
+	{
+	  GtkTreeDataSortHeader *header;
+	  header = _gtk_tree_data_list_get_header (tree_store->sort_list,
+						   tree_store->sort_column_id);
+	  g_return_if_fail (header != NULL);
+	  g_return_if_fail (header->func != NULL);
+	  func = header->func;
+	}
+      else
+	{
+	  func = tree_store->default_sort_func;
+	}
     }
 
   if (func != gtk_tree_data_list_compare_func)