From e22bb63b54dfb5e390af072da59ea0ba00f717c1 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 6 Aug 2007 14:06:27 +0000
Subject: [PATCH] Monotone-Parent: 2d2e743a5087ca30371568023cc4df66fe721a9d
 Monotone-Revision: 68e241a279756be7a7c1d8d9b8547e113f07073e

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-06T14:06:27
Monotone-Branch: ca.inverse.sogo
---
 UI/MainUI/SOGoGroupPage.m  |  4 +---
 UI/MainUI/SOGoGroupsPage.m |  4 +---
 UI/MainUI/SOGoRootPage.m   | 17 +++++++++++++----
 UI/MainUI/common.h         | 36 ------------------------------------
 4 files changed, 15 insertions(+), 46 deletions(-)
 delete mode 100644 UI/MainUI/common.h

diff --git a/UI/MainUI/SOGoGroupPage.m b/UI/MainUI/SOGoGroupPage.m
index f157417e6..e59e1b776 100644
--- a/UI/MainUI/SOGoGroupPage.m
+++ b/UI/MainUI/SOGoGroupPage.m
@@ -19,13 +19,11 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoComponent.h>
 
 @interface SOGoGroupPage : SoComponent
 @end
 
-#include "common.h"
-
 @implementation SOGoGroupPage
 
 @end /* SOGoGroupPage */
diff --git a/UI/MainUI/SOGoGroupsPage.m b/UI/MainUI/SOGoGroupsPage.m
index fe6e10ebd..87cf60de3 100644
--- a/UI/MainUI/SOGoGroupsPage.m
+++ b/UI/MainUI/SOGoGroupsPage.m
@@ -20,7 +20,7 @@
 */
 // $Id: SOGoGroupsPage.m 106 2004-06-30 09:44:35Z helge $
 
-#include <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoComponent.h>
 
 @interface SOGoGroupsPage : SoComponent
 {
@@ -28,8 +28,6 @@
 
 @end
 
-#include "common.h"
-
 @implementation SOGoGroupsPage
 
 @end /* SOGoGroupsPage */
diff --git a/UI/MainUI/SOGoRootPage.m b/UI/MainUI/SOGoRootPage.m
index a10a6f7dd..912def217 100644
--- a/UI/MainUI/SOGoRootPage.m
+++ b/UI/MainUI/SOGoRootPage.m
@@ -19,7 +19,19 @@
   02111-1307, USA.
 */
 
-#include <NGObjWeb/SoComponent.h>
+#import <Foundation/NSUserDefaults.h>
+
+#import <NGObjWeb/SoComponent.h>
+#import <NGObjWeb/SoObject.h>
+#import <NGObjWeb/WOApplication.h>
+#import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
+#import <NGExtensions/NSNull+misc.h>
+#import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSString+misc.h>
+#import <SOGo/SOGoAuthenticator.h>
+#import <SOGo/SOGoUser.h>
 
 @interface SOGoRootPage : SoComponent
 {
@@ -28,9 +40,6 @@
 
 @end
 
-#include <SOGo/SOGoAuthenticator.h>
-#include "common.h"
-
 @implementation SOGoRootPage
 
 static BOOL doNotRedirect = NO;
diff --git a/UI/MainUI/common.h b/UI/MainUI/common.h
deleted file mode 100644
index 41b1b5939..000000000
--- a/UI/MainUI/common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Copyright (C) 2002-2004 SKYRIX Software AG
-
-  This file is part of OpenGroupware.org.
-
-  OGo is free software; you can redistribute it and/or modify it under
-  the terms of the GNU Lesser General Public License as published by the
-  Free Software Foundation; either version 2, or (at your option) any
-  later version.
-
-  OGo is distributed in the hope that it will be useful, but WITHOUT ANY
-  WARRANTY; without even the implied warranty of MERCHANTABILITY or
-  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-  License for more details.
-
-  You should have received a copy of the GNU Lesser General Public
-  License along with OGo; see the file COPYING.  If not, write to the
-  Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
-*/
-// $Id: common.h 1101 2007-07-10 19:27:48Z wolfgang $
-
-#import <Foundation/Foundation.h>
-
-#if NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  include <NGExtensions/NGObjectMacros.h>
-#  include <NGExtensions/NSString+Ext.h>
-#endif
-
-#include <NGExtensions/NGExtensions.h>
-#include <NGObjWeb/NGObjWeb.h>
-#include <NGObjWeb/SoObjects.h>
-
-#include <GDLAccess/GDLAccess.h>
-
-#warning importing common.h is baaad