GNOME.org
 

[evolution-patches] Moving proxy and proxy-login plugins to groupwise features

Hi,

Attached with this mail is the patch to move the proxy and proxy-login
plugins into the consolidated groupwise-features plugin.

Please review it.

Thanks,
Sankar 

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/ChangeLog,v
retrieving revision 1.1507
diff -u -p -r1.1507 ChangeLog
--- ChangeLog	13 Jul 2005 10:10:13 -0000	1.1507
+++ ChangeLog	19 Jul 2005 11:18:20 -0000
@@ -1,3 +1,8 @@
+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.
+	
 2005-07-13  Tor Lillqvist  <tml novell com>
 
 	* configure.in: Add libedataserverui to the IMPORTERS dependency
Index: configure.in
===================================================================
RCS file: /cvs/gnome/evolution/configure.in,v
retrieving revision 1.835
diff -u -p -r1.835 configure.in
--- configure.in	13 Jul 2005 10:10:13 -0000	1.835
+++ configure.in	19 Jul 2005 11:18:20 -0000
@@ -1412,7 +1412,7 @@ AC_SUBST_FILE(EVO_PLUGIN_RULE)
 AC_ARG_ENABLE(plugins, [  --enable-plugins=[no/base/all/experimental/list]      Enable plugins.],enable_plugins="$enableval",enable_plugins=all)
 
 dnl Add any new plugins here
-plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features groupwise-account-setup mail-account-disable proxy proxy-login $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
+plugins_base="calendar-file calendar-http calendar-weather itip-formatter plugin-manager default-source addressbook-file startup-wizard print-message mark-all-read groupwise-features groupwise-account-setup mail-account-disable $SA_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN" 
 
 plugins_standard="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions new-mail-notify default-mailer" 
 
@@ -1695,8 +1695,6 @@ plugins/print-message/Makefile
 plugins/groupwise-account-setup/Makefile
 plugins/groupwise-features/Makefile
 plugins/mail-account-disable/Makefile
-plugins/proxy/Makefile
-plugins/proxy-login/Makefile
 plugins/sa-junk-plugin/Makefile
 smime/Makefile
 smime/lib/Makefile
Index: po/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/po/ChangeLog,v
retrieving revision 1.2052
diff -u -p -r1.2052 ChangeLog
--- po/ChangeLog	18 Jul 2005 22:16:24 -0000	1.2052
+++ po/ChangeLog	19 Jul 2005 11:18:21 -0000
@@ -1,3 +1,9 @@
+2005-07-19  Sankar P <psankar novell com>
+
+	* POTFILES.in : Changed the path of the files that 
+	are moved due to the consolidation of proxy features' plugins
+	into the groupwise-features plugin.
+
 2005-07-19  Nikos Charonitakis  <charosn her forthnet gr>
 
 	* el.po: Updated Greek translation.
Index: po/POTFILES.in
===================================================================
RCS file: /cvs/gnome/evolution/po/POTFILES.in,v
retrieving revision 1.275
diff -u -p -r1.275 POTFILES.in
--- po/POTFILES.in	16 Jul 2005 06:50:49 -0000	1.275
+++ po/POTFILES.in	19 Jul 2005 11:18:21 -0000
@@ -334,13 +334,13 @@ plugins/subject-thread/org-gnome-subject
 plugins/subject-thread/subject-thread.c
 plugins/mail-account-disable/mail-account-disable.c
 plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
-plugins/proxy/org-gnome-proxy-errors.xml
-plugins/proxy/proxy-listing.glade
-plugins/proxy/proxy-add-dialog.glade
-plugins/proxy/proxy.c
-plugins/proxy-login/proxy-login.c
-plugins/proxy-login/org-gnome-proxy-login-errors.xml
-plugins/proxy-login/proxy-login-dialog.glade
+plugins/groupwise-features/org-gnome-proxy-errors.xml
+plugins/groupwise-features/proxy-listing.glade
+plugins/groupwise-features/proxy-add-dialog.glade
+plugins/groupwise-features/proxy.c
+plugins/groupwise-features/proxy-login.c
+plugins/groupwise-features/org-gnome-proxy-login-errors.xml
+plugins/groupwise-features/proxy-login-dialog.glade
 plugins/sa-junk-plugin/em-junk-filter.c
 shell/GNOME_Evolution_Shell.server.in.in
 shell/GNOME_Evolution_Test.server.in.in
Index: plugins/groupwise-features/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/Makefile.am,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile.am
--- plugins/groupwise-features/Makefile.am	13 Jul 2005 10:05:43 -0000	1.9
+++ plugins/groupwise-features/Makefile.am	19 Jul 2005 11:18:21 -0000
@@ -10,26 +10,31 @@ INCLUDES =						\
 	$(EVOLUTION_CALENDAR_CFLAGS)			\
 	$(EVOLUTION_ADDRESSBOOK_CFLAGS)			\
 	$(CAMEL_GROUPWISE_CFLAGS)			\
-	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"
+	-DEVOLUTION_GLADEDIR=\""$(gladedir)"\"		\
+	-DEVOLUTION_IMAGESDIR=\""$(imagesdir)"\"	
 
 @EVO_PLUGIN_RULE@
 
 plugin_DATA = org-gnome-groupwise-features.eplug org-gnome-compose-send-options.xml
 plugin_LTLIBRARIES = liborg-gnome-groupwise-features.la
 
-liborg_gnome_groupwise_features_la_SOURCES = \
-		share-folder-common.c	     \
-	       	share-folder.c 		     \
-		share-folder.h               \
-		install-shared.c             \
-		send-options.c               \
-		mail-send-options.c          \
-		mail-send-options.h          \
-		status-track.c               \
-		addressbook-groupwise.c      \
-		junk-mail-settings.c	\
-		junk-settings.c \
-		junk-settings.h
+liborg_gnome_groupwise_features_la_SOURCES = 	\
+		share-folder-common.c	     	\
+	       	share-folder.c 		     	\
+		share-folder.h               	\
+		install-shared.c             	\
+		send-options.c               	\
+		mail-send-options.c          	\
+		mail-send-options.h          	\
+		status-track.c               	\
+		addressbook-groupwise.c      	\
+		junk-mail-settings.c		\
+		junk-settings.c 		\
+		junk-settings.h			\
+		proxy.h				\
+		proxy.c				\
+		proxy-login.h			\
+		proxy-login.c				
 
 liborg_gnome_groupwise_features_la_LIBADD=			\
 	$(top_builddir)/e-util/libeutil.la			\
@@ -45,14 +50,27 @@ liborg_gnome_groupwise_features_la_LIBAD
 
 liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-glade_DATA =properties.glade junk-settings.glade 
+glade_DATA =			\
+	properties.glade	\
+	junk-settings.glade 	\
+	proxy-add-dialog.glade	\
+	proxy-listing.glade	\
+	proxy-login-dialog.glade
+
+error_DATA = 					\
+	org-gnome-shared-folder.errors.xml	\
+	org-gnome-proxy-errors.xml		\
+	org-gnome-proxy-login-errors.xml
 
-error_DATA = org-gnome-shared-folder.errors.xml
 errordir = $(privdatadir)/errors
 
+BUILT_SOURCES = $(error_i18n)
+
 EXTRA_DIST =						\
 	$(error_DATA)					\
 	$(glade_DATA) 					\
 	org-gnome-compose-send-options.xml		\
-	org-gnome-groupwise-features.eplug.xml
+	org-gnome-groupwise-features.eplug.xml		\
+	org-gnome-proxy-login-errors.xml
+
 CLEANFILES = $(BUILT_SOURCES)
Index: plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml,v
retrieving revision 1.7
diff -u -p -r1.7 org-gnome-groupwise-features.eplug.xml
--- plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml	10 Jul 2005 09:31:58 -0000	1.7
+++ plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml	19 Jul 2005 11:18:21 -0000
@@ -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>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]