diff options
18 files changed, 26 insertions, 59 deletions
diff --git a/default_user/ChangeLog b/default_user/ChangeLog index 6bc356fa18..be7f469dc6 100644 --- a/default_user/ChangeLog +++ b/default_user/ChangeLog @@ -1,3 +1,15 @@ +2000-07-05 Chris Toshok <toshok@helixcode.com> + + * shortcuts.xml: remove the Internet Directories group. + + * Makefile.am (default_DATA): add ldapservers.xml. + + * local/Makefile.am (SUBDIRS): remove Directories. + + * ldapservers.xml: new ldap metadata. + + * local/Directories/*: remove directories. + 2000-06-01 Ettore Perazzoli <ettore@helixcode.com> * local/Inbox/mbox: Removed `<blockquote>' from the main text so diff --git a/default_user/Makefile.am b/default_user/Makefile.am index 2669874e5f..6ffd66c0fc 100644 --- a/default_user/Makefile.am +++ b/default_user/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = local defaultdir = $(prefix)/share/evolution/default_user -default_DATA = shortcuts.xml +default_DATA = ldapservers.xml shortcuts.xml EXTRA_DIST = $(default_DATA) diff --git a/default_user/ldapservers.xml b/default_user/ldapservers.xml new file mode 100644 index 0000000000..d9a5c72c77 --- /dev/null +++ b/default_user/ldapservers.xml @@ -0,0 +1,13 @@ +<?xml version="1.0"?> +<contactservers> + <contactserver> + <name>Bigfoot</name> + <description>Bigfoot</description> + <uri>ldap://ldap.bigfoot.com/</uri> + </contactserver> + <contactserver> + <name>Netcenter</name> + <description>Netcenter Member Directory</description> + <uri>ldap://memberdir.netscape.com/ou=member_directory,o=netcenter.com</uri> + </contactserver> +</contactservers> diff --git a/default_user/local/Directories/.cvsignore b/default_user/local/Directories/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/default_user/local/Directories/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/default_user/local/Directories/Makefile.am b/default_user/local/Directories/Makefile.am deleted file mode 100644 index 64eb44d5b4..0000000000 --- a/default_user/local/Directories/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories - -defaultdirectory_DATA = \ - folder-metadata.xml - -SUBDIRS= subfolders - -EXTRA_DIST = $(defaultdirectory_DATA) - diff --git a/default_user/local/Directories/folder-metadata.xml b/default_user/local/Directories/folder-metadata.xml deleted file mode 100644 index 23b773838a..0000000000 --- a/default_user/local/Directories/folder-metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0"?> -<efolder> - <type>contacts</type> - <description>Internet Directory Servers</description> -</efolder> diff --git a/default_user/local/Directories/subfolders/.cvsignore b/default_user/local/Directories/subfolders/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/default_user/local/Directories/subfolders/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/default_user/local/Directories/subfolders/Bigfoot/.cvsignore b/default_user/local/Directories/subfolders/Bigfoot/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/default_user/local/Directories/subfolders/Bigfoot/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/default_user/local/Directories/subfolders/Bigfoot/Makefile.am b/default_user/local/Directories/subfolders/Bigfoot/Makefile.am deleted file mode 100644 index 67f2f55a2a..0000000000 --- a/default_user/local/Directories/subfolders/Bigfoot/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfolders/Bigfoot - -defaultdirectory_DATA = \ - folder-metadata.xml \ - uri - -EXTRA_DIST = $(defaultdirectory_DATA) diff --git a/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml b/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml deleted file mode 100644 index 905fcbe84a..0000000000 --- a/default_user/local/Directories/subfolders/Bigfoot/folder-metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0"?> -<efolder> - <type>contacts</type> - <description>Bigfoot</description> -</efolder> diff --git a/default_user/local/Directories/subfolders/Bigfoot/uri b/default_user/local/Directories/subfolders/Bigfoot/uri deleted file mode 100644 index fd658ed9b2..0000000000 --- a/default_user/local/Directories/subfolders/Bigfoot/uri +++ /dev/null @@ -1 +0,0 @@ -ldap://ldap.bigfoot.com/
\ No newline at end of file diff --git a/default_user/local/Directories/subfolders/Makefile.am b/default_user/local/Directories/subfolders/Makefile.am deleted file mode 100644 index 1dc5d5ce8e..0000000000 --- a/default_user/local/Directories/subfolders/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfolders - -SUBDIRS= Bigfoot \ - Netcenter diff --git a/default_user/local/Directories/subfolders/Netcenter/.cvsignore b/default_user/local/Directories/subfolders/Netcenter/.cvsignore deleted file mode 100644 index 282522db03..0000000000 --- a/default_user/local/Directories/subfolders/Netcenter/.cvsignore +++ /dev/null @@ -1,2 +0,0 @@ -Makefile -Makefile.in diff --git a/default_user/local/Directories/subfolders/Netcenter/Makefile.am b/default_user/local/Directories/subfolders/Netcenter/Makefile.am deleted file mode 100644 index aca286c422..0000000000 --- a/default_user/local/Directories/subfolders/Netcenter/Makefile.am +++ /dev/null @@ -1,7 +0,0 @@ -defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfolders/Netcenter - -defaultdirectory_DATA = \ - folder-metadata.xml \ - uri - -EXTRA_DIST = $(defaultdirectory_DATA) diff --git a/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml b/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml deleted file mode 100644 index c3292f4130..0000000000 --- a/default_user/local/Directories/subfolders/Netcenter/folder-metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0"?> -<efolder> - <type>contacts</type> - <description>Netcenter</description> -</efolder> diff --git a/default_user/local/Directories/subfolders/Netcenter/uri b/default_user/local/Directories/subfolders/Netcenter/uri deleted file mode 100644 index 6be98a814d..0000000000 --- a/default_user/local/Directories/subfolders/Netcenter/uri +++ /dev/null @@ -1 +0,0 @@ -ldap://memberdir.netscape.com/ou=member_directory,o=netcenter.com
\ No newline at end of file diff --git a/default_user/local/Makefile.am b/default_user/local/Makefile.am index f14aa4a6da..3c89920d47 100644 --- a/default_user/local/Makefile.am +++ b/default_user/local/Makefile.am @@ -1,7 +1,6 @@ SUBDIRS = \ Calendar \ Contacts \ - Directories \ Drafts \ Inbox \ Outbox \ diff --git a/default_user/shortcuts.xml b/default_user/shortcuts.xml index 3838b14164..fadf740c5a 100644 --- a/default_user/shortcuts.xml +++ b/default_user/shortcuts.xml @@ -10,11 +10,6 @@ </group> - <group title="Internet Directories"> - <item>evolution:/local/Directories/Bigfoot</item> - <item>evolution:/local/Directories/Netcenter</item> - </group> - <!-- <group title="Personal shortcuts"> </group> --> |