From ebca594c3c6a1be866cff57b9b44fe06d14381f8 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Mon, 13 Jun 2011 20:43:17 +0000 Subject: [PATCH] Remove GTK version check for setting show_symbol_list_expanders git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5843 ea778897-0a13-0410-b9d1-a72fbfd435f5 --- doc/geany.html | 5 ++--- doc/geany.txt | 3 +-- src/sidebar.c | 15 +++++---------- 3 files changed, 8 insertions(+), 15 deletions(-) diff --git a/doc/geany.html b/doc/geany.html index ec621c93..69e696ae 100644 --- a/doc/geany.html +++ b/doc/geany.html @@ -5068,8 +5068,7 @@ scrollbars are hidden completely. show_symbol_list_expanders Whether to show or hide the small expander -icons on the symbol list treeview (only -available with GTK 2.12 or above). +icons on the symbol list treeview. true allow_always_save @@ -6573,7 +6572,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.

diff --git a/doc/geany.txt b/doc/geany.txt index 19974a81..161d8aeb 100644 --- a/doc/geany.txt +++ b/doc/geany.txt @@ -4360,8 +4360,7 @@ show_editor_scrollbars Whether to display scrollbars. If set to t scrollbars are hidden completely. **Interface related** show_symbol_list_expanders Whether to show or hide the small expander true - icons on the symbol list treeview (only - available with GTK 2.12 or above). + icons on the symbol list treeview. allow_always_save Whether files can be saved always, even if false they don't have any changes. By default, the Save button and menu item are disabled diff --git a/src/sidebar.c b/src/sidebar.c index 1eeb9bf5..77919f73 100644 --- a/src/sidebar.c +++ b/src/sidebar.c @@ -136,16 +136,11 @@ static void prepare_taglist(GtkWidget *tree, GtkTreeStore *store) g_signal_connect(tree, "key-press-event", G_CALLBACK(sidebar_key_press_cb), NULL); - if (gtk_check_version(2, 12, 0) == NULL) - { - g_object_set(tree, "show-expanders", interface_prefs.show_symbol_list_expanders, NULL); - if (! interface_prefs.show_symbol_list_expanders) - g_object_set(tree, "level-indentation", 10, NULL); - /* Tooltips */ - g_object_set(tree, - "has-tooltip", TRUE, - "tooltip-column", SYMBOLS_COLUMN_TOOLTIP, NULL); - } + gtk_tree_view_set_show_expanders(tree, interface_prefs.show_symbol_list_expanders); + if (! interface_prefs.show_symbol_list_expanders) + gtk_tree_view_set_level_indentation(tree, 10); + /* Tooltips */ + gtk_tree_view_set_tooltip_column(tree, SYMBOLS_COLUMN_TOOLTIP); /* selection handling */ selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));