From 898b73657fa358eef93fd91eb9b9a8b79d3a4641 Mon Sep 17 00:00:00 2001
From: wolfgang <wolfgang@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Thu, 10 May 2007 19:13:27 +0000
Subject: [PATCH] git-svn-id:
 http://svn.opengroupware.org/SOGo/inverse/trunk@1061
 d1b88da0-ebda-0310-925b-ed51d893ca5b

---
 ChangeLog                         |  2 +
 UI/MailerUI/GNUmakefile           |  1 -
 UI/MailerUI/UIxMailAddressbook.m  | 65 -------------------------------
 UI/MailerUI/product.plist         | 18 ---------
 UI/WebServerResources/MailerUI.js |  3 +-
 5 files changed, 4 insertions(+), 85 deletions(-)
 delete mode 100644 UI/MailerUI/UIxMailAddressbook.m

diff --git a/ChangeLog b/ChangeLog
index d0592e30..59e3d314 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2007-05-10  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* 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 285a419a..8b3f2108 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 1c44412d..00000000
--- 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$
-
-
-#include <SOGoUI/UIxComponent.h>
-
-
-@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 a1934d2f..0979d877 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";
-        };
       };
     };
 
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 214be585..5d1bb554 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -372,7 +372,8 @@ function onMailboxTreeItemClick(event) {
   this.select();
   topNode.selectedEntry = this;
 
-  openMailbox(mailbox);
+  if (this.parentNode.getAttribute("datatype") != "account")
+     openMailbox(mailbox);
   event.preventDefault();
 }
 
-- 
2.39.5