aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog6
-rw-r--r--ui/evolution-mail-message.xml4
2 files changed, 8 insertions, 2 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 3454637c64..3f3c5c5dde 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,9 @@
+2005-12-31 Harish Krishnaswamy <kharish@novell.com>
+
+ * evolution-mail-message.xml : Revert the patch committed
+ for shortcut to mark spam (see 2005-12-16 below)
+ as it uses an existing accel.
+
2005-12-23 Srinivasa Ragavan <sragavan@novell.com>
** Fixes bug #324677
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index c237753df4..f3183b68c8 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -101,11 +101,11 @@
<cmd name="MessageMarkAsJunk"
_tip="Mark the selected message(s) as junk"
- accel="*Control*j" pixtype="pixbuf"/>
+ pixtype="pixbuf"/>
<cmd name="MessageMarkAsNotJunk"
_tip="Mark the selected message(s) as not being junk"
- accel="*Control**Shift*j" pixtype="pixbuf"/>
+ pixtype="pixbuf"/>
<cmd name="MessageFilterJunk"
_tip="Filter the selected messages for junk status"