X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window-ui-dimming.h;h=270b83d323cd98c54ad11e9d38f4e827ce17a955;hb=266e59ba330fbca5c32475b5696ec2e28a99ede6;hp=79f678c64f0008684db4d7d488abbf9d3a4f84c5;hpb=a7be4d9c27d5a6074f3a1701b12bcc2c45887022;p=modest

diff --git a/src/hildon2/modest-msg-view-window-ui-dimming.h b/src/hildon2/modest-msg-view-window-ui-dimming.h
index 79f678c..270b83d 100644
--- a/src/hildon2/modest-msg-view-window-ui-dimming.h
+++ b/src/hildon2/modest-msg-view-window-ui-dimming.h
@@ -14,7 +14,6 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
 	{ "/MenuBar/MessageMenu/MessageNewMenu", G_CALLBACK(modest_ui_dimming_rules_on_new_msg) },
 	{ "/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",  G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
 	{ "/MenuBar/MessageMenu/MessageDetailsMenu", G_CALLBACK(modest_ui_dimming_rules_on_details) },
 
@@ -33,7 +32,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 +43,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 +58,12 @@ 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/ToolbarMessageForward", 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