Monotone-Parent: 4ad21ea0342a626a99aabc213cf8ed9a827eb0c4

Monotone-Revision: d175e2ab17f0d56d2fdc9a046048a0302d9fd0f7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-11-02T13:16:05
Monotone-Branch: ca.inverse.sogo

SoObjects/SOGo/NSString+Utilities.m

@@ -29,12 +29,13 @@
 #import <EOControl/EOQualifier.h>
 
 #import <NGExtensions/NSDictionary+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
 
 #import <NGMime/NGMimeHeaderFieldGenerator.h>
+#import <SBJson/SBJsonParser.h>
+
 #import "NSArray+Utilities.h"
-#import "NSDictionary+BSJSONAdditions.h"
 #import "NSDictionary+URL.h"
-#import "NSScanner+BSJSONAdditions.h"
 
 #import "NSString+Utilities.h"
 
@@ -513,17 +514,24 @@ static NSMutableCharacterSet *safeLDIFStartChars = nil;
 
 - (id) objectFromJSONString
 {
-  NSScanner *scanner;
+  SBJsonParser *parser;
   NSObject *object;
+  NSError *error;
 
   object = nil;
 
   if ([self length] > 0)
     {
-      scanner = [[NSScanner alloc] initWithString: self];
-      if (![scanner scanJSONValue: &object])
-        object = nil;
-      [scanner autorelease];
+      parser = [SBJsonParser new];
+      [parser autorelease];
+      error = nil;
+      object = [parser objectWithString: self
+                                  error: &error];
+      if (error)
+        {
+          [self errorWithFormat: @"json parser: %@", error];
+          object = nil;
+        }
     }
 
   return object;