From 53c01a5ae01eac468e6da48a936747286f8540f7 Mon Sep 17 00:00:00 2001
From: Vivek Jain <jvivek@novell.com>
Date: Thu, 7 Jul 2005 09:05:00 +0000
Subject: have one more hookitem in folderview.popup for displaying junk mail

2005-07-07  Vivek Jain <jvivek@novell.com>

	* org-gnome-groupwise-features.eplug.xml:
	 have one more hookitem in folderview.popup
	 for displaying junk mail settings

	 * junk-mail-settings.c
	 * junk-settings.c
	 * junk-settings.h
	 * junk-settings.glade
	* Makefile.am : updated to add these files

svn path=/trunk/; revision=29665
---
 plugins/groupwise-features/ChangeLog                        | 13 +++++++++++++
 plugins/groupwise-features/Makefile.am                      |  7 +++++--
 .../org-gnome-groupwise-features.eplug.xml                  |  2 ++
 3 files changed, 20 insertions(+), 2 deletions(-)

(limited to 'plugins')

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index eac8378ed0..86c2e4d16f 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,16 @@
+2005-07-07  Vivek Jain <jvivek@novell.com>
+	
+	* org-gnome-groupwise-features.eplug.xml:
+	 have one more hookitem in folderview.popup
+	 for displaying junk mail settings
+	 
+	 added four more files
+	 * junk-mail-settings.c
+	 * junk-settings.c
+	 * junk-settings.h
+	 * junk-settings.glade
+	* Makefile.am : updated to add these files 
+
 2005-06-27  Sushma Rai  <rsushma@novell.com>
 
 	* org-gnome-groupwise-features.eplug.xml:
diff --git a/plugins/groupwise-features/Makefile.am b/plugins/groupwise-features/Makefile.am
index 7b10948f7a..cc4e5c74b9 100644
--- a/plugins/groupwise-features/Makefile.am
+++ b/plugins/groupwise-features/Makefile.am
@@ -25,7 +25,10 @@ liborg_gnome_groupwise_features_la_SOURCES = \
 		mail-send-options.c          \
 		mail-send-options.h          \
 		status-track.c               \
-		addressbook-groupwise.c
+		addressbook-groupwise.c      \
+		junk-mail-settings.c	\
+		junk-settings.c \
+		junk-settings.h
 
 liborg_gnome_groupwise_features_la_LIBADD=			\
 	$(top_builddir)/e-util/libeutil.la			\
@@ -40,7 +43,7 @@ liborg_gnome_groupwise_features_la_LIBADD=			\
 
 liborg_gnome_groupwise_features_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
-glade_DATA =properties.glade 
+glade_DATA =properties.glade junk-settings.glade 
 
 error_DATA = org-gnome-shared-folder.errors.xml
 errordir = $(privdatadir)/errors
diff --git a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
index cf4f8a75ff..d92229948f 100644
--- a/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
+++ b/plugins/groupwise-features/org-gnome-groupwise-features.eplug.xml
@@ -57,6 +57,7 @@
 		<hook class="org.gnome.evolution.mail.popup:1.0">
 			<menu id="org.gnome.evolution.mail.foldertree.popup" target="folder" factory = "org_gnome_create_option">
 			</menu>
+			<menu id="org.gnome.evolution.mail.folderview.popup" target="select" factory = "org_gnome_junk_settings"/>
 			<menu id="org.gnome.evolution.mail.folderview.popup" target="select">
 				<item
 					type="item"
@@ -96,6 +97,7 @@
 					activate="org_gnome_compose_send_options"/>
 			</menu>
 		</hook>
+
 	</e-plugin>
 
 </e-plugin-list>
-- 
cgit v1.2.3