From 961151ba172a4430e1ed92b291a8cc911d162f21 Mon Sep 17 00:00:00 2001 From: "Ira W. Snyder" Date: Mon, 28 Jan 2008 18:46:58 -0800 Subject: [PATCH] [Window] Fix shadowed variable "index" The string.h header declares a global variable "index". The TildaWindow code also used a variable named index, so the global variable was shadowed by the local variable. While this isn't a problem, I prefer to make code -Wshadow safe. Also, I removed a comment left over from debugging in TildaController. --- tilda-controller.c | 1 - tilda-window.c | 8 +++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tilda-controller.c b/tilda-controller.c index a3d6f67..7361ff8 100644 --- a/tilda-controller.c +++ b/tilda-controller.c @@ -240,7 +240,6 @@ tilda_controller_constructor (GType type, obj = parent_class->constructor (type, n_construct_properties, construct_properties); - g_print ("%s all set up\n", __func__); /* The object is ready, and all constructor-time properties have been set. * Have fun! */ diff --git a/tilda-window.c b/tilda-window.c index 822a987..6a5b84e 100644 --- a/tilda-window.c +++ b/tilda-window.c @@ -91,6 +91,8 @@ tilda_window_add_terminal (TildaWindow *self) gint number; TildaTerminal *tt; + GtkWidget *label; + gint notebook_index; number = tilda_window_find_next_free_terminal_number (self); tt = g_object_new (TILDA_TYPE_TERMINAL, @@ -99,10 +101,10 @@ tilda_window_add_terminal (TildaWindow *self) NULL); g_ptr_array_add (self->terms, tt); - GtkWidget *label = gtk_label_new ("Tilda"); - gint index = gtk_notebook_prepend_page (GTK_NOTEBOOK(self->notebook), tt->hbox, label); + label = gtk_label_new ("Tilda"); + notebook_index = gtk_notebook_prepend_page (GTK_NOTEBOOK(self->notebook), tt->hbox, label); gtk_notebook_set_tab_label_packing (GTK_NOTEBOOK(self->notebook), tt->hbox, TRUE, TRUE, GTK_PACK_END); - gtk_notebook_set_current_page (GTK_NOTEBOOK(self->notebook), index); + gtk_notebook_set_current_page (GTK_NOTEBOOK(self->notebook), notebook_index); if (gtk_notebook_get_n_pages (GTK_NOTEBOOK(self->notebook)) > 1) gtk_notebook_set_show_tabs (GTK_NOTEBOOK(self->notebook), TRUE); -- 2.34.1