Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gtk+/ChangeLog,v
retrieving revision 1.7552
diff -u -p -r1.7552 ChangeLog
--- ChangeLog	22 Feb 2006 17:52:28 -0000	1.7552
+++ ChangeLog	23 Feb 2006 12:31:01 -0000
@@ -1,3 +1,9 @@
+Thu Feb 23 13:28:21 2006  Tim Janik  <timj@imendio.com>
+
+	* gdk/x11/gdkim-x11.c (_gdk_x11_initialize_locale): remove unconditional
+	warnings about missing X locale support. Gdk properly handles this
+	situation anyway.
+
 2006-02-22  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtktextbtree.c: 
Index: gdk/x11/gdkim-x11.c
===================================================================
RCS file: /cvs/gnome/gtk+/gdk/x11/gdkim-x11.c,v
retrieving revision 1.38
diff -u -p -r1.38 gdkim-x11.c
--- gdk/x11/gdkim-x11.c	16 Mar 2005 03:17:27 -0000	1.38
+++ gdk/x11/gdkim-x11.c	23 Feb 2006 12:31:01 -0000
@@ -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")))
     {
