diff --git a/SoObjects/Appointments/SOGoAppointmentFolders.m b/SoObjects/Appointments/SOGoAppointmentFolders.m index 883564a7e..99b73a636 100644 --- a/SoObjects/Appointments/SOGoAppointmentFolders.m +++ b/SoObjects/Appointments/SOGoAppointmentFolders.m @@ -1,7 +1,7 @@ /* SOGoAppointmentFolders.m - this file is part of SOGo * - * Copyright (C) 2007-2013 Inverse inc. + * Copyright (C) 2007-2014 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -56,13 +56,6 @@ #import "SOGoAppointmentFolders.h" -@interface SOGoParentFolder (Private) - -- (NSException *) _fetchPersonalFolders: (NSString *) sql - withChannel: (EOAdaptorChannel *) fc; - -@end - static SoSecurityManager *sm = nil; @implementation SOGoAppointmentFolders @@ -596,8 +589,9 @@ static SoSecurityManager *sm = nil; } } -- (NSException *) _fetchPersonalFolders: (NSString *) sql - withChannel: (EOAdaptorChannel *) fc +- (NSException *) fetchSpecialFolders: (NSString *) sql + withChannel: (EOAdaptorChannel *) fc + andFolderType: (SOGoFolderType) folderType { BOOL isWebRequest; NSException *error; @@ -607,7 +601,7 @@ static SoSecurityManager *sm = nil; SOGoWebAppointmentFolder *webFolder; NSString *name; - error = [super _fetchPersonalFolders: sql withChannel: fc]; + error = [super fetchSpecialFolders: sql withChannel: fc andFolderType: folderType]; if (!error) { isWebRequest = [[context request] handledByDefaultHandler]; diff --git a/SoObjects/SOGo/SOGoParentFolder.h b/SoObjects/SOGo/SOGoParentFolder.h index 323e71d61..73ee5deeb 100644 --- a/SoObjects/SOGo/SOGoParentFolder.h +++ b/SoObjects/SOGo/SOGoParentFolder.h @@ -1,6 +1,6 @@ /* SOGoParentFolder.h - this file is part of SOGo * - * Copyright (C) 2006-2013 Inverse inc. + * Copyright (C) 2006-2014 Inverse inc. * * This file is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,6 +24,7 @@ #import "SOGoFolder.h" #import "SOGoConstants.h" +@class EOAdaptorChannel; @class NSMutableDictionary; @class NSString; @class WOResponse; @@ -60,6 +61,10 @@ - (id) lookupPersonalFolder: (NSString *) name ignoringRights: (BOOL) ignoreRights; +- (NSException *) fetchSpecialFolders: (NSString *) sql + withChannel: (EOAdaptorChannel *) fc + andFolderType: (SOGoFolderType) folderType; + @end #endif /* SOGOPARENTFOLDERS_H */