This commit was manufactured by cvs2svn to create tag 'guikachu-0_7'.guikachu-0_7

svn path=/tags/guikachu-0_7/; revision=10432

19 files changed, 0 insertions, 2955 deletions

diff --git a/camel/providers/nntp/.cvsignore b/camel/providers/nntp/.cvsignore
deleted file mode 100644
index 2fbeab8712..0000000000
--- a/camel/providers/nntp/.cvsignore
+++ /dev/null
@@ -1,12 +0,0 @@
-.deps
-Makefile
-Makefile.in
-.libs
-.deps
-*.lo
-*.la
-test-newsrc
-*.bb
-*.bbg
-*.da
-*.gcov
diff --git a/camel/providers/nntp/Makefile.am b/camel/providers/nntp/Makefile.am
deleted file mode 100644
index a453ec305f..0000000000
--- a/camel/providers/nntp/Makefile.am
+++ /dev/null
@@ -1,53 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-libcamelnntpincludedir = $(includedir)/camel
-
-providerdir = $(pkglibdir)/camel-providers/$(VERSION)
-
-provider_LTLIBRARIES = libcamelnntp.la
-provider_DATA = libcamelnntp.urls
-
-INCLUDES = -I../..				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/libibex			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	-I$(includedir)				\
-	$(EXTRA_GNOME_CFLAGS)			\
-	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
-
-libcamelnntp_la_SOURCES = 			\
-	camel-nntp-auth.c			\
-	camel-nntp-folder.c			\
-	camel-nntp-grouplist.c			\
-	camel-nntp-newsrc.c			\
-	camel-nntp-provider.c			\
-	camel-nntp-store.c			\
-	camel-nntp-utils.c
-
-libcamelnntpinclude_HEADERS =			\
-	camel-nntp-auth.h			\
-	camel-nntp-folder.h			\
-	camel-nntp-grouplist.h			\
-	camel-nntp-newsrc.h			\
-	camel-nntp-resp-codes.h			\
-	camel-nntp-store.h			\
-	camel-nntp-types.h			\
-	camel-nntp-utils.h
-
-libcamelnntp_la_LDFLAGS = -version-info 0:0:0
-
-EXTRA_DIST = libcamelnntp.urls
-
-#noinst_PROGRAMS = test-newsrc
-
-#LDADD = \
-	#$(top_builddir)/camel/libcamel.la 	\
-	#$(top_builddir)/e-util/libeutil.la	\
-	#$(top_builddir)/libibex/libibex.la 	\
-	#$(GNOME_LIBDIR) 			\
-	#$(GNOMEUI_LIBS) $(INTLLIBS) $(EXTRA_GNOME_LIBS)
-#	$(BONOBO_LIBS)				
-
-#test_newsrc_LDADD = libcamelnntp.la $(LDADD)
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
deleted file mode 100644
index b211f52593..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ /dev/null
@@ -1,94 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-auth.c : authentication for nntp */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include <camel-nntp-auth.h>
-#include <camel-nntp-store.h>
-#include <camel-nntp-resp-codes.h>
-#include <camel-exception.h>
-#include <camel-session.h>
-
-int
-camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelService *service = CAMEL_SERVICE (store);
-	CamelSession *session = camel_service_get_session (service);
-	int resp;
-
-	if (!service->url->authmech && !service->url->passwd) {
-		gchar *prompt;
-			
-		prompt = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),
-					  service->url->user, service->url->host);
-		service->url->passwd =
-			camel_session_query_authenticator (session,
-							   CAMEL_AUTHENTICATOR_ASK, prompt,
-							   TRUE, service, "password", ex);
-		g_free (prompt);
-			
-		if (!service->url->passwd) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL, 
-					     "You didn\'t enter a password.");
-			resp = 666;
-			goto done;
-		}
-	}
-
-	/* first send username */
-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO USER %s", service->url->user);
-
-	if (resp == NNTP_AUTH_REJECTED) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Server rejected username"));
-		goto done;
-
-	}
-	else if (resp != NNTP_AUTH_CONTINUE) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Failed to send username to server"));
-		goto done;
-	}
-
-	/* then send the username if the server asks for it */
-	resp = camel_nntp_command (store, ex, NULL, "AUTHINFO PASS %s", service->url->passwd);
-
-	if (resp == NNTP_AUTH_REJECTED) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_CANT_AUTHENTICATE,
-				      _("Server rejected username/password"));
-		goto done;
-	}
-
- done:
-
-	if (service->url->passwd) {
-		/* let's be paranoid */
-		memset (service->url->passwd, 0, strlen (service->url->passwd));
-		g_free (service->url->passwd);
-		service->url->passwd = NULL;
-	}
-	return resp;
-}
diff --git a/camel/providers/nntp/camel-nntp-auth.h b/camel/providers/nntp/camel-nntp-auth.h
deleted file mode 100644
index 2708d9d335..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-auth.h : authentication for nntp */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_AUTH_H
-#define CAMEL_NNTP_AUTH_H 1
-
-#include <camel-nntp-store.h>
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-int camel_nntp_auth_authenticate (CamelNNTPStore *store, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_AUTH_H */
diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
deleted file mode 100644
index 7edc4a98fd..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ /dev/null
@@ -1,265 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.c : Abstract class for an email folder */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#include <config.h> 
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <dirent.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <fcntl.h>
-
-#include "camel-folder-summary.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-utils.h"
-
-#include "string-utils.h"
-#include "camel-stream-mem.h"
-#include "camel-data-wrapper.h"
-#include "camel-mime-message.h"
-#include "camel-folder-summary.h"
-
-#include "camel-exception.h"
-
-static CamelFolderClass *parent_class=NULL;
-
-/* Returns the class for a CamelNNTPFolder */
-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CNNTPS_CLASS(so) CAMEL_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-
-static void
-nntp_folder_sync (CamelFolder *folder, gboolean expunge, 
-		  CamelException *ex)
-{
-	CamelNNTPStore *store;
-
-	camel_folder_summary_save (folder->summary);
-
-	store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-
-	if (store->newsrc)
-		camel_nntp_newsrc_write (store->newsrc);
-}
-
-static void
-nntp_folder_set_message_flags (CamelFolder *folder, const char *uid,
-			       guint32 flags, guint32 set)
-{
-        ((CamelFolderClass *)parent_class)->set_message_flags(folder, uid, flags, set);
-
-	if (flags & set & CAMEL_MESSAGE_SEEN) {
-		int article_num;
-		CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-
-		sscanf (uid, "%d", &article_num);
-
-		camel_nntp_newsrc_mark_article_read (nntp_store->newsrc,
-						     folder->name,
-						     article_num);
-	}
-}
-
-static CamelMimeMessage *
-nntp_folder_get_message (CamelFolder *folder, const gchar *uid, CamelException *ex)
-{
-	CamelStream *message_stream = NULL;
-	CamelMimeMessage *message = NULL;
-	CamelStore *parent_store;
-	char *buf;
-	int buf_len;
-	int buf_alloc;
-	int status;
-	gboolean done;
-	char *message_id;
-
-	/* get the parent store */
-	parent_store = camel_folder_get_parent_store (folder);
-
-	message_id = strchr (uid, ',') + 1;
-	status = camel_nntp_command (CAMEL_NNTP_STORE( parent_store ), ex, NULL, "ARTICLE %s", message_id);
-
-	/* if the message_id was not found, raise an exception and return */
-	if (status == NNTP_NO_SUCH_ARTICLE) {
-		camel_exception_setv (ex, 
-				     CAMEL_EXCEPTION_FOLDER_INVALID_UID,
-				     _("Message %s not found."),
-				      message_id);
-		return NULL;
-	}
-	else if (status != NNTP_ARTICLE_FOLLOWS) {
-		/* XXX */
-		g_warning ("weird nntp error %d\n", status);
-		return NULL;
-	}
-
-	/* this could probably done fairly easily with an nntp stream that
-	   returns eof after '.' */
-
-	/* XXX ick ick ick.  read the entire message into a buffer and
-	   then create a stream_mem for it. */
-	buf_alloc = 2048;
-	buf_len = 0;
-	buf = g_malloc(buf_alloc);
-	done = FALSE;
-
-	buf[0] = 0;
-
-	while (!done) {
-		int line_length;
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (parent_store), &line, ex) < 0) {
-			g_warning ("recv_line failed while building message\n");
-			break;
-		}
-
-		/* XXX check exception */
-
-		line_length = strlen ( line );
-
-		if (!strcmp(line, ".")) {
-			done = TRUE;
-			g_free (line);
-		}
-		else {
-			if (buf_len + line_length > buf_alloc) {
-				buf_alloc *= 2;
-				buf = g_realloc (buf, buf_alloc);
-			}
-			strcat(buf, line);
-			strcat(buf, "\n");
-			buf_len += strlen(line) + 1;
-			g_free (line);
-		}
-	}
-
-	/* create a stream bound to the message */
-	message_stream = camel_stream_mem_new_with_buffer(buf, buf_len);
-
-	message = camel_mime_message_new ();
-	camel_data_wrapper_construct_from_stream (CAMEL_DATA_WRAPPER(message), message_stream);
-
-	camel_object_unref (CAMEL_OBJECT (message_stream));
-
-#if 0
-	gtk_signal_connect (CAMEL_OBJECT (message), "message_changed", message_changed, folder);
-#endif
-
-	g_free (buf);
-
-	return message;
-}
-
-static GPtrArray*
-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	g_assert (0);
-	return NULL;
-}
-
-static void           
-nntp_folder_finalize (CamelObject *object)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (object);
-
-	g_free (nntp_folder->summary_file_path);
-}
-
-static void
-camel_nntp_folder_class_init (CamelNNTPFolderClass *camel_nntp_folder_class)
-{
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_nntp_folder_class);
-
-	parent_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-		
-	/* virtual method definition */
-
-	/* virtual method overload */
-	camel_folder_class->sync = nntp_folder_sync;
-	camel_folder_class->set_message_flags = nntp_folder_set_message_flags;
-	camel_folder_class->get_message = nntp_folder_get_message;
-	camel_folder_class->search_by_expression = nntp_folder_search_by_expression;
-}
-
-CamelType
-camel_nntp_folder_get_type (void)
-{
-	static CamelType camel_nntp_folder_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_nntp_folder_type == CAMEL_INVALID_TYPE)	{
-		camel_nntp_folder_type = camel_type_register (CAMEL_FOLDER_TYPE, "CamelNNTPFolder",
-							      sizeof (CamelNNTPFolder),
-							      sizeof (CamelNNTPFolderClass),
-							      (CamelObjectClassInitFunc) camel_nntp_folder_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) NULL,
-							      (CamelObjectFinalizeFunc) nntp_folder_finalize);
-	}
-	
-	return camel_nntp_folder_type;
-}
-
-CamelFolder *
-camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)
-{
-	CamelFolder *folder = CAMEL_FOLDER (camel_object_new (CAMEL_NNTP_FOLDER_TYPE));
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	const gchar *root_dir_path;
-
-	camel_folder_construct (folder, parent, folder_name, folder_name);
-	folder->has_summary_capability = TRUE;
-
-	root_dir_path = camel_nntp_store_get_toplevel_dir (CAMEL_NNTP_STORE(folder->parent_store));
-	nntp_folder->summary_file_path = g_strdup_printf ("%s/%s-ev-summary",
-							  root_dir_path,
-							  folder->name);
-
-	folder->summary = camel_folder_summary_new ();
-	camel_folder_summary_set_filename (folder->summary,
-					   nntp_folder->summary_file_path);
-
-	if (-1 == camel_folder_summary_load (folder->summary)) {
-		/* Bad or nonexistant summary file */
-		camel_nntp_get_headers (CAMEL_FOLDER( folder )->parent_store,
-					nntp_folder, ex);
-		if (camel_exception_get_id (ex)) {
-			camel_object_unref (CAMEL_OBJECT (folder));
-			return NULL;
-		}
-
-		/* XXX check return value */
-		camel_folder_summary_save (folder->summary);
-	}
-
-	return folder;
-}
diff --git a/camel/providers/nntp/camel-nntp-folder.h b/camel/providers/nntp/camel-nntp-folder.h
deleted file mode 100644
index 190d0bf346..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.h : NNTP group (folder) support. */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_FOLDER_H
-#define CAMEL_NNTP_FOLDER_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-folder.h"
-
-/*  #include "camel-store.h" */
-
-#define CAMEL_NNTP_FOLDER_TYPE     (camel_nntp_folder_get_type ())
-#define CAMEL_NNTP_FOLDER(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolder))
-#define CAMEL_NNTP_FOLDER_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_FOLDER_TYPE, CamelNNTPFolderClass))
-#define CAMEL_IS_NNTP_FOLDER(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_FOLDER_TYPE))
-
-
-typedef struct {
-	CamelFolder parent_object;
-
-	gchar *summary_file_path;  /* contains the messages summary */
-	CamelFolderSummary *summary;
-} CamelNNTPFolder;
-
-
-
-typedef struct {
-	CamelFolderClass parent_class;
-
-	/* Virtual methods */	
-	
-} CamelNNTPFolderClass;
-
-
-/* public methods */
-
-/* Standard Camel function */
-CamelType camel_nntp_folder_get_type (void);
-
-CamelFolder *camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_FOLDER_H */
diff --git a/camel/providers/nntp/camel-nntp-grouplist.c b/camel/providers/nntp/camel-nntp-grouplist.c
deleted file mode 100644
index 578a6eba66..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ /dev/null
@@ -1,214 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.c : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-#include <errno.h>
-#include <string.h>
-
-#include "camel-exception.h"
-#include "camel-nntp-grouplist.h"
-#include "camel-nntp-resp-codes.h"
-
-static CamelNNTPGroupList *
-camel_nntp_get_grouplist_from_server (CamelNNTPStore *store, CamelException *ex)
-{
-	int status;
-	gboolean done = FALSE;
-	CamelNNTPGroupList *list;
-
-	status = camel_nntp_command (store, ex, NULL,
-				     "LIST");
-
-	if (status != NNTP_LIST_FOLLOWS) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not get group list from server."));
-		return NULL;
-	}
-
-	list = g_new0 (CamelNNTPGroupList, 1);
-	list->time = time (NULL);
-
-	while (!done) {
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, ex) < 0)
-			return list;
-
-		if (*line == '.') {
-			done = TRUE;
-		}
-		else {
-			CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
-			char **split_line = g_strsplit (line, " ", 4);
-
-			entry->group_name = g_strdup (split_line[0]);
-			entry->high = atoi (split_line[1]);
-			entry->low = atoi (split_line[2]);
-
-			g_strfreev (split_line);
-			
-			list->group_list = g_list_append (list->group_list, entry);
-		}
-	}
-
-	return list;
-}
-
-static CamelNNTPGroupList*
-camel_nntp_get_grouplist_from_file (CamelNNTPStore *store, CamelException *ex)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);
-	CamelNNTPGroupList *list;
-	FILE *fp;
-	char buf[300];
-	unsigned long time;
-
-	g_free (root_dir);
-	fp = fopen (grouplist_file, "r");
-	g_free (grouplist_file);
-
-	if (fp == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to load grouplist file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	/* read the time */
-	if (!fgets (buf, sizeof (buf), fp)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to load grouplist file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		fclose (fp);
-		return NULL;
-	}
-
-
-	list = g_new0 (CamelNNTPGroupList, 1);
-	list->store = store;
-	sscanf (buf, "%lu", &time);
-	list->time = time;
-
-	while (fgets (buf, sizeof (buf), fp)) {
-		CamelNNTPGroupListEntry *entry = g_new (CamelNNTPGroupListEntry, 1);
-		char **split_line = g_strsplit (buf, " ", 4);
-
-		entry->group_name = g_strdup (split_line[0]);
-		entry->high = atoi (split_line[1]);
-		entry->low = atoi (split_line[2]);
-
-		g_strfreev (split_line);
-
-		list->group_list = g_list_append (list->group_list, entry);
-	}
-
-	fclose (fp);
-
-	return list;
-}
-
-static void
-save_entry (CamelNNTPGroupListEntry *entry, FILE *fp)
-{
-	fprintf (fp, "%s %d %d\n", entry->group_name, entry->low, entry->high);
-}
-
-void
-camel_nntp_grouplist_save (CamelNNTPGroupList *group_list, CamelException *ex)
-{
-	FILE *fp;
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(group_list->store));
-	gchar *grouplist_file = g_strdup_printf ("%s/grouplist", root_dir);
-
-	g_free (root_dir);
-	fp = fopen (grouplist_file, "w");
-	g_free (grouplist_file);
-
-	if (fp == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to save grouplist file for %s: %s"),
-				      CAMEL_SERVICE(group_list->store)->url->host,
-				      strerror(errno));
-		return;
-	}
-
-	fprintf (fp, "%lu\n", (long)group_list->time);
-
-	g_list_foreach (group_list->group_list, (GFunc)save_entry, fp);
-
-	fclose (fp);
-}
-
-static void
-free_entry (CamelNNTPGroupListEntry *entry, void *data)
-{
-	g_free (entry->group_name);
-	g_free (entry);
-}
-
-void
-camel_nntp_grouplist_free (CamelNNTPGroupList *group_list)
-{
-	g_return_if_fail (group_list);
-
-	g_list_foreach (group_list->group_list, (GFunc)free_entry, NULL);
-
-	g_free (group_list);
-}
-
-CamelNNTPGroupList*
-camel_nntp_grouplist_fetch (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelNNTPGroupList *list;
-
-	list = camel_nntp_get_grouplist_from_file (store, ex);
-
-	printf ("camel_nntp_get_grouplist_from_file returned %p\n", list);
-
-	if (!list) {
-		camel_exception_clear (ex);
-
-		list = camel_nntp_get_grouplist_from_server (store, ex);
-
-		if (!list) {
-			camel_nntp_grouplist_free (list);
-		}
-		else {
-			list->store = store;
-			camel_nntp_grouplist_save (list, ex);
-			return list;
-		}
-	}
-
-	return list;
-}
-
-gint
-camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex)
-{
-	return 0;
-}
diff --git a/camel/providers/nntp/camel-nntp-grouplist.h b/camel/providers/nntp/camel-nntp-grouplist.h
deleted file mode 100644
index 67c74d5dc2..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_GROUPLIST_H
-#define CAMEL_NNTP_GROUPLIST_H 1
-
-#include <time.h>
-#include "camel-nntp-store.h"
-
-struct CamelNNTPGroupListEntry {
-	char *group_name;
-	guint32 low;
-	guint32 high;
-	guint32 flags;
-};
-
-struct CamelNNTPGroupList {
-	CamelNNTPStore *store;
-	time_t time;
-	GList *group_list;
-};
-
-CamelNNTPGroupList* camel_nntp_grouplist_fetch  (CamelNNTPStore *store, CamelException *ex);
-gint                camel_nntp_grouplist_update (CamelNNTPGroupList *group_list, CamelException *ex);
-void                camel_nntp_grouplist_save   (CamelNNTPGroupList *group_list, CamelException *ex);
-void                camel_nntp_grouplist_free   (CamelNNTPGroupList *group_list);
-
-#endif /* CAMEL_NNTP_GROUPLIST_H */
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
deleted file mode 100644
index d0b56222cf..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ /dev/null
@@ -1,645 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-newsrc.c - .newsrc parsing/regurgitating code */
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <glib.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <errno.h>
-#include "camel-nntp-newsrc.h"
-#include <camel/camel-folder-summary.h>
-
-#ifdef ENABLE_THREADS
-#include <pthread.h>
-
-#define NEWSRC_LOCK(f, l) (g_mutex_lock(((CamelNNTPNewsrc *)f)->l))
-#define NEWSRC_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPNewsrc *)f)->l))
-#else
-#define NEWSRC_LOCK(f, l)
-#define NEWSRC_UNLOCK(f, l)
-#endif
-
-typedef struct {
-	guint low;
-	guint high;
-} ArticleRange;
-
-typedef struct {
-	char *name;
-	GArray *ranges;
-	gboolean subscribed;
-} NewsrcGroup;
-
-struct CamelNNTPNewsrc {
-	gchar *filename;
-	GHashTable *groups;
-	gboolean dirty;
-#ifdef ENABLE_THREADS
-	GMutex *lock;
-#endif
-} ;
-
-
-static NewsrcGroup *
-camel_nntp_newsrc_group_add (CamelNNTPNewsrc *newsrc, const char *group_name, gboolean subscribed)
-{
-	NewsrcGroup *new_group = g_malloc(sizeof(NewsrcGroup));
-
-	new_group->name = g_strdup(group_name);
-	new_group->subscribed = subscribed;
-	new_group->ranges = g_array_new (FALSE, FALSE, sizeof (ArticleRange));
-
-	g_hash_table_insert (newsrc->groups, new_group->name, new_group);
-
-	newsrc->dirty = TRUE;
-
-	return new_group;
-}
-
-static int
-camel_nntp_newsrc_group_get_highest_article_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)
-{
-	if (!group || group->ranges->len == 0)
-		return 0;
-
-	return g_array_index(group->ranges, ArticleRange, group->ranges->len - 1).high;
-}
-
-static int
-camel_nntp_newsrc_group_get_num_articles_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group)
-{
-	int i;
-	int count = 0;
-
-	if (group == NULL)
-		return 0;
-
-	for (i = 0; i < group->ranges->len; i ++)
-		count += (g_array_index(group->ranges, ArticleRange, i).high -
-			  g_array_index(group->ranges, ArticleRange, i).low) + 1;
-
-	return count;
-}
-
-
-static void
-camel_nntp_newsrc_group_mark_range_read(CamelNNTPNewsrc *newsrc, NewsrcGroup *group, long low, long high)
-{
-	int i;
-
-	if (group->ranges->len == 1
-	    && g_array_index (group->ranges, ArticleRange, 0).low == 0
-	    && g_array_index (group->ranges, ArticleRange, 0).high == 0) {
-		g_array_index (group->ranges, ArticleRange, 0).low = low;
-		g_array_index (group->ranges, ArticleRange, 0).high = high;
-
-		newsrc->dirty = TRUE;
-	}
-	else  {
-		ArticleRange tmp_range;
-
-		for (i = 0; i < group->ranges->len; i ++) {
-			guint range_low = g_array_index (group->ranges, ArticleRange, i).low;
-			guint range_high = g_array_index (group->ranges, ArticleRange, i).high;
-			
-			/* if it's already part of a range, return immediately. */
-			if (low >= range_low &&
-			    low <= range_high &&
-			    high >= range_low &&
-			    high <= range_high) {
-				return;
-			}
-			/* if we have a new lower bound for this range, set it. */
-			else if (low <= range_low
-				 && high >= range_low
-				 && high <= range_high) {
-				g_array_index (group->ranges, ArticleRange, i).low = low;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we have a new upper bound for this range, set it. */
-			else if (high >= range_high
-				 && low >= range_low
-				 && low <= range_high) {
-				g_array_index (group->ranges, ArticleRange, i).high = high;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we would be inserting another range that
-                           starts one index higher than an existing
-                           one, make the upper value of the existing
-                           range the upper value of the new one. */
-			else if (low == range_high + 1) {
-				g_array_index (group->ranges, ArticleRange, i).high = high;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if we would be inserting another range that
-                           ends one index lower than an existing one,
-                           group the existing range by setting its low
-                           to the new low */
-			else if (high == range_low - 1) {
-				g_array_index (group->ranges, ArticleRange, i).low = low;
-				newsrc->dirty = TRUE;
-				return;
-			}
-			/* if the range lies entirely outside another
-                           range, doesn't coincide with it's
-                           endpoints, and has lower values, insert it
-                           into the middle of the list. */
-			else if (low < range_low
-				 && high < range_low) {
-				tmp_range.low = low;
-				tmp_range.high = high;
-
-				group->ranges = g_array_insert_val (group->ranges, i, tmp_range);
-				newsrc->dirty = TRUE;
-
-				return;
-			}
-		}
-
-		/* if we made it here, the range needs to go at the end */
-		tmp_range.low = low;
-		tmp_range.high = high;
-		group->ranges = g_array_append_val (group->ranges, tmp_range);
-		newsrc->dirty = TRUE;
-	} 
-}
-
-int
-camel_nntp_newsrc_get_highest_article_read (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-	int ret;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	ret = camel_nntp_newsrc_group_get_highest_article_read (newsrc, group);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-int
-camel_nntp_newsrc_get_num_articles_read (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-	int ret;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	ret = camel_nntp_newsrc_group_get_num_articles_read (newsrc, group);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-void
-camel_nntp_newsrc_mark_article_read (CamelNNTPNewsrc *newsrc, const char *group_name, int num)
-{
-	NEWSRC_LOCK(newsrc, lock);
-	camel_nntp_newsrc_mark_range_read (newsrc, group_name, num, num);
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-void
-camel_nntp_newsrc_mark_range_read(CamelNNTPNewsrc *newsrc, const char *group_name, long low, long high)
-{
-	NewsrcGroup *group;
-
-	/* swap them if they're in the wrong order. */
-	if (low > high) {
-		long tmp;
-
-		tmp = high;
-		high = low;
-		low = tmp;
-	}
-
-	NEWSRC_LOCK(newsrc, lock);
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-gboolean
-camel_nntp_newsrc_article_is_read (CamelNNTPNewsrc *newsrc, const char *group_name, long num)
-{
-	int i;
-	NewsrcGroup *group;
-	int ret = FALSE;
-
-	NEWSRC_LOCK(newsrc, lock);
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	
-	for (i = 0; i < group->ranges->len; i++) {
-		if (num >= g_array_index (group->ranges, ArticleRange, i).low && 
-		    num <= g_array_index (group->ranges, ArticleRange, i).high) {
-			ret = TRUE;
-			break;
-		}
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return FALSE;
-}
-
-gboolean  
-camel_nntp_newsrc_group_is_subscribed (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-	int ret = FALSE;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		ret = group->subscribed;
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-void
-camel_nntp_newsrc_subscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-
-	if (group) {
-		if (!group->subscribed)
-			newsrc->dirty = TRUE;
-		group->subscribed = TRUE;
-	}
-	else {
-		camel_nntp_newsrc_group_add (newsrc, group_name, TRUE);
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-void
-camel_nntp_newsrc_unsubscribe_group (CamelNNTPNewsrc *newsrc, const char *group_name)
-{
-	NewsrcGroup *group;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	group = g_hash_table_lookup (newsrc->groups, group_name);
-	if (group) {
-		if (group->subscribed)
-			newsrc->dirty = TRUE;
-		group->subscribed = FALSE;
-	}
-	else {
-		camel_nntp_newsrc_group_add (newsrc, group_name, FALSE);
-	}
-
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-struct newsrc_ptr_array {
-	GPtrArray *ptr_array;
-	gboolean subscribed_only;
-};
-
-/* this needs to strdup the grup_name, if the group array is likely to change */
-static void
-get_group_foreach (char *group_name, NewsrcGroup *group, struct newsrc_ptr_array *npa)
-{
-	if (group->subscribed || !npa->subscribed_only) {
-		g_ptr_array_add (npa->ptr_array, group_name);
-	}
-}
-
-GPtrArray *
-camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc)
-{
-	struct newsrc_ptr_array npa;
-
-	g_return_val_if_fail (newsrc, NULL);
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	npa.ptr_array = g_ptr_array_new();
-	npa.subscribed_only = TRUE;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)get_group_foreach, &npa);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return npa.ptr_array;
-}
-
-GPtrArray *
-camel_nntp_newsrc_get_all_group_names (CamelNNTPNewsrc *newsrc)
-{
-	struct newsrc_ptr_array npa;
-
-	g_return_val_if_fail (newsrc, NULL);
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	npa.ptr_array = g_ptr_array_new();
-	npa.subscribed_only = FALSE;
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)get_group_foreach, &npa);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return npa.ptr_array;
-}
-
-void
-camel_nntp_newsrc_free_group_names (CamelNNTPNewsrc *newsrc, GPtrArray *group_names)
-{
-	g_ptr_array_free (group_names, TRUE);
-}
-
-struct newsrc_fp {
-	CamelNNTPNewsrc *newsrc;
-	FILE *fp;
-};
-
-static void
-camel_nntp_newsrc_write_group_line(gpointer key, NewsrcGroup *group, struct newsrc_fp *newsrc_fp)
-{
-	CamelNNTPNewsrc *newsrc;
-	FILE *fp;
-	int i;
-
-	fp = newsrc_fp->fp;
-	newsrc = newsrc_fp->newsrc;
-
-	fprintf (fp, "%s%c", group->name, group->subscribed ? ':' : '!');
-
-	if (group->ranges->len == 1
-	    && g_array_index (group->ranges, ArticleRange, 0).low == 0
-	    && g_array_index (group->ranges, ArticleRange, 0).high == 0) {
-		fprintf (fp, "\n");
-
-		return; /* special case since our parsing code will insert this
-			   bogus range if there were no read articles.  The code
-			   to add a range is smart enough to remove this one if we
-			   ever mark an article read, but we still need to deal with
-			   it if that code doesn't get hit. */
-	}
-
-	fprintf (fp, " ");
-
-	for (i = 0; i < group->ranges->len; i ++) {
-		char range_buffer[100];
-		guint low = g_array_index (group->ranges, ArticleRange, i).low;
-		guint high = g_array_index (group->ranges, ArticleRange, i).high;
-
-		if (low == high)
-			sprintf(range_buffer, "%d", low);
-		else if (low == high - 1)
-			sprintf(range_buffer, "%d,%d", low, high);
-		else
-			sprintf(range_buffer, "%d-%d", low, high);
-
-		if (i != group->ranges->len - 1)
-			strcat(range_buffer, ",");
-
-		fprintf (fp, range_buffer);
-	}
-
-	fprintf (fp, "\n");
-}
-
-void 
-camel_nntp_newsrc_write_to_file(CamelNNTPNewsrc *newsrc, FILE *fp)
-{
-	struct newsrc_fp newsrc_fp;
-
-	g_return_if_fail (newsrc);
-
-	newsrc_fp.newsrc = newsrc;
-	newsrc_fp.fp = fp;
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	g_hash_table_foreach (newsrc->groups,
-			      (GHFunc)camel_nntp_newsrc_write_group_line,
-			      &newsrc_fp);
-
-	NEWSRC_UNLOCK(newsrc, lock);
-}
-
-void
-camel_nntp_newsrc_write(CamelNNTPNewsrc *newsrc)
-{
-	FILE *fp;
-
-	g_return_if_fail (newsrc);
-
-	NEWSRC_LOCK(newsrc, lock);
-
-	if (!newsrc->dirty)
-		return;
-
-	if ((fp = fopen(newsrc->filename, "w")) == NULL) {
-		g_warning ("Couldn't open newsrc file '%s'.\n", newsrc->filename);
-		NEWSRC_UNLOCK(newsrc, lock);
-		return;
-	}
-
-	newsrc->dirty = FALSE;
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	camel_nntp_newsrc_write_to_file(newsrc, fp);
-
-	fclose(fp);
-}
-
-static void
-camel_nntp_newsrc_parse_line(CamelNNTPNewsrc *newsrc, char *line)
-{
-	char *p, *comma, *dash;
-	gboolean is_subscribed;
-	NewsrcGroup *group;
-
-	p = strchr(line, ':');
-
-	if (p) {
-		is_subscribed = TRUE;
-	}
-	else {
-		p = strchr(line, '!');
-		if (p)
-			is_subscribed = FALSE;
-		else
-			return; /* bogus line. */
-	}
-
-	*p++ = '\0';
-
-	group = camel_nntp_newsrc_group_add (newsrc, line, is_subscribed);
-
-	do {
-		guint high, low;
-
-		comma = strchr(p, ',');
-
-		if (comma)
-			*comma = '\0';
-
-		dash = strchr(p, '-');
-
-		if (!dash) { /* there wasn't a dash.  must be just one number */
-			high = low = atol(p);
-		}
-		else { /* there was a dash. */
-			*dash = '\0';
-			low = atol(p);
-			*dash = '-';
-			p = dash + 1;
-			high = atol(p);
-		}
-
-		camel_nntp_newsrc_group_mark_range_read (newsrc, group, low, high);
-
-		if (comma) {
-			*comma = ',';
-			p = comma + 1;
-		}
-
-	} while(comma);
-}
-
-static char*
-get_line (char *buf, char **p)
-{
-	char *l;
-	char *line;
-
-	g_assert (*p == NULL || **p == '\n' || **p == '\0');
-
-	if (*p == NULL) {
-		*p = buf;
-
-		if (**p == '\0')
-			return NULL;
-	}
-	else {
-		if (**p == '\0')
-			return NULL;
-
-		(*p) ++;
-	
-		/* if we just incremented to the end of the buffer, return NULL */
-		if (**p == '\0')
-			return NULL;
-	}
-
-	l = strchr (*p, '\n');
-	if (l) {
-		*l = '\0';
-		line = g_strdup (*p);
-		*l = '\n';
-		*p = l;
-	}
-	else {
-		/* we're at the last line (which isn't terminated by a \n, btw) */
-		line = g_strdup (*p);
-		(*p) += strlen (*p);
-	}
-
-	return line;
-}
-
-CamelNNTPNewsrc *
-camel_nntp_newsrc_read_for_server (const char *server)
-{
-	int fd;
-	char buf[1024];
-	char *file_contents, *line, *p;
-	char *filename;
-	CamelNNTPNewsrc *newsrc;
-	int newsrc_len;
-	int len_read = 0;
-	struct stat sb;
-
-	filename = g_strdup_printf ("%s/.newsrc-%s", g_get_home_dir(), server);
-
-	newsrc = g_new0(CamelNNTPNewsrc, 1);
-	newsrc->filename = filename;
-	newsrc->groups = g_hash_table_new (g_str_hash, g_str_equal);
-#ifdef ENABLE_THREADS
-	newsrc->lock = g_mutex_new();
-#endif
-
-	if ((fd = open(filename, O_RDONLY)) == -1) {
-		g_warning ("~/.newsrc-%s not present.\n", server);
-		return newsrc;
-	}
-
-	if (fstat (fd, &sb) == -1) {
-		g_warning ("failed fstat on ~/.newsrc-%s: %s\n", server, strerror(errno));
-		return newsrc;
-	}
-	newsrc_len = sb.st_size;
-
-	file_contents = g_malloc (newsrc_len + 1);
-
-	while (len_read < newsrc_len) {
-		int c = read (fd, buf, sizeof (buf));
-
-		if (c == -1)
-			break;
-
-		memcpy (&file_contents[len_read], buf, c);
-		len_read += c;
-	}
-	file_contents [len_read] = 0;
-
-	p = NULL;
-	while ((line = get_line (file_contents, &p))) {
-		camel_nntp_newsrc_parse_line(newsrc, line);
-		g_free (line);
-	}
-
-	close (fd);
-	g_free (file_contents);
-
-	return newsrc;
-}
diff --git a/camel/providers/nntp/camel-nntp-newsrc.h b/camel/providers/nntp/camel-nntp-newsrc.h
deleted file mode 100644
index 652e3edbce..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#ifndef _CAMEL_NNTP_NEWSRC_H_
-#define _CAMEL_NNTP_NEWSRC_H_
-
-#include <stdio.h>
-#include "glib.h"
-
-typedef struct CamelNNTPNewsrc CamelNNTPNewsrc;
-
-int              camel_nntp_newsrc_get_highest_article_read   (CamelNNTPNewsrc *newsrc, const char *group_name);
-int              camel_nntp_newsrc_get_num_articles_read      (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_mark_article_read          (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, int num);
-void             camel_nntp_newsrc_mark_range_read            (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, long low, long high);
-
-gboolean         camel_nntp_newsrc_article_is_read            (CamelNNTPNewsrc *newsrc,
-							       const char *group_name, long num);
-
-gboolean         camel_nntp_newsrc_group_is_subscribed        (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_subscribe_group            (CamelNNTPNewsrc *newsrc, const char *group_name);
-void             camel_nntp_newsrc_unsubscribe_group          (CamelNNTPNewsrc *newsrc, const char *group_name);
-
-GPtrArray*       camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc);
-GPtrArray*       camel_nntp_newsrc_get_all_group_names        (CamelNNTPNewsrc *newsrc);
-void             camel_nntp_newsrc_free_group_names           (CamelNNTPNewsrc *newsrc, GPtrArray *group_names);
-
-void             camel_nntp_newsrc_write_to_file              (CamelNNTPNewsrc *newsrc, FILE *fp);
-void             camel_nntp_newsrc_write                      (CamelNNTPNewsrc *newsrc);
-CamelNNTPNewsrc *camel_nntp_newsrc_read_for_server            (const char *server);
-
-#endif /* _CAMEL_NNTP_NEWSRC_H_ */
-
-
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
deleted file mode 100644
index 07857c173c..0000000000
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ /dev/null
@@ -1,112 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-provider.c: nntp provider registration code */
-
-/* 
- * Authors :
- *   Chris Toshok <toshok@helixcode.com>
- *
- * Copyright (C) 2000 Helix Code, Inc. (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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <string.h>
-#include "camel-nntp-store.h"
-#include "camel-provider.h"
-#include "camel-session.h"
-
-static void add_hash (guint *hash, char *s);
-static guint nntp_url_hash (gconstpointer key);
-static gint check_equal (char *s1, char *s2);
-static gint nntp_url_equal (gconstpointer a, gconstpointer b);
-
-static CamelProvider news_provider = {
-	"nntp",
-	N_("USENET news"),
-
-	N_("This is a provider for reading from and posting to"
-	   "USENET newsgroups."),
-
-	"news",
-
-	CAMEL_PROVIDER_IS_REMOTE | CAMEL_PROVIDER_IS_STORAGE,
-
-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |
-	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,
-
-	/* ... */
-};
-
-void
-camel_provider_module_init (CamelSession *session)
-{
-	news_provider.object_types[CAMEL_PROVIDER_STORE] =
-		camel_nntp_store_get_type();
-
-	news_provider.service_cache = g_hash_table_new (nntp_url_hash, nntp_url_equal);
-
-	camel_session_register_provider (session, &news_provider);
-}
-
-static void
-add_hash (guint *hash, char *s)
-{
-	if (s)
-		*hash ^= g_str_hash(s);
-}
-
-static guint
-nntp_url_hash (gconstpointer key)
-{
-	const CamelURL *u = (CamelURL *)key;
-	guint hash = 0;
-
-	add_hash (&hash, u->user);
-	add_hash (&hash, u->host);
-	hash ^= u->port;
-	
-	return hash;
-}
-
-static gint
-check_equal (char *s1, char *s2)
-{
-	if (s1 == NULL) {
-		if (s2 == NULL)
-			return TRUE;
-		else
-			return FALSE;
-	}
-	
-	if (s2 == NULL)
-		return FALSE;
-
-	return strcmp (s1, s2) == 0;
-}
-
-static gint
-nntp_url_equal (gconstpointer a, gconstpointer b)
-{
-	const CamelURL *u1 = a, *u2 = b;
-	
-	return check_equal (u1->user, u2->user)
-		&& check_equal (u1->host, u2->host)
-		&& u1->port == u2->port;
-}
diff --git a/camel/providers/nntp/camel-nntp-resp-codes.h b/camel/providers/nntp/camel-nntp-resp-codes.h
deleted file mode 100644
index 8b9dc8ff6c..0000000000
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-resp-codes.h : #defines for all the response codes we care about */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_RESP_CODES_H
-#define CAMEL_NNTP_RESP_CODES_H 1
-
-#define CAMEL_NNTP_OK(x) ((x) < 400)
-#define CAMEL_NNTP_ERR(x) (!CAMEL_NNTP_OK(x) && (x) < 500)
-#define CAMEL_NNTP_FAIL(x) (!CAMEL_NNTP_OK(x) && !CAMEL_NNTP_ERR(x))
-
-#define NNTP_GREETING_POSTING_OK    200
-#define NNTP_GREETING_NO_POSTING    201
-
-#define NNTP_GROUP_SELECTED           211
-#define NNTP_LIST_FOLLOWS             215
-#define NNTP_ARTICLE_FOLLOWS          220
-#define NNTP_HEAD_FOLLOWS             221
-#define NNTP_DATA_FOLLOWS             224
-#define NNTP_NEW_ARTICLE_LIST_FOLLOWS 230
-#define NNTP_NEW_GROUP_LIST_FOLLOWS   231
-
-#define NNTP_NO_SUCH_GROUP          411
-#define NNTP_NO_SUCH_ARTICLE        430
-
-/* authentication */
-#define NNTP_AUTH_ACCEPTED          281
-#define NNTP_AUTH_CONTINUE          381
-#define NNTP_AUTH_REQUIRED          480
-#define NNTP_AUTH_REJECTED          482
-
-#define NNTP_PROTOCOL_ERROR         666
-
-#endif /* CAMEL_NNTP_RESP_CODES_H */
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
deleted file mode 100644
index 494e11f647..0000000000
--- a/camel/providers/nntp/camel-nntp-store.c
+++ /dev/null
@@ -1,850 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.c : class for an nntp store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include <config.h>
-
-#include <dirent.h>
-#include <errno.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "libgnome/libgnome.h"
-
-#include "camel-nntp-resp-codes.h"
-#include "camel-folder-summary.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-grouplist.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-auth.h"
-#include "camel-exception.h"
-#include "camel-url.h"
-#include "string-utils.h"
-
-#define NNTP_PORT 119
-
-#define DUMP_EXTENSIONS
-
-/* define if you want the subscribe ui to show folders in tree form */
-/* #define INFO_AS_TREE */
-
-static CamelRemoteStoreClass *remote_store_class = NULL;
-
-static CamelServiceClass *service_class = NULL;
-
-/* Returns the class for a CamelNNTPStore */
-#define CNNTPS_CLASS(so) CAMEL_NNTP_STORE_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CF_CLASS(so) CAMEL_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-#define CNNTPF_CLASS(so) CAMEL_NNTP_FOLDER_CLASS (CAMEL_OBJECT_GET_CLASS(so))
-
-static gboolean ensure_news_dir_exists (CamelNNTPStore *store);
-
-static void
-camel_nntp_store_get_extensions (CamelNNTPStore *store, CamelException *ex)
-{
-	store->extensions = 0;
-
-	if (camel_nntp_command (store, ex, NULL, "LIST EXTENSIONS") == NNTP_LIST_FOLLOWS) {
-		gboolean done = FALSE;
-		CamelException ex;
-
-		camel_exception_init (&ex);
-
-		while (!done) {
-			char *line;
-
-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, &ex) < 0)
-				break; /* XXX */
-
-			if (*line == '.') {
-				done = TRUE;
-			}
-			else {
-#define CHECK_EXT(name,val) if (!strcasecmp (line, (name))) store->extensions |= (val)
-
-				CHECK_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);
-				CHECK_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);
-				CHECK_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);
-				CHECK_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);
-				CHECK_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);
-				CHECK_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);
-				CHECK_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);
-				CHECK_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);
-
-#undef CHECK_EXT
-			}
-
-			g_free (line);
-		}
-	}
-
-#ifdef DUMP_EXTENSIONS
-	g_print ("NNTP Extensions:");
-#define DUMP_EXT(name,val) if (store->extensions & (val)) g_print (" %s", name);
-	DUMP_EXT ("SEARCH",     CAMEL_NNTP_EXT_SEARCH);
-	DUMP_EXT ("SETGET",     CAMEL_NNTP_EXT_SETGET);
-	DUMP_EXT ("OVER",       CAMEL_NNTP_EXT_OVER);
-	DUMP_EXT ("XPATTEXT",   CAMEL_NNTP_EXT_XPATTEXT);
-	DUMP_EXT ("XACTIVE",    CAMEL_NNTP_EXT_XACTIVE);
-	DUMP_EXT ("LISTMOTD",   CAMEL_NNTP_EXT_LISTMOTD);
-	DUMP_EXT ("LISTSUBSCR", CAMEL_NNTP_EXT_LISTSUBSCR);
-	DUMP_EXT ("LISTPNAMES", CAMEL_NNTP_EXT_LISTPNAMES);
-	g_print ("\n");
-#undef DUMP_EXT
-#endif
-}
-
-static void
-camel_nntp_store_get_overview_fmt (CamelNNTPStore *store, CamelException *ex)
-{
-	int status;
-	int i;
-	gboolean done = FALSE;
-	
-	status = camel_nntp_command (store, ex, NULL,
-				     "LIST OVERVIEW.FMT");
-
-	if (status != NNTP_LIST_FOLLOWS) {
-		if (store->extensions & CAMEL_NNTP_EXT_OVER) {
-			/* if we can't get the overview format, we should
-			   disable OVER support */
-			g_warning ("server reported support of OVER but LIST OVERVIEW.FMT failed."
-				   "  disabling OVER.\n");
-			store->extensions &= ~CAMEL_NNTP_EXT_OVER;
-			return;
-		}
-	}
-	else {
-		if (!(store->extensions & CAMEL_NNTP_EXT_OVER)) {
-			g_warning ("server didn't report support of OVER but LIST OVERVIEW.FMT worked."
-				   "  enabling OVER.\n");
-			store->extensions |= CAMEL_NNTP_EXT_OVER;
-		}
-	}
-
-	/* start at 1 because the article number is always first */
-	store->num_overview_fields = 1;
-	
-	for (i = 0; i < CAMEL_NNTP_OVER_LAST; i ++) {
-		store->overview_field [i].index = -1;
-	}
-
-	while (!done) {
-		char *line;
-
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &line, ex) < 0)
-			break; /* XXX */
-
-		if (*line == '.') {
-			done = TRUE;
-		}
-		else {
-			CamelNNTPOverField *over_field = NULL;
-			char *colon = NULL;;
-
-			if (!strncasecmp (line, "From:", 5)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_FROM ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 5;
-			}
-			else if (!strncasecmp (line, "Subject:", 7)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_SUBJECT ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 7;
-			}
-			else if (!strncasecmp (line, "Date:", 5)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_DATE ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 5;
-			}
-			else if (!strncasecmp (line, "Message-ID:", 11)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-			else if (!strncasecmp (line, "References:", 11)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_REFERENCES ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-			else if (!strncasecmp (line, "Bytes:", 6)) {
-				over_field = &store->overview_field [ CAMEL_NNTP_OVER_BYTES ];
-				over_field->index = store->num_overview_fields;
-				colon = line + 11;
-			}
-		
-			if (colon && !strncmp (colon + 1, "full", 4))
-				over_field->full = TRUE;
-
-			store->num_overview_fields ++;
-		}
-
-		g_free (line);
-	}
-
-	for (i = 0; i < CAMEL_NNTP_OVER_LAST; i ++) {
-		if (store->overview_field [i].index == -1) {
-			g_warning ("server's OVERVIEW.FMT doesn't support minimum set we require,"
-				   " disabling OVER support.\n");
-			store->extensions &= ~CAMEL_NNTP_EXT_OVER;
-		}
-	}
-}
-
-static gboolean
-nntp_store_connect (CamelService *service, CamelException *ex)
-{
-	char *buf;
-	int resp_code;
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-
-	if (!ensure_news_dir_exists(store)) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Could not open directory for news server: %s"),
-				      strerror (errno));
-		return FALSE;
-	}
-
-	if (CAMEL_SERVICE_CLASS (remote_store_class)->connect (service, ex) == FALSE)
-		return FALSE;
-
-	/* Read the greeting */
-	if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (service), &buf, ex) < 0) {
-		return FALSE;
-	}
-
-	/* check if posting is allowed. */
-	resp_code = atoi (buf);
-	if (resp_code == NNTP_GREETING_POSTING_OK) {
-		g_print ("posting allowed\n");
-		store->posting_allowed = TRUE;
-	}
-	else if (resp_code == NNTP_GREETING_NO_POSTING) {
-		g_print ("no posting allowed\n");
-		store->posting_allowed = FALSE;
-	}
-	else {
-		g_warning ("unexpected server greeting code %d, no posting allowed\n", resp_code);
-		store->posting_allowed = FALSE;
-	}
-
-	g_free (buf);
-
-	/* get a list of extensions that the server supports */
-	camel_nntp_store_get_extensions (store, ex);
-
-	/* try to get the overview.fmt */
-	camel_nntp_store_get_overview_fmt (store, ex);
-
-	return TRUE;
-}
-
-static gboolean
-nntp_store_disconnect (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-
-	if (clean)
-		camel_nntp_command (store, ex, NULL, "QUIT");
-
-	if (store->newsrc)
-		camel_nntp_newsrc_write (store->newsrc);
-
-	if (!service_class->disconnect (service, clean, ex))
-		return FALSE;
-
-	return TRUE;
-}
-
-static char *
-nntp_store_get_name (CamelService *service, gboolean brief)
-{
-	if (brief)
-		return g_strdup_printf ("%s", service->url->host);
-	else
-		return g_strdup_printf (_("USENET News via %s"), service->url->host);
-	
-}
-
-static CamelServiceAuthType password_authtype = {
-	N_("Password"),
-	
-	N_("This option will authenticate with the NNTP server using a "
-	   "plaintext password."),
-	
-	"",
-	TRUE
-};
-
-static GList *
-nntp_store_query_auth_types (CamelService *service, gboolean connect, CamelException *ex)
-{
-	GList *prev;
-	
-	g_warning ("nntp::query_auth_types: not implemented. Defaulting.");
-	prev = CAMEL_SERVICE_CLASS (remote_store_class)->query_auth_types (service, ex);
-	return g_list_prepend (prev, &password_authtype);
-}
-
-static CamelFolder *
-nntp_store_get_folder (CamelStore *store, const gchar *folder_name,
-		       guint32 flags, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	printf ("get_folder called on folder_name=%s\n", folder_name);
-
-	/* if we haven't already read our .newsrc, read it now */
-	if (!nntp_store->newsrc)
-		nntp_store->newsrc = 
-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)->url->host);
-
-	if (!nntp_store->newsrc) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to open or create .newsrc file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	return camel_nntp_folder_new (store, folder_name, ex);
-}
-
-#ifdef INFO_AS_TREE
-static void
-build_folder_info (CamelNNTPStore *nntp_store, CamelFolderInfo **root,
-		   CamelFolderInfo *parent, CamelNNTPGroupListEntry *entry,
-		   char *prefix, char *suffix,
-		   GHashTable *name_to_info)
-{
-	CamelURL *url = CAMEL_SERVICE (nntp_store)->url;
-	char *dot;
-	if ((dot = strchr (suffix, '.'))) {
-		/* it's an internal node, figure out the next node in
-                   the chain */
-		CamelFolderInfo *node;
-		char *node_name, *node_full_name;
-
-		node_name = g_malloc0 (dot - suffix + 1);
-		strncpy (node_name, suffix, dot - suffix);
-		node_full_name = g_strdup_printf ("%s.%s", prefix, node_name);
-
-		node = g_hash_table_lookup (name_to_info, node_full_name);
-		if (!node) {
-			/* we need to add one */
-			node = g_new0 (CamelFolderInfo, 1);
-			node->name = g_strdup (node_name);
-			node->full_name = g_strdup (node_full_name);
-			node->url = NULL;
-			node->unread_message_count = -1;
-
-			if (parent) {
-				if (parent->child) {
-					node->sibling = parent->child;
-					parent->child = node;
-				}
-				else {
-					parent->child = node;
-				}
-			}
-			else {
-				if (*root) {
-					*root = node;
-				}
-				else {
-					node->sibling = *root;
-					*root = node;
-				}
-			}
-
-			g_hash_table_insert (name_to_info, node_full_name, node);
-		}
-
-		build_folder_info (nntp_store, root, node, entry, node_full_name, dot + 1, name_to_info);
-	}
-	else {
-		/* it's a leaf node, make the CamelFolderInfo and
-                   append it to @parent's list of children. */
-		CamelFolderInfo *new_group;
-
-		new_group = g_new0 (CamelFolderInfo, 1);
-		new_group->name = g_strdup (entry->group_name);
-		new_group->full_name = g_strdup (entry->group_name);
-		new_group->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						  url->user ? url->user : "",
-						  url->user ? "@" : "",
-						  url->host, (char *)entry->group_name);
-
-		new_group->unread_message_count = (entry->high - entry->low - 
-						   camel_nntp_newsrc_get_num_articles_read (nntp_store->newsrc, entry->group_name));
-
-		if (parent) {
-			if (parent->child) {
-				new_group->sibling = parent->child;
-				parent->child = new_group;
-			}
-			else {
-				parent->child = new_group;
-			}
-		}
-		else {
-			if (*root) {
-				*root = new_group;
-			}
-			else {
-				new_group->sibling = *root;
-				*root = new_group;
-			}
-		}
-	}
-}
-#endif
-
-static CamelFolderInfo *
-build_folder_info_from_grouplist (CamelNNTPStore *nntp_store, const char *top)
-{
-	GList *g;
-	CamelFolderInfo *groups = NULL;
-#ifdef INFO_AS_TREE
-	GHashTable *hash = g_hash_table_new (g_str_hash, g_str_equal);
-#else
-	CamelFolderInfo *last = NULL, *fi;
-	CamelURL *url = CAMEL_SERVICE (nntp_store)->url;
-#endif
-
-	for (g = nntp_store->group_list->group_list; g; g = g_list_next (g)) {
-		CamelNNTPGroupListEntry *entry = g->data;
-
-		if (!top || !strncmp (top, entry->group_name, strlen (top))) {
-#ifdef INFO_AS_TREE
-			build_folder_info (nntp_store, &groups, NULL, entry,
-					   "", entry->group_name, hash);
-#else
-
-			fi = g_new0 (CamelFolderInfo, 1);
-			fi->name = g_strdup (entry->group_name);
-			fi->full_name = g_strdup (entry->group_name);
-			fi->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						   url->user ? url->user : "",
-						   url->user ? "@" : "",
-						   url->host, (char *)entry->group_name);
-
-			fi->unread_message_count = (entry->high - entry->low - 
-						    camel_nntp_newsrc_get_num_articles_read (
-							     nntp_store->newsrc, entry->group_name));
-
-			if (last)
-				last->sibling = fi;
-			else
-				groups = fi;
-			last = fi;
-#endif
-		}
-	}
-
-	return groups;
-}
-
-static CamelFolderInfo *
-nntp_store_get_folder_info (CamelStore *store, const char *top,
-			    gboolean fast, gboolean recursive,
-			    gboolean subscribed_only,
-			    CamelException *ex)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	CamelNNTPStore *nntp_store = (CamelNNTPStore *)store;
-	GPtrArray *names;
-	CamelFolderInfo *groups = NULL, *last = NULL, *fi;
-	int i;
-
-	/* if we haven't already read our .newsrc, read it now */
-	if (!nntp_store->newsrc)
-		nntp_store->newsrc = 
-		camel_nntp_newsrc_read_for_server (CAMEL_SERVICE(store)->url->host);
-
-	if (!nntp_store->newsrc) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Unable to open or create .newsrc file for %s: %s"),
-				      CAMEL_SERVICE(store)->url->host,
-				      strerror(errno));
-		return NULL;
-	}
-
-	if (!subscribed_only) {
-		if (!nntp_store->group_list)
-			nntp_store->group_list = camel_nntp_grouplist_fetch (nntp_store, ex);
-		if (camel_exception_is_set (ex)) {
-			return NULL;
-		}
-		else {
-			fi = build_folder_info_from_grouplist (nntp_store, top);
-			return fi;
-		}
-	}
-
-	if (top == NULL) {
-		/* return the list of groups */
-		names = camel_nntp_newsrc_get_subscribed_group_names (nntp_store->newsrc);
-		for (i = 0; i < names->len; i++) {
-			fi = g_new0 (CamelFolderInfo, 1);
-			fi->name = g_strdup (names->pdata[i]);
-			fi->full_name = g_strdup (names->pdata[i]);
-			fi->url = g_strdup_printf ("nntp://%s%s%s/%s",
-						   url->user ? url->user : "",
-						   url->user ? "@" : "",
-						   url->host, (char *)names->pdata[i]);
-			/* FIXME */
-			fi->unread_message_count = -1;
-
-			if (last)
-				last->sibling = fi;
-			else
-				groups = fi;
-			last = fi;
-		}
-		camel_nntp_newsrc_free_group_names (nntp_store->newsrc, names);
-
-		return groups;
-	}
-	else {
-		/* getting a specific group */
-
-		fi = g_new0 (CamelFolderInfo, 1);
-		fi->name = g_strdup (top);
-		fi->full_name = g_strdup (top);
-		fi->url = g_strdup_printf ("nntp://%s/%s", url->host, top);
-		/* FIXME */
-		fi->unread_message_count = -1;
-
-		return fi;
-	}
-}
-
-static gboolean
-nntp_store_folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	return camel_nntp_newsrc_group_is_subscribed (nntp_store->newsrc, folder_name);
-}
-
-static void
-nntp_store_subscribe_folder (CamelStore *store, const char *folder_name,
-			     CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	camel_nntp_newsrc_subscribe_group (nntp_store->newsrc, folder_name);
-}
-
-static void
-nntp_store_unsubscribe_folder (CamelStore *store, const char *folder_name,
-			       CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-
-	camel_nntp_newsrc_unsubscribe_group (nntp_store->newsrc, folder_name);
-}
-
-static void
-finalize (CamelObject *object)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (object);
-	if (nntp_store->newsrc)
-		camel_nntp_newsrc_write (nntp_store->newsrc);
-}
-
-static void
-camel_nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class)
-{
-	CamelStoreClass *camel_store_class = CAMEL_STORE_CLASS (camel_nntp_store_class);
-	CamelServiceClass *camel_service_class = CAMEL_SERVICE_CLASS (camel_nntp_store_class);
-
-	remote_store_class = CAMEL_REMOTE_STORE_CLASS(camel_type_get_global_classfuncs 
-						      (camel_remote_store_get_type ()));
-
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->connect = nntp_store_connect;
-	camel_service_class->disconnect = nntp_store_disconnect;
-	camel_service_class->query_auth_types = nntp_store_query_auth_types;
-	camel_service_class->get_name = nntp_store_get_name;
-
-	camel_store_class->get_folder = nntp_store_get_folder;
-	camel_store_class->get_folder_info = nntp_store_get_folder_info;
-	camel_store_class->free_folder_info = camel_store_free_folder_info_full;
-
-	camel_store_class->folder_subscribed = nntp_store_folder_subscribed;
-	camel_store_class->subscribe_folder = nntp_store_subscribe_folder;
-	camel_store_class->unsubscribe_folder = nntp_store_unsubscribe_folder;
-}
-
-
-
-static void
-camel_nntp_store_init (gpointer object, gpointer klass)
-{
-	CamelRemoteStore *remote_store = CAMEL_REMOTE_STORE (object);
-	CamelStore *store = CAMEL_STORE (object);
-
-	remote_store->default_port = NNTP_PORT;
-
-	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
-}
-
-CamelType
-camel_nntp_store_get_type (void)
-{
-	static CamelType camel_nntp_store_type = CAMEL_INVALID_TYPE;
-	
-	if (camel_nntp_store_type == CAMEL_INVALID_TYPE)	{
-		camel_nntp_store_type = camel_type_register (CAMEL_REMOTE_STORE_TYPE, "CamelNNTPStore",
-							     sizeof (CamelNNTPStore),
-							     sizeof (CamelNNTPStoreClass),
-							     (CamelObjectClassInitFunc) camel_nntp_store_class_init,
-							     NULL,
-							     (CamelObjectInitFunc) camel_nntp_store_init,
-							     (CamelObjectFinalizeFunc) finalize);
-	}
-	
-	return camel_nntp_store_type;
-}
-
-
-/**
- * camel_nntp_command: Send a command to a NNTP server.
- * @store: the NNTP store
- * @ret: a pointer to return the full server response in
- * @fmt: a printf-style format string, followed by arguments
- *
- * This command sends the command specified by @fmt and the following
- * arguments to the connected NNTP store specified by @store. It then
- * reads the server's response and parses out the status code. If
- * the caller passed a non-NULL pointer for @ret, camel_nntp_command
- * will set it to point to an buffer containing the rest of the
- * response from the NNTP server. (If @ret was passed but there was
- * no extended response, @ret will be set to NULL.) The caller must
- * free this buffer when it is done with it.
- *
- * Return value: the response code of the nntp command.
- **/
-static int
-camel_nntp_command_send_recv (CamelNNTPStore *store, CamelException *ex, char **ret, char *cmd)
-{
-	char *respbuf;
-	int resp_code;
-	gboolean again;
-
-	do {
-		again = FALSE;
-
-		/* Send the command */
-		if (camel_remote_store_send_string (CAMEL_REMOTE_STORE (store), ex, cmd) < 0) {
-			return NNTP_PROTOCOL_ERROR;
-		}
-
-		/* Read the response */
-		if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (store), &respbuf, ex) < 0) {
-			if (ret)
-				*ret = g_strdup (g_strerror (errno));
-			return NNTP_PROTOCOL_ERROR;
-		}
-
-		resp_code = atoi (respbuf);
-
-		/* this is kind of a gross hack, but since an auth challenge
-		   can pop up at any time, and we want to shield this from our
-		   callers, we handle authentication here. */
-		if (resp_code == NNTP_AUTH_REQUIRED) {
-			resp_code = camel_nntp_auth_authenticate (store, ex);
-			if (resp_code != NNTP_AUTH_ACCEPTED) {
-				return resp_code;
-			}
-
-			/* need to resend our command here */
-			again = TRUE;
-		}
-	} while (again);
-
-	if (ret) {
-		*ret = strchr (respbuf, ' ');
-		if (*ret)
-			*ret = g_strdup (*ret + 1);
-	}
-	g_free (respbuf);
-
-	return resp_code;
-}
-
-int
-camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...)
-{
-	char *cmdbuf;
-	va_list ap;
-	int resp_code;
-	char *real_fmt;
-
-	real_fmt = g_strdup_printf ("%s\r\n", fmt);
-
-	va_start (ap, fmt);
-	cmdbuf = g_strdup_vprintf (real_fmt, ap);
-	va_end (ap);
-
-	g_free (real_fmt);
-
-	resp_code = camel_nntp_command_send_recv (store, ex, ret, cmdbuf);
-
-	g_free (cmdbuf);
-
-	return resp_code;
-}
-
-void
-camel_nntp_store_subscribe_group (CamelStore *store,
-				  const gchar *group_name)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	char *ret = NULL;
-	CamelException *ex = camel_exception_new();
-
-	if (camel_exception_get_id (ex)) {
-		g_free (root_dir);
-		camel_exception_free (ex);
-		return;
-	}
-
-	if (camel_nntp_command ( CAMEL_NNTP_STORE (store),
-				 ex, &ret, "GROUP %s", group_name) == NNTP_GROUP_SELECTED) {
-		/* we create an empty summary file here, so that when
-                   the group is opened we'll know we need to build it. */
-		gchar *summary_file;
-		int fd;
-		summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);
-		
-		fd = open (summary_file, O_CREAT | O_RDWR, 0666);
-		close (fd);
-
-		g_free (summary_file);
-	}
-	if (ret) g_free (ret);
-
-	g_free (root_dir);
-	camel_exception_free (ex);
-}
-
-void
-camel_nntp_store_unsubscribe_group (CamelStore *store,
-				    const gchar *group_name)
-{
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-	gchar *summary_file;
-
-	summary_file = g_strdup_printf ("%s/%s-ev-summary", root_dir, group_name);
-	if (g_file_exists (summary_file))
-		unlink (summary_file);
-	g_free (summary_file);
-
-	g_free (root_dir);
-}
-
-GList *
-camel_nntp_store_list_subscribed_groups(CamelStore *store)
-{
-	GList *group_name_list = NULL;
-	struct stat stat_buf;
-	gint stat_error = 0;
-	gchar *entry_name;
-	gchar *full_entry_name;
-	gchar *real_group_name;
-	struct dirent *dir_entry;
-	DIR *dir_handle;
-	gchar *root_dir = camel_nntp_store_get_toplevel_dir(CAMEL_NNTP_STORE(store));
-
-	dir_handle = opendir (root_dir);
-	g_return_val_if_fail (dir_handle, NULL);
-
-	/* read the first entry in the directory */
-	dir_entry = readdir (dir_handle);
-	while ((stat_error != -1) && (dir_entry != NULL)) {
-
-		/* get the name of the next entry in the dir */
-		entry_name = dir_entry->d_name;
-		full_entry_name = g_strdup_printf ("%s/%s", root_dir, entry_name);
-		stat_error = stat (full_entry_name, &stat_buf);
-		g_free (full_entry_name);
-
-		/* is it a normal file ending in -ev-summary ? */
-		if ((stat_error != -1) && S_ISREG (stat_buf.st_mode)) {
-			gboolean summary_suffix_found;
-
-			real_group_name = string_prefix (entry_name, "-ev-summary",
-							 &summary_suffix_found);
-
-			if (summary_suffix_found)
-				/* add the folder name to the list */
-				group_name_list = g_list_append (group_name_list, 
-								 real_group_name);
-		}
-		/* read next entry */
-		dir_entry = readdir (dir_handle);
-	}
-
-	closedir (dir_handle);
-
-	return group_name_list;
-}
-
-gchar *
-camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store)
-{
-	CamelURL *url = CAMEL_SERVICE (store)->url;
-	char *top_dir;
-
-	g_assert(url != NULL);
-
-	top_dir = g_strdup_printf( "%s/evolution/news/%s",
-				   g_get_home_dir (),
-				   url->host );
-
-	return top_dir;
-}
-
-static gboolean
-ensure_news_dir_exists (CamelNNTPStore *store)
-{
-	gchar *dir = camel_nntp_store_get_toplevel_dir (store);
-
-	if (access (dir, F_OK) == 0) {
-		g_free (dir);
-		return TRUE;
-	}
-
-	if (camel_mkdir_hier (dir, S_IRWXU) == -1) {
-		g_free (dir);
-		return FALSE;
-	}
-
-	return TRUE;
-}
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
deleted file mode 100644
index d7836f47ae..0000000000
--- a/camel/providers/nntp/camel-nntp-store.h
+++ /dev/null
@@ -1,113 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-store.h : class for an nntp store */
-
-/* 
- *
- * Copyright (C) 2000 Helix Code, Inc. <toshok@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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_STORE_H
-#define CAMEL_NNTP_STORE_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-#include "camel-remote-store.h"
-#include "camel-nntp-newsrc.h"
-#include "camel-nntp-types.h"
-
-#define CAMEL_NNTP_STORE_TYPE     (camel_nntp_store_get_type ())
-#define CAMEL_NNTP_STORE(obj)     (CAMEL_CHECK_CAST((obj), CAMEL_NNTP_STORE_TYPE, CamelNNTPStore))
-#define CAMEL_NNTP_STORE_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), CAMEL_NNTP_STORE_TYPE, CamelNNTPStoreClass))
-#define CAMEL_IS_NNTP_STORE(o)    (CAMEL_CHECK_TYPE((o), CAMEL_NNTP_STORE_TYPE))
-
-
-enum {
-	CAMEL_NNTP_OVER_FROM,
-	CAMEL_NNTP_OVER_SUBJECT,
-	CAMEL_NNTP_OVER_DATE,
-	CAMEL_NNTP_OVER_MESSAGE_ID,
-	CAMEL_NNTP_OVER_REFERENCES,
-	CAMEL_NNTP_OVER_BYTES,
-
-	CAMEL_NNTP_OVER_LAST
-};
-
-struct CamelNNTPOverField {
-	int index;
-	gboolean full; /* full in the OVER sense - the field name
-                          precedes the ':' in the XOVER list. */
-};
-
-struct CamelNNTPStore {
-	CamelRemoteStore parent_object;	
-
-#define CAMEL_NNTP_EXT_SEARCH     (1<<0)
-#define CAMEL_NNTP_EXT_SETGET     (1<<1)
-#define CAMEL_NNTP_EXT_OVER       (1<<2)
-#define CAMEL_NNTP_EXT_XPATTEXT   (1<<3)
-#define CAMEL_NNTP_EXT_XACTIVE    (1<<4)
-#define CAMEL_NNTP_EXT_LISTMOTD   (1<<5)
-#define CAMEL_NNTP_EXT_LISTSUBSCR (1<<6)
-#define CAMEL_NNTP_EXT_LISTPNAMES (1<<7)
-	guint32 extensions;
-
-	gboolean posting_allowed;
-
-	int num_overview_fields;
-	CamelNNTPOverField overview_field[ CAMEL_NNTP_OVER_LAST ];
-
-	CamelNNTPNewsrc *newsrc;
-	CamelNNTPGroupList *group_list;
-
-};
-
-struct CamelNNTPStoreClass {
-	CamelRemoteStoreClass parent_class;
-
-};
-
-
-/* public methods */
-void camel_nntp_store_open (CamelNNTPStore *store, CamelException *ex);
-void camel_nntp_store_close (CamelNNTPStore *store, gboolean expunge,
-			     CamelException *ex);
-
-void camel_nntp_store_subscribe_group (CamelStore *store, const gchar *group_name);
-void camel_nntp_store_unsubscribe_group (CamelStore *store, const gchar *group_name);
-GList *camel_nntp_store_list_subscribed_groups(CamelStore *store);
-
-gchar *camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store);
-
-/* support functions */
-int camel_nntp_command (CamelNNTPStore *store, CamelException *ex, char **ret, char *fmt, ...);
-
-/* Standard Camel function */
-CamelType camel_nntp_store_get_type (void);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_STORE_H */
-
-
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
deleted file mode 100644
index b1d91779b1..0000000000
--- a/camel/providers/nntp/camel-nntp-types.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-grouplist.h : getting/updating the list of newsgroups on the server. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#ifndef CAMEL_NNTP_TYPES_H
-#define CAMEL_NNTP_TYPES_H 1
-
-typedef struct CamelNNTPGroupList CamelNNTPGroupList;
-typedef struct CamelNNTPGroupListEntry CamelNNTPGroupListEntry;
-typedef struct CamelNNTPOverField CamelNNTPOverField;
-typedef struct CamelNNTPStore CamelNNTPStore;
-typedef struct CamelNNTPStoreClass CamelNNTPStoreClass;
-
-#endif /* CAMEL_NNTP_TYPES_H */
diff --git a/camel/providers/nntp/camel-nntp-utils.c b/camel/providers/nntp/camel-nntp-utils.c
deleted file mode 100644
index 439626d977..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ /dev/null
@@ -1,256 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-utils.c : utilities used by the nntp code. */
-
-/* 
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 2000 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-#include "camel-folder-summary.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-utils.h"
-#include "camel-stream-mem.h"
-#include "camel-exception.h"
-
-#include "e-util/md5-utils.h"
-
-#include <stdlib.h>
-#include <string.h>
-
-static void
-get_XOVER_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
-		  int first_message, int last_message, CamelException *ex)
-{
-	int status;
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	char digest[16];
-
-	status = camel_nntp_command (nntp_store, ex, NULL,
-				     "XOVER %d-%d",
-				     first_message,
-				     last_message);
-
-	if (status == NNTP_DATA_FOLLOWS) {
-		gboolean done = FALSE;
-
-		while (!done) {
-			char *line;
-
-			if (camel_remote_store_recv_line (CAMEL_REMOTE_STORE (nntp_store), &line, ex) < 0) {
-				g_warning ("failed to recv_line while building OVER header list\n");
-				break;
-			}
-
-			if (*line == '.') {
-				done = TRUE;
-				g_print ("done\n");
-			}
-			else {
-				CamelMessageInfo *new_info = camel_folder_summary_info_new(nntp_folder->summary);
-				char **split_line = g_strsplit (line, "\t", 7);
-				char *subject, *from, *date, *message_id, *bytes;
-				char *uid;
-
-				subject = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_SUBJECT].index];
-				from = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_FROM].index];
-				date = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_DATE].index];
-				message_id = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_MESSAGE_ID].index];
-				bytes = split_line [nntp_store->overview_field [CAMEL_NNTP_OVER_BYTES].index];
-
-				/* if the overview format flagged this
-                                   field as "full", skip over the
-                                   preceding field name and colon */
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_SUBJECT ].full)
-					subject += strlen ("Subject:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_FROM ].full)
-					from += strlen ("From:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_DATE ].full)
-					date += strlen ("Date:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_MESSAGE_ID ].full)
-					message_id += strlen ("Message-ID:");
-				if (nntp_store->overview_field [ CAMEL_NNTP_OVER_BYTES ].full)
-					bytes += strlen ("Bytes:");
-
-				uid = g_strdup_printf ("%s,%s", split_line[0], message_id);
-				camel_message_info_set_subject(new_info, g_strdup(subject));
-				camel_message_info_set_from(new_info, g_strdup(from));
-				camel_message_info_set_to(new_info, g_strdup(folder->name));
-				camel_message_info_set_uid(new_info, uid);
-
-				new_info->date_sent = header_decode_date(date, NULL);
-#if 0
-				/* XXX do we need to fill in both dates? */
-				new_info->headers.date_received = g_strdup(date);
-#endif
-				new_info->size = atoi(bytes);
-				md5_get_digest(message_id, strlen(message_id), digest);
-				memcpy(new_info->message_id.id.hash, digest, sizeof(new_info->message_id.id.hash));
-
-				if (camel_nntp_newsrc_article_is_read (nntp_store->newsrc,
-								       folder->name,
-								       atoi (split_line[0])))
-				    new_info->flags |= CAMEL_MESSAGE_SEEN;
-
-				camel_folder_summary_add (nntp_folder->summary, new_info);
-				g_strfreev (split_line);
-			}
-			g_free (line);
-		}
-	}
-	else {
-		/* XXX */
-		g_warning ("weird nntp response for XOVER: %d\n", status);
-	}
-}
-
-#if 0
-static GArray*
-get_HEAD_headers(CamelNNTPStore *nntp_store, CamelFolder *folder,
-		 int first_message, int last_message, CamelException *ex)
-{
-	int i;
-	int status;
-
-	for (i = first_message; i < last_message; i ++) {
-		status = camel_nntp_command (nntp_store, ex, NULL,
-					     "HEAD %d", i);
-
-		if (status == NNTP_HEAD_FOLLOWS) {
-			gboolean done = FALSE;
-			char *buf;
-			int buf_len;
-			int buf_alloc;
-			int h;
-			CamelStream *header_stream;
-			GArray *header_array;
-			CamelStream *nntp_istream;
-			CamelMessageInfo *new_info = g_new0(CamelMessageInfo, 1);
-
-			buf_alloc = 2048;
-			buf_len = 0;
-			buf = g_malloc(buf_alloc);
-			done = FALSE;
-
-			buf[0] = 0;
-
-			nntp_istream = nntp_store->istream;
-
-			while (!done) {
-				char *line;
-				int line_length;
-
-				line = camel_stream_buffer_read_line ( 
-						      CAMEL_STREAM_BUFFER ( nntp_istream ));
-				line_length = strlen ( line );
-
-				if (*line == '.') {
-					done = TRUE;
-				}
-				else {
-					if (buf_len + line_length > buf_alloc) {
-						buf_alloc *= 2;
-						buf = g_realloc (buf, buf_alloc);
-					}
-					strcat(buf, line);
-					strcat(buf, "\n");
-					buf_len += strlen(line);
-					g_free (line);
-				}
-			}
-
-			/* create a stream from which to parse the headers */
-			header_stream = camel_stream_mem_new_with_buffer(buf,
-								 buf_len,
-								 CAMEL_STREAM_MEM_READ);
-
-			header_array = get_header_array_from_stream (header_stream);
-
-			memset (&info, 0, sizeof(info));
-
-			for (h = 0; h < header_array->len; h ++) {
-				Rfc822Header *header = &((Rfc822Header*)header_array->data)[h];
-				if (!g_strcasecmp(header->name, "From"))
-					new_info->from = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "To"))
-					new_info->to = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "Subject"))
-					new_info->subject = g_strdup(header->value);
-				else if (!g_strcasecmp(header->name, "Message-ID")) {
-					new_info->uid = g_strdup_printf("%d,%s", i, header->value);
-					new_info->message_id = g_strdup(header->value);
-				}
-				else if (!g_strcasecmp(header->name, "Date")) {
-					new_info->date_sent = header_decode_date (header->value);
-#if 0
-					new_info->date_sent = g_strdup(header->value);
-					new_info->date_received = g_strdup(header->value);
-#endif
-				}
-			}
-
-			camel_folder_summary_add (nntp_folder->summary, new_info);
-		}
-		else if (status == CAMEL_NNTP_FAIL) {
-			/* nasty things are afoot */
-			g_warning ("failure doing HEAD\n");
-			break;
-		}
-	}
-}
-#endif
-
-void
-camel_nntp_get_headers (CamelStore *store,
-			CamelNNTPFolder *nntp_folder,
-			CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-	CamelFolder *folder = CAMEL_FOLDER (nntp_folder);
-	char *ret;
-	int first_message, nb_message, last_message;
-	int status;
-
-	status = camel_nntp_command (nntp_store, ex, &ret,
-				     "GROUP %s", folder->name);
-
-	sscanf (ret, "%d %d %d", &nb_message, &first_message, &last_message);
-	g_free (ret);
-
-	if (status == NNTP_NO_SUCH_GROUP) {
-		/* XXX throw invalid group exception */
-		camel_exception_setv (ex, 
-				      CAMEL_EXCEPTION_FOLDER_INVALID,
-				      "group %s not found on server",
-				      folder->name);
-		return;
-	}
-
-
-	if (nntp_store->extensions & CAMEL_NNTP_EXT_OVER) {
-		get_XOVER_headers (nntp_store, folder, first_message, last_message, ex);
-	}
-	else {
-		g_warning ("need to fix get_HEAD_headers\n");
-#if 0
-		get_HEAD_headers (nntp_store, folder, first_message, last_message, ex);
-#endif
-	}		
-}
diff --git a/camel/providers/nntp/camel-nntp-utils.h b/camel/providers/nntp/camel-nntp-utils.h
deleted file mode 100644
index f28697c744..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-utils.h : Utilities for the NNTP provider */
-
-/* 
- *
- * Author : Chris Toshok <toshok@helixcode.com> 
- *
- * Copyright (C) 1999 Helix Code .
- *
- * 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 the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * 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 Place, Suite 330, Boston, MA 02111-1307
- * USA
- */
-
-
-#ifndef CAMEL_NNTP_UTILS_H
-#define CAMEL_NNTP_UTILS_H 1
-
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus }*/
-
-void camel_nntp_get_headers (CamelStore *store, CamelNNTPFolder *nntp_folder, CamelException *ex);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_UTILS_H */
diff --git a/camel/providers/nntp/libcamelnntp.urls b/camel/providers/nntp/libcamelnntp.urls
deleted file mode 100644
index dee2e70f14..0000000000
--- a/camel/providers/nntp/libcamelnntp.urls
+++ /dev/null
@@ -1,2 +0,0 @@
-news
-nntp
diff --git a/camel/providers/nntp/test-newsrc.c b/camel/providers/nntp/test-newsrc.c
deleted file mode 100644
index c4b985e565..0000000000
--- a/camel/providers/nntp/test-newsrc.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <glib.h>
-#include "camel-nntp-newsrc.h"
-
-int
-main(int argc, char *argv[])
-{
-  CamelNNTPNewsrc *newsrc = camel_nntp_newsrc_read_for_server (argv[1]);
-  camel_nntp_newsrc_write_to_file (newsrc, stdout);
-}