X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-msg-edit-window.c;h=309390e787e5179fdcf4181b10a2a4ae6de07229;hp=639ecb4f3cfb3167c7ef191982a48322bc11a100;hb=c7d97f3f8158d317bd5fa78fbb91277a1c3b7555;hpb=f4c8ac213f2217771e21aade64fbed16d618a77e

diff --git a/src/maemo/modest-msg-edit-window.c b/src/maemo/modest-msg-edit-window.c
index 639ecb4..309390e 100644
--- a/src/maemo/modest-msg-edit-window.c
+++ b/src/maemo/modest-msg-edit-window.c
@@ -1255,7 +1255,7 @@ set_msg (ModestMsgEditWindow *self, TnyMsg *msg, gboolean preserve_is_rich)
 	gtk_text_buffer_get_start_iter (priv->text_buffer, &iter);
 	gtk_text_buffer_place_cursor (priv->text_buffer, &iter);
 
-	modest_msg_edit_window_reset_modified (self);
+	modest_msg_edit_window_set_modified (self, FALSE);
 
 	modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (self));
 	modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
@@ -1555,7 +1555,6 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
 	g_object_unref (menu_rules_group);
 	g_object_unref (toolbar_rules_group);
 	g_object_unref (clipboard_rules_group);
-	gtk_widget_show_all (GTK_WIDGET (obj));
 	modest_msg_edit_window_clipboard_owner_change (NULL, NULL, MODEST_MSG_EDIT_WINDOW (obj));
 
 	set_msg (MODEST_MSG_EDIT_WINDOW (obj), msg, preserve_is_rich);
@@ -1567,7 +1566,7 @@ modest_msg_edit_window_new (TnyMsg *msg, const gchar *account_name, gboolean pre
 	modest_window_check_dimming_rules_group (MODEST_WINDOW (obj), MODEST_DIMMING_RULES_CLIPBOARD);
 	priv->update_caption_visibility = TRUE;
 
-	modest_msg_edit_window_reset_modified (MODEST_MSG_EDIT_WINDOW (obj));
+	modest_msg_edit_window_set_modified (MODEST_MSG_EDIT_WINDOW (obj), FALSE);
 
 	/* Track account-removed signal, this window should be closed
 	   in the case we're creating a mail associated to the account
@@ -3022,18 +3021,19 @@ body_changed (GtkTextBuffer *buffer, ModestMsgEditWindow *editor)
 }
 
 void
-modest_msg_edit_window_reset_modified (ModestMsgEditWindow *editor)
+modest_msg_edit_window_set_modified (ModestMsgEditWindow *editor,
+				     gboolean modified)
 {
 	ModestMsgEditWindowPrivate *priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE (editor);
 	GtkTextBuffer *buffer;
 
 	buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->to_field));
-	gtk_text_buffer_set_modified (buffer, FALSE);
+	gtk_text_buffer_set_modified (buffer, modified);
 	buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->cc_field));
-	gtk_text_buffer_set_modified (buffer, FALSE);
+	gtk_text_buffer_set_modified (buffer, modified);
 	buffer = modest_recpt_editor_get_buffer (MODEST_RECPT_EDITOR(priv->bcc_field));
-	gtk_text_buffer_set_modified (buffer, FALSE);
-	gtk_text_buffer_set_modified (priv->text_buffer, FALSE);
+	gtk_text_buffer_set_modified (buffer, modified);
+	gtk_text_buffer_set_modified (priv->text_buffer, modified);
 }
 
 gboolean