SF.net SVN: geany:[4360] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Sun Oct 25 12:21:05 UTC 2009


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

Log Message:
-----------
Rename "select" variables into "selection" to avoid shadowed names.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/sidebar.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-10-25 11:52:47 UTC (rev 4359)
+++ trunk/ChangeLog	2009-10-25 12:21:05 UTC (rev 4360)
@@ -7,6 +7,8 @@
    Before looking for line and column numbers specified as part
    of a filename, ensure the file doesn't exist on disk. This allows
    opening of files like "test:0".
+ * src/sidebar.c:
+   Rename "select" variables into "selection" to avoid shadowed names.
 
 
 2009-10-23  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/src/sidebar.c
===================================================================
--- trunk/src/sidebar.c	2009-10-25 11:52:47 UTC (rev 4359)
+++ trunk/src/sidebar.c	2009-10-25 12:21:05 UTC (rev 4360)
@@ -105,7 +105,7 @@
 {
 	GtkCellRenderer *text_renderer, *icon_renderer;
 	GtkTreeViewColumn *column;
-	GtkTreeSelection *select;
+	GtkTreeSelection *selection;
 
 	text_renderer = gtk_cell_renderer_text_new();
 	icon_renderer = gtk_cell_renderer_pixbuf_new();
@@ -145,8 +145,8 @@
 	}
 
 	/* selection handling */
-	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
-	gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tree));
+	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
 	/* callback for changed selection not necessary, will be handled by button-press-event */
 }
 
@@ -232,7 +232,7 @@
 	GtkCellRenderer *icon_renderer;
 	GtkCellRenderer *text_renderer;
 	GtkTreeViewColumn *column;
-	GtkTreeSelection *select;
+	GtkTreeSelection *selection;
 	GtkTreeSortable *sortable;
 
 	tv.tree_openfiles = ui_lookup_widget(main_widgets.window, "treeview6");
@@ -275,8 +275,8 @@
 		g_object_set(tv.tree_openfiles, "has-tooltip", TRUE, "tooltip-column", DOCUMENTS_FILENAME, NULL);
 
 	/* selection handling */
-	select = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles));
-	gtk_tree_selection_set_mode(select, GTK_SELECTION_SINGLE);
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(tv.tree_openfiles));
+	gtk_tree_selection_set_mode(selection, GTK_SELECTION_SINGLE);
 	g_object_unref(store_openfiles);
 
 	g_signal_connect(GTK_TREE_VIEW(tv.tree_openfiles), "button-press-event",
@@ -774,14 +774,14 @@
 		event->keyval == GDK_KP_Enter ||
 		event->keyval == GDK_space)
 	{
-		GtkTreeSelection *select = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
+		GtkTreeSelection *selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(widget));
 		may_steal_focus = TRUE;
 		/* delay the query of selection state because this callback is executed before GTK
 		 * changes the selection (g_signal_connect_after would be better but it doesn't work) */
 		if (widget ==  tv.tree_openfiles) /* tag and doc list have separate handlers */
-			g_idle_add((GSourceFunc) on_openfiles_tree_selection_changed, select);
+			g_idle_add((GSourceFunc) on_openfiles_tree_selection_changed, selection);
 		else
-			g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, select);
+			g_idle_add((GSourceFunc) on_taglist_tree_selection_changed, selection);
 	}
 	return FALSE;
 }


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



More information about the Commits mailing list