From 182b4568fa00a788369c27cf8039e13bf5ecbbeb Mon Sep 17 00:00:00 2001
From: "Berend.Cornelius%sun.com"
 <Berend.Cornelius%sun.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 20 Sep 2007 17:47:06 +0000
Subject: [PATCH] 359443Deleting item from Agenda deletes an email instead;
 r=mickey

git-svn-id: svn://10.0.0.236/trunk@236372 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/calendar/lightning/content/agenda-tree.js           | 6 +++---
 .../lightning/content/messenger-overlay-sidebar.xul         | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mozilla/calendar/lightning/content/agenda-tree.js b/mozilla/calendar/lightning/content/agenda-tree.js
index 19488199df8..167e3db79f7 100644
--- a/mozilla/calendar/lightning/content/agenda-tree.js
+++ b/mozilla/calendar/lightning/content/agenda-tree.js
@@ -386,7 +386,7 @@ function onKeyPress(event)
   const kKE = Ci.nsIDOMKeyEvent;
   switch(event.keyCode) {
     case kKE.DOM_VK_DELETE:
-      document.getElementById('agenda_new_event_command').doCommand();
+      document.getElementById('agenda_delete_event_command').doCommand();
       event.stopPropagation();
       event.preventDefault();
       break;
@@ -613,8 +613,8 @@ function observer_onDeleteItem(item, rebuildFlag)
         return;
     }
     var queryStart = this.agendaTreeView.today.start.clone();
-    queryStart.hour = 0;
-    queryStart.minute = 0;
+    queryStart.hour = 0;
+    queryStart.minute = 0;
     queryStart.second = 0;
     var occs = item.getOccurrencesBetween(queryStart,
                                           this.agendaTreeView.soon.end, {});
diff --git a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
index bafa3c1a2f7..e175e576a59 100644
--- a/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/mozilla/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -178,7 +178,7 @@
     <broadcaster id="is_editable" hidden="false"/>
   </broadcasterset>
   <commandset id="calendar_commands">
-    <command id="agenda_new_event_command" oncommand="agendaTreeView.deleteEvent()"/>
+    <command id="agenda_delete_event_command" oncommand="agendaTreeView.deleteEvent()"/>
     <command id="calendar_new_event_command" oncommand="createEventWithDialog(getSelectedCalendar());"/>
     <command id="calendar_new_todo_command" oncommand="createTodoWithDialog(getSelectedCalendar());"/>
     <command id="calendar_new_calendar_command" oncommand="openCalendarWizard();"/>