From e2209f993c1633246ca360ee71f255c5daf04092 Mon Sep 17 00:00:00 2001
From: Sankar P <psankar@novell.com>
Date: Wed, 20 Jul 2005 05:11:34 +0000
Subject: Removed the proxy and proxy-login plugins as they are merged into the

2005-07-19  Sankar P  <psankar@novell.com>

	* configure.in : Removed the proxy and proxy-login plugins as they are
	merged into the groupwise-features plugin.

svn path=/trunk/; revision=29805
---
 .../org-gnome-groupwise-features.eplug.xml             | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml')

diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index 591af966a9..1f1e2cee91 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -6,6 +6,9 @@
 		<author name="Vivek Jain" email="jvivek@novell.com" />
 		<author name="Chenthill Palanisamy" email="pchenthill@novell.com"/>
 		<author name="Parthasarathi Susarla" email="sparthasarathi@novell.com"/>
+	    	<author name="Sankar P" email="psankar@novell.com"/>
+    		<author name="Shreyas Srinivasan" email="sshreyas@novell.com"/>
+
 		<_description>A plugin for the features in Groupwise accounts.</_description>
 		<hook class="org.gnome.evolution.mail.config:1.0">
 			<group id="org.gnome.evolution.mail.folderConfig" target="folder"
@@ -79,7 +82,20 @@
 					activate="org_gnome_compose_send_options"/>
 			</menu>
 		</hook>
-
+	
+		<hook class="org.gnome.evolution.mail.config:1.0">
+			<group id="org.gnome.evolution.mail.config.accountEditor" 
+				target="account" commit = "proxy_commit" abort="proxy_abort">
+				<item type="page" path="60.proxy" factory="org_gnome_proxy"/>
+			</group>
+		</hook>
+		
+		<hook class="org.gnome.evolution.mail.popup:1.0">
+		      <menu id="org.gnome.evolution.mail.foldertree.popup" target="folder"
+			factory = "org_gnome_create_proxy_login_option">
+		      </menu>
+		</hook>
+		
 	</e-plugin>
 
 </e-plugin-list>
-- 
cgit v1.2.3