* Fixes NB#64415, now the show_toolbar options are per window type specific

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

diff --git a/src/maemo/ui/modest-main-window-ui.xml b/src/maemo/ui/modest-main-window-ui.xml
index 09aee19..0689133 100644 (file)
--- a/src/maemo/ui/modest-main-window-ui.xml
+++ b/src/maemo/ui/modest-main-window-ui.xml
@@ -46,16 +46,17 @@
       <menuitem name="EmailContentsMenu"     action="EmailContents"/>
       <menuitem name="EmailPurgeAttachmentsMenu" action="EmailPurgeAttachments"/>
       <separator/>
+      <menuitem name="EmailRenameMenu" action="EmailRenameFolder"/>
       <menuitem name="EmailDeleteMenu" action="EmailDelete"/>
       <separator/>
       <menuitem name="EmailDetailsMenu" action="EmailDetails"/>
     </menu>
     
     <menu name="EditMenu" action="Edit">
-      <menuitem name="EditCutMenu" action="EditCut"/>
-      <menuitem name="EditCopyMenu" action="EditCopy"/>
-      <menuitem name="EditPasteMenu" action="EditPaste"/>
-      <separator/>
+<!--       <menuitem name="EditCutMenu" action="EditCut"/> -->
+<!--       <menuitem name="EditCopyMenu" action="EditCopy"/> -->
+<!--       <menuitem name="EditPasteMenu" action="EditPaste"/> -->
+<!--       <separator/> -->
       <menuitem name="EditSelectAllMenu" action="EditSelectAll"/>
       <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
       <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>
@@ -117,10 +118,10 @@
     <menuitem action="HeaderViewCSMReplyAll"/>
     <menuitem action="HeaderViewCSMForward"/>
     <menuitem action="HeaderViewCSMCancelSending"/>
-    <separator/>
-    <menuitem action="HeaderViewCSMCut"/>
-    <menuitem action="HeaderViewCSMCopy"/>
-    <menuitem action="HeaderViewCSMPaste"/>
+<!--     <separator/> -->
+<!--     <menuitem action="HeaderViewCSMCut"/> -->
+<!--     <menuitem action="HeaderViewCSMCopy"/> -->
+<!--     <menuitem action="HeaderViewCSMPaste"/> -->
     <separator/>
     <menuitem action="HeaderViewCSMDelete"/>
     <menuitem action="HeaderViewCSMHelp"/>