Monotone-Parent: 8eff3fcb9d28703e16adf6fd2da5a29c70cf6a0a

Monotone-Revision: 7d47465e08002ccdb1fd666a02bb7acc70d38c1d

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2010-01-27T13:45:57
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailAccounts.h

@@ -22,7 +22,7 @@
 #ifndef __Mailer_SOGoMailAccounts_H__
 #define __Mailer_SOGoMailAccounts_H__
 
-#import <SoObjects/SOGo/SOGoFolder.h>
+#import <SOGo/SOGoFolder.h>
 
 /*
   SOGoMailAccounts

SoObjects/SOGo/GNUmakefile.preamble

@@ -1,6 +1,6 @@
 # compilation settings
 
-SOGo_INCLUDE_DIRS += -I.. -I../.. -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
+SOGo_INCLUDE_DIRS += -I.. -I../../UI -DSOGO_MAJOR_VERSION="\"$(MAJOR_VERSION)\"" -DSOGO_MINOR_VERSION="\"$(MINOR_VERSION)\""
 
 ADDITIONAL_CPPFLAGS += \
 	-DSOGO_LIBDIR="\"$(SOGO_LIBDIR)\""

SoObjects/SOGo/SOGoGCSFolder.m

@@ -52,7 +52,7 @@
 #import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/NSURL+GCS.h>
 #import <SaxObjC/XMLNamespaces.h>
-#import <UI/SOGoUI/SOGoFolderAdvisory.h>
+#import <SOGoUI/SOGoFolderAdvisory.h>
 
 #import "NSDictionary+Utilities.h"
 #import "NSArray+Utilities.h"

SoObjects/SOGo/SOGoObject.m

@@ -49,7 +49,7 @@
 #import <NGCards/NSDictionary+NGCards.h>
 #import <SaxObjC/XMLNamespaces.h>
 
-#import <UI/SOGoUI/SOGoACLAdvisory.h>
+#import <SOGoUI/SOGoACLAdvisory.h>
 
 #import "NSArray+Utilities.h"
 #import "NSCalendarDate+SOGo.h"

SoObjects/SOGo/SOGoUserFolder.m

@@ -48,7 +48,7 @@
 #import <Contacts/SOGoContactFolders.h>
 #import <Mailer/SOGoMailAccounts.h>
 
-#import <UI/SOGoUI/UIxComponent.h>
+#import <SOGoUI/UIxComponent.h>
 
 #import "NSArray+Utilities.h"
 #import "NSDictionary+Utilities.h"

UI/MainUI/SOGoRootPage.h

@@ -23,7 +23,7 @@
 #ifndef SOGOROOTPAGE_H
 #define SOGOROOTPAGE_H
 
-#import <UI/SOGoUI/UIxComponent.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface SOGoRootPage : UIxComponent
 {