From 80e9302dbc6091701773d54eaf419400cac40fae Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 18 Jan 2010 09:23:06 +0000 Subject: [PATCH] Monotone-Parent: b5a04e99cccb4e6bde4bed001b9a407168745cad Monotone-Revision: ae021bb9d1c2734bd2fb058dda318f00f1edb2e7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-01-18T09:23:06 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 6 ++++++ Main/sogod.m | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index eb25cbb12..03b631ce7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-18 Wolfgang Sourdeau + + * Main/sogod.m (main): set the "GNUSTEP_STRING_ENCODING" + environment variable to NSUTF8StringEncoding to properly decode + the user defaults strings in UTF8. + 2010-01-15 Wolfgang Sourdeau * SoObjects/SOGo/SOGoUserSettings.m diff --git a/Main/sogod.m b/Main/sogod.m index 047a64623..4a123b938 100644 --- a/Main/sogod.m +++ b/Main/sogod.m @@ -38,6 +38,11 @@ main (int argc, char **argv, char **env) SOGoSystemDefaults *sd; int rc; + /* Here we work around a bug in GNUstep which decode XML user defaults using + the system encoding, rather than honouring the encoding specified in the + file. */ + putenv ("GNUSTEP_STRING_ENCODING=NSUTF8StringEncoding"); + pool = [NSAutoreleasePool new]; if (getuid() > 0)