[evolution-patches] Slight popup menu fixes: icons, order

[Christian Neumair <chris gnome-de org>]

This patch adds copy/move mail stock icons to the message context menu
and the message drop popup menu. Besides, it swaps the Move/Copy actions
and the Delete action in the message popup. It is normal to the put
Delete action below other actions (Cut/Copy/Paste/etc.). It simply feels
more consistent with the desktop.
I'm not yet sure whether the menu can be slimed down but I hope so. It
looks overloaded at the moment.

regs,
 Chris

Index: mail/em-folder-tree.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-tree.c,v
retrieving revision 1.107
diff -u -r1.107 em-folder-tree.c
--- mail/em-folder-tree.c	28 May 2004 17:04:18 -0000	1.107
+++ mail/em-folder-tree.c	3 Jun 2004 16:51:15 -0000
@@ -947,8 +951,8 @@
 }
 
 static EMPopupItem emft_drop_popup_menu[] = {
-	{ EM_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), G_CALLBACK (emft_drop_popup_copy), NULL, NULL, 1 },
-	{ EM_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), G_CALLBACK (emft_drop_popup_move), NULL, NULL, 1 },
+	{ EM_POPUP_ITEM, "00.emc.00", N_("_Copy to Folder"), G_CALLBACK (emft_drop_popup_copy), NULL, "stock_mail-copy", 1 },
+	{ EM_POPUP_ITEM, "00.emc.01", N_("_Move to Folder"), G_CALLBACK (emft_drop_popup_move), NULL, "stock_mail-move", 1 },
 	{ EM_POPUP_ITEM, "00.emc.02", N_("_Copy"), G_CALLBACK (emft_drop_popup_copy), NULL, "stock_folder-copy", 2 },
 	{ EM_POPUP_ITEM, "00.emc.03", N_("_Move"), G_CALLBACK (emft_drop_popup_move), NULL, "stock_folder-move", 2 },
 	{ EM_POPUP_BAR, "10.emc" },
Index: mail/em-folder-view.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-folder-view.c,v
retrieving revision 1.75
diff -u -r1.75 em-folder-view.c
--- mail/em-folder-view.c	25 May 2004 04:10:24 -0000	1.75
+++ mail/em-folder-view.c	3 Jun 2004 16:51:18 -0000
@@ -914,14 +914,14 @@
 	{ EM_POPUP_ITEM, "30.emfv.03", N_("_Mark as Unimportant"), G_CALLBACK(emfv_popup_mark_unimportant), NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT },
 	{ EM_POPUP_ITEM, "30.emfv.04", N_("Mark as _Junk"), G_CALLBACK(emfv_popup_mark_junk), NULL, "stock_spam", EM_POPUP_SELECT_MARK_JUNK },
 	{ EM_POPUP_ITEM, "30.emfv.05", N_("Mark as _Not Junk"), G_CALLBACK(emfv_popup_mark_nojunk), NULL, "stock_not-spam", EM_POPUP_SELECT_MARK_NOJUNK },
-	
+
 	{ EM_POPUP_BAR, "40.emfv" },
-	{ EM_POPUP_ITEM, "40.emfv.00", N_("_Delete"), G_CALLBACK(emfv_popup_delete), NULL, "stock_delete", EM_POPUP_SELECT_DELETE },
-	{ EM_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), G_CALLBACK(emfv_popup_undelete), NULL, "stock_undelete", EM_POPUP_SELECT_UNDELETE },
+	{ EM_POPUP_ITEM, "40.emfv.00", N_("Mo_ve to Folder..."), G_CALLBACK(emfv_popup_move), NULL, "stock_mail-move" },
+	{ EM_POPUP_ITEM, "40.emfv.01", N_("_Copy to Folder..."), G_CALLBACK(emfv_popup_copy), NULL, "stock_mail-copy" },
 
 	{ EM_POPUP_BAR, "50.emfv" },
-	{ EM_POPUP_ITEM, "50.emfv.00", N_("Mo_ve to Folder..."), G_CALLBACK(emfv_popup_move) },
-	{ EM_POPUP_ITEM, "50.emfv.01", N_("_Copy to Folder..."), G_CALLBACK(emfv_popup_copy) },
+	{ EM_POPUP_ITEM, "50.emfv.00", N_("_Delete"), G_CALLBACK(emfv_popup_delete), NULL, "stock_delete", EM_POPUP_SELECT_DELETE },
+	{ EM_POPUP_ITEM, "50.emfv.01", N_("U_ndelete"), G_CALLBACK(emfv_popup_undelete), NULL, "stock_undelete", EM_POPUP_SELECT_UNDELETE },
 
 	{ EM_POPUP_BAR, "60.label" },
 	{ EM_POPUP_SUBMENU, "60.label.00", N_("Label") },