Fix some unused variables.

Tue Oct 21 16:12:51 2003  Owen Taylor  <otaylor@redhat.com>

        * demos/gtk-demo/menus.c (do_menus): Fix some unused
        variables.

        * gtk/gtkmain.c (_gtk_get_lc_ctype): Fix an unused
        variable warning

diff --git a/ChangeLog b/ChangeLog
index 9ff19f81a308e0813296b931c1b205f1db3f1366..e027fd65170635f8155a6fc7b38cd2e64ee8175b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+Tue Oct 21 16:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/menus.c (do_menus): Fix some unused
+       variables.
+
+       * gtk/gtkmain.c (_gtk_get_lc_ctype): Fix an unused
+       variable warning.
+
 Thu Oct 23 00:04:50 2003  Matthias Clasen  <maclas@gmx.de>
 
        * NEWS: Partial update for 2.3.0.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9ff19f81a308e0813296b931c1b205f1db3f1366..e027fd65170635f8155a6fc7b38cd2e64ee8175b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+Tue Oct 21 16:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/menus.c (do_menus): Fix some unused
+       variables.
+
+       * gtk/gtkmain.c (_gtk_get_lc_ctype): Fix an unused
+       variable warning.
+
 Thu Oct 23 00:04:50 2003  Matthias Clasen  <maclas@gmx.de>
 
        * NEWS: Partial update for 2.3.0.

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9ff19f81a308e0813296b931c1b205f1db3f1366..e027fd65170635f8155a6fc7b38cd2e64ee8175b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+Tue Oct 21 16:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/menus.c (do_menus): Fix some unused
+       variables.
+
+       * gtk/gtkmain.c (_gtk_get_lc_ctype): Fix an unused
+       variable warning.
+
 Thu Oct 23 00:04:50 2003  Matthias Clasen  <maclas@gmx.de>
 
        * NEWS: Partial update for 2.3.0.

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9ff19f81a308e0813296b931c1b205f1db3f1366..e027fd65170635f8155a6fc7b38cd2e64ee8175b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+Tue Oct 21 16:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/menus.c (do_menus): Fix some unused
+       variables.
+
+       * gtk/gtkmain.c (_gtk_get_lc_ctype): Fix an unused
+       variable warning.
+
 Thu Oct 23 00:04:50 2003  Matthias Clasen  <maclas@gmx.de>
 
        * NEWS: Partial update for 2.3.0.

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9ff19f81a308e0813296b931c1b205f1db3f1366..e027fd65170635f8155a6fc7b38cd2e64ee8175b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+Tue Oct 21 16:12:51 2003  Owen Taylor  <otaylor@redhat.com>
+
+       * demos/gtk-demo/menus.c (do_menus): Fix some unused
+       variables.
+
+       * gtk/gtkmain.c (_gtk_get_lc_ctype): Fix an unused
+       variable warning.
+
 Thu Oct 23 00:04:50 2003  Matthias Clasen  <maclas@gmx.de>
 
        * NEWS: Partial update for 2.3.0.

diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 24ccd65377db43edd565bbd1eecdd63ae98b0da3..7678f01dc310663a472f49b07c6726206061bbbf 100644 (file)
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -77,8 +77,6 @@ do_menus (void)
   GtkWidget *box1;
   GtkWidget *box2;
   GtkWidget *button;
-  GtkWidget *optionmenu;
-  GtkWidget *separator;
   
   if (!window)
     {

diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index ea9297be321e564760a03b69818536d5c7de40b9..38b9fadb1cd6df159420bdea7a37369e6a61884b 100644 (file)
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -1027,8 +1027,6 @@ gtk_set_locale (void)
 gchar *
 _gtk_get_lc_ctype (void)
 {
-  gchar *p;
-
 #ifdef G_OS_WIN32
   /* Somebody might try to set the locale for this process using the
    * LANG or LC_ environment variables. The Microsoft C library
@@ -1040,6 +1038,8 @@ _gtk_get_lc_ctype (void)
    * don't have to clickety-click in the Control Panel, you can simply
    * start the program with LC_ALL=something on the command line.)
    */
+  gchar *p;
+
   p = getenv ("LC_ALL");
   if (p != NULL)
     return g_strdup (p);