merge of '7dbd8709dbd0912d12d3ffd82df6d64d900a28b6'

and 'bab2062ac2f3f3078377ef0d19e780ee5ea5e068'

Monotone-Parent: 7dbd8709dbd0912d12d3ffd82df6d64d900a28b6
Monotone-Parent: bab2062ac2f3f3078377ef0d19e780ee5ea5e068
Monotone-Revision: 886f71d2861cb6d59b81ebbddad0f7edee83e3c7

Monotone-Author: flachapelle@inverse.ca
Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-01-07T16:46:25
Monotone-Date: 2009-01-07T16:48:02
Monotone-Branch: ca.inverse.sogo
Monotone-Branch: ca.inverse.sogo

ChangeLog

@@ -1,3 +1,11 @@
+2009-01-07  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/SOGo/NSString+Utilities.m ([NSString
+	-doubleQuotedString]): new method that returns a double-quoted and
+	properly escaped version of the string. Since it's the same
+	algorithm used in jsonRepresentation, the latter is now calling
+	this new method.
+
 2009-01-07  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor

SoObjects/SOGo/NSString+Utilities.h

@@ -42,6 +42,8 @@
 
 - (NSString *) stringByDetectingURLs;
 
+- (NSString *) doubleQuotedString;
+
 - (NSString *) jsonRepresentation;
 
 /* bare email addresses */

SoObjects/SOGo/NSString+Utilities.m

@@ -283,7 +283,7 @@ static NSMutableCharacterSet *urlStartChars = nil;
   return selfCopy;
 }
 
-- (NSString *) jsonRepresentation
+- (NSString *) doubleQuotedString
 {
   NSMutableString *representation;
 
@@ -300,6 +300,11 @@ static NSMutableCharacterSet *urlStartChars = nil;
   return [NSString stringWithFormat: @"\"%@\"", representation];
 }
 
+- (NSString *) jsonRepresentation
+{
+  return [self doubleQuotedString];
+}
+
 - (NSString *) pureEMailAddress
 {
   NSString *pureAddress;