Remove Hildon1 conditional code from hildon2.

[modest] / src / hildon2 / ui / modest-main-window-ui.xml

diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
index c650fd2..43730ab 100644 (file)
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ b/src/hildon2/ui/modest-main-window-ui.xml
@@ -71,8 +71,6 @@
       </menu>
       <separator/>
       <menuitem name="ToolsContactsMenu" action="ToolsContacts"/>
-      <separator/>
-      <menuitem name="ToolsHelpMenu" action="ToolsHelp"/>
     </menu>
     
   </menubar>
@@ -88,31 +86,6 @@
     <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
-  <popup name="HeaderViewCSM">
-    <menuitem action="HeaderViewCSMReply"/>
-    <menuitem action="HeaderViewCSMReplyAll"/>
-    <menuitem action="HeaderViewCSMForward"/>
-    <menuitem action="HeaderViewCSMCancelSending"/>
-<!--     <separator/> -->
-<!--     <menuitem action="HeaderViewCSMCut"/> -->
-<!--     <menuitem action="HeaderViewCSMCopy"/> -->
-<!--     <menuitem action="HeaderViewCSMPaste"/> -->
-    <separator/>
-    <menuitem action="HeaderViewCSMDelete"/>
-    <menuitem action="HeaderViewCSMHelp"/>
-  </popup>
-
-  <popup name="FolderViewCSM">
-    <menuitem action="FolderViewCSMNewFolder"/>
-    <menuitem action="FolderViewCSMRenameFolder"/>
-    <menuitem action="FolderViewCSMDeleteFolder"/>
-    <separator/>
-<!--    <menuitem action="FolderViewCSMPasteMsgs"/> -->
-    <separator/>
-    <separator/>
-    <menuitem action="FolderViewCSMHelp"/>
-  </popup>
-
   <popup name="ToolbarReplyCSM" action="ToolbarCSM">
     <menuitem action="ToolbarMessageForward"/>
     <menuitem action="ToolbarMessageReplyAll"/>