From 03055a3444d2e825a9f4c31abac58318dc0fa743 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 23 Mar 2009 13:10:33 +0000 Subject: [PATCH] Monotone-Parent: 19411003409b1b14299b09729d662efa35865717 Monotone-Revision: 93f5621e5282201f7b9a61447d23a396e8f682a4 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-03-23T13:10:33 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 7 +++++++ SoObjects/Contacts/SOGoContactFolders.m | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 61653a6cf..e573fb3fc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2009-03-23 Wolfgang Sourdeau + + * SoObjects/Contacts/SOGoContactFolders.m ([SOGoContactFolders + -appendSystemSources]): modified the return type and returns nil, + to match the new SOGoParentFolder definition of the method. + Otherwise, a confusion is created on the stack. + 2009-03-23 Ludovic Marcotte * SoObjects/SOGo/SOGoUser.m: diff --git a/SoObjects/Contacts/SOGoContactFolders.m b/SoObjects/Contacts/SOGoContactFolders.m index b83e7bd7d..c2330347f 100644 --- a/SoObjects/Contacts/SOGoContactFolders.m +++ b/SoObjects/Contacts/SOGoContactFolders.m @@ -50,7 +50,7 @@ return [SOGoContactGCSFolder class]; } -- (void) appendSystemSources +- (NSException *) appendSystemSources { LDAPUserManager *um; NSEnumerator *sourceIDs; @@ -68,6 +68,8 @@ [currentFolder setLDAPSource: [um sourceWithID: currentSourceID]]; [subFolders setObject: currentFolder forKey: currentSourceID]; } + + return nil; } - (NSString *) defaultFolderName