From: Sergio Villar Senin <svillar@igalia.com>
Date: Wed, 9 Sep 2009 09:01:01 +0000 (+0200)
Subject: Fixes NB#131601, toolbar lost in editor after canceling "lose formatting" confirmatio... 
X-Git-Tag: 3.0.17-rc52~4
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=cf96b9042c5bb24791069cdee123f0437a0296eb

Fixes NB#131601, toolbar lost in editor after canceling "lose formatting" confirmation note
---

diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c
index 27c1878..c9c8497 100644
--- a/src/hildon2/modest-msg-edit-window.c
+++ b/src/hildon2/modest-msg-edit-window.c
@@ -3070,19 +3070,13 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
 
 	gtk_widget_set_no_show_all (GTK_WIDGET (parent_priv->toolbar), TRUE);
 
-	if (parent_priv->toolbar) {
-		if (file_format == MODEST_FILE_FORMAT_PLAIN_TEXT) {
-			gtk_widget_hide (parent_priv->toolbar);
-		} else {
-			gtk_widget_show (parent_priv->toolbar);
-		}
-	}
-
 	if (current_format != file_format) {
 		switch (file_format) {
 		case MODEST_FILE_FORMAT_FORMATTED_TEXT:
 			wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), TRUE);
 			remove_tags (WP_TEXT_BUFFER (priv->text_buffer));
+			if (parent_priv->toolbar)
+				gtk_widget_show (parent_priv->toolbar);
 			break;
 		case MODEST_FILE_FORMAT_PLAIN_TEXT:
 		{
@@ -3093,7 +3087,8 @@ modest_msg_edit_window_set_file_format (ModestMsgEditWindow *window,
 			gtk_widget_destroy (dialog);
 			if (response == GTK_RESPONSE_OK) {
 				wp_text_buffer_enable_rich_text (WP_TEXT_BUFFER (priv->text_buffer), FALSE);
-				if (parent_priv->toolbar) gtk_widget_hide (parent_priv->toolbar);
+				if (parent_priv->toolbar)
+					gtk_widget_hide (parent_priv->toolbar);
 			} else {
 				GtkToggleAction *action = GTK_TOGGLE_ACTION (gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/FormatMenu/FileFormatFormattedTextMenu"));
 				modest_utils_toggle_action_set_active_block_notify (action, TRUE);