Reverted mail-config changes temporarily until I get it working correctly.

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

	* Makefile.am:
	* component-factory.c:
	* folder-browser-factory.c:
	* folder-browser.c:
	* mail-callbacks.c:
	* mail-config.[c,h]:
	* mail-display.c:
	* mail-format.c:
	* mail-tools.c: Reverted mail-config changes temporarily until
	I get it working correctly.

svn path=/trunk/; revision=7305

1 files changed, 47 insertions, 72 deletions

diff --git a/mail/mail-config.h b/mail/mail-config.h
index 5c40b832f2..bbf7176acb 100644
--- a/mail/mail-config.h
+++ b/mail/mail-config.h
@@ -1,8 +1,7 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+
 /*
- *  Authors: Jeffrey Stedfast <fejj@helixcode.com>
- *
- *  Copyright 2001 Helix Code, Inc. (www.helixcode.com)
+ *  Copyright 2000, Helix Code, Inc. (http://www.helixcode.com)
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,58 +16,41 @@
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
- *
  */
 
-#ifndef MAIL_CONFIG_H
-#define MAIL_CONFIG_H
+#ifndef _MAIL_CONFIG_H
+#define _MAIL_CONFIG_H
 
-#include <glib.h>
-#include <camel/camel.h>
 
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
 
-typedef struct {
+#include <glib.h>
+#include <camel/camel-folder.h>
+
+typedef struct 
+{
 	gchar *name;
 	gchar *address;
-	gchar *reply_to;
-	gchar *organization;
-	gchar *signature;
+	gchar *org;
+	gchar *sig;
 } MailConfigIdentity;
 
-typedef struct {
+typedef struct
+{
 	gchar *url;
 	gboolean keep_on_server;
-	gboolean save_passwd;
-	gboolean use_ssl;
+	gboolean remember_password;
 } MailConfigService;
 
-typedef struct {
-	gchar *name;
-	gboolean default_account;
-	
-	MailConfigIdentity *id;
-	MailConfigService *source;
-	MailConfigService *transport;
-} MailConfigAccount;
-
 /* Identities */
-MailConfigIdentity *identity_copy (const MailConfigIdentity *id);
+MailConfigIdentity *identity_copy (MailConfigIdentity *id);
 void                identity_destroy (MailConfigIdentity *id);
+void                identity_destroy_each (gpointer item, gpointer data);
 
 /* Services */
-MailConfigService *service_copy (const MailConfigService *source);
+MailConfigService *service_copy (MailConfigService *source);
 void               service_destroy (MailConfigService *source);
 void               service_destroy_each (gpointer item, gpointer data);
 
-/* Accounts */
-MailConfigAccount *account_copy (const MailConfigAccount *account);
-void               account_destroy (MailConfigAccount *account);
-void               account_destroy_each (gpointer item, gpointer data);
-
 /* Configuration */
 void mail_config_init (void);
 void mail_config_clear (void);
@@ -76,45 +58,38 @@ void mail_config_write (void);
 void mail_config_write_on_exit (void);
 
 /* General Accessor functions */
-gboolean mail_config_is_configured            (void);
-
-gboolean mail_config_get_thread_list          (void);
-void     mail_config_set_thread_list          (gboolean value);
-
-gboolean mail_config_get_view_source          (void);
-void     mail_config_set_view_source          (gboolean value);
-
-gint     mail_config_get_paned_size           (void);
-void     mail_config_set_paned_size           (gint size);
-
-gboolean mail_config_get_send_html            (void);
-void     mail_config_set_send_html            (gboolean send_html);
-
-gint     mail_config_get_mark_as_seen_timeout (void);
-void     mail_config_set_mark_as_seen_timeout (gint timeout);
-
-const MailConfigAccount  *mail_config_get_default_account (void);
-const GSList             *mail_config_get_accounts        (void);
-void                      mail_config_add_account         (MailConfigAccount *account);
-void                      mail_config_set_default_account (const MailConfigAccount *account);
-
-const MailConfigIdentity *mail_config_get_default_identity (void);
-const MailConfigService  *mail_config_get_default_transport (void);
-
-const MailConfigService  *mail_config_get_default_news    (void);
-const GSList             *mail_config_get_news            (void);
-void                      mail_config_add_news            (MailConfigService *news);
-
-/* convenience functions to help ease the transition over to the new codebase */
-GSList *mail_config_get_sources (void);
+gboolean       mail_config_is_configured   (void);
+gboolean       mail_config_thread_list     (void);
+gboolean       mail_config_view_source     (void);
+gint           mail_config_paned_size      (void);
+void           mail_config_set_thread_list (gboolean value);
+void           mail_config_set_view_source (gboolean value);
+void           mail_config_set_paned_size  (gint size);
+gboolean       mail_config_send_html (void);
+void           mail_config_set_send_html (gboolean send_html);
+gint           mail_config_mark_as_seen_timeout (void);
+void           mail_config_set_mark_as_seen_timeout (gint timeout);
+
+/* Identity Accessor functions */
+MailConfigIdentity *mail_config_get_default_identity (void);
+void                mail_config_add_identity (MailConfigIdentity *id);
+GSList             *mail_config_get_identities       (void);
+
+/* Service Accessor functions */
+MailConfigService  *mail_config_get_default_source (void);
+GSList             *mail_config_get_sources (void);
+void                mail_config_add_source (MailConfigService *source);
+
+MailConfigService  *mail_config_get_transport (void);
+void                mail_config_set_transport (MailConfigService *transport);
+
+MailConfigService  *mail_config_get_default_news (void);
+GSList             *mail_config_get_news (void);
+void                mail_config_add_news (MailConfigService *source);
 
 /* static utility functions */
-char *mail_config_folder_to_cachename (CamelFolder *folder, const char *prefix);
+char 		   *mail_config_folder_to_cachename(CamelFolder *folder, const char *prefix);
 
-gboolean  mail_config_check_service (CamelURL *url, CamelProviderType type, GList **authtypes);
+#endif
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
 
-#endif /* MAIL_CONFIG_H */