Rename ModestToolbarDimmingRules to ModestWindowDimmingRules and

[modest] / src / maemo / modest-main-window-ui.h

diff --git a/src/maemo/modest-main-window-ui.h b/src/maemo/modest-main-window-ui.h
index 9bbc353..9da7705 100644 (file)
--- a/src/maemo/modest-main-window-ui.h
+++ b/src/maemo/modest-main-window-ui.h
@@ -42,11 +42,11 @@ G_BEGIN_DECLS
 static const GtkActionEntry modest_action_entries [] = {
 
        /* Toplevel menus */
-       { "Email",       NULL, N_("mcen_me_inbox_email"),        NULL, NULL, G_CALLBACK (modest_ui_actions_on_email_menu_activated) },
-       { "Edit",        NULL, N_("mcen_me_inbox_edit"),         NULL, NULL, G_CALLBACK (modest_ui_actions_on_edit_menu_activated) },
-       { "View",        NULL, N_("mcen_me_inbox_view"),         NULL, NULL, G_CALLBACK (modest_ui_actions_on_view_menu_activated) },
-       { "Tools",       NULL, N_("mcen_me_inbox_tools"),        NULL, NULL, G_CALLBACK (modest_ui_actions_on_tools_menu_activated) },
-       { "Attachments", NULL, N_("mcen_me_viewer_attachments"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_attachment_menu_activated) },
+       { "Email",       NULL, N_("mcen_me_inbox_email"),        NULL, NULL, NULL },
+       { "Edit",        NULL, N_("mcen_me_inbox_edit"),         NULL, NULL, NULL },
+       { "View",        NULL, N_("mcen_me_inbox_view"),         NULL, NULL, NULL },
+       { "Tools",       NULL, N_("mcen_me_inbox_tools"),        NULL, NULL, NULL },
+       { "Attachments", NULL, N_("mcen_me_viewer_attachments"), NULL, NULL, NULL },
        { "Close",       NULL, N_("mcen_me_inbox_close") },
        { "Zoom",        NULL, N_("Zoom") },
 
@@ -58,7 +58,7 @@ static const GtkActionEntry modest_action_entries [] = {
        /* Email */
        { "EmailNew", NULL, N_("mcen_me_inbox_new") }, /* submenu */
        { "EmailNewMessage",  NULL,  N_("mcen_me_inbox_message"),      "<CTRL>N", NULL,   G_CALLBACK (modest_ui_actions_on_new_msg) },
-       { "EmailNewDefault", NULL, N_("mcen_me_viewer_newemail"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_msg) },
+       { "EmailNewDefault", NULL, N_("mcen_me_viewer_newemail"), "<CTRL>N", NULL, G_CALLBACK (modest_ui_actions_on_new_msg) },
        { "EmailNewFolder",   NULL,  N_("mcen_me_inbox_folder"),       NULL,      NULL,   G_CALLBACK (modest_ui_actions_on_new_folder) },
        { "EmailOpen",        NULL,  N_("mcen_me_inbox_open"),          "<CTRL>O", NULL,   G_CALLBACK (modest_ui_actions_on_open) },
        { "EmailReply",       NULL,  N_("mcen_me_inbox_reply"),         "<CTRL>R",      NULL,   G_CALLBACK (modest_ui_actions_on_reply) },