Reorganize the message view menu, following the new ui specs:

   * Removed find in message as it's not used very often.

Fix 2/2 for NB#156612

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index cf2f3f3..fa6cc1a 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -3911,9 +3911,9 @@ 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_viewer_find"), NULL,
-                                          APP_MENU_CALLBACK (modest_msg_view_window_show_find_toolbar),
-                                          MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_find_in_msg));
+       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),
                                           dngettext(GETTEXT_PACKAGE,
@@ -3939,9 +3939,6 @@ setup_menu (ModestMsgViewWindow *self)
                                           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_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"), NULL,
                                           APP_MENU_CALLBACK (modest_ui_actions_add_to_contacts),
                                           MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_add_to_contacts));

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index aca66e5..5505e67 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -65,6 +65,5 @@
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
-  <accelerator name="AccelFindInMessage" action="FindInMessage"/>
 
   </ui>