From: Sergio Villar Senin <svillar@igalia.com>
Date: Tue, 16 Jan 2007 12:52:42 +0000 (+0000)
Subject: * The reply/fw stuff now uses the text/plain part of the original message
X-Git-Tag: git_migration_finished~4237
X-Git-Url: http://git.maemo.org/git/?p=modest;a=commitdiff_plain;h=be74f41618d52283c9994519ef5d1f693aa989ca

* The reply/fw stuff now uses the text/plain part of the original message
* Deleted an unused lock from the ModestTnyAccountStore

pmo-trunk-r642
---

diff --git a/src/gtk/modest-edit-msg-window.c b/src/gtk/modest-edit-msg-window.c
index dfd1fb4..5707116 100644
--- a/src/gtk/modest-edit-msg-window.c
+++ b/src/gtk/modest-edit-msg-window.c
@@ -316,7 +316,7 @@ modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg)
 
 	priv = MODEST_EDIT_MSG_WINDOW_GET_PRIVATE (self);
 
-	header = tny_msg_get_header (msg);
+	header  = tny_msg_get_header (msg);
 	to      = tny_header_get_to (header);
 	cc      = tny_header_get_cc (header);
 	bcc     = tny_header_get_bcc (header);
@@ -333,7 +333,7 @@ modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg)
 	
 	buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
 	gtk_text_buffer_set_text (buf,
-				  (const gchar *) modest_tny_msg_actions_find_body (msg, TRUE),
+				  (const gchar *) modest_tny_msg_actions_find_body (msg, FALSE),
 				  -1);
 
 	/* TODO: lower priority, select in the From: combo to the
diff --git a/src/maemo/modest-edit-msg-window.c b/src/maemo/modest-edit-msg-window.c
index 39a431ef..872a059 100644
--- a/src/maemo/modest-edit-msg-window.c
+++ b/src/maemo/modest-edit-msg-window.c
@@ -450,7 +450,7 @@ modest_edit_msg_window_set_msg (ModestEditMsgWindow *self, TnyMsg *msg)
 	
 	buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW(priv->msg_body));
 	gtk_text_buffer_set_text (buf,
-				  (const gchar *) modest_tny_msg_actions_find_body (msg, TRUE),
+				  (const gchar *) modest_tny_msg_actions_find_body (msg, FALSE),
 				  -1);
 
 	/* TODO: lower priority, select in the From: combo to the
diff --git a/src/modest-mail-operation.c b/src/modest-mail-operation.c
index 849bed6..9d79383 100644
--- a/src/modest-mail-operation.c
+++ b/src/modest-mail-operation.c
@@ -309,9 +309,10 @@ create_reply_forward_mail (TnyMsg *msg, const gchar *from, gboolean is_reply, gu
 	TnyMimePart *body;
 	ModestFormatter *formatter;
 
-	/* Get body from original msg */
+	/* Get body from original msg. Always look for the text/plain
+	   part of the message to create the reply/forwarded mail */
 	header = tny_msg_get_header (msg);
-	body   = modest_tny_msg_actions_find_body_part (msg, TRUE);
+	body   = modest_tny_msg_actions_find_body_part (msg, FALSE);
 
 	/* TODO: select the formatter from account prefs */
 	formatter = modest_formatter_new ("text/plain");
diff --git a/src/modest-tny-account-store.c b/src/modest-tny-account-store.c
index 3bb21dd..7455bc5 100644
--- a/src/modest-tny-account-store.c
+++ b/src/modest-tny-account-store.c
@@ -71,7 +71,6 @@ enum {
 
 typedef struct _ModestTnyAccountStorePrivate ModestTnyAccountStorePrivate;
 struct _ModestTnyAccountStorePrivate {
-	GMutex             *store_lock;	
 	gchar              *cache_dir;
 	GHashTable         *password_hash;
 	TnyDevice          *device;
@@ -387,9 +386,6 @@ modest_tny_account_store_finalize (GObject *obj)
 		priv->tny_session_camel = NULL;
 	}
 
-	if (priv->store_lock)
-		g_mutex_free (priv->store_lock);
-
 	g_free (priv->cache_dir);
 	priv->cache_dir = NULL;
 
@@ -423,7 +419,6 @@ modest_tny_account_store_new (ModestAccountMgr *account_mgr) {
 				       G_CALLBACK (on_account_changed), obj);
 	g_signal_connect (G_OBJECT(account_mgr), "account_removed",
 				       G_CALLBACK (on_account_removed), obj);
-	priv->store_lock = g_mutex_new ();
 
 	pfact = TNY_PLATFORM_FACTORY (modest_tny_platform_factory_get_instance());
 	if (!pfact) {