From 92f7d57d3627dcd180080ce62125cc5fbd761147 Mon Sep 17 00:00:00 2001 From: helge Date: Tue, 21 Dec 2004 14:18:22 +0000 Subject: [PATCH] added WOMessageUseUTF8 bool default git-svn-id: http://svn.opengroupware.org/SOPE/trunk@455 e4a50df8-12e2-0310-a44c-efbce7f8a7e3 --- sope-appserver/NGObjWeb/ChangeLog | 5 +++++ .../NGObjWeb/DynamicElements/WOGenericElement.h | 5 ++--- sope-appserver/NGObjWeb/Version | 2 +- sope-appserver/NGObjWeb/WOMessage.m | 12 +++++++++--- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sope-appserver/NGObjWeb/ChangeLog b/sope-appserver/NGObjWeb/ChangeLog index 734dc807..85143f7d 100644 --- a/sope-appserver/NGObjWeb/ChangeLog +++ b/sope-appserver/NGObjWeb/ChangeLog @@ -1,3 +1,8 @@ +2004-12-21 Helge Hess + + * WOMessage.m: added 'WOMessageUseUTF8' bool default to enable UTF-8 + as the default message encoding (v4.5.104) + 2004-12-19 Marcus Mueller * v4.5.103 diff --git a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h index cb9794d4..d8b54c18 100644 --- a/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h +++ b/sope-appserver/NGObjWeb/DynamicElements/WOGenericElement.h @@ -1,7 +1,7 @@ /* - Copyright (C) 2000-2003 SKYRIX Software AG + Copyright (C) 2000-2004 SKYRIX Software AG - This file is part of OGo + This file is part of OpenGroupware.org. OGo is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the @@ -18,7 +18,6 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// $Id$ #ifndef __NGObjWeb_DynElem_WOGenericElement_H__ #define __NGObjWeb_DynElem_WOGenericElement_H__ diff --git a/sope-appserver/NGObjWeb/Version b/sope-appserver/NGObjWeb/Version index 5984d7cc..e6908ce5 100644 --- a/sope-appserver/NGObjWeb/Version +++ b/sope-appserver/NGObjWeb/Version @@ -1,6 +1,6 @@ # version file -SUBMINOR_VERSION:=103 +SUBMINOR_VERSION:=104 # v4.5.91 requires libNGExtensions v4.5.134 # v4.5.84 requires libNGExtensions v4.5.127 diff --git a/sope-appserver/NGObjWeb/WOMessage.m b/sope-appserver/NGObjWeb/WOMessage.m index db9f97f4..a4a6d4e0 100644 --- a/sope-appserver/NGObjWeb/WOMessage.m +++ b/sope-appserver/NGObjWeb/WOMessage.m @@ -53,12 +53,18 @@ static WOMessageProfileInfo profiletot = { 0, 0, 0, 0, 0 }; printProfile = [ud boolForKey:@"WOProfileResponse"]; + if ([ud boolForKey:@"WOMessageUseUTF8"]) { + defaultEncoding = NSUTF8StringEncoding; + } + else { #ifdef __APPLE__ - //#warning default encoding is ISO Latin 1 ... - defaultEncoding = NSISOLatin1StringEncoding; + //#warning default encoding is ISO Latin 1 ... + // TODO: why are we doing this? + defaultEncoding = NSISOLatin1StringEncoding; #else - defaultEncoding = [NSStringClass defaultCStringEncoding]; + defaultEncoding = [NSStringClass defaultCStringEncoding]; #endif + } } static inline void _ensureBody(WOMessage *self) { -- 2.39.5