mirror of
https://github.com/inverse-inc/sogo.git
synced 2026-10-11 23:07:12 +00:00
Monotone-Parent: 652fb1324338399d044d5f01bb158d94080a27c0
Monotone-Revision: ea84b0da49761a54044bb70c2502171c1b981e86 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-26T18:20:46 Monotone-Branch: ca.inverse.sogo
This commit is contained in:
1 parent
25fa112832
commit
3743b78fff
11 files changed
+49
-41
No files matched your search
@@ -43,8 +43,7 @@
|
||||
|
||||
#import <Appointments/SOGoAppointmentFolders.h>
|
||||
|
||||
#import <SOGo/NSDictionary+Utilities.h>
|
||||
#import <SOGo/NSDictionary+BSJSONAdditions.h>
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
#import <SOGo/SOGoCache.h>
|
||||
#import <SOGo/SOGoCASSession.h>
|
||||
#import <SOGo/SOGoDomainDefaults.h>
|
||||
@@ -408,7 +407,7 @@
|
||||
WOCookie *authCookie;
|
||||
|
||||
request = [context request];
|
||||
message = [NSMutableDictionary dictionaryWithJSONString: [request contentAsString]];
|
||||
message = [[request contentAsString] objectFromJSONString];
|
||||
username = [message objectForKey: @"userName"];
|
||||
password = [message objectForKey: @"password"];
|
||||
newPassword = [message objectForKey: @"newPassword"];
|
||||
|
||||
@@ -55,7 +55,6 @@
|
||||
#import <Appointments/SOGoAppointmentOccurence.h>
|
||||
#import <Appointments/SOGoTaskObject.h>
|
||||
#import <SOGo/NSArray+Utilities.h>
|
||||
#import <SOGo/NSDictionary+BSJSONAdditions.h>
|
||||
#import <SOGo/NSDictionary+Utilities.h>
|
||||
#import <SOGo/NSString+Utilities.h>
|
||||
#import <SOGo/SOGoUser.h>
|
||||
@@ -1727,8 +1726,8 @@ RANGE(2);
|
||||
if ([json length])
|
||||
{
|
||||
attendees = [NSArray array];
|
||||
attendeesData = [NSMutableDictionary dictionaryWithJSONString: json];
|
||||
if (attendeesData)
|
||||
attendeesData = [json objectFromJSONString];
|
||||
if (attendeesData && [attendeesData isKindOfClass: [NSDictionary class]])
|
||||
{
|
||||
newAttendees = [NSMutableArray array];
|
||||
attendees = [attendeesData allValues];
|
||||
|
||||
Reference in new issue
Block a user