In message_reader, ignore folder parameter if header provided (fix 4 for NB#126941)

[modest] / src / hildon2 / modest-msg-view-window-ui-dimming.h

diff --git a/src/hildon2/modest-msg-view-window-ui-dimming.h b/src/hildon2/modest-msg-view-window-ui-dimming.h
index 79f678c..cf1984a 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) },
 
@@ -45,10 +44,6 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
        { "/MenuBar/ToolsMenu/CloseWindowMenu", NULL },
        { "/MenuBar/ToolsMenu/CloseAllWindowsMenu", NULL },
 
-       /* Contextual Menus (Toolbar) */
-       { "/ToolbarReplyCSM/MessageForwardMenu", NULL },
-       { "/ToolbarReplyCSM/MessageReplyAllMenu", NULL },
-       { "/ToolbarReplyCSM/MessageReplyMenu", NULL },
        
 };
 
@@ -64,12 +59,11 @@ static const ModestDimmingEntry modest_msg_view_toolbar_dimming_entries [] = {
 
        /* Toolbar */
        { "/ToolBar/ToolbarMessageReply", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
-       { "/ToolBar/ToolbarMessageMoveTo", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
+       { "/ToolBar/ToolbarMessageReplyAll", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/ToolBar/ToolbarDeleteMessage",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
-       { "/ToolBar/FindInMessage", G_CALLBACK(modest_ui_dimming_rules_on_find_msg) },
+       { "/ToolBar/ToolbarDownloadExternalImages", G_CALLBACK(modest_ui_dimming_rules_on_fetch_images) },
        { "/ToolBar/ToolbarMessageBack", G_CALLBACK(modest_ui_dimming_rules_on_view_previous) },
        { "/ToolBar/ToolbarMessageNext", G_CALLBACK(modest_ui_dimming_rules_on_view_next) },
-       { "/ToolBar/ToolbarCancel", NULL },
 };
 
 G_END_DECLS