Updated. We might want to change the corba interface for this to allow

2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>

	* evolution-composer.c (impl_Composer_set_headers): Updated. We
	might want to change the corba interface for this to allow setting
	the from-address as well.

	* e-msg-composer.c (e_msg_composer_new_with_message): Updated.
	(e_msg_composer_set_headers): Now takes a 'From' argument so that
	we can try to pre-determine the account the user will want to send
	from.

svn path=/trunk/; revision=8165

5 files changed, 23 insertions, 5 deletions

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 87db5bf2a6..29afb30a6f 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,14 @@
+2001-02-10  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* evolution-composer.c (impl_Composer_set_headers): Updated. We
+	might want to change the corba interface for this to allow setting
+	the from-address as well.
+
+	* e-msg-composer.c (e_msg_composer_new_with_message): Updated.
+	(e_msg_composer_set_headers): Now takes a 'From' argument so that
+	we can try to pre-determine the account the user will want to send
+	from.
+
 2001-02-11  Gediminas Paulauskas <menesis@delfi.lt>
 
 	* e-msg-composer-attachment.glade.h: removed.
diff --git a/composer/e-msg-composer-hdrs.c b/composer/e-msg-composer-hdrs.c
index 147b5ffbde..de6f37477c 100644
--- a/composer/e-msg-composer-hdrs.c
+++ b/composer/e-msg-composer-hdrs.c
@@ -641,6 +641,7 @@ e_msg_composer_hdrs_set_from_account (EMsgComposerHdrs *hdrs,
 	
 	g_return_if_fail (hdrs != NULL);
 	g_return_if_fail (E_IS_MSG_COMPOSER_HDRS (hdrs));
+	g_return_if_fail (account_name != NULL);
 	
 	omenu = GTK_OPTION_MENU (hdrs->priv->from_entry);
 	
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index ef4b8414f2..92249af5bb 100644
--- a/composer/e-msg-composer.c
+++ b/composer/e-msg-composer.c
@@ -1825,7 +1825,7 @@ e_msg_composer_new_with_message (CamelMimeMessage *msg)
 		}
 	}
 	
-	e_msg_composer_set_headers (new, To, Cc, Bcc, subject);
+	e_msg_composer_set_headers (new, NULL, To, Cc, Bcc, subject);
 	
 	free_recipients (To);
 	free_recipients (Cc);
@@ -2046,6 +2046,7 @@ e_msg_composer_show_attachments (EMsgComposer *composer,
 /**
  * e_msg_composer_set_headers:
  * @composer: a composer object
+ * @from: the name of the account the user will send from
  * @to: the values for the "To" header
  * @cc: the values for the "Cc" header
  * @bcc: the values for the "Bcc" header
@@ -2054,8 +2055,11 @@ e_msg_composer_show_attachments (EMsgComposer *composer,
  * Sets the headers in the composer to the given values.
  **/
 void 
-e_msg_composer_set_headers (EMsgComposer *composer, const GList *to,
-			    const GList *cc, const GList *bcc,
+e_msg_composer_set_headers (EMsgComposer *composer,
+			    const char *from,
+			    const GList *to,
+			    const GList *cc,
+			    const GList *bcc,
 			    const char *subject)
 {
 	EMsgComposerHdrs *hdrs;
@@ -2063,6 +2067,7 @@ e_msg_composer_set_headers (EMsgComposer *composer, const GList *to,
 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
 	hdrs = E_MSG_COMPOSER_HDRS (composer->hdrs);
 	
+	e_msg_composer_hdrs_set_from_account (hdrs, from);
 	e_msg_composer_hdrs_set_to (hdrs, to);
 	e_msg_composer_hdrs_set_cc (hdrs, cc);
 	e_msg_composer_hdrs_set_bcc (hdrs, bcc);
diff --git a/composer/e-msg-composer.h b/composer/e-msg-composer.h
index ef60ebd1e4..485ca6f9f1 100644
--- a/composer/e-msg-composer.h
+++ b/composer/e-msg-composer.h
@@ -99,6 +99,7 @@ EMsgComposer     *e_msg_composer_new_from_url         (const char       *url);
 void              e_msg_composer_show_attachments     (EMsgComposer     *composer,
 						       gboolean          show);
 void              e_msg_composer_set_headers          (EMsgComposer     *composer,
+						       const char       *from,
 						       const GList      *to,
 						       const GList      *cc,
 						       const GList      *bcc,
diff --git a/composer/evolution-composer.c b/composer/evolution-composer.c
index 3036f98e82..08c26a7aeb 100644
--- a/composer/evolution-composer.c
+++ b/composer/evolution-composer.c
@@ -95,8 +95,8 @@ impl_Composer_set_headers (PortableServer_Servant servant,
 	gto = corba_recipientlist_to_glist (to);
 	gcc = corba_recipientlist_to_glist (cc);
 	gbcc = corba_recipientlist_to_glist (bcc);
-
-	e_msg_composer_set_headers (composer->composer, gto, gcc, gbcc,
+	
+	e_msg_composer_set_headers (composer->composer, NULL, gto, gcc, gbcc,
 				    subject);
 
 	free_recipient_glist (gto);