From 614bbed704982f024bb1fd422a3b2eaced428378 Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 14 Mar 2006 14:51:06 +0000 Subject: [PATCH] Merge from HEAD to get rid of some warnings (simplifies debugging). 2006-03-14 Kristian Rietveld Merge from HEAD to get rid of some warnings (simplifies debugging). 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 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ gdk/x11/gdkim-x11.c | 7 ++----- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a462b4e9f8..33a67f7547 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2006-03-14 Kristian Rietveld + + Merge from HEAD to get rid of some warnings (simplifies debugging). + + 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. + 2006-03-14 Kristian Rietveld Couple of fixes from Markku Vire. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index a462b4e9f8..33a67f7547 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +2006-03-14 Kristian Rietveld + + Merge from HEAD to get rid of some warnings (simplifies debugging). + + 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. + 2006-03-14 Kristian Rietveld Couple of fixes from Markku Vire. 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"))) {