From a941deb67f65dfe4ccff17f0be6388d4c74c7bf3 Mon Sep 17 00:00:00 2001 From: Tim Janik Date: Fri, 24 Feb 2006 12:28:33 +0000 Subject: [PATCH] remove unconditional warnings about missing X locale support. Gdk properly Thu Feb 23 13:28:21 2006 Tim Janik * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional warnings about missing X locale support. Gdk properly handles this situation anyway. --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ gdk/x11/gdkim-x11.c | 7 ++----- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index de3bb6d8c5..b80ebbdf53 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Feb 23 13:28:21 2006 Tim Janik + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional + warnings about missing X locale support. Gdk properly handles this + situation anyway. + Fri Feb 17 14:20:29 2006 Tim Janik * gtk/gtktreemodel.h: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index de3bb6d8c5..b80ebbdf53 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +Thu Feb 23 13:28:21 2006 Tim Janik + + * gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional + warnings about missing X locale support. Gdk properly handles this + situation anyway. + Fri Feb 17 14:20:29 2006 Tim Janik * gtk/gtktreemodel.h: diff --git a/gdk/x11/gdkim-x11.c b/gdk/x11/gdkim-x11.c index 0ee7356531..028befb4d8 100644 --- a/gdk/x11/gdkim-x11.c +++ b/gdk/x11/gdkim-x11.c @@ -62,11 +62,8 @@ _gdk_x11_initialize_locale (void) g_free (last_locale); last_locale = g_strdup (current_locale); - if (!XSupportsLocale ()) - g_warning ("locale not supported by Xlib"); - - if (!XSetLocaleModifiers ("")) - g_warning ("cannot set locale modifiers"); + if (XSupportsLocale ()) + XSetLocaleModifiers (""); if ((strcmp (current_locale, "C")) && (strcmp (current_locale, "POSIX"))) {