From 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 24 Nov 2008 05:14:44 +0000
Subject: Merge revisions 36737:36810 from trunk.

svn path=/branches/kill-bonobo/; revision=36811
---
 plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml')

diff --git a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
index 6452504f95..44cf7af61f 100644
--- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
+++ b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
@@ -6,7 +6,7 @@
 		domain="@GETTEXT_PACKAGE@"
 		_name="Unsubscribe Folders"
 		location="@PLUGINDIR@/liborg-gnome-mail-folder-unsubscribe@SOEXT@">
-		<_description>Allows unsubscribing of mail folders in the folder tree context menu.</_description>
+		<_description>Allows unsubscribing of mail folders in the side bar context menu.</_description>
 		<author name="Jeffrey Stedfast" email="fejj@novell.com"/>
 
 		<hook class="org.gnome.evolution.mail.popup:1.0">
-- 
cgit v1.2.3


From f0cf88bc99a458193f2c16a3ed346c20f6a5fd1a Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Thu, 25 Jun 2009 13:27:20 -0400
Subject: Kill the "folder-unsubscribe" plugin.

Feature is now integrated in core mailer, and has a main menu item.
---
 .../org-gnome-mail-folder-unsubscribe.eplug.xml      | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml

(limited to 'plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml')

diff --git a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
deleted file mode 100644
index 24271fa8af..0000000000
--- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<e-plugin-list>
-	<e-plugin
-		id="org.gnome.evolution.mail.folder.unsubscribe" 
-		type="shlib"
-		domain="@GETTEXT_PACKAGE@"
-		_name="Unsubscribe Folders"
-		location="@PLUGINDIR@/liborg-gnome-mail-folder-unsubscribe@SOEXT@">
-		<_description>Unsubscribe from an IMAP folder by right-clicking on it in the folder tree.</_description>
-		<author name="Jeffrey Stedfast" email="fejj@novell.com"/>
-
-		<hook class="org.gnome.evolution.mail.popup:1.0">
-			<menu id="org.gnome.evolution.mail.foldertree.popup" target="folder">
-				<item type="item" path="30.emc.03" _label="_Unsubscribe"
-					activate="org_gnome_mail_folder_unsubscribe"
-					enable="delete" visible="delete"/>
-			</menu>
-		</hook>
-	</e-plugin>
-</e-plugin-list>
-- 
cgit v1.2.3