fix up if-condition to only set the true arrow type if show_sort_indicator

2007-10-01  Kristian Rietveld  <kris@imendio.com>

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):
	fix up if-condition to only set the true arrow type if
	show_sort_indicator is TRUE.  (#448343, reported by Emil Nowak).

svn path=/trunk/; revision=18871

diff --git a/ChangeLog b/ChangeLog
index cc40155808cfd37594ceb902662b733171c16f03..249178044486b9c5fe2a283afff5b505fdaba2a4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-01  Kristian Rietveld  <kris@imendio.com>
+
+       * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):
+       fix up if-condition to only set the true arrow type if
+       show_sort_indicator is TRUE.  (#448343, reported by Emil Nowak).
+
 2007-09-25  Emmanuele Bassi  <ebassi@gnome.org>
 
        Fixes for bug #480123.

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 2a352d9d4aba954d497ebcc24c46d4c56e167a00..ea8adbb813eae4db8628eaccc15b3453760de94f 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -926,7 +926,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
                                          NULL);
 
   if (tree_column->show_sort_indicator
-      || (sort_column_id >= 0 && sort_column_id == tree_column->sort_column_id))
+      && (sort_column_id >= 0 && sort_column_id == tree_column->sort_column_id))
     {
       gboolean alternative;