SF.net SVN: geany:[5943] trunk/src/prefs.c

[ntrel at users.sourceforge.net]

Revision: 5943
          http://geany.svn.sourceforge.net/geany/?rev=5943&view=rev
Author:   ntrel
Date:     2011-09-21 16:03:11 +0000 (Wed, 21 Sep 2011)
Log Message:
-----------
Use various_treeview global to tidy code a little.

Modified Paths:
--------------
    trunk/src/prefs.c

Modified: trunk/src/prefs.c
===================================================================
--- trunk/src/prefs.c	2011-09-21 15:50:36 UTC (rev 5942)
+++ trunk/src/prefs.c	2011-09-21 16:03:11 UTC (rev 5943)
@@ -74,12 +74,15 @@
 GeanyToolPrefs tool_prefs;
 
 
+/* keybinding globals, should be put in a struct */
 static GtkTreeIter g_iter;
 static GtkTreeStore *store = NULL;
 static GtkTreeView *tree = NULL;
 static GtkWidget *dialog_label;
 static gboolean edited = FALSE;
 
+static GtkTreeView *various_treeview = NULL;
+
 static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data);
 static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data);
 static void kb_grab_key_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data);
@@ -109,7 +112,6 @@
 {
 	StashGroup *group;
 	guint i;
-	GtkWidget *widget = ui_lookup_widget(ui_widgets.prefs_dialog, "various_treeview");
 
 	foreach_ptr_array(group, i, pref_groups)
 	{
@@ -127,10 +129,10 @@
 	switch (action)
 	{
 		case PREF_DISPLAY:
-			stash_tree_display(pref_groups, GTK_TREE_VIEW(widget));
+			stash_tree_display(pref_groups, various_treeview);
 			break;
 		case PREF_UPDATE:
-			stash_tree_update(pref_groups, GTK_TREE_VIEW(widget));
+			stash_tree_update(pref_groups, various_treeview);
 			break;
 	}
 }
@@ -1615,7 +1617,7 @@
 	if (ui_widgets.prefs_dialog == NULL)
 	{
 		GtkWidget *combo_new, *combo_open, *combo_eol;
-		GtkWidget *label, *various_tree;
+		GtkWidget *label;
 		guint i;
 		gchar *encoding_string;
 		GdkPixbuf *pb;
@@ -1699,8 +1701,9 @@
 		}
 
 		/* page Various */
-		various_tree = ui_lookup_widget(ui_widgets.prefs_dialog, "various_treeview");
-		stash_tree_setup(pref_groups, GTK_TREE_VIEW(various_tree));
+		various_treeview = GTK_TREE_VIEW(ui_lookup_widget(ui_widgets.prefs_dialog,
+			"various_treeview"));
+		stash_tree_setup(pref_groups, various_treeview);
 
 #ifdef HAVE_VTE
 		vte_append_preferences_tab();

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