gtk+ r19085 - in branches/gtk-2-12: . gtk

[tml svn gnome org]

Author: tml
Date: 2007-11-28 01:16:48 +0000 (Wed, 28 Nov 2007)
New Revision: 19085
ViewCVS link: http://svn.gnome.org/viewcvs/gtk+?rev=19085&view=rev

Modified:
   branches/gtk-2-12/ChangeLog
   branches/gtk-2-12/config.h.win32.in
   branches/gtk-2-12/gtk-zip.sh.in
   branches/gtk-2-12/gtk/gtkmain.c
Log:
2007-11-28  Tor Lillqvist  <tml novell com>

	Merged from trunk: 

	A proper build of GNU libintl is supposed to export the variable
	_nl_msg_cat_cntr. configure looks for that variable in order to
	recognize GNU gettext. If it sees that it is indeed GNU gettext
	that is used, it decides to install message catalogs in
	share/locale, otherwise in lib/locale. Until now on Windows I have
	built GTK+ against a build of GNU gettext that did not export
	_nl_msg_cat_cntr. But this will change, so we can't assume message
	catalogs are always in lib/locale.

	* gtk/gtkmain.c: (_gtk_get_localedir) [Win32]: Rework to handle
	GTK_LOCALEDIR being either in "lib" or "share". Move the function
	before the inclusion of gtkprivate.h so that it sees the original
	GTK_LOCALEDIR.

	* gtk-zip.sh.in: Check whether the message catalogs are in
	share/locale or lib/locale.

	* config.h.win32.in: Tack on "/share/locale" to GTK_LOCALEDIR so
	that the code in _gtk_get_localedir() will find the slashes.