From 336203b8e41ee08fb44d874822b3814641da0042 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Mon, 6 Aug 2007 14:46:38 +0000
Subject: [PATCH] Monotone-Parent: 56b1de6e843c25b294505745dc96155ab59c7d97
 Monotone-Revision: e7970ad63b6a1a0efea47a6f72a427a3b754f106

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-08-06T14:46:38
Monotone-Branch: ca.inverse.sogo
---
 UI/Contacts/ContactsUIProduct.m      |  5 ----
 UI/Contacts/UIxContactFoldersView.m  |  7 +++---
 UI/Contacts/UIxContactView.m         |  7 +++---
 UI/Contacts/UIxContactsFilterPanel.m | 15 +++++-------
 UI/Contacts/common.h                 | 36 ----------------------------
 5 files changed, 13 insertions(+), 57 deletions(-)
 delete mode 100644 UI/Contacts/common.h

diff --git a/UI/Contacts/ContactsUIProduct.m b/UI/Contacts/ContactsUIProduct.m
index 829b562aa..5f2c211b1 100644
--- a/UI/Contacts/ContactsUIProduct.m
+++ b/UI/Contacts/ContactsUIProduct.m
@@ -23,12 +23,7 @@
 #import <Foundation/NSObject.h>
 
 @interface ContactsUIProduct : NSObject
-{
-}
-
 @end
 
-#include "common.h"
-
 @implementation ContactsUIProduct
 @end /* ContactsUIProduct */
diff --git a/UI/Contacts/UIxContactFoldersView.m b/UI/Contacts/UIxContactFoldersView.m
index cbc7b4451..385a49554 100644
--- a/UI/Contacts/UIxContactFoldersView.m
+++ b/UI/Contacts/UIxContactFoldersView.m
@@ -24,13 +24,16 @@
 
 #import <NGObjWeb/NSException+HTTP.h>
 #import <NGObjWeb/SoObject.h>
-#import <NGObjWeb/WOResponse.h>
+#import <NGObjWeb/SoSecurityManager.h>
 #import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WORequest.h>
+#import <NGObjWeb/WOResponse.h>
 
 #import <GDLContentStore/GCSFolder.h>
 #import <GDLContentStore/GCSFolderManager.h>
 
 #import <SoObjects/SOGo/LDAPUserManager.h>
+#import <SoObjects/SOGo/SOGoPermissions.h>
 #import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/NSString+Utilities.h>
 #import <SoObjects/Contacts/SOGoContactFolders.h>
@@ -38,8 +41,6 @@
 #import <SoObjects/Contacts/SOGoContactGCSFolder.h>
 #import <SoObjects/Contacts/SOGoContactLDAPFolder.h>
 
-#import "common.h"
-
 #import "UIxContactFoldersView.h"
 
 @implementation UIxContactFoldersView
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index 120976497..01a07de90 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -18,16 +18,15 @@
   Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
   02111-1307, USA.
 */
-// $Id: UIxContactView.m 1040 2007-04-02 21:29:40Z wolfgang $
-
-#import <Contacts/SOGoContactObject.h>
 
+#import <NGObjWeb/NSException+HTTP.h>
+#import <NGObjWeb/WOResponse.h>
 #import <NGCards/NGVCard.h>
 #import <NGCards/CardElement.h>
 #import <NGCards/NSArray+NGCards.h>
 #import <NGExtensions/NSString+Ext.h>
 
-#import "common.h"
+#import <SoObjects/Contacts/SOGoContactObject.h>
 
 #import "UIxContactView.h"
 
diff --git a/UI/Contacts/UIxContactsFilterPanel.m b/UI/Contacts/UIxContactsFilterPanel.m
index f08c6abc9..c78796b81 100644
--- a/UI/Contacts/UIxContactsFilterPanel.m
+++ b/UI/Contacts/UIxContactsFilterPanel.m
@@ -19,7 +19,7 @@
  02111-1307, USA.
  */
 
-#include <SOGoUI/UIxComponent.h>
+#import <SOGoUI/UIxComponent.h>
 
 @interface UIxContactsFilterPanel : UIxComponent
 {
@@ -29,9 +29,6 @@
 
 @end
 
-#include <SOGoUI/UIxComponent.h>
-#include "common.h"
-
 @implementation UIxContactsFilterPanel
 
 static NSArray      *filters           = nil;
@@ -62,8 +59,8 @@ static NSArray      *filters           = nil;
 
 - (void) dealloc
 {
-  [self->searchCriteria release];
-  [self->searchText release];
+  [searchCriteria release];
+  [searchText release];
   [super dealloc];
 }
 
@@ -71,12 +68,12 @@ static NSArray      *filters           = nil;
 
 - (void) setSearchText: (NSString *)_txt
 {
-  ASSIGNCOPY(self->searchText, _txt);
+  ASSIGNCOPY(searchText, _txt);
 }
 
 - (void) setSearchCriteria: (NSString *)_txt
 {
-  ASSIGNCOPY(self->searchText, _txt);
+  ASSIGNCOPY(searchText, _txt);
 }
 
 - (NSString *) searchText
@@ -107,7 +104,7 @@ static NSArray      *filters           = nil;
 - (NSString *) filterLabel
 {
 #if 1
-  return [[[self context] page] labelForKey: [self valueForKey:@"filter"]];
+  return [[[self context] page] labelForKey: @"filter"];
 #else
   return [self valueForKey: @"filter"];
 #endif
diff --git a/UI/Contacts/common.h b/UI/Contacts/common.h
deleted file mode 100644
index 6cb44dd7b..000000000
--- a/UI/Contacts/common.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
-  Copyright (C) 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 LIB_FOUNDATION_LIBRARY
-#  include <Foundation/exceptions/GeneralExceptions.h>
-#elif 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>
-
-#warning importing common.h is baaad