diff options
| author | Kristian Rietveld <kristian@src.gnome.org> | 2003-01-27 21:41:06 +0000 |
|---|---|---|
| committer | Kristian Rietveld <kristian@src.gnome.org> | 2003-01-27 21:41:06 +0000 |
| commit | 3804b7e64bb9f0cc88a53f6cc26d3bd03de7d0e9 (patch) | |
| tree | 227981c5c5d781884b7f8a9f28ce8cf8e62a3ace /gtk/gtktreeviewcolumn.c | |
| parent | b6913de5e9266fa851c1c3cb870494e5a7b966b5 (diff) | |
| download | gtk+-3804b7e64bb9f0cc88a53f6cc26d3bd03de7d0e9.tar.gz | |
ChangeLog too long to mention here. Bugs fixed: #100973, #83195, #87556,
#99803, #100458. And a couple of non-bugzilla'd bugs (I am soooo sure
I misspelled that).
Diffstat (limited to 'gtk/gtktreeviewcolumn.c')
| -rw-r--r-- | gtk/gtktreeviewcolumn.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 3f4dbd642d..423b77e68e 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -2109,7 +2109,7 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column, gint sort_column_id) { g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column)); - g_return_if_fail (sort_column_id >= 0); + g_return_if_fail (sort_column_id >= -1); if (tree_column->sort_column_id == sort_column_id) return; @@ -2119,6 +2119,8 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column, /* Handle unsetting the id */ if (sort_column_id == -1) { + GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_column->tree_view)); + if (tree_column->sort_clicked_signal) { g_signal_handler_disconnect (tree_column, tree_column->sort_clicked_signal); @@ -2127,12 +2129,13 @@ gtk_tree_view_column_set_sort_column_id (GtkTreeViewColumn *tree_column, if (tree_column->sort_column_changed_signal) { - g_signal_handler_disconnect (tree_column, tree_column->sort_column_changed_signal); + g_signal_handler_disconnect (model, tree_column->sort_column_changed_signal); tree_column->sort_column_changed_signal = 0; } gtk_tree_view_column_set_sort_order (tree_column, GTK_SORT_ASCENDING); gtk_tree_view_column_set_sort_indicator (tree_column, FALSE); + gtk_tree_view_column_set_clickable (tree_column, FALSE); return; } |