From 864c47e7dc6607b2eb679f155fd5327f062ddcff Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 3 Oct 2004 06:12:09 +0000 Subject: [PATCH] Set sort_indicator to FALSE when appropriate. (#153714, Reinout van 2004-10-03 Matthias Clasen * gtk/gtktreeviewcolumn.c (gtk_tree_view_column_setup_sort_column_id_callback): Set sort_indicator to FALSE when appropriate. (#153714, Reinout van Schouwen) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeviewcolumn.c | 9 ++++++--- 5 files changed, 26 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8fe5b8b55c..d124387154 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2004-10-03 Matthias Clasen + * gtk/gtktreeviewcolumn.c + (gtk_tree_view_column_setup_sort_column_id_callback): + Set sort_indicator to FALSE when appropriate. (#153714, + Reinout van Schouwen) + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): Fix positioning near the monitor boundaries. (#154341, Ken Harris) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8fe5b8b55c..d124387154 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,10 @@ 2004-10-03 Matthias Clasen + * gtk/gtktreeviewcolumn.c + (gtk_tree_view_column_setup_sort_column_id_callback): + Set sort_indicator to FALSE when appropriate. (#153714, + Reinout van Schouwen) + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): Fix positioning near the monitor boundaries. (#154341, Ken Harris) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8fe5b8b55c..d124387154 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,10 @@ 2004-10-03 Matthias Clasen + * gtk/gtktreeviewcolumn.c + (gtk_tree_view_column_setup_sort_column_id_callback): + Set sort_indicator to FALSE when appropriate. (#153714, + Reinout van Schouwen) + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): Fix positioning near the monitor boundaries. (#154341, Ken Harris) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8fe5b8b55c..d124387154 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,10 @@ 2004-10-03 Matthias Clasen + * gtk/gtktreeviewcolumn.c + (gtk_tree_view_column_setup_sort_column_id_callback): + Set sort_indicator to FALSE when appropriate. (#153714, + Reinout van Schouwen) + * gtk/gtktreeview.c (gtk_tree_view_search_position_func): Fix positioning near the monitor boundaries. (#154341, Ken Harris) diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 686c049220..f221a5e549 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -1226,10 +1226,12 @@ gtk_tree_view_column_setup_sort_column_id_callback (GtkTreeViewColumn *tree_colu { gtk_tree_view_column_set_sort_indicator (tree_column, TRUE); gtk_tree_view_column_set_sort_order (tree_column, real_order); - - return; + } + else + { + gtk_tree_view_column_set_sort_indicator (tree_column, FALSE); } - } + } } @@ -1306,6 +1308,7 @@ _gtk_tree_view_column_unset_model (GtkTreeViewColumn *column, column->sort_column_changed_signal); column->sort_column_changed_signal = 0; } + gtk_tree_view_column_set_sort_indicator (column, FALSE); } void