Remove CSM in msg view.

pmo-trunk-r7982

diff --git a/src/hildon2/modest-msg-view-window-ui-dimming.h b/src/hildon2/modest-msg-view-window-ui-dimming.h
index b48afae..9658090 100644 (file)
--- a/src/hildon2/modest-msg-view-window-ui-dimming.h
+++ b/src/hildon2/modest-msg-view-window-ui-dimming.h
@@ -44,10 +44,6 @@ static const ModestDimmingEntry modest_msg_view_menu_dimming_entries [] = {
        { "/MenuBar/ToolsMenu/CloseWindowMenu", NULL },
        { "/MenuBar/ToolsMenu/CloseAllWindowsMenu", NULL },
 
        { "/MenuBar/ToolsMenu/CloseWindowMenu", NULL },
        { "/MenuBar/ToolsMenu/CloseAllWindowsMenu", NULL },
 

-       /* Contextual Menus (Toolbar) */
-       { "/ToolbarReplyCSM/MessageForwardMenu", NULL },
-       { "/ToolbarReplyCSM/MessageReplyAllMenu", NULL },
-       { "/ToolbarReplyCSM/MessageReplyMenu", NULL },

        
 };
 
        
 };
 

diff --git a/src/hildon2/modest-msg-view-window.c b/src/hildon2/modest-msg-view-window.c
index 025b68f..a148f89 100644 (file)
--- a/src/hildon2/modest-msg-view-window.c
+++ b/src/hildon2/modest-msg-view-window.c
@@ -2197,7 +2197,6 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
 {
        ModestMsgViewWindowPrivate *priv = NULL;
        ModestWindowPrivate *parent_priv;
 {
        ModestMsgViewWindowPrivate *priv = NULL;
        ModestWindowPrivate *parent_priv;

-       GtkWidget *reply_button = NULL, *menu = NULL;

 
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);
 
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
        priv = MODEST_MSG_VIEW_WINDOW_GET_PRIVATE(self);

@@ -2219,13 +2218,6 @@ modest_msg_view_window_show_toolbar (ModestWindow *self,
                hildon_window_add_toolbar (HILDON_WINDOW (self), 
                                           GTK_TOOLBAR (parent_priv->toolbar));
 
                hildon_window_add_toolbar (HILDON_WINDOW (self), 
                                           GTK_TOOLBAR (parent_priv->toolbar));
 

-               /* Set reply button tap and hold menu */
-               reply_button = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-                                                         "/ToolBar/ToolbarMessageReply");
-               menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, 
-                                                 "/ToolbarReplyCSM");
-               if (menu && reply_button)
-                       gtk_widget_tap_and_hold_setup (GTK_WIDGET (reply_button), menu, NULL, 0);

        }
 
        if (show_toolbar) {
        }
 
        if (show_toolbar) {

diff --git a/src/hildon2/ui/modest-msg-view-window-ui.xml b/src/hildon2/ui/modest-msg-view-window-ui.xml
index 0aac525..41ed15a 100644 (file)
--- a/src/hildon2/ui/modest-msg-view-window-ui.xml
+++ b/src/hildon2/ui/modest-msg-view-window-ui.xml
@@ -60,11 +60,6 @@
     <toolitem action="ToolbarMessageNext" position="bot"/>
   </toolbar>
 
     <toolitem action="ToolbarMessageNext" position="bot"/>
   </toolbar>
 

-  <popup name="ToolbarReplyCSM">
-      <menuitem name="MessageReplyAllMenu" action="EmailReplyAll"/>
-      <menuitem name="MessageForwardMenu" action="EmailForward"/>
-  </popup>
-

   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>
   <accelerator name="AccelZoomMinus" action="ZoomMinus"/>
   <accelerator name="AccelZoomPlus" action="ZoomPlus"/>
   <accelerator name="AccelToggleFullscreen" action="ToggleFullscreen"/>