glib r5946 - in branches/glib-2-14: . glib

[tml svn gnome org]

Author: tml
Date: 2007-11-26 23:39:48 +0000 (Mon, 26 Nov 2007)
New Revision: 5946
ViewCVS link: http://svn.gnome.org/viewcvs/glib?rev=5946&view=rev

Modified:
   branches/glib-2-14/ChangeLog
   branches/glib-2-14/glib-zip.in
   branches/glib-2-14/glib/gutils.c
Log:
2007-11-27  Tor Lillqvist  <tml novell com>

	Merge from trunk:

	* glib/gutils.c (_glib_get_locale_dir) [Win32]: Use either
	lib/locale or share/locale depending on which one is in
	GLIB_LOCALE_DIR. When the configury recognizes GNU gettext (based
	on the _nl_msg_cat_cntr variable, eek), share/locale gets used.

	* glib-zip.in: Likewise, look for message catalogs either in
	lib/locale or share/locale.