Patch from David Hampton to fix sorting on booleans.

Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>

        * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
        from David Hampton to fix sorting on booleans.

diff --git a/ChangeLog b/ChangeLog
index 7e17bda3edcd4e55933ff740ef666f0bf6ffec29..f70e827dce0e1245926fd54d92be8ad90ae0ff96 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
+       from David Hampton to fix sorting on booleans.
+
 Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 7e17bda3edcd4e55933ff740ef666f0bf6ffec29..f70e827dce0e1245926fd54d92be8ad90ae0ff96 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
+       from David Hampton to fix sorting on booleans.
+
 Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 7e17bda3edcd4e55933ff740ef666f0bf6ffec29..f70e827dce0e1245926fd54d92be8ad90ae0ff96 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
+       from David Hampton to fix sorting on booleans.
+
 Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 7e17bda3edcd4e55933ff740ef666f0bf6ffec29..f70e827dce0e1245926fd54d92be8ad90ae0ff96 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
+       from David Hampton to fix sorting on booleans.
+
 Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 7e17bda3edcd4e55933ff740ef666f0bf6ffec29..f70e827dce0e1245926fd54d92be8ad90ae0ff96 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Nov 20 14:51:41 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       * gtk/gtktreedatalist.c (gtk_tree_data_list_compare_func): Patch
+       from David Hampton to fix sorting on booleans.
+
 Thu Nov 20 15:48:03 2003  Soeren Sandmann  <sandmann@daimi.au.dk>
 
        * gtk/gtksocket.c (gtk_socket_focus): Use gtk_widget_is_focus()

diff --git a/gtk/gtktreedatalist.c b/gtk/gtktreedatalist.c
index c09ac0683d75a040a4af3e680e7fbc263ea54c2f..b4bef80ced99f1f4e0a575571fc215b306edaa72 100644 (file)
--- a/gtk/gtktreedatalist.c
+++ b/gtk/gtktreedatalist.c
@@ -314,9 +314,9 @@ gtk_tree_data_list_compare_func (GtkTreeModel *model,
   switch (G_TYPE_FUNDAMENTAL (type))
     {
     case G_TYPE_BOOLEAN:
-      if (g_value_get_int (&a_value) < g_value_get_int (&b_value))
+      if (g_value_get_boolean (&a_value) < g_value_get_boolean (&b_value))
        retval = -1;
-      else if (g_value_get_int (&a_value) == g_value_get_int (&b_value))
+      else if (g_value_get_boolean (&a_value) == g_value_get_boolean (&b_value))
        retval = 0;
       else
        retval = 1;