Cleanup delete actions in shell views.

4 files changed, 18 insertions, 14 deletions

diff --git a/ui/evolution-calendars.ui b/ui/evolution-calendars.ui
index 818ed176b3..feef83de6c 100644
--- a/ui/evolution-calendars.ui
+++ b/ui/evolution-calendars.ui
@@ -14,6 +14,7 @@
         <menuitem action='event-delete'/>
         <menuitem action='event-delete-occurrence'/>
         <menuitem action='event-delete-occurrence-all'/>
+        <menuitem action='calendar-delete'/>
       </placeholder>
     </menu>
     <menu action='view-menu'>
@@ -28,7 +29,7 @@
   </menubar>
   <toolbar name='main-toolbar'>
     <toolitem action='calendar-print'/>
-    <toolitem action='event-delete'/>
+    <toolitem action='delete-selection'/>
     <separator/>
     <toolitem action='calendar-go-back'/>
     <toolitem action='calendar-go-today'/>
@@ -115,7 +116,7 @@
     <separator/>
     <menuitem action='calendar-memopad-forward'/>
     <separator/>
-    <menuitem action='calendar-memopad-delete'/>
+    <menuitem action='popup-delete-selection'/>
   </popup>
   <popup name='calendar-taskpad-popup'>
     <menuitem action='calendar-taskpad-new'/>
@@ -134,7 +135,7 @@
     <menuitem action='calendar-taskpad-mark-complete'/>
     <menuitem action='calendar-taskpad-mark-incomplete'/>
     <separator/>
-    <menuitem action='calendar-taskpad-delete'/>
+    <menuitem action='popup-delete-selection'/>
   </popup>
   <popup name='calendar-search-options'>
     <menuitem action='calendar-search-advanced-hidden'/>
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index c3ce87108a..1dc66b44bc 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -45,7 +45,7 @@
   </menubar>
   <toolbar name='main-toolbar'>
     <toolitem action='address-book-print'/>
-    <toolitem action='contact-delete'/>
+    <toolitem action='delete-selection'/>
     <toolitem action='address-book-stop'/>
   </toolbar>
   <popup name='address-book-popup'>
@@ -64,17 +64,18 @@
     <separator/>
     <menuitem action='contact-popup-open'/>
     <menuitem action='contact-popup-save-as'/>
-    <menuitem action='contact-popup-forward'/>
-    <menuitem action='contact-popup-send-message'/>
     <menuitem action='contact-popup-print'/>
     <separator/>
-    <menuitem action='contact-popup-copy'/>
-    <menuitem action='contact-popup-move'/>
-    <separator/>
     <menuitem action='popup-cut-clipboard'/>
     <menuitem action='popup-copy-clipboard'/>
     <menuitem action='popup-paste-clipboard'/>
-    <menuitem action='contact-popup-delete'/>
+    <separator/>
+    <menuitem action='contact-popup-copy'/>
+    <menuitem action='contact-popup-move'/>
+    <menuitem action='contact-popup-forward'/>
+    <menuitem action='contact-popup-send-message'/>
+    <separator/>
+    <menuitem action='popup-delete-selection'/>
   </popup>
   <popup name='contact-search-options'>
     <menuitem action='contact-search-advanced-hidden'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index 29c4263440..c20ebc5334 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -12,6 +12,7 @@
     <menu action='edit-menu'>
       <placeholder name='edit-actions'>
         <menuitem action='memo-delete'/>
+        <menuitem action='memo-list-delete'/>
       </placeholder>
     </menu>
     <menu action='view-menu'>
@@ -32,7 +33,7 @@
       <toolitem action='paste-clipboard'/>
       <separator/>
       <toolitem action='memo-list-print'/>
-      <toolitem action='memo-delete'/>
+      <toolitem action='delete-selection'/>
     </placeholder>
   </toolbar>
   <popup name='memo-popup'>
@@ -49,7 +50,7 @@
     <separator/>
     <menuitem action='memo-popup-forward'/>
     <separator/>
-    <menuitem action='memo-popup-delete'/>
+    <menuitem action='popup-delete-selection'/>
   </popup>
   <popup name='memo-list-popup'>
     <menuitem action='memo-list-new'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index de4d97e067..4483c95a1e 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -12,6 +12,7 @@
     <menu action='edit-menu'>
       <placeholder name='edit-actions'>
         <menuitem action='task-delete'/>
+        <menuitem action='task-list-delete'/>
         <separator/>
         <menuitem action='task-mark-complete'/>
         <menuitem action='task-mark-incomplete'/>
@@ -41,7 +42,7 @@
     <toolitem action='paste-clipboard'/>
     <separator/>
     <toolitem action='task-print'/>
-    <toolitem action='task-delete'/>
+    <toolitem action='delete-selection'/>
   </toolbar>
   <popup name='task-popup'>
     <menuitem action='task-new'/>
@@ -60,7 +61,7 @@
     <menuitem action='task-popup-mark-complete'/>
     <menuitem action='task-popup-mark-incomplete'/>
     <separator/>
-    <menuitem action='task-popup-delete'/>
+    <menuitem action='popup-delete-selection'/>
   </popup>
   <popup name='task-list-popup'>
     <menuitem action='task-list-new'/>