Set properly menu check items for view cc and view bcc

pmo-drop-split-view-r6860

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 7b9c859..f2a67e5 100644 (file)
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -1085,15 +1085,19 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        gchar *to, *cc, *bcc, *subject;
        gchar *body;
        ModestMsgEditWindowPrivate *priv;
+       ModestWindowPrivate *parent_priv;
        GtkTextIter iter;
        TnyHeaderFlags priority_flags;
        TnyFolder *msg_folder;
        gboolean is_html = FALSE;
+       GtkAction *action;
+       gboolean field_view_set;
        
        g_return_if_fail (MODEST_IS_MSG_EDIT_WINDOW (self));
        g_return_if_fail (TNY_IS_MSG (msg));
 
        priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (self);
+       parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
 
        header = tny_msg_get_header (msg);
        to      = tny_header_dup_to (header);
@@ -1104,6 +1108,9 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
 
        if (to)
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->to_field),  to);
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewCcFieldMenu");
+       field_view_set = TRUE;
        if (cc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->cc_field),  cc);
                gtk_widget_set_no_show_all (priv->cc_caption, FALSE);
@@ -1111,7 +1118,13 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_CC, NULL)) {
                gtk_widget_set_no_show_all (priv->cc_caption, TRUE);
                gtk_widget_hide (priv->cc_caption);
+               field_view_set = FALSE;
        }
+       if (action)
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), field_view_set);
+
+       action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewBccFieldMenu");
+       field_view_set = TRUE;
        if (bcc) {
                modest_recpt_editor_set_recipients (MODEST_RECPT_EDITOR (priv->bcc_field), bcc);
                gtk_widget_set_no_show_all (priv->bcc_caption, FALSE);
@@ -1119,7 +1132,12 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
        } else if (!modest_conf_get_bool (modest_runtime_get_conf (), MODEST_CONF_SHOW_BCC, NULL)) {
                gtk_widget_set_no_show_all (priv->bcc_caption, TRUE);
                gtk_widget_hide (priv->bcc_caption);
-       } 
+               field_view_set = FALSE;
+       }
+       if (action)
+               gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), field_view_set);
+
+
        if (subject)
                gtk_entry_set_text (GTK_ENTRY(priv->subject_field), subject);
        modest_msg_edit_window_set_priority_flags (MODEST_MSG_EDIT_WINDOW(self),