SF.net SVN: geany:[5843] trunk

[colombanw at users.sourceforge.net]

Revision: 5843
          http://geany.svn.sourceforge.net/geany/?rev=5843&view=rev
Author:   colombanw
Date:     2011-06-13 20:43:17 +0000 (Mon, 13 Jun 2011)

Log Message:
-----------
Remove GTK version check for setting show_symbol_list_expanders

Modified Paths:
--------------
    trunk/doc/geany.html
    trunk/doc/geany.txt
    trunk/src/sidebar.c

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2011-06-13 20:42:55 UTC (rev 5842)
+++ trunk/doc/geany.html	2011-06-13 20:43:17 UTC (rev 5843)
@@ -5068,8 +5068,7 @@
 </tr>
 <tr><td>show_symbol_list_expanders</td>
 <td>Whether to show or hide the small expander
-icons on the symbol list treeview (only
-available with GTK 2.12 or above).</td>
+icons on the symbol list treeview.</td>
 <td>true</td>
 </tr>
 <tr><td>allow_always_save</td>
@@ -6573,7 +6572,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2011-06-13 20:17 UTC.
+Generated on: 2011-06-13 20:23 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2011-06-13 20:42:55 UTC (rev 5842)
+++ trunk/doc/geany.txt	2011-06-13 20:43:17 UTC (rev 5843)
@@ -4360,8 +4360,7 @@
                                   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

Modified: trunk/src/sidebar.c
===================================================================
--- trunk/src/sidebar.c	2011-06-13 20:42:55 UTC (rev 5842)
+++ trunk/src/sidebar.c	2011-06-13 20:43:17 UTC (rev 5843)
@@ -136,16 +136,11 @@
 	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));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.