SF.net SVN: geany:[4362] trunk

[eht16 at users.sourceforge.net]

Revision: 4362
          http://geany.svn.sourceforge.net/geany/?rev=4362&view=rev
Author:   eht16
Date:     2009-10-25 12:32:57 +0000 (Sun, 25 Oct 2009)

Log Message:
-----------
Rename "select" variables into "selection" to avoid shadowed names.
Make use of ui_widget_modify_font_from_string().

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/plugins/filebrowser.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-25 12:30:36 UTC (rev 4361)
+++ trunk/ChangeLog	2009-10-25 12:32:57 UTC (rev 4362)
@@ -11,6 +11,9 @@
    Rename "select" variables into "selection" to avoid shadowed names.
  * plugins/geanyfunctions.h, src/plugins.c, src/plugindata.h:
    Add ui_widget_modify_font_from_string() to the plugin API.
+ * plugins/filebrowser.c:
+   Rename "select" variables into "selection" to avoid shadowed names.
+   Make use of ui_widget_modify_font_from_string().
 
 
 2009-10-23  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/plugins/filebrowser.c
===================================================================
--- trunk/plugins/filebrowser.c	2009-10-25 12:30:36 UTC (rev 4361)
+++ trunk/plugins/filebrowser.c	2009-10-25 12:32:57 UTC (rev 4362)
@@ -35,7 +35,7 @@
 GeanyFunctions	*geany_functions;
 
 
-PLUGIN_VERSION_CHECK(131)
+PLUGIN_VERSION_CHECK(163)
 
 PLUGIN_SET_INFO(_("File Browser"), _("Adds a file browser tab to the sidebar."), VERSION,
 	_("The Geany developer team"))
@@ -732,8 +732,7 @@
 {
 	GtkCellRenderer *text_renderer, *icon_renderer;
 	GtkTreeViewColumn *column;
-	GtkTreeSelection *select;
-	PangoFontDescription *pfd;
+	GtkTreeSelection *selection;
 
 	file_store = gtk_list_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
 
@@ -753,20 +752,18 @@
 	gtk_tree_view_set_enable_search(GTK_TREE_VIEW(file_view), TRUE);
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(file_view), FILEVIEW_COLUMN_NAME);
 
-	pfd = pango_font_description_from_string(geany->interface_prefs->tagbar_font);
-	gtk_widget_modify_font(file_view, pfd);
-	pango_font_description_free(pfd);
+	ui_widget_modify_font_from_string(file_view, geany->interface_prefs->tagbar_font);
 
 	/* GTK 2.12 tooltips */
 	if (gtk_check_version(2, 12, 0) == NULL)
 		g_object_set(file_view, "has-tooltip", TRUE, "tooltip-column", FILEVIEW_COLUMN_FILENAME, NULL);
 
 	/* selection handling */
-	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
-	gtk_tree_selection_set_mode(select, GTK_SELECTION_MULTIPLE);
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(file_view));
+	gtk_tree_selection_set_mode(selection, GTK_SELECTION_MULTIPLE);
 
 	g_signal_connect(file_view, "realize", G_CALLBACK(on_current_path), NULL);
-	g_signal_connect(select, "changed", G_CALLBACK(on_tree_selection_changed), NULL);
+	g_signal_connect(selection, "changed", G_CALLBACK(on_tree_selection_changed), NULL);
 	g_signal_connect(file_view, "button-press-event", G_CALLBACK(on_button_press), NULL);
 	g_signal_connect(file_view, "key-press-event", G_CALLBACK(on_key_press), NULL);
 }


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