From 82101429ace39073911832aea85ef1d435d2357d Mon Sep 17 00:00:00 2001
From: Gilles Dartiguelongue <gdartigu@src.gnome.org>
Date: Sat, 17 Nov 2007 23:20:07 +0000
Subject: 	** Fix for bug #495875

	right click menu reordering

svn path=/trunk/; revision=34549
---
 plugins/folder-unsubscribe/ChangeLog                               | 7 +++++++
 .../folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml | 2 +-
 plugins/mail-account-disable/ChangeLog                             | 7 +++++++
 plugins/mail-account-disable/mail-account-disable.c                | 4 ++--
 plugins/mark-all-read/ChangeLog                                    | 7 +++++++
 plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml            | 2 +-
 6 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'plugins')

diff --git a/plugins/folder-unsubscribe/ChangeLog b/plugins/folder-unsubscribe/ChangeLog
index 0323493df0..909ad22d46 100644
--- a/plugins/folder-unsubscribe/ChangeLog
+++ b/plugins/folder-unsubscribe/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
+
+	** Fix bug #495875
+
+	* org-gnome-mail-folder-unsubscribe.eplug.xml:
+	right click menu reordering
+
 2007-04-02  Sankar P  <psankar@novell.com>
 
 	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
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 c564f15460..6452504f95 100644
--- a/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
+++ b/plugins/folder-unsubscribe/org-gnome-mail-folder-unsubscribe.eplug.xml
@@ -11,7 +11,7 @@
 
 		<hook class="org.gnome.evolution.mail.popup:1.0">
 			<menu id="org.gnome.evolution.mail.foldertree.popup" target="folder">
-				<item type="item" path="20.emc.03" _label="_Unsubscribe"
+				<item type="item" path="30.emc.03" _label="_Unsubscribe"
 					activate="org_gnome_mail_folder_unsubscribe"
 					enable="delete" visible="delete"/>
 			</menu>
diff --git a/plugins/mail-account-disable/ChangeLog b/plugins/mail-account-disable/ChangeLog
index 13d2d14224..d40282a91b 100644
--- a/plugins/mail-account-disable/ChangeLog
+++ b/plugins/mail-account-disable/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
+
+	** Fix bug #495875
+
+	* mail-account-disable.c:
+	right click menu reordering
+
 2007-04-02  Sankar P  <psankar@novell.com>
 
 	* Committed on behalf of Gilles Dartiguelongue <dartigug@esiee.fr>
diff --git a/plugins/mail-account-disable/mail-account-disable.c b/plugins/mail-account-disable/mail-account-disable.c
index bd6df815b0..d83f5aae77 100644
--- a/plugins/mail-account-disable/mail-account-disable.c
+++ b/plugins/mail-account-disable/mail-account-disable.c
@@ -43,8 +43,8 @@ void mail_account_disable (EPopup *ep, EPopupItem *p, void *data);
 void org_gnome_create_mail_account_disable (EPlugin *ep, EMPopupTargetFolder *t);
 
 static EPopupItem popup_items[] = {
-	{ E_POPUP_ITEM, "20.emc.04", N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE },
-	{ E_POPUP_ITEM, "20.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
+	{ E_POPUP_ITEM, "40.emc.04", N_("_Disable"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE },
+	{ E_POPUP_ITEM, "40.emc.04", N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
 };
 
 static void
diff --git a/plugins/mark-all-read/ChangeLog b/plugins/mark-all-read/ChangeLog
index 71d81e28ae..ce35ebf76e 100644
--- a/plugins/mark-all-read/ChangeLog
+++ b/plugins/mark-all-read/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-18  Gilles Dartiguelongue  <gdartigu@svn.gnome.org>
+
+	** Fix bug #495875
+
+	* org-gnome-mark-all-read.eplug.xml:
+	right click menu reordering
+
 2007-11-05  Michael Monreal  <mmonreal@svn.gnome.org>
 
 	** Fix for bug #492102
diff --git a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
index 1bba85e254..a4542572a5 100644
--- a/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
+++ b/plugins/mark-all-read/org-gnome-mark-all-read.eplug.xml
@@ -11,7 +11,7 @@
 
 		<hook class="org.gnome.evolution.mail.popup:1.0">
 			<menu id="org.gnome.evolution.mail.foldertree.popup" target="folder">
-				<item type="item" path="10.emc.01" icon="mail-mark-read" _label="Mark Me_ssages as Read" activate="org_gnome_mark_all_read" enable="folder" visible="folder"/>
+				<item type="item" path="30.emc.01" icon="mail-mark-read" _label="Mark Me_ssages as Read" activate="org_gnome_mark_all_read" enable="folder" visible="folder"/>
 			</menu>
 		</hook>
 	</e-plugin>
-- 
cgit