Removed special-case code for NNTP support.

2002-07-04  Jeffrey Stedfast  <fejj@ximian.com>

	* mail-accounts.c: Removed special-case code for NNTP support.

	* mail-account-gui.c (mail_account_gui_setup): Allow configuration
	of both mail and news accounts.

	* component-factory.c (mail_load_storages): No longer need the
	is-account argument.

	* subscribe-dialog.c (populate_store_list): Don't special-case
	news accounts anymore.

	* mail-config.c (mail_config_get_default_news): Removed.
	(mail_config_get_news): Removed.
	(mail_config_add_news): Removed.
	(mail_config_remove_news): Removed.

svn path=/trunk/; revision=17368

1 files changed, 4 insertions, 83 deletions

diff --git a/mail/mail-config.c b/mail/mail-config.c
index e3151513b3..58bb0f5ce8 100644
--- a/mail/mail-config.c
+++ b/mail/mail-config.c
@@ -104,8 +104,6 @@ typedef struct {
 	GSList *accounts;
 	int default_account;
 	
-	GSList *news;
-	
 	char *pgp_path;
 	int pgp_type;
 	
@@ -148,17 +146,17 @@ MailConfigSignature *
 signature_copy (const MailConfigSignature *sig)
 {
 	MailConfigSignature *ns;
-
+	
 	g_return_val_if_fail (sig != NULL, NULL);
 	
 	ns = g_new (MailConfigSignature, 1);
-
+	
 	ns->id = sig->id;
 	ns->name = g_strdup (sig->name);
 	ns->filename = g_strdup (sig->filename);
 	ns->script = g_strdup (sig->script);
 	ns->html = sig->html;
-
+	
 	return ns;
 }
 
@@ -186,7 +184,7 @@ identity_copy (const MailConfigIdentity *id)
 	new->organization = g_strdup (id->organization);
 	new->def_signature = id->def_signature;
 	new->auto_signature = id->auto_signature;
-
+	
 	return new;
 }
 
@@ -351,12 +349,6 @@ mail_config_clear (void)
 		config->accounts = NULL;
 	}
 	
-	if (config->news) {
-		g_slist_foreach (config->news, service_destroy_each, NULL);
-		g_slist_free (config->news);
-		config->news = NULL;
-	}
-	
 	g_free (config->pgp_path);
 	config->pgp_path = NULL;
 	
@@ -807,29 +799,6 @@ config_read (void)
 	
 	mail_config_set_default_account_num (default_num);
 	
-#ifdef ENABLE_NNTP
-	/* News */
-	
-	len = bonobo_config_get_long_with_default (config->db, 
-	        "/News/Sources/num", 0, NULL);
-	for (i = 0; i < len; i++) {
-		MailConfigService *n;
-		char *path, *r;
-		
-		path = g_strdup_printf ("/News/Sources/url_%d", i);
-		
-		if ((r = bonobo_config_get_string (config->db, path, NULL))) {
-			n = g_new0 (MailConfigService, 1);		
-			n->url = r;
-			n->enabled = TRUE;
-			config->news = g_slist_append (config->news, n);
-		} 
-		
-		g_free (path);
-		
-	}
-#endif
-	
 	/* Format */
 	config->send_html = bonobo_config_get_boolean_with_default (config->db,
 	        "/Mail/Format/send_html", FALSE, NULL);
@@ -1175,24 +1144,6 @@ mail_config_write (void)
 		g_free (path);
 	}
 	
-#ifdef ENABLE_NNTP
-	/* News */
-	
-  	len = g_slist_length (config->news);
-	bonobo_config_set_long (config->db, "/News/Sources/num", len, NULL);
-	for (i = 0; i < len; i++) {
-		MailConfigService *n;
-		char *path;
-		
-		n = g_slist_nth_data (config->news, i);
-		
-		path = g_strdup_printf ("/News/Sources/url_%d", i);
-		bonobo_config_set_string_wrapper (config->db, path, n->url, NULL);
-		g_free (path);
-	}
-	
-#endif
-	
 	CORBA_exception_init (&ev);
 	Bonobo_ConfigDatabase_sync (config->db, &ev);
 	CORBA_exception_free (&ev);
@@ -2457,36 +2408,6 @@ mail_config_get_default_transport (void)
 		return NULL;
 }
 
-const MailConfigService *
-mail_config_get_default_news (void)
-{
-	if (!config->news)
-		return NULL;
-	
-	return (MailConfigService *)config->news->data;
-}
-
-const GSList *
-mail_config_get_news (void)
-{
-	return config->news;
-}
-
-void
-mail_config_add_news (MailConfigService *news) 
-{
-	config->news = g_slist_append (config->news, news);
-}
-
-const GSList *
-mail_config_remove_news (MailConfigService *news)
-{
-	config->news = g_slist_remove (config->news, news);
-	service_destroy (news);
-	
-	return config->news;
-}
-
 GSList *
 mail_config_get_sources (void)
 {