X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-msg-view-window.c;h=a40707d31d191f5ac7b34ab0238ae9e0412b2ad1;hb=df5dce160ee41889f8fd1539ea66bd9beac0609a;hp=31c2671efcb3020f761c40921c41e3da5a70d682;hpb=3534e326a11dd5616bd58391fce9071222b6b9fb;p=modest

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 31c2671..a40707d 100644
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -734,7 +734,6 @@ modest_msg_view_window_construct (ModestMsgViewWindow *self,
 
 	/* Menubar */
 	parent_priv->menubar = NULL;
-	parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new();
 
 	toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE);
 	clipboard_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_CLIPBOARD, FALSE);
@@ -2786,7 +2785,7 @@ modest_msg_view_window_save_attachments (ModestMsgViewWindow *window, TnyList *m
 						      GTK_FILE_CHOOSER_ACTION_SAVE);
 
 	/* set folder */
-	folder = g_build_filename (g_get_home_dir (), g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
+	folder = g_build_filename (g_getenv (MYDOCS_ENV), DOCS_FOLDER, NULL);
 	gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (save_dialog), folder);
 	g_free (folder);
 
@@ -3094,31 +3093,31 @@ setup_menu (ModestMsgViewWindow *self)
 	g_return_if_fail (MODEST_IS_MSG_VIEW_WINDOW(self));
 
 	/* Settings menu buttons */
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_replytoall"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_replytoall"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_reply_all),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_reply_msg));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_forward"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_forward"), "<Control>d",
 					   APP_MENU_CALLBACK (modest_ui_actions_on_forward),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_reply_msg));
 	
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_mark_as_read"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_mark_as_read"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_mark_as_read),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_read_msg_in_view));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_mark_as_unread"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_mark_as_unread"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_on_mark_as_unread),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_mark_as_unread_msg_in_view));
 	
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_save_attachments"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_save_attachments"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_save_attachments),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_save_attachments));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_remove_attachments"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_remove_attachments),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_remove_attachments));
 	
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_newemail"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_new_message"), "<Control>n",
 					   APP_MENU_CALLBACK (modest_ui_actions_on_new_msg),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_new_msg));
-	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"),
+	modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_viewer_addtocontacts"), NULL,
 					   APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
 					   MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));
 }