This is a manual merge of branch drop split view intro trunk.

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

diff --git a/src/maemo/modest-msg-view-window-ui-dimming.h b/src/maemo/modest-msg-view-window-ui-dimming.h
index 959859d..79f678c 100644 (file)
--- a/src/maemo/modest-msg-view-window-ui-dimming.h
+++ b/src/maemo/modest-msg-view-window-ui-dimming.h
@@ -15,13 +15,11 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
        { "/MenuBar/MessageMenu/MessageReplyMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/MenuBar/MessageMenu/MessageReplyAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/MenuBar/MessageMenu/MessageForwardMenu",  G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
-       { "/MenuBar/MessageMenu/MessageDeleteMenu",  NULL },
+       { "/MenuBar/MessageMenu/MessageDeleteMenu",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
        { "/MenuBar/MessageMenu/MessageDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details) },
 
        /* Edit Menu */
        { "/MenuBar/EditMenu", NULL },
-       { "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) },
-       { "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) },
        { "/MenuBar/EditMenu/EditPasteMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) },
        { "/MenuBar/EditMenu/EditSelectAllMenu", NULL },
        { "/MenuBar/EditMenu/EditMoveToMenu", G_CALLBACK(modest_ui_dimming_rules_on_move_to) },
@@ -41,7 +39,6 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
 
        /* Tools Menu */
        { "/MenuBar/ToolsMenu", NULL },
-       { "/MenuBar/ToolsMenu/ToolsAddToContactsMenu", G_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts) },
 
        /* Close Menu */
        { "/MenuBar/CloseMenu", NULL },
@@ -55,6 +52,13 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
        
 };
 
+/* Clipboard status dimming rule entries */
+static const ModestDimmingEntry modest_msg_view_clipboard_dimming_entries [] = {
+       { "/MenuBar/EditMenu/EditCutMenu", G_CALLBACK(modest_ui_dimming_rules_always_dimmed) },
+       { "/MenuBar/EditMenu/EditCopyMenu", G_CALLBACK(modest_ui_dimming_rules_on_copy) },
+       { "/MenuBar/ToolsMenu/ToolsAddToContactsMenu", G_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts) },
+};
+
 /* Menu Dimming rules entries */
 static const ModestDimmingEntry modest_msg_view_toolbar_dimming_entries [] = {