Update the documentation to specify a more useful behaviour, which can be

2004-11-30  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): Update
	the documentation to specify a more useful behaviour, which can be
	implemented with the multiple special values we have now.  (#159984,
	Nicholas Rahn)

	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id):
	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id):
	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): Update the
	implementations.

8 files changed, 92 insertions, 18 deletions

diff --git a/ChangeLog b/ChangeLog
index fba1c60449..b237166984 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,20 @@
+2004-11-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): Update 
+	the documentation to specify a more useful behaviour, which can be
+	implemented with the multiple special values we have now.  (#159984,
+	Nicholas Rahn)
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): Update the
+	implementations.
+
 Tue Nov 30 16:25:29 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextdisplay.c (render_para): Don't paint in the
 	trailing end of a wrapped line when the selection 
-	starts after the line. (#159984, Matthias Clasen)
+	starts after the line. (#160000, Matthias Clasen)
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): pass in byte_count + 1 
 	for selection_end index when the selection end is past the end of the 
@@ -77,6 +89,11 @@ Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): 
+
 	* NEWS: Updates.
 
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index fba1c60449..b237166984 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,8 +1,20 @@
+2004-11-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): Update 
+	the documentation to specify a more useful behaviour, which can be
+	implemented with the multiple special values we have now.  (#159984,
+	Nicholas Rahn)
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): Update the
+	implementations.
+
 Tue Nov 30 16:25:29 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextdisplay.c (render_para): Don't paint in the
 	trailing end of a wrapped line when the selection 
-	starts after the line. (#159984, Matthias Clasen)
+	starts after the line. (#160000, Matthias Clasen)
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): pass in byte_count + 1 
 	for selection_end index when the selection end is past the end of the 
@@ -77,6 +89,11 @@ Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): 
+
 	* NEWS: Updates.
 
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index fba1c60449..b237166984 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,8 +1,20 @@
+2004-11-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): Update 
+	the documentation to specify a more useful behaviour, which can be
+	implemented with the multiple special values we have now.  (#159984,
+	Nicholas Rahn)
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): Update the
+	implementations.
+
 Tue Nov 30 16:25:29 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextdisplay.c (render_para): Don't paint in the
 	trailing end of a wrapped line when the selection 
-	starts after the line. (#159984, Matthias Clasen)
+	starts after the line. (#160000, Matthias Clasen)
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): pass in byte_count + 1 
 	for selection_end index when the selection end is past the end of the 
@@ -77,6 +89,11 @@ Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): 
+
 	* NEWS: Updates.
 
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index fba1c60449..b237166984 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,8 +1,20 @@
+2004-11-30  Matthias Clasen  <mclasen@redhat.com>
+
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): Update 
+	the documentation to specify a more useful behaviour, which can be
+	implemented with the multiple special values we have now.  (#159984,
+	Nicholas Rahn)
+
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): Update the
+	implementations.
+
 Tue Nov 30 16:25:29 2004  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtktextdisplay.c (render_para): Don't paint in the
 	trailing end of a wrapped line when the selection 
-	starts after the line. (#159984, Matthias Clasen)
+	starts after the line. (#160000, Matthias Clasen)
 
 	* gtk/gtktextdisplay.c (gtk_text_layout_draw): pass in byte_count + 1 
 	for selection_end index when the selection end is past the end of the 
@@ -77,6 +89,11 @@ Tue Nov 23 19:37:34 2004  Owen Taylor  <otaylor@redhat.com>
 
 2004-11-30  Matthias Clasen  <mclasen@redhat.com>
 
+	* gtk/gtktreemodelsort.c (gtk_tree_model_sort_get_sort_column_id): 
+	* gtk/gtktreestore.c (gtk_tree_store_get_sort_column_id): 
+	* gtk/gtktreesortable.c (gtk_tree_sortable_get_sort_column_id): 
+	* gtk/gtkliststore.c (gtk_list_store_get_sort_column_id): 
+
 	* NEWS: Updates.
 
 2004-11-29  Matthias Clasen  <mclasen@redhat.com>
diff --git a/gtk/gtkliststore.c b/gtk/gtkliststore.c
index e8de5f8a0a..32489cfa7f 100644
--- a/gtk/gtkliststore.c
+++ b/gtk/gtkliststore.c
@@ -1699,13 +1699,15 @@ gtk_list_store_get_sort_column_id (GtkTreeSortable  *sortable,
 
   g_return_val_if_fail (GTK_IS_LIST_STORE (sortable), FALSE);
 
-  if (list_store->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
-    return FALSE;
-
   if (sort_column_id)
     * sort_column_id = list_store->sort_column_id;
   if (order)
     * order = list_store->order;
+
+  if (list_store->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID ||
+      list_store->sort_column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
+    return FALSE;
+
   return TRUE;
 }
 
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c
index abfd0c6e4f..61cb405f49 100644
--- a/gtk/gtktreemodelsort.c
+++ b/gtk/gtktreemodelsort.c
@@ -1322,14 +1322,15 @@ gtk_tree_model_sort_get_sort_column_id (GtkTreeSortable *sortable,
 
   g_return_val_if_fail (GTK_IS_TREE_MODEL_SORT (sortable), FALSE);
 
-  if (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
-    return FALSE;
-
   if (sort_column_id)
     *sort_column_id = tree_model_sort->sort_column_id;
   if (order)
     *order = tree_model_sort->order;
 
+  if (tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID ||
+      tree_model_sort->sort_column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
+    return FALSE;
+  
   return TRUE;
 }
 
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 79a7d09287..8b0f5d6ac6 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -94,10 +94,12 @@ gtk_tree_sortable_sort_column_changed (GtkTreeSortable *sortable)
  * @order: The #GtkSortType to be filled in
  * 
  * Fills in @sort_column_id and @order with the current sort column and the
- * order, if applicable.  If the sort column is not set, then FALSE is returned,
- * and the values in @sort_column_id and @order are unchanged.
-  * 
- * Return value: %TRUE, if the sort column has been set
+ * order.  It returns %TRUE unless the @sort_column_id is 
+ * %GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID or 
+ * %GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID.
+ * 
+ * Return value: %TRUE if the sort column is not one of the special sort
+ *   column ids.
  **/
 gboolean
 gtk_tree_sortable_get_sort_column_id (GtkTreeSortable  *sortable,
diff --git a/gtk/gtktreestore.c b/gtk/gtktreestore.c
index c8cc9cd1fb..642b74c728 100644
--- a/gtk/gtktreestore.c
+++ b/gtk/gtktreestore.c
@@ -2833,15 +2833,16 @@ gtk_tree_store_get_sort_column_id (GtkTreeSortable  *sortable,
 
   g_return_val_if_fail (GTK_IS_TREE_STORE (sortable), FALSE);
 
-  if (tree_store->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID)
-    return FALSE;
-
   if (sort_column_id)
     * sort_column_id = tree_store->sort_column_id;
   if (order)
     * order = tree_store->order;
-  return TRUE;
 
+  if (tree_store->sort_column_id == GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID ||
+      tree_store->sort_column_id == GTK_TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID)
+    return FALSE;
+
+  return TRUE;
 }
 
 static void