From bb0d02c04bb2c09e004ba5bad2159cc3cb219672 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Mon, 28 Apr 2003 16:47:35 +0000
Subject: Fixes #35814

2003-04-27  Rodney Dawes  <dobey@ximian.com>

	Fixes #35814

	* calendar/gui/calendar-component.c: Change mnemonic/keybinding for
	New Meeting to not conflict with other items in the File->New menu

	* ui/evolution.xml: Changed the New Folder keybinding to C-S-f

svn path=/trunk/; revision=20984
---
 calendar/ChangeLog                | 7 +++++++
 calendar/gui/calendar-component.c | 4 ++--
 ui/ChangeLog                      | 6 +++++-
 ui/evolution.xml                  | 2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index dd1412bd7d..e9f1bc0614 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,10 @@
+2003-04-27  Rodney Dawes  <dobey@ximian.com>
+
+	Fixes #35814
+	
+	* gui/calendar-component.c: Change mnemonic/keybinding for
+	New Meeting to not conflict with other items in the File->New menu
+	
 2003-04-24  Rodrigo Moya <rodrigo@ximian.com>
 
 	Fixes #41661
diff --git a/calendar/gui/calendar-component.c b/calendar/gui/calendar-component.c
index 0d1e06236e..98f0964cc4 100644
--- a/calendar/gui/calendar-component.c
+++ b/calendar/gui/calendar-component.c
@@ -734,9 +734,9 @@ create_object (void)
 			    FOLDER_CALENDAR, 'a', "new_appointment.xpm");
 
 	add_creatable_item (shell_component, CREATE_MEETING_ID,
-			    _("New meeting"), _("_Meeting"),
+			    _("New meeting"), _("M_eeting"),
 			    _("Create a new meeting request"),
-			    FOLDER_CALENDAR, 's', "meeting-request-16.png");
+			    FOLDER_CALENDAR, 'e', "meeting-request-16.png");
 
 	add_creatable_item (shell_component, CREATE_TASK_ID,
 			    _("New task"), _("_Task"),
diff --git a/ui/ChangeLog b/ui/ChangeLog
index f30eab01f4..374d23d539 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,4 +1,8 @@
-003-04-23  Anna Marie Dirks  <anna@ximian.com>
+2003-04-28  Rodney Dawes  <dobey@ximian.com>
+
+	* evolution.xml: Changed the New Folder keybinding to C-S-f
+	
+2003-04-23  Anna Marie Dirks  <anna@ximian.com>
 
 	* evolution.xml: Changed the placement and label of "Create New Folder"
 	to be consistent with the terms/layout used for other (namely
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 3a484926e7..e5689eae32 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -43,7 +43,7 @@
 	<menuitem name="Folder" verb="NewFolder"
 		  _label="_Folder..."
 		  _tip="Create a new folder"
-		  accel="*Control**Shift*e"
+		  accel="*Control**Shift*f"
 		  pixtype="pixbuf"/>
 
 	<menuitem name="Shortcut" verb="NewShortcut"
-- 
cgit v1.2.3