summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2006-03-20 05:38:37 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2006-03-20 05:38:37 +0000
commit6aee75af24813b913a97f1abf4c9dae58eb477b0 (patch)
tree5dc9bec53459f82e0bdf7e6b79f1f5900027059c
parent4d112a0ac375f5ec98de736347e1a672a44eaefd (diff)
downloadgtk+-6aee75af24813b913a97f1abf4c9dae58eb477b0.tar.gz
Make sure gettext is initialized before using it. (#335129, Christian
2006-03-20 Matthias Clasen <mclasen@redhat.com> * gtk/gtkmain.c (gtk_get_option_group): Make sure gettext is initialized before using it. (#335129, Christian Persch)
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--gtk/gtkmain.c2
3 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 4ef7231dde..5d0988b059 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-20 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkmain.c (gtk_get_option_group): Make sure gettext
+ is initialized before using it. (#335129, Christian Persch)
+
2006-03-19 Matthias Clasen <mclasen@redhat.com>
* MAINTAINERS: Add this, at the request of the GNOME sysadmin team.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4ef7231dde..5d0988b059 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-03-20 Matthias Clasen <mclasen@redhat.com>
+
+ * gtk/gtkmain.c (gtk_get_option_group): Make sure gettext
+ is initialized before using it. (#335129, Christian Persch)
+
2006-03-19 Matthias Clasen <mclasen@redhat.com>
* MAINTAINERS: Add this, at the request of the GNOME sysadmin team.
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index 3d767c12cf..7e7fe83d29 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -588,6 +588,8 @@ gtk_get_option_group (gboolean open_default_display)
GOptionGroup *group;
OptionGroupInfo *info;
+ gettext_initialization ();
+
info = g_new0 (OptionGroupInfo, 1);
info->open_default_display = open_default_display;