From bd8323c98fe803ab5fc5651d20f0cc328f452e37 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 10 May 2007 19:12:39 +0000 Subject: [PATCH] Monotone-Parent: b683287432e5a1e96ebba43f490459bc5186b815 Monotone-Revision: fd070cf4b55b0d6d586d71e3048fea3a0f2668db Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2007-05-10T19:12:39 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 2 + UI/MailerUI/GNUmakefile | 1 - UI/MailerUI/UIxMailAddressbook.m | 65 -------------------------------- UI/MailerUI/product.plist | 18 --------- 4 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 UI/MailerUI/UIxMailAddressbook.m diff --git a/ChangeLog b/ChangeLog index d0592e30d..59e3d3141 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2007-05-10 Wolfgang Sourdeau + * UI/MailerUI/UIxMailAddressbook.m: removed obsolete module. + * UI/Contacts/UIxContactFoldersView.m ([UIxContactFoldersView -contactSearchAction]): simplified method to use the facilities provided by the LDAPUserManager. No longer takes care of the diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index 285a419a7..8b3f2108d 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -35,7 +35,6 @@ MailerUI_OBJC_FILES += \ UIxMailReplyAction.m \ UIxMailForwardAction.m \ UIxMailToSelection.m \ - UIxMailAddressbook.m \ UIxMailWindowCloser.m \ \ UIxFilterList.m \ diff --git a/UI/MailerUI/UIxMailAddressbook.m b/UI/MailerUI/UIxMailAddressbook.m deleted file mode 100644 index d9b56744d..000000000 --- a/UI/MailerUI/UIxMailAddressbook.m +++ /dev/null @@ -1,65 +0,0 @@ -/* - Copyright (C) 2000-2004 SKYRIX Software AG - - This file is part of OGo - - 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: UIxMailAddressbook.m 825 2005-07-19 12:47:20Z znek $ - - -#include - - -@interface UIxMailAddressbook : UIxComponent -{ - -} - -- (NSString *)contactsPath; -- (NSString *)anaisPath; - -@end - -#include "common.h" - -@implementation UIxMailAddressbook - -- (NSString *)contactsPath { - return [[self userFolderPath] - stringByAppendingPathComponent:@"Contacts/select"]; -} - -- (NSString *)anaisPath { - return @"/anais/Admin/Autres/aideFonc.php"; -} - -- (id)defaultAction { - NSString *path = [self contactsPath]; - path = [path stringByAppendingString:@"?callback=addAddress"]; - return [self redirectToLocation:path]; -} - -- (id)anaisAction { - NSString *path, *param; - - - param = @"?m_fonc=addAddress&m_data=datawebmail&m_type=Pour&m_nom=,&m_champ=mail,uid,sn,cn,dn&m_agenda0#mon_etiquette"; - path = [[self anaisPath] stringByAppendingString:param]; - return [self redirectToLocation:path]; -} - -@end /* UIxMailAddressbook */ diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist index a1934d2f8..0979d877f 100644 --- a/UI/MailerUI/product.plist +++ b/UI/MailerUI/product.plist @@ -263,15 +263,6 @@ protectedBy = "View"; pageName = "UIxMailAccountView"; }; - addressbook = { - protectedBy = "View"; - pageName = "UIxMailAddressbook"; - }; - anais = { - protectedBy = "View"; - pageName = "UIxMailAddressbook"; - actionName = "anais"; - }; compose = { protectedBy = "View"; actionClass = "UIxMailEditorAction"; @@ -369,15 +360,6 @@ pageName = "UIxMailEditor"; actionName = "send"; }; - addressbook = { - protectedBy = "View"; - pageName = "UIxMailAddressbook"; - }; - anais = { - protectedBy = "View"; - pageName = "UIxMailAddressbook"; - actionName = "anais"; - }; }; };