From 4ac3ee58b5937f6f227a2a12c9acbb6f6acda8f6 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Wed, 28 Sep 2005 23:46:10 +0000 Subject: [PATCH] The locale directory is passed to bindtextdomain() which isn't 2005-09-29 Tor Lillqvist * 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) --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ gtk/gtkmain.c | 13 +++++++++++-- 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3ade2ece23..12c42db1e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-29 Tor Lillqvist + + * 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 * gtk/gtkselection.c (_gtk_selection_request): Free mult_atoms diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3ade2ece23..12c42db1e3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-09-29 Tor Lillqvist + + * 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 * gtk/gtkselection.c (_gtk_selection_request): Free mult_atoms diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index 7a2c596368..c42a3509b6 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -297,9 +297,18 @@ _gtk_get_localedir (void) { static char *gtk_localedir = NULL; if (gtk_localedir == NULL) - gtk_localedir = g_win32_get_package_installation_subdirectory - (GETTEXT_PACKAGE, dll_name, "lib\\locale"); + { + gchar *temp; + + temp = g_win32_get_package_installation_subdirectory + (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; }