* Fixes NB#92686, migrate the main window menus to the 1,5 specs

pmo-drop-split-view-r6620

diff --git a/src/hildon2/modest-main-window-ui-dimming.h b/src/hildon2/modest-main-window-ui-dimming.h
index 262a9ca..15e8c7b 100644 (file)
--- a/src/hildon2/modest-main-window-ui-dimming.h
+++ b/src/hildon2/modest-main-window-ui-dimming.h
@@ -41,16 +41,12 @@ G_BEGIN_DECLS
 static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
 
        /* Email Menu */
-       { "/MenuBar/EmailMenu/EmailNewMainMenu", NULL },
-       { "/MenuBar/EmailMenu/EmailNewMainMenu/EmailNewFolderMenu", G_CALLBACK(modest_ui_dimming_rules_on_new_folder) },
-       { "/MenuBar/EmailMenu/EmailOpenMenu", G_CALLBACK(modest_ui_dimming_rules_on_open_msg) },
-       { "/MenuBar/EmailMenu/EmailReplyMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
+       { "/MenuBar/EmailMenu/EmailNewFolderMenu", G_CALLBACK(modest_ui_dimming_rules_on_new_folder) },
        { "/MenuBar/EmailMenu/EmailReplyAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/MenuBar/EmailMenu/EmailForwardMenu",  G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/MenuBar/EmailMenu/EmailContentsMenu", G_CALLBACK(modest_ui_dimming_rules_on_contents_msg) },
        { "/MenuBar/EmailMenu/EmailPurgeAttachmentsMenu", G_CALLBACK(modest_ui_dimming_rules_on_remove_attachments) },
        { "/MenuBar/EmailMenu/EmailRenameMenu",  G_CALLBACK(modest_ui_dimming_rules_on_rename_folder) },
-       { "/MenuBar/EmailMenu/EmailDeleteMenu",  G_CALLBACK(modest_ui_dimming_rules_on_delete) },
        { "/MenuBar/EmailMenu/EmailDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details) },
 
        /* Edit Menu */

diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
index 5ee5aec..c650fd2 100644 (file)
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ b/src/hildon2/ui/modest-main-window-ui.xml
@@ -33,13 +33,8 @@
   <menubar name="MenuBar">
     
     <menu name="EmailMenu" action="Email">
-      <menu name="EmailNewMainMenu" action="EmailNew">
-       <menuitem name="EmailNewMessageMenu"  action="EmailNewMessage"/>
-       <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
-      </menu>
-      <menuitem name="EmailOpenMenu" action="EmailOpen"/>
+      <menuitem name="EmailNewFolderMenu" action="EmailNewFolder"/>
       <separator/>
-      <menuitem name="EmailReplyMenu" action="EmailReply"/>
       <menuitem name="EmailReplyAllMenu" action="EmailReplyAll"/>
       <menuitem name="EmailForwardMenu" action="EmailForward"/>
       <separator/>
@@ -47,16 +42,11 @@
       <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="EditSelectAllMenu" action="EditSelectAll"/>
       <menuitem name="EditMarkAsReadMenu" action="EditMarkAsRead"/>
       <menuitem name="EditMarkAsUnreadMenu" action="EditMarkAsUnread"/>