gtk+ r17162 - in branches/gtk-2-10: . gtk

[tml svn gnome org]

Author: tml
Date: 2007-01-17 01:24:47 +0000 (Wed, 17 Jan 2007)
New Revision: 17162
ViewCVS link: http://svn.gnome.org/viewcvs/gtk+?rev=17162&view=rev

Modified:
   branches/gtk-2-10/ChangeLog
   branches/gtk-2-10/gtk/gtkimmodule.c
Log:
2007-01-17  Tor Lillqvist  <tml novell com>

	Merge from trunk, for discussion see #396175:

	* gtk/gtkimmodule.c: Do the prefix corrections always on Win32,
	not just when GTK_LIBDIR is defined. i.e., until now they were
	done only in the autoconfiscated gcc builds. Hans needs to make
	sure GTK_LIBDIR and GTK_LOCALEDIR are defined also in MSVC builds
	now.
	(correct_localedir_prefix): New function, like
	correct_libdir_prefix(), but for GTK_LOCALEDIR, in case
	GTK_LOCALEDIR is not a descendant of GTK_LIBDIR.
	(gtk_im_module_initialize): Thus call correct_localedir_prefix()
	on the domain_dirname instead of correct_libdir_prefix().
	(_gtk_im_module_list): Call correct_localedir_prefix() on
	simple_context_info.domain_dirname.