diff options
| author | Owen Taylor <otaylor@redhat.com> | 2003-10-23 03:20:54 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2003-10-23 03:20:54 +0000 |
| commit | 3724a591d822c3bc53ce829407a142e19d418acf (patch) | |
| tree | ec9cd2d633d71d490bf49768b026c97b339d358f | |
| parent | d7c1842b559fff7eb81d8b84e9f767669e3ba81a (diff) | |
| download | gdk-pixbuf-3724a591d822c3bc53ce829407a142e19d418acf.tar.gz | |
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
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
| -rw-r--r-- | demos/gtk-demo/menus.c | 2 | ||||
| -rw-r--r-- | gtk/gtkmain.c | 4 |
7 files changed, 42 insertions, 4 deletions
@@ -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 9ff19f81a..e027fd651 100644 --- 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 9ff19f81a..e027fd651 100644 --- 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 9ff19f81a..e027fd651 100644 --- 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 9ff19f81a..e027fd651 100644 --- 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 24ccd6537..7678f01dc 100644 --- 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 ea9297be3..38b9fadb1 100644 --- 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); |