Call set_from_account which means we no longer have to do all the crap

2001-01-12  Jeffrey Stedfast  <fejj@helixcode.com>

	* e-msg-composer.c (build_message): Call set_from_account which
	means we no longer have to do all the crap involved in formatting
	strings into an internet-address.
	(e_msg_composer_get_preferred_account): New access function.

	* e-msg-composer-hdrs.c (add_header): case COMBOBOX has changed to
	OPTIOMENU.
	(create_optionmenu): Update to use an optionmenu of accounts.
	(from_changed): New callback for the From optionmenu.
	(setup_headers): s/COMBOBOX/OPTIONMENU
	(init): Set the account and from_options to NULL.
	(e_msg_composer_hdrs_get_from): Updated.
	(destroy): free the from_options.
	(e_msg_composer_hdrs_set_from_address): Renamed from set_from
	because it no longer takes a string arg but rather an account arg.

svn path=/trunk/; revision=7458

1 files changed, 5 insertions, 2 deletions

diff --git a/composer/e-msg-composer-hdrs.h b/composer/e-msg-composer-hdrs.h
index a343fb0b7d..1521cc94a3 100644
--- a/composer/e-msg-composer-hdrs.h
+++ b/composer/e-msg-composer-hdrs.h
@@ -26,6 +26,7 @@
 
 #include <gnome.h>
 #include <camel/camel-mime-message.h>
+#include <mail/mail-config.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -48,6 +49,8 @@ struct _EMsgComposerHdrs {
 
 	EMsgComposerHdrsPrivate *priv;
 	
+	const MailConfigAccount *account;
+	
 	gboolean has_changed;
 };
 
@@ -64,8 +67,8 @@ GtkWidget  *e_msg_composer_hdrs_new                (void);
 void        e_msg_composer_hdrs_to_message         (EMsgComposerHdrs *hdrs,
 						    CamelMimeMessage *msg);
 
-void        e_msg_composer_hdrs_set_from           (EMsgComposerHdrs *hdrs,
-						    const char       *from);
+void        e_msg_composer_hdrs_set_from_account   (EMsgComposerHdrs *hdrs,
+						    const char *account_name);
 void        e_msg_composer_hdrs_set_to             (EMsgComposerHdrs *hdrs,
 						    const GList      *to_list);
 void        e_msg_composer_hdrs_set_cc             (EMsgComposerHdrs *hdrs,