* Fixes NB#92691, remove View attachment from menu

pmo-trunk-r6326

diff --git a/src/hildon2/modest-main-window-ui.h b/src/hildon2/modest-main-window-ui.h
index 4eb9620..5873917 100644 (file)
--- a/src/hildon2/modest-main-window-ui.h
+++ b/src/hildon2/modest-main-window-ui.h
@@ -87,7 +87,6 @@ static const GtkActionEntry modest_action_entries [] = {
        { "ViewNextMessage", NULL, N_("mcen_me_viewer_nextmessage"),      NULL, NULL, G_CALLBACK (modest_ui_actions_on_next) },
 
        /* Attachments */
-       { "ViewAttachment", NULL, N_("mcen_me_viewer_view_attachment"), NULL, NULL, G_CALLBACK (modest_ui_actions_view_attachment) },
        { "SaveAttachment", NULL, N_("mcen_me_viewer_save_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_save_attachments) },
        { "RemoveAttachment", NULL, N_("mcen_me_inbox_remove_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_remove_attachments) },
        

diff --git a/src/hildon2/modest-msg-view-window-ui-dimming.h b/src/hildon2/modest-msg-view-window-ui-dimming.h
index 79f678c..b48afae 100644 (file)
--- a/src/hildon2/modest-msg-view-window-ui-dimming.h
+++ b/src/hildon2/modest-msg-view-window-ui-dimming.h
@@ -33,7 +33,6 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
        
        /* Attachments Menu */
        { "/MenuBar/AttachmentsMenu", NULL },
-       { "/MenuBar/AttachmentsMenu/ViewAttachmentMenu", G_CALLBACK(modest_ui_dimming_rules_on_view_attachments) },
        { "/MenuBar/AttachmentsMenu/SaveAttachmentMenu", G_CALLBACK(modest_ui_dimming_rules_on_save_attachments) },
        { "/MenuBar/AttachmentsMenu/RemoveAttachmentMenu", G_CALLBACK(modest_ui_dimming_rules_on_remove_attachments) },
 

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 01a33be..cc9d55d 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -68,7 +68,6 @@
     </menu>
 
     <menu name="AttachmentsMenu" action="Attachments">
-      <menuitem name="ViewAttachmentMenu" action="ViewAttachment"/>
       <menuitem name="SaveAttachmentMenu" action="SaveAttachment"/>
       <menuitem name="RemoveAttachmentMenu" action="RemoveAttachment"/>
     </menu>