callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

The locale directory is passed to bindtextdomain() which isn't

Browse Source 
2005-09-29  Tor Lillqvist  <tml@novell.com>

	* gtk/gtkmain.c (_gtk_get_localedir): The locale directory is
	passed to bindtextdomain() which isn't UTF-8-aware, so convert to
	system codepage using g_win32_locale_filename_from_utf8().
	(#317457, Kazuki Iwamoto)
This commit is contained in:
Tor Lillqvist
2005-09-28 23:46:10 +00:00
committed by Tor Lillqvist
parent d1a3c8dc1f
commit 4ac3ee58b5
3 changed files with 25 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2005-09-29 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c (_gtk_get_localedir): The locale directory is
passed to bindtextdomain() which isn't UTF-8-aware, so convert to
system codepage using g_win32_locale_filename_from_utf8().
(#317457, Kazuki Iwamoto)
2005-09-28 Matthias Clasen <mclasen@redhat.com> 2005-09-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c (_gtk_selection_request): Free mult_atoms * gtk/gtkselection.c (_gtk_selection_request): Free mult_atoms

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2005-09-29 Tor Lillqvist <tml@novell.com>
* gtk/gtkmain.c (_gtk_get_localedir): The locale directory is
passed to bindtextdomain() which isn't UTF-8-aware, so convert to
system codepage using g_win32_locale_filename_from_utf8().
(#317457, Kazuki Iwamoto)
2005-09-28 Matthias Clasen <mclasen@redhat.com> 2005-09-28 Matthias Clasen <mclasen@redhat.com>
* gtk/gtkselection.c (_gtk_selection_request): Free mult_atoms * gtk/gtkselection.c (_gtk_selection_request): Free mult_atoms

11
gtk/gtkmain.c
View File

@ -297,9 +297,18 @@ _gtk_get_localedir (void)
{ {
static char *gtk_localedir = NULL; static char *gtk_localedir = NULL;
if (gtk_localedir == NULL) if (gtk_localedir == NULL)
gtk_localedir = g_win32_get_package_installation_subdirectory {
gchar *temp;
temp = g_win32_get_package_installation_subdirectory
(GETTEXT_PACKAGE, dll_name, "lib\\locale"); (GETTEXT_PACKAGE, dll_name, "lib\\locale");
/* gtk_localedir is passed to bindtextdomain() which isn't
* UTF-8-aware.
*/
gtk_localedir = g_win32_locale_filename_from_utf8 (temp);
g_free (temp);
}
return gtk_localedir; return gtk_localedir;
} }