Monotone-Parent: 7b6ad79fde0791f201e8b98eb957ded1410de5c1

Monotone-Revision: 7576485920bab942eaccc45f2ab5b1914255643d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-04-20T21:30:17
Monotone-Branch: ca.inverse.sogo

UI/Scheduler/UIxCalFilterPanel.m

@@ -27,7 +27,8 @@
 
 #import <NGObjWeb/WOContext.h>
 
-#import <SoObjects/SOGo/SOGoUser.h>
+#import <SOGo/SOGoUser.h>
+#import <SOGo/SOGoUserSettings.h>
 
 #import "UIxCalFilterPanel.h"
 

UI/Scheduler/UIxCalMainView.m

@@ -31,15 +31,16 @@
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 
+#import <SOGo/NSArray+Utilities.h>
 #import <SOGo/SOGoPermissions.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
-
-#import <SoObjects/SOGo/NSArray+Utilities.h>
-
-#import "UIxCalMainView.h"
+#import <SOGo/SOGoUserSettings.h>
 
 #import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentFolders.h>
+
+#import "UIxCalMainView.h"
 
 @implementation UIxCalMainView
 

UI/Scheduler/UIxCalUserRightsEditor.m

@@ -21,6 +21,7 @@
  */
 
 #import <Foundation/NSArray.h>
+#import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
 #import <NGObjWeb/WORequest.h>
 #import <SoObjects/SOGo/SOGoPermissions.h>

UI/Scheduler/UIxCalView.m

@@ -21,9 +21,6 @@
  */
 
 #import <Foundation/Foundation.h>
-#import <SOGo/NSArray+Utilities.h>
-#import <SOGo/NSDictionary+Utilities.h>
-#import <SOGo/NSString+Utilities.h>
 
 #import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/SoUser.h>
@@ -37,11 +34,15 @@
 #import <NGCards/NGCards.h>
 
 #import <Appointments/SOGoAppointmentFolder.h>
+#import <Appointments/SOGoAppointmentFolders.h>
 #import <Appointments/SOGoAppointmentObject.h>
 #import <SOGo/NSArray+Utilities.h>
+#import <SOGo/NSDictionary+Utilities.h>
+#import <SOGo/NSString+Utilities.h>
 #import <SOGo/SOGoObject.h>
 #import <SOGo/SOGoUser.h>
 #import <SOGo/SOGoUserDefaults.h>
+#import <SOGo/SOGoUserSettings.h>
 
 #import <SOGoUI/SOGoAptFormatter.h>