evolution r35570 - in trunk: mail ui

[abharath svn gnome org]

Author: abharath
Date: Mon Jun  2 05:15:09 2008
New Revision: 35570
URL: http://svn.gnome.org/viewvc/evolution?rev=35570&view=rev

Log:
Committing on behalf of  Srinivasa Ragavan  <sragavan novell com>

2008-06-02  Srinivasa Ragavan  <sragavan novell com>

        ** Fix for bug #531836
        Added bonobo accel key for Ctrl+D, Del to keep working on 
        deleted mails, but not the toolbar/menu


Modified:
   trunk/mail/ChangeLog
   trunk/mail/em-folder-view.c
   trunk/ui/ChangeLog
   trunk/ui/evolution-mail-message.xml

Modified: trunk/mail/em-folder-view.c
==============================================================================
--- trunk/mail/em-folder-view.c	(original)
+++ trunk/mail/em-folder-view.c	Mon Jun  2 05:15:09 2008
@@ -175,6 +175,7 @@
 	{ "MessageFilterJunk",        EM_POPUP_SELECT_MANY },
 	{ "MessageCopy",              EM_POPUP_SELECT_MANY },
 	{ "MessageDelete",            EM_POPUP_SELECT_MANY|EM_POPUP_SELECT_DELETE },
+	{ "MessageDeleteKey",         EM_POPUP_SELECT_MANY},	
 	{ "MessageForward",           EM_POPUP_SELECT_MANY },
 	{ "MessageForwardAttached",   EM_POPUP_SELECT_MANY },
 	{ "MessageForwardInline",     EM_POPUP_SELECT_ONE },
@@ -2062,6 +2063,7 @@
 	BONOBO_UI_UNSAFE_VERB ("MessageFilterJunk", emfv_message_filter_junk),
 	BONOBO_UI_UNSAFE_VERB ("MessageCopy", emfv_message_copy),
 	BONOBO_UI_UNSAFE_VERB ("MessageDelete", emfv_message_delete),
+	BONOBO_UI_UNSAFE_VERB ("MessageDeleteKey", emfv_message_delete),
 	BONOBO_UI_UNSAFE_VERB ("MessageForward", emfv_message_forward),
 	BONOBO_UI_UNSAFE_VERB ("MessageForwardAttached", emfv_message_forward_attached),
 	BONOBO_UI_UNSAFE_VERB ("MessageForwardInline", emfv_message_forward_inline),

Modified: trunk/ui/evolution-mail-message.xml
==============================================================================
--- trunk/ui/evolution-mail-message.xml	(original)
+++ trunk/ui/evolution-mail-message.xml	Mon Jun  2 05:15:09 2008
@@ -58,7 +58,6 @@
 
     <cmd name="MessageDelete"
      _tip="Mark the selected messages for deletion"
-     accel="*Control*d"
      pixtype="pixbuf"/>
 
     <cmd name="MessageFollowUpFlag"
@@ -244,8 +243,9 @@
     <accel verb="MailNextUnread"     name="*Control*period"/>
     <accel verb="MailNextUnread"     name="period"/>
     <accel verb="MailNextUnread"     name="bracketright"/>
-    <accel verb="MessageDelete"      name="Delete"/>
-    <accel verb="MessageDelete"      name="KP_Delete"/>
+    <accel verb="MessageDeleteKey"   name="Delete"/>
+    <accel verb="MessageDeleteKey"   name="KP_Delete"/>
+    <accel verb="MessageDeleteKey"   name="*Control*d"/>
   </keybindings>
 
   <menu>