* Removed header view and folder view CSM menus in main window

  (fixes NB#93296).

pmo-trunk-r6374

diff --git a/src/hildon2/modest-main-window-ui-dimming.h b/src/hildon2/modest-main-window-ui-dimming.h
index 15e8c7b..d7d63d8 100644 (file)
--- a/src/hildon2/modest-main-window-ui-dimming.h
+++ b/src/hildon2/modest-main-window-ui-dimming.h
@@ -65,7 +65,6 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu", G_CALLBACK(modest_ui_dimming_rules_on_send_receive_all) },
        { "/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveCancelSendingMenu", G_CALLBACK(modest_ui_dimming_rules_on_cancel_sending) },
        { "/MenuBar/ToolsMenu/ToolsContactsMenu", NULL },
-       { "/MenuBar/ToolsMenu/ToolsHelpMenu", NULL },
 
        /* Close Menu */
        { "/MenuBar/CloseMenu", NULL },
@@ -79,7 +78,6 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        { "/HeaderViewCSM/HeaderViewCSMForward", G_CALLBACK(modest_ui_dimming_rules_on_reply_msg) },
        { "/HeaderViewCSM/HeaderViewCSMDelete", G_CALLBACK(modest_ui_dimming_rules_on_delete_msg) },
        { "/HeaderViewCSM/HeaderViewCSMCancelSending", G_CALLBACK(modest_ui_dimming_rules_on_cancel_sending) },
-       { "/HeaderViewCSM/HeaderViewCSMHelp", NULL },
 
        /* Contextual Menus (Folder View) */
        { "/FolderViewCSM/FolderViewCSMNewFolder", G_CALLBACK(modest_ui_dimming_rules_on_new_folder) },
@@ -87,7 +85,6 @@ static const ModestDimmingEntry modest_main_window_menu_dimming_entries [] = {
        { "/FolderViewCSM/FolderViewCSMPasteMsgs", G_CALLBACK(modest_ui_dimming_rules_on_paste) },
        { "/FolderViewCSM/FolderViewCSMDeleteFolder", G_CALLBACK(modest_ui_dimming_rules_on_delete_folder) },
        { "/FolderViewCSM/FolderViewCSMSearchMessages", NULL },
-       { "/FolderViewCSM/FolderViewCSMHelp", NULL },
 
        /* Contextual Menus (Toolbar) */
        { "/ToolbarReplyCSM/ToolbarMessageForward", NULL },

diff --git a/src/hildon2/modest-main-window.c b/src/hildon2/modest-main-window.c
index e7441b3..927bdd5 100644 (file)
--- a/src/hildon2/modest-main-window.c
+++ b/src/hildon2/modest-main-window.c
@@ -898,26 +898,6 @@ modest_main_window_cleanup_queue_error_signals (ModestMainWindow *self)
 
 
 static void
-_folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
-{
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
-
-       /* Update dimmed */
-       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW(user_data));
-}
-
-static void
-_header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data)
-{
-       g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data));
-
-       /* Update visibility */
-
-       /* Update dimmed */
-       modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW(user_data));
-}
-
-static void
 modest_main_window_disconnect_signals (ModestWindow *self)
 {      
        ModestMainWindowPrivate *priv;  
@@ -932,7 +912,6 @@ connect_signals (ModestMainWindow *self)
 {      
        ModestWindowPrivate *parent_priv;
        ModestMainWindowPrivate *priv;
-       GtkWidget *menu;
        
        priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
        parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
@@ -959,12 +938,6 @@ connect_signals (ModestMainWindow *self)
                                           G_CALLBACK (on_folder_view_focus_in), 
                                           self);
 
-       /* Folder view CSM */
-       menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM");
-       gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->folder_view), menu, NULL, 0);
-       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), "tap-and-hold",
-                                                      G_CALLBACK(_folder_view_csm_menu_activated),
-                                                      self);
        /* header view */
        priv->sighandlers = 
                modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "header_selected",
@@ -991,14 +964,6 @@ connect_signals (ModestMainWindow *self)
                                           G_CALLBACK (on_updating_msg_list), 
                                           self);
        
-       /* Header view CSM */
-       menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM");
-       gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0);
-       priv->sighandlers = 
-               modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold",
-                                          G_CALLBACK(_header_view_csm_menu_activated),
-                                          self);
-
        /* window */
        /* we don't register this in sighandlers, as it should be run after disconnecting all signals,
         * in destroy stage */

diff --git a/src/hildon2/modest-msg-edit-window-ui-dimming.h b/src/hildon2/modest-msg-edit-window-ui-dimming.h
index 09435b9..acf94d2 100644 (file)
--- a/src/hildon2/modest-msg-edit-window-ui-dimming.h
+++ b/src/hildon2/modest-msg-edit-window-ui-dimming.h
@@ -11,7 +11,6 @@ G_BEGIN_DECLS
 static const ModestDimmingEntry modest_msg_edit_window_menu_dimming_entries [] = {
 
        /* Format Menu */
-       { "/MenuBar/FormatMenu/SelectFontMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
        { "/MenuBar/FormatMenu/AlignmentMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
        { "/MenuBar/FormatMenu/AlignmentLeftMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },
        { "/MenuBar/FormatMenu/AlignmentRightMenu", G_CALLBACK (modest_ui_dimming_rules_on_set_style) },

diff --git a/src/hildon2/ui/modest-main-window-ui.xml b/src/hildon2/ui/modest-main-window-ui.xml
index 6d5e5d1..43730ab 100644 (file)
--- a/src/hildon2/ui/modest-main-window-ui.xml
+++ b/src/hildon2/ui/modest-main-window-ui.xml
@@ -86,29 +86,6 @@
     <toolitem action="ToolbarCancel" position="bot"/>
   </toolbar>
 
-  <popup name="HeaderViewCSM">
-    <menuitem action="HeaderViewCSMReply"/>
-    <menuitem action="HeaderViewCSMReplyAll"/>
-    <menuitem action="HeaderViewCSMForward"/>
-    <menuitem action="HeaderViewCSMCancelSending"/>
-<!--     <separator/> -->
-<!--     <menuitem action="HeaderViewCSMCut"/> -->
-<!--     <menuitem action="HeaderViewCSMCopy"/> -->
-<!--     <menuitem action="HeaderViewCSMPaste"/> -->
-    <separator/>
-    <menuitem action="HeaderViewCSMDelete"/>
-  </popup>
-
-  <popup name="FolderViewCSM">
-    <menuitem action="FolderViewCSMNewFolder"/>
-    <menuitem action="FolderViewCSMRenameFolder"/>
-    <menuitem action="FolderViewCSMDeleteFolder"/>
-    <separator/>
-<!--    <menuitem action="FolderViewCSMPasteMsgs"/> -->
-    <separator/>
-    <separator/>
-  </popup>
-
   <popup name="ToolbarReplyCSM" action="ToolbarCSM">
     <menuitem action="ToolbarMessageForward"/>
     <menuitem action="ToolbarMessageReplyAll"/>