INTEGRATION: CWS evo2fixes (1.7.44); FILE MERGED

2006/02/20 12:11:18 mmeeks 1.7.44.1: Issue number: i#62138#
Submitted by: mmeeks
Reviewed by:  fs

Re-factor & add support for updated Evolution, LDAP & Groupwise accounts.

2 files changed, 13 insertions, 5 deletions

diff --git a/extensions/source/abpilot/addresssettings.hxx b/extensions/source/abpilot/addresssettings.hxx
index 82834ba74565..072ad4e50351 100644
--- a/extensions/source/abpilot/addresssettings.hxx
+++ b/extensions/source/abpilot/addresssettings.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: addresssettings.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2005-12-19 17:27:17 $
+ *  last change: $Author: kz $ $Date: 2006-02-28 10:38:29 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -56,6 +56,8 @@ namespace abp
         AST_MORK,
         AST_THUNDERBIRD,
         AST_EVOLUTION,
+        AST_EVOLUTION_GROUPWISE,
+        AST_EVOLUTION_LDAP,
         AST_KAB,
         AST_LDAP,
         AST_OUTLOOK,
diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx
index 4753c2ab72ba..0293bfbf3598 100644
--- a/extensions/source/abpilot/datasourcehandling.hxx
+++ b/extensions/source/abpilot/datasourcehandling.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: datasourcehandling.hxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2005-12-19 17:27:42 $
+ *  last change: $Author: kz $ $Date: 2006-02-28 10:38:57 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -89,9 +89,15 @@ namespace abp
         /// creates a new Thunderbird data source
         ODataSource createNewThunderbird( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
-        /// creates a new Evolution data source
+        /// creates a new Evolution local data source
         ODataSource createNewEvolution( const ::rtl::OUString& _rName ) SAL_THROW (( ));
 
+        /// creates a new Evolution LDAP data source
+        ODataSource createNewEvolutionLdap( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
+        /// creates a new Evolution GROUPWISE data source
+        ODataSource createNewEvolutionGroupwise( const ::rtl::OUString& _rName ) SAL_THROW (( ));
+
         /// creates a new KDE address book data source
         ODataSource createNewKab( const ::rtl::OUString& _rName ) SAL_THROW (( ));