From dcf2c0e754d6e251733cea74c2427738122620af Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sat, 18 Jul 2009 14:05:05 -0400
Subject: More whitespace cleanup.

---
 mail/em-composer-utils.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 402a6d2ca1..a97b1cc8d7 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1511,7 +1511,7 @@ em_utils_send_receipt (CamelFolder *folder, CamelMimeMessage *message)
 	camel_object_unref (addr);
 
 	camel_medium_set_header (CAMEL_MEDIUM (receipt), "Return-Path", "<>");
-	if(account) {
+	if (account) {
 		camel_medium_set_header (CAMEL_MEDIUM (receipt),
 					"X-Evolution-Account", account->uid);
 		camel_medium_set_header (CAMEL_MEDIUM (receipt),
-- 
cgit 


From 1482abed5ec48a2b47d2f2bc17db4ad28d61d248 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Mon, 20 Jul 2009 14:28:58 +0530
Subject: Change for Anjal to support forwarding of mails

---
 mail/em-composer-utils.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index a97b1cc8d7..11f4272cf8 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -1030,14 +1030,14 @@ setup_forward_attached_callbacks (EMsgComposer *composer, CamelFolder *folder, G
 	g_object_weak_ref ((GObject *) composer, (GWeakNotify) composer_destroy_fad_cb, fad);
 }
 
-static void
+static struct _EMsgComposer *
 forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, CamelMimePart *part, gchar *subject, const gchar *fromuri)
 {
 	EMsgComposer *composer;
 
 	composer = create_new_composer (subject, fromuri, TRUE, FALSE);
 	if (composer == NULL)
-		return;
+		return NULL;
 
 	e_msg_composer_attach (composer, part);
 
@@ -1046,7 +1046,10 @@ forward_attached (CamelFolder *folder, GPtrArray *uids, GPtrArray *messages, Cam
 
 	composer_set_no_change (composer, TRUE, FALSE);
 
-	gtk_widget_show (GTK_WIDGET (composer));
+	if (!e_msg_composer_get_lite())
+		gtk_widget_show (GTK_WIDGET (composer));
+
+	return composer;
 }
 
 static void
@@ -1192,7 +1195,7 @@ em_utils_forward_quoted (CamelFolder *folder, GPtrArray *uids, const gchar *from
  *
  * Forwards a message in the user's configured default style.
  **/
-void
+struct _EMsgComposer *
 em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
 {
 	GPtrArray *messages;
@@ -1200,7 +1203,7 @@ em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
 	GConfClient *gconf;
 	gchar *subject;
 	gint mode;
-
+	struct _EMsgComposer *composer = NULL;
 	messages = g_ptr_array_new ();
 	g_ptr_array_add (messages, message);
 
@@ -1214,7 +1217,7 @@ em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
 
 		subject = mail_tool_generate_forward_subject (message);
 
-		forward_attached (NULL, NULL, messages, part, subject, fromuri);
+		composer = forward_attached (NULL, NULL, messages, part, subject, fromuri);
 		camel_object_unref (part);
 		g_free (subject);
 		break;
@@ -1227,6 +1230,8 @@ em_utils_forward_message (CamelMimeMessage *message, const gchar *fromuri)
 	}
 
 	g_ptr_array_free (messages, TRUE);
+
+	return composer;
 }
 
 /**
-- 
cgit 


From 606f6c15dbfbd7821a5aa92a81d64b318842fe7a Mon Sep 17 00:00:00 2001
From: Chenthill Palanisamy <pchenthill@novell.com>
Date: Thu, 23 Jul 2009 18:34:02 +0530
Subject: Bug #339361 (bnc) - soap threading not working.

---
 mail/em-composer-utils.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 11f4272cf8..8b77c716a5 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2336,18 +2336,7 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	g_return_val_if_fail(message != NULL, NULL);
 
-	/** @Event: message.replying
-	 * @Title: Message being replied to
-	 * @Target: EMEventTargetMessage
-	 *
-	 * message.replying is emitted when a user starts replying to a message.
-	 */
-
-	eme = em_event_peek();
-	target = em_event_target_new_message(eme, folder, message, uid,
-					     mode == REPLY_MODE_ALL ? EM_EVENT_MESSAGE_REPLY_ALL : 0);
-	e_event_emit((EEvent *)eme, "message.replying", (EEventTarget *)target);
-
+	
 	to = camel_internet_address_new();
 	cc = camel_internet_address_new();
 
@@ -2385,6 +2374,18 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	composer_set_body (composer, message, source);
 
+	/** @Event: message.replying
+	 * @Title: Message being replied to
+	 * @Target: EMEventTargetMessage
+	 *
+	 * message.replying is emitted when a user starts replying to a message.
+	 */
+
+	eme = em_event_peek();
+	target = em_event_target_new_message(eme, folder, message, uid,
+					     mode == REPLY_MODE_ALL ? EM_EVENT_MESSAGE_REPLY_ALL | EM_EVENT_MESSAGE_REPLY : EM_EVENT_MESSAGE_REPLY, composer);
+	e_event_emit((EEvent *)eme, "message.replying", (EEventTarget *)target);
+
 	em_composer_utils_setup_callbacks (composer, folder, uid, flags, flags, NULL, NULL);
 
 	composer_set_no_change (composer, TRUE, FALSE);
-- 
cgit 


From 30ac043b6ef2ad85de31c8dfbd87ac5a63d58dd8 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Sun, 26 Jul 2009 08:18:59 -0400
Subject: Coding style and whitespace cleanups.

---
 mail/em-composer-utils.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mail/em-composer-utils.c')

diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c
index 8b77c716a5..e76159a0dc 100644
--- a/mail/em-composer-utils.c
+++ b/mail/em-composer-utils.c
@@ -2336,7 +2336,6 @@ em_utils_reply_to_message(CamelFolder *folder, const gchar *uid, CamelMimeMessag
 
 	g_return_val_if_fail(message != NULL, NULL);
 
-	
 	to = camel_internet_address_new();
 	cc = camel_internet_address_new();
 
-- 
cgit