Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from HEAD to get rid of some warnings (simplifies debugging).

Browse Source 
2006-03-14  Kristian Rietveld  <kris@imendio.com>

	Merge from HEAD to get rid of some warnings (simplifies debugging).

	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.
This commit is contained in:
Kristian Rietveld
2006-03-14 14:51:06 +00:00
committed by Kristian Rietveld
parent 914b750cbf
commit 614bbed704
3 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2006-03-14 Kristian Rietveld <kris@imendio.com>
Merge from HEAD to get rid of some warnings (simplifies debugging).
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-03-14 Kristian Rietveld <kris@imendio.com>
Couple of fixes from Markku Vire.

10
ChangeLog.pre-2-10
View File

@@ -1,3 +1,13 @@
2006-03-14 Kristian Rietveld <kris@imendio.com>
Merge from HEAD to get rid of some warnings (simplifies debugging).
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-03-14 Kristian Rietveld <kris@imendio.com>
Couple of fixes from Markku Vire.

7
gdk/x11/gdkim-x11.c
View File

@@ -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")))
{