From: José Dapena Paz <jdapena@igalia.com>
Date: Thu, 17 Dec 2009 16:20:47 +0000 (+0100)
Subject: Fix showing the calendar box when it shouldn't
X-Git-Tag: 3.2.10-1~2
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=ebfd2dc6d77fd9a54fe5d611403647421b994610

Fix showing the calendar box when it shouldn't
---

diff --git a/src/widgets/modest-gtkhtml-msg-view.c b/src/widgets/modest-gtkhtml-msg-view.c
index b2c5205..34a0367 100644
--- a/src/widgets/modest-gtkhtml-msg-view.c
+++ b/src/widgets/modest-gtkhtml-msg-view.c
@@ -1284,6 +1284,8 @@ modest_gtkhtml_msg_view_init (ModestGtkhtmlMsgView *obj)
 
 	priv->calendar_actions_container = gtk_vbox_new (FALSE, 0);
 	gtk_box_pack_start (GTK_BOX (priv->headers_box), priv->calendar_actions_container, FALSE, FALSE, 0);
+	gtk_widget_hide_all (priv->calendar_actions_container);
+	gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
 
 #ifndef MODEST_TOOLKIT_HILDON2
 	separator = gtk_hseparator_new ();
@@ -1938,16 +1940,16 @@ set_message (ModestGtkhtmlMsgView *self, TnyMsg *msg, TnyMimePart *other_body)
 #ifdef MODEST_TOOLKIT_HILDON2
 	gtk_widget_set_no_show_all (priv->priority_box, TRUE);
 	gtk_widget_set_no_show_all (priv->calendar_box, TRUE);
-	gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
 #endif
+	gtk_widget_set_no_show_all (priv->calendar_actions_container, TRUE);
 	gtk_widget_set_no_show_all (priv->attachments_box, TRUE);
 	gtk_widget_show_all (priv->mail_header_view);
 	gtk_widget_set_no_show_all (priv->attachments_box, FALSE);
 #ifdef MODEST_TOOLKIT_HILDON2
 	gtk_widget_set_no_show_all (priv->priority_box, FALSE);
 	gtk_widget_set_no_show_all (priv->calendar_box, FALSE);
-	gtk_widget_set_no_show_all (priv->calendar_actions_container, FALSE);
 #endif
+	gtk_widget_set_no_show_all (priv->calendar_actions_container, FALSE);
 	gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
 
 	html_vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (priv->html_scroll));
@@ -2031,8 +2033,8 @@ set_header (ModestGtkhtmlMsgView *self, TnyHeader *header)
 #ifdef MODEST_TOOLKIT_HILDON2
 	gtk_widget_hide_all (priv->priority_box);
 	gtk_widget_hide_all (priv->calendar_box);
-	gtk_widget_hide_all (priv->calendar_actions_container);
 #endif
+	gtk_widget_hide_all (priv->calendar_actions_container);
 	gtk_widget_set_no_show_all (priv->mail_header_view, TRUE);
 	tny_mime_part_view_clear (TNY_MIME_PART_VIEW (priv->body_view));
 	priv->idle_changes_count = 0;
@@ -2816,17 +2818,17 @@ set_calendar (ModestGtkhtmlMsgView *self, TnyHeader *header, TnyMsg *msg)
 		gtk_box_pack_start (GTK_BOX (priv->calendar_actions_container), priv->calendar_actions_box, FALSE, FALSE, 0);
 		g_signal_emit_by_name (G_OBJECT (self), "handle-calendar", calendar_part, priv->calendar_actions_box, &retval);
 		if (retval) {
-			gtk_widget_show (priv->calendar_actions_container);
+			gtk_widget_show_all (priv->calendar_actions_container);
 			gtk_widget_show (priv->calendar_actions_box);
 		} else {
-			gtk_widget_hide (priv->calendar_actions_container);
+			gtk_widget_hide_all (priv->calendar_actions_container);
 			gtk_widget_hide (priv->calendar_actions_box);
 		}
 		gtk_widget_show_all  (priv->calendar_box);
 		g_object_unref (calendar_part);
 	} else {
 		gtk_widget_hide_all (priv->calendar_box);
-		gtk_widget_hide (priv->calendar_actions_container);
+		gtk_widget_hide_all (priv->calendar_actions_container);
 		gtk_widget_hide (priv->calendar_actions_box);
 	}