gtk+ r20338 - in branches/gtk-2-12: . gtk

[kristian svn gnome org]

Author: kristian
Date: Sun Jun  8 20:39:03 2008
New Revision: 20338
URL: http://svn.gnome.org/viewvc/gtk+?rev=20338&view=rev

Log:
2008-06-08  Kristian Rietveld  <kris imendio com>

	Merge from trunk:

	* gtk/gtktreeviewcolumn.c (gtk_tree_view_column_update_button):
	always determine what arrow to show if show_sort_indicator is true.
	(#352738, Chris Vine).



Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/gtk/gtktreeviewcolumn.c

Modified: branches/gtk-2-12/gtk/gtktreeviewcolumn.c
==============================================================================
--- branches/gtk-2-12/gtk/gtktreeviewcolumn.c	(original)
+++ branches/gtk-2-12/gtk/gtktreeviewcolumn.c	Sun Jun  8 20:39:03 2008
@@ -925,8 +925,7 @@
 					  &sort_column_id,
 					  NULL);
 
-  if (tree_column->show_sort_indicator
-      && (sort_column_id >= 0 && sort_column_id == tree_column->sort_column_id))
+  if (tree_column->show_sort_indicator)
     {
       gboolean alternative;