Revision: 4612 http://geany.svn.sourceforge.net/geany/?rev=4612&view=rev Author: eht16 Date: 2010-01-31 16:27:12 +0000 (Sun, 31 Jan 2010)
Log Message: ----------- Backport from trunk: Rename "select" variables into "selection" to avoid shadowed names.
Modified Paths: -------------- branches/geany-0.18.1/ChangeLog branches/geany-0.18.1/plugins/filebrowser.c
Modified: branches/geany-0.18.1/ChangeLog =================================================================== --- branches/geany-0.18.1/ChangeLog 2010-01-31 16:26:44 UTC (rev 4611) +++ branches/geany-0.18.1/ChangeLog 2010-01-31 16:27:12 UTC (rev 4612) @@ -53,6 +53,8 @@ opening of files like "test:0". * src/treeviews.c: Rename "select" variables into "selection" to avoid shadowed names. + * plugins/filebrowser.c: + Rename "select" variables into "selection" to avoid shadowed names.
2009-10-19 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: branches/geany-0.18.1/plugins/filebrowser.c =================================================================== --- branches/geany-0.18.1/plugins/filebrowser.c 2010-01-31 16:26:44 UTC (rev 4611) +++ branches/geany-0.18.1/plugins/filebrowser.c 2010-01-31 16:27:12 UTC (rev 4612) @@ -711,7 +711,7 @@ { GtkCellRenderer *text_renderer, *icon_renderer; GtkTreeViewColumn *column; - GtkTreeSelection *select; + GtkTreeSelection *selection; PangoFontDescription *pfd;
file_store = gtk_list_store_new(FILEVIEW_N_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING); @@ -741,11 +741,11 @@ 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.