New function to create composer with sig file set.

2000-07-28  JP Rosevear  <jpr@arcavia.com>

	* e-msg-composer.c (e_msg_composer_new_with_sig_file): New
	function to create composer with sig file set.
	(e_msg_composer_get_sig_file): New function to get sig file
	(e_msg_composer_set_sig_file): New function to set sig file

2000-07-29  JP Rosevear  <jpr@arcavia.com>

	* mail-format.c (mail_generate_reply): Use new mail config stuff

	* component-factory.c (create_imap_storage): Use new mail config
	stuff
	(create_news_storage): ditto

	* evolution-mail.schemas: Gconf schema for evolution mail

	* mail-config-druid.glade: Gladification of config druid

	* mail-config.h: New header with config structs.

	* mail-config.c: Rewrite of GUI configuration tools to use
	new config structs.  Stores multiple identities and sources now.
	Still only uses the first one found.
	(mail_config_fetch): Returns MailConfig struct to caller
	for configuration queries.
	(mail_config): Renamed function to show mail config dialog.
	(mail_config_druid): Renamed function to show mail config druid.

	* mail-ops.c (create_msg_composer): Use
	e_msg_composer_new_with_sig_file and new config stuff
	(check_configured): Use new config stuff
	(fetch_mail): ditto
	(composer_send_cb): ditto

svn path=/trunk/; revision=4413

1 files changed, 4 insertions, 5 deletions

diff --git a/mail/mail-format.c b/mail/mail-format.c
index 582068042c..5304e05e2a 100644
--- a/mail/mail-format.c
+++ b/mail/mail-format.c
@@ -1355,17 +1355,16 @@ reply_body (CamelDataWrapper *data, gboolean want_plain, gboolean *is_html)
 EMsgComposer *
 mail_generate_reply (CamelMimeMessage *message, gboolean to_all)
 {
+	const MailConfig *config;
 	CamelDataWrapper *contents;
-	char *text, *subject, *path, *string;
+	char *text, *subject;
 	EMsgComposer *composer;
 	gboolean want_plain, is_html;
 	const char *repl_to, *message_id, *references;
 	GList *to, *cc;
 
-	path = g_strdup_printf ("=%s/config=/mail/msg_format", evolution_dir);
-	string = gnome_config_get_string (path);
-	g_free (path);
-	want_plain = string && !strcasecmp (string, "plain");
+	config = mail_config_fetch ();
+	want_plain = !config->send_html;
 
 	contents = camel_medium_get_content_object (CAMEL_MEDIUM (message));
 	text = reply_body (contents, want_plain, &is_html);