aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@novell.com>2008-06-02 13:15:09 +0800
committerBharath Acharya <abharath@src.gnome.org>2008-06-02 13:15:09 +0800
commit31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1 (patch)
treef25a272cdb21cb3a767a327c8f4e0207544e0aea
parent341147f72e14d9e57d8f1cf4e9b7d6a9887cb5bb (diff)
downloadgsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.tar
gsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.tar.gz
gsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.tar.bz2
gsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.tar.lz
gsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.tar.xz
gsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.tar.zst
gsoc2013-evolution-31cfa1dd24e2a69fa5e436a9ab9996231d0a8ef1.zip
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 svn path=/trunk/; revision=35570
-rw-r--r--mail/ChangeLog7
-rw-r--r--mail/em-folder-view.c2
-rw-r--r--ui/ChangeLog7
-rw-r--r--ui/evolution-mail-message.xml6
4 files changed, 19 insertions, 3 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 395904e6ba..d99e696db9 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-02 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #531836
+
+ * em-folder-view.c: Added bonobo accel key for Ctrl+D, Del to keep
+ working on deleted mails, but not the toolbar/menu
+
2008-06-02 Milan Crha <mcrha@redhat.com>
** Fix for bug #525966
diff --git a/mail/em-folder-view.c b/mail/em-folder-view.c
index 519ba02f78..99f089dba4 100644
--- a/mail/em-folder-view.c
+++ b/mail/em-folder-view.c
@@ -175,6 +175,7 @@ static const EMFolderViewEnable emfv_enable_map[] = {
{ "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 @@ static BonoboUIVerb emfv_message_verbs[] = {
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),
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 29039c9f32..eabc9a50ea 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,10 @@
+2008-06-02 Srinivasa Ragavan <sragavan@novell.com>
+
+ ** Fix for bug #531836
+
+ * evolution-mail-message.xml: Added bonobo accel key for Ctrl+D, Del to
+ keep working on deleted mails, but not the toolbar/menu
+
2008-05-19 Matthew Barnes <mbarnes@redhat.com>
* Makefile.am:
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index ab1e86b245..5b0a29c57d 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -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>