merge of '004229d10ec89760026cebaca31254e6487c54ab'

and '8ac7c60ab7cfe1eb0f5cedd0ac4b33114af38fb8'

Monotone-Parent: 004229d10ec89760026cebaca31254e6487c54ab
Monotone-Parent: 8ac7c60ab7cfe1eb0f5cedd0ac4b33114af38fb8
Monotone-Revision: afb2242cf07ec3d3c9cbe25bb4a43d4e15d1ec70

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2009-11-30T22:38:33
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/SOGoDefaultsSource.h

@@ -26,6 +26,8 @@
 #ifndef SOGODEFAULTSSOURCE_H
 #define SOGODEFAULTSSOURCE_H
 
+#import <Foundation/NSObject.h>
+
 @class NSArray;
 @class NSData;
 @class NSDictionary;

SoObjects/SOGo/SOGoLDAPDefaults.h

@@ -23,6 +23,8 @@
 #ifndef SOGOLDAPDEFAULTS_H
 #define SOGOLDAPDEFAULTS_H
 
+@class NSString;
+
 @protocol SOGoLDAPDefaults
 
 - (int) ldapQueryLimit;

SoObjects/SOGo/SOGoUserProfile.m

@@ -217,18 +217,6 @@
   return rc;
 }
 
-- (NSString *) _sqlJsonRepresentation: (NSString *) jsonRepresentation
-{
-  NSMutableString *sql;
-
-  sql = [jsonRepresentation mutableCopy];
-  [sql autorelease];
-  [sql replaceString: @"\\" withString: @"\\\\"];
-  [sql replaceString: @"'" withString: @"''"];
-
-  return sql;
-}
-
 - (BOOL) primaryStoreProfile
 {
   NSString *jsonRepresentation;