Kill dead files

svn path=/trunk/; revision=28342

26 files changed, 0 insertions, 5524 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 bc8b82ccad..0000000000
--- a/camel/providers/nntp/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-camel_provider_LTLIBRARIES = libcamelnntp.la
-camel_provider_DATA = libcamelnntp.urls
-
-INCLUDES = -I../..				\
-	-I$(top_srcdir)				\
-	-I$(top_srcdir)/camel			\
-	-I$(top_srcdir)/intl			\
-	-I$(top_srcdir)/e-util			\
-	-I$(top_srcdir)				\
-	$(CAMEL_CFLAGS)				\
-	$(GNOME_INCLUDEDIR)			\
-	$(GTK_INCLUDEDIR)			\
-	-DG_LOG_DOMAIN=\"camel-nntp-provider\"
-
-libcamelnntp_la_SOURCES = 			\
-	camel-nntp-provider.c			\
-	camel-nntp-store.c			\
-	camel-nntp-folder.c			\
-	camel-nntp-stream.c			\
-	camel-nntp-summary.c			\
-	camel-nntp-store-summary.c
-
-noinst_HEADERS =			\
-	camel-nntp-store.h			\
-	camel-nntp-folder.h			\
-	camel-nntp-resp-codes.h			\
-	camel-nntp-stream.h			\
-	camel-nntp-summary.h			\
-	camel-nntp-store-summary.h		\
-	camel-nntp-private.h
-
-libcamelnntp_la_LDFLAGS = -avoid-version -module
-
-EXTRA_DIST = libcamelnntp.urls
diff --git a/camel/providers/nntp/camel-nntp-auth.c b/camel/providers/nntp/camel-nntp-auth.c
deleted file mode 100644
index f8d3a62e27..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.c
+++ /dev/null
@@ -1,92 +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 Ximian, Inc. <toshok@ximian.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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_get_password (session, 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 fc96cf6a4e..0000000000
--- a/camel/providers/nntp/camel-nntp-auth.h
+++ /dev/null
@@ -1,42 +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@ximian.com> 
- *
- * Copyright (C) 1999 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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 de0f4cd222..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ /dev/null
@@ -1,533 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* camel-nntp-folder.c : Class for a news folder
- *
- * Authors : Chris Toshok <toshok@ximian.com> 
- *           Michael Zucchi <notzed@ximian.com>
- *
- * Copyright (C) 2001-2003 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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 <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "camel/camel-file-utils.h"
-#include "camel/camel-stream-mem.h"
-#include "camel/camel-data-wrapper.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-folder-search.h"
-#include "camel/camel-exception.h"
-#include "camel/camel-session.h"
-#include "camel/camel-data-cache.h"
-
-#include "camel/camel-mime-filter-crlf.h"
-#include "camel/camel-stream-filter.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-multipart.h"
-#include "camel/camel-mime-part.h"
-#include "camel/camel-stream-buffer.h"
-#include "camel/camel-i18n.h"
-#include "camel/camel-private.h"
-
-#include "camel-nntp-summary.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-private.h"
-
-static CamelFolderClass *folder_class = NULL;
-static CamelDiscoFolderClass *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))
-
-void
-camel_nntp_folder_selected(CamelNNTPFolder *folder, char *line, CamelException *ex)
-{
-	camel_nntp_summary_check((CamelNNTPSummary *)((CamelFolder *)folder)->summary,
-				 (CamelNNTPStore *)((CamelFolder *)folder)->parent_store,
-				 line, folder->changes, ex);
-}
-
-static void
-nntp_folder_refresh_info_online (CamelFolder *folder, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store;
-	CamelFolderChangeInfo *changes = NULL;
-	CamelNNTPFolder *nntp_folder;
-	char *line;
-
-	nntp_store = (CamelNNTPStore *) folder->parent_store;
-	nntp_folder = (CamelNNTPFolder *) folder;
-	
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-
-	camel_nntp_command(nntp_store, ex, nntp_folder, &line, NULL);
-
-	if (camel_folder_change_info_changed(nntp_folder->changes)) {
-		changes = nntp_folder->changes;
-		nntp_folder->changes = camel_folder_change_info_new();
-	}
-	
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-	
-	if (changes) {
-		camel_object_trigger_event ((CamelObject *) folder, "folder_changed", changes);
-		camel_folder_change_info_free (changes);
-	}
-}
-
-static void
-nntp_folder_sync_online (CamelFolder *folder, CamelException *ex)
-{
-	CAMEL_SERVICE_LOCK(folder->parent_store, connect_lock);
-	camel_folder_summary_save (folder->summary);
-	CAMEL_SERVICE_UNLOCK(folder->parent_store, connect_lock);
-}
-
-static void
-nntp_folder_sync_offline (CamelFolder *folder, CamelException *ex)
-{
-	CAMEL_SERVICE_LOCK(folder->parent_store, connect_lock);
-	camel_folder_summary_save (folder->summary);
-	CAMEL_SERVICE_UNLOCK(folder->parent_store, connect_lock);
-}
-
-static gboolean
-nntp_folder_set_message_flags (CamelFolder *folder, const char *uid, guint32 flags, guint32 set)
-{
-        return ((CamelFolderClass *) folder_class)->set_message_flags (folder, uid, flags, set);
-}
-
-static CamelStream *
-nntp_folder_download_message (CamelNNTPFolder *nntp_folder, const char *id, const char *msgid, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = (CamelNNTPStore *) ((CamelFolder *) nntp_folder)->parent_store;
-	CamelStream *stream = NULL;
-	int ret;
-	char *line;
-
-	ret = camel_nntp_command (nntp_store, ex, nntp_folder, &line, "article %s", id);
-	if (ret == 220) {
-		stream = camel_data_cache_add (nntp_store->cache, "cache", msgid, NULL);
-		if (stream) {
-			if (camel_stream_write_to_stream ((CamelStream *) nntp_store->stream, stream) == -1)
-				goto fail;
-			if (camel_stream_reset (stream) == -1)
-				goto fail;
-		} else {
-			stream = (CamelStream *) nntp_store->stream;
-			camel_object_ref (stream);
-		}
-	} else if (ret == 423 || ret == 430) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID_UID, _("Cannot get message %s: %s"), msgid, line);
-	} else if (ret != -1) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), msgid, line);
-	}
-	
-	return stream;
-	
- fail:
-	if (errno == EINTR)
-		camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
-	else
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), msgid, g_strerror (errno));
-	
-	return NULL;
-}
-
-
-static void
-nntp_folder_cache_message (CamelDiscoFolder *disco_folder, const char *uid, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = (CamelNNTPStore *)((CamelFolder *) disco_folder)->parent_store;
-	CamelStream *stream;
-	char *article, *msgid;
-
-	article = alloca(strlen(uid)+1);
-	strcpy(article, uid);
-	msgid = strchr(article, ',');
-	if (!msgid) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Internal error: uid in invalid format: %s"), uid);
-		return;
-	}
-	*msgid++ = 0;
-	
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	stream = nntp_folder_download_message ((CamelNNTPFolder *) disco_folder, article, msgid, ex);
-	if (stream)
-		camel_object_unref (stream);
-
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-}
-
-static CamelMimeMessage *
-nntp_folder_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
-{
-	CamelMimeMessage *message = NULL;
-	CamelNNTPStore *nntp_store;
-	CamelFolderChangeInfo *changes;
-	CamelNNTPFolder *nntp_folder;
-	CamelStream *stream = NULL;
-	char *article, *msgid;
-
-	nntp_store = (CamelNNTPStore *) folder->parent_store;
-	nntp_folder = (CamelNNTPFolder *) folder;
-	
-	article = alloca(strlen(uid)+1);
-	strcpy(article, uid);
-	msgid = strchr (article, ',');
-	if (msgid == NULL) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("Internal error: uid in invalid format: %s"), uid);
-		return NULL;
-	}
-	*msgid++ = 0;
-
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	/* Lookup in cache, NEWS is global messageid's so use a global cache path */
-	stream = camel_data_cache_get (nntp_store->cache, "cache", msgid, NULL);
-	if (stream == NULL) {
-		if (camel_disco_store_status ((CamelDiscoStore *) nntp_store) == CAMEL_DISCO_STORE_OFFLINE) {
-			camel_exception_set (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					     _("This message is not currently available"));
-			goto fail;
-		}
-
-		stream = nntp_folder_download_message (nntp_folder, article, msgid, ex);
-		if (stream == NULL)
-			goto fail;
-	}
-	
-	message = camel_mime_message_new ();
-	if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *) message, stream) == -1) {
-		if (errno == EINTR)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Cannot get message %s: %s"), uid, g_strerror (errno));
-		camel_object_unref(message);
-		message = NULL;
-	}
-
-	camel_object_unref (stream);
-fail:
-	if (camel_folder_change_info_changed (nntp_folder->changes)) {
-		changes = nntp_folder->changes;
-		nntp_folder->changes = camel_folder_change_info_new ();
-	} else {
-		changes = NULL;
-	}
-	
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-	
-	if (changes) {
-		camel_object_trigger_event ((CamelObject *) folder, "folder_changed", changes);
-		camel_folder_change_info_free (changes);
-	}
-		
-	return message;
-}
-
-static GPtrArray*
-nntp_folder_search_by_expression (CamelFolder *folder, const char *expression, CamelException *ex)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	GPtrArray *matches;
-	
-	CAMEL_NNTP_FOLDER_LOCK(nntp_folder, search_lock);
-	
-	if (nntp_folder->search == NULL)
-		nntp_folder->search = camel_folder_search_new ();
-	
-	camel_folder_search_set_folder (nntp_folder->search, folder);
-	matches = camel_folder_search_search(nntp_folder->search, expression, NULL, ex);
-	
-	CAMEL_NNTP_FOLDER_UNLOCK(nntp_folder, search_lock);
-	
-	return matches;
-}
-
-static GPtrArray *
-nntp_folder_search_by_uids (CamelFolder *folder, const char *expression, GPtrArray *uids, CamelException *ex)
-{
-	CamelNNTPFolder *nntp_folder = (CamelNNTPFolder *) folder;
-	GPtrArray *matches;
-
-	if (uids->len == 0)
-		return g_ptr_array_new();
-	
-	CAMEL_NNTP_FOLDER_LOCK(folder, search_lock);
-	
-	if (nntp_folder->search == NULL)
-		nntp_folder->search = camel_folder_search_new ();
-	
-	camel_folder_search_set_folder (nntp_folder->search, folder);
-	matches = camel_folder_search_search(nntp_folder->search, expression, uids, ex);
-	
-	CAMEL_NNTP_FOLDER_UNLOCK(folder, search_lock);
-	
-	return matches;
-}
-
-static void
-nntp_folder_search_free (CamelFolder *folder, GPtrArray *result)
-{
-	CamelNNTPFolder *nntp_folder = CAMEL_NNTP_FOLDER (folder);
-	
-	camel_folder_search_free_result (nntp_folder->search, result);
-}
-
-static void           
-nntp_folder_append_message_online (CamelFolder *folder, CamelMimeMessage *mime_message,
-				   const CamelMessageInfo *info, char **appended_uid,
-				   CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = (CamelNNTPStore *) folder->parent_store;
-	CamelStream *stream = (CamelStream*)nntp_store->stream;
-	CamelStreamFilter *filtered_stream;
-	CamelMimeFilter *crlffilter;
-	int ret;
-	unsigned int u;
-	struct _camel_header_raw *header, *savedhdrs, *n, *tail;
-	char *group, *line;
-	
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	/* send 'POST' command */
-	ret = camel_nntp_command (nntp_store, ex, NULL, &line, "post");
-	if (ret != 340) {
-		if (ret == 440)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INSUFFICIENT_PERMISSION,
-					      _("Posting failed: %s"), line);
-		else if (ret != -1)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-					      _("Posting failed: %s"), line);
-		CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-		return;
-	}
-	
-	/* the 'Newsgroups: ' header */
-	group = g_strdup_printf ("Newsgroups: %s\r\n", folder->full_name);
-	
-	/* setup stream filtering */
-	crlffilter = camel_mime_filter_crlf_new (CAMEL_MIME_FILTER_CRLF_ENCODE, CAMEL_MIME_FILTER_CRLF_MODE_CRLF_DOTS);
-	filtered_stream = camel_stream_filter_new_with_stream (stream);
-	camel_stream_filter_add (filtered_stream, crlffilter);
-	camel_object_unref (crlffilter);
-	
-	/* remove mail 'To', 'CC', and 'BCC' headers */
-	savedhdrs = NULL;
-	tail = (struct _camel_header_raw *) &savedhdrs;
-	
-	header = (struct _camel_header_raw *) &CAMEL_MIME_PART (mime_message)->headers;
-	n = header->next;
-	while (n != NULL) {
-		if (!g_ascii_strcasecmp (n->name, "To") || !g_ascii_strcasecmp (n->name, "Cc") || !g_ascii_strcasecmp (n->name, "Bcc")) {
-			header->next = n->next;
-			tail->next = n;
-			n->next = NULL;
-			tail = n;
-		} else {
-			header = n;
-		}
-		
-		n = header->next;
-	}
-	
-	/* write the message */
-	if (camel_stream_write(stream, group, strlen(group)) == -1
-	    || camel_data_wrapper_write_to_stream (CAMEL_DATA_WRAPPER (mime_message), CAMEL_STREAM (filtered_stream)) == -1
-	    || camel_stream_flush (CAMEL_STREAM (filtered_stream)) == -1
-	    || camel_stream_write (stream, "\r\n.\r\n", 5) == -1
-	    || (ret = camel_nntp_stream_line (nntp_store->stream, (unsigned char **)&line, &u)) == -1) {
-		if (errno == EINTR)
-			camel_exception_setv (ex, CAMEL_EXCEPTION_USER_CANCEL, _("User cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Posting failed: %s"), g_strerror (errno));
-	} else if (atoi(line) != 240) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM, _("Posting failed: %s"), line);
-	}
-
-	camel_object_unref (filtered_stream);
-	g_free(group);
-	header->next = savedhdrs;
-
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-	
-	return;
-}
-
-static void
-nntp_folder_append_message_offline (CamelFolder *folder, CamelMimeMessage *mime_message,
-				    const CamelMessageInfo *info, char **appended_uid,
-				    CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-	                      _("You cannot post NNTP messages while working offline!"));	
-}
-
-/* I do not know what to do this exactly. Looking at the IMAP implementation for this, it
-   seems to assume the message is copied to a folder on the same store. In that case, an
-   NNTP implementation doesn't seem to make any sense. */
-static void
-nntp_folder_transfer_message (CamelFolder *source, GPtrArray *uids, CamelFolder *dest,
-			      GPtrArray **transferred_uids, gboolean delete_orig, CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-	                      _("You cannot copy messages from a NNTP folder!"));
-}
-
-static void           
-nntp_folder_init (CamelNNTPFolder *nntp_folder, CamelNNTPFolderClass *klass)
-{
-	struct _CamelNNTPFolderPrivate *p;
-	
-	nntp_folder->changes = camel_folder_change_info_new ();
-	p = nntp_folder->priv = g_malloc0 (sizeof (*nntp_folder->priv));
-	p->search_lock = g_mutex_new ();
-	p->cache_lock = g_mutex_new ();
-}
-
-static void           
-nntp_folder_finalise (CamelNNTPFolder *nntp_folder)
-{
-	struct _CamelNNTPFolderPrivate *p;
-	
-	camel_folder_summary_save (((CamelFolder*) nntp_folder)->summary);
-	
-	p = nntp_folder->priv;
-	g_mutex_free (p->search_lock);
-	g_mutex_free (p->cache_lock);
-	g_free (p);
-}
-
-static void
-nntp_folder_class_init (CamelNNTPFolderClass *camel_nntp_folder_class)
-{
-	CamelDiscoFolderClass *camel_disco_folder_class = CAMEL_DISCO_FOLDER_CLASS (camel_nntp_folder_class);
-	CamelFolderClass *camel_folder_class = CAMEL_FOLDER_CLASS (camel_nntp_folder_class);
-	
-	parent_class = CAMEL_DISCO_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_disco_folder_get_type ()));
-	folder_class = CAMEL_FOLDER_CLASS (camel_type_get_global_classfuncs (camel_folder_get_type ()));
-	
-	/* virtual method definition */
-	
-	/* virtual method overload */
-	camel_disco_folder_class->sync_online = nntp_folder_sync_online;
-	camel_disco_folder_class->sync_resyncing = nntp_folder_sync_offline;
-	camel_disco_folder_class->sync_offline = nntp_folder_sync_offline;        
-	camel_disco_folder_class->cache_message = nntp_folder_cache_message;
-	camel_disco_folder_class->append_online = nntp_folder_append_message_online;
-	camel_disco_folder_class->append_resyncing = nntp_folder_append_message_online;
-	camel_disco_folder_class->append_offline = nntp_folder_append_message_offline;
-	camel_disco_folder_class->transfer_online = nntp_folder_transfer_message;
-	camel_disco_folder_class->transfer_resyncing = nntp_folder_transfer_message;
-	camel_disco_folder_class->transfer_offline = nntp_folder_transfer_message;
-	camel_disco_folder_class->refresh_info_online = nntp_folder_refresh_info_online;
-	
-	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;
-	camel_folder_class->search_by_uids = nntp_folder_search_by_uids;
-	camel_folder_class->search_free = nntp_folder_search_free;
-}
-
-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_DISCO_FOLDER_TYPE, "CamelNNTPFolder",
-							      sizeof (CamelNNTPFolder),
-							      sizeof (CamelNNTPFolderClass),
-							      (CamelObjectClassInitFunc) nntp_folder_class_init,
-							      NULL,
-							      (CamelObjectInitFunc) nntp_folder_init,
-							      (CamelObjectFinalizeFunc) nntp_folder_finalise);
-	}
-	
-	return camel_nntp_folder_type;
-}
-
-CamelFolder *
-camel_nntp_folder_new (CamelStore *parent, const char *folder_name, CamelException *ex)
-{
-	CamelFolder *folder;
-	CamelNNTPFolder *nntp_folder;
-	char *root;
-	CamelService *service;
-	CamelStoreInfo *si;
-	gboolean subscribed = TRUE;
-	
-	service = (CamelService *) parent;
-	root = camel_session_get_storage_path (service->session, service, ex);
-	if (root == NULL)
-		return NULL;
-	
-	/* If this doesn't work, stuff wont save, but let it continue anyway */
-	camel_mkdir (root, 0777);
-	
-	folder = (CamelFolder *) camel_object_new (CAMEL_NNTP_FOLDER_TYPE);
-	nntp_folder = (CamelNNTPFolder *)folder;
-	
-	camel_folder_construct (folder, parent, folder_name, folder_name);
-	folder->folder_flags |= CAMEL_FOLDER_HAS_SUMMARY_CAPABILITY|CAMEL_FOLDER_HAS_SEARCH_CAPABILITY;
-	
-	nntp_folder->storage_path = g_build_filename (root, folder->full_name, NULL);
-	g_free (root);
-	
-	root = g_strdup_printf ("%s.cmeta", nntp_folder->storage_path);
-	camel_object_set(nntp_folder, NULL, CAMEL_OBJECT_STATE_FILE, root, NULL);
-	camel_object_state_read(nntp_folder);
-	g_free(root);
-
-	root = g_strdup_printf("%s.ev-summary", nntp_folder->storage_path);
-	folder->summary = (CamelFolderSummary *) camel_nntp_summary_new (folder, root);
-	g_free(root);
-	camel_folder_summary_load (folder->summary);
-	
-	si = camel_store_summary_path ((CamelStoreSummary *) ((CamelNNTPStore*) parent)->summary, folder_name);
-	if (si) {
-		subscribed = (si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) != 0;
-		camel_store_summary_info_free ((CamelStoreSummary *) ((CamelNNTPStore*) parent)->summary, si);
-	}
-	
-	if (subscribed) {
-		camel_folder_refresh_info(folder, ex);
-		if (camel_exception_is_set(ex)) {
-			camel_object_unref (folder);
-			folder = NULL;
-		}
-        }
-	
-	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 0914ee4cad..0000000000
--- a/camel/providers/nntp/camel-nntp-folder.h
+++ /dev/null
@@ -1,75 +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@ximian.com> 
- *
- * Copyright (C) 2000 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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/camel-folder.h"
-#include "camel/camel-disco-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 _CamelNNTPFolder {
-	CamelDiscoFolder parent;
-
-	struct _CamelNNTPFolderPrivate *priv;
-
-	struct _CamelFolderChangeInfo *changes;
-	char *storage_path;
-	CamelFolderSearch *search;
-} CamelNNTPFolder;
-
-typedef struct _CamelNNTPFolderClass {
-	CamelDiscoFolderClass parent;
-
-	/* 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);
-
-void camel_nntp_folder_selected(CamelNNTPFolder *folder, char *line, 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 cbcf2b30b2..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.c
+++ /dev/null
@@ -1,218 +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@ximian.com> 
- *
- * Copyright (C) 2000 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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;
-
-	CAMEL_NNTP_STORE_LOCK(store);
-	status = camel_nntp_command (store, ex, NULL, &line, "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) {
-			list->group_list = g_list_reverse(list->group_list);
-			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_prepend (list->group_list, entry);
-		}
-	}
-	CAMEL_NNTP_STORE_UNLOCK(store);
-
-	list->group_list = g_list_reverse(list->group_list);
-	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_prepend (list->group_list, entry);
-	}
-
-	fclose (fp);
-
-	list->group_list = g_list_reverse(list->group_list);
-	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 b45d352cd8..0000000000
--- a/camel/providers/nntp/camel-nntp-grouplist.h
+++ /dev/null
@@ -1,51 +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@ximian.com> 
- *
- * Copyright (C) 2000 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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;
-};
-
-typedef struct CamelNNTPGroupList _CamelNNTPGroupList;
-typedef struct CamelNNTPGroupListEntry _CamelNNTPGroupListEntry;
-
-struct CamelNNTPGroupList* camel_nntp_grouplist_fetch  (CamelNNTPStore *store, CamelException *ex);
-gint                       camel_nntp_grouplist_update (struct CamelNNTPGroupList *group_list, CamelException *ex);
-void                       camel_nntp_grouplist_save   (struct CamelNNTPGroupList *group_list, CamelException *ex);
-void                       camel_nntp_grouplist_free   (struct 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 309e1f45c8..0000000000
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ /dev/null
@@ -1,651 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- *  Authors: Chris Toshok <toshok@ximian.com>
- *
- *  Copyright 2000-2003 Ximian, Inc. (www.ximian.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 Street #330, Boston, MA 02111-1307, USA.
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <glib.h>
-
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <pthread.h>
-#include <unistd.h>
-#include <fcntl.h>
-#include <errno.h>
-
-#include "camel-nntp-newsrc.h"
-#include <camel/camel-folder-summary.h>
-
-#define NEWSRC_LOCK(f, l) (g_mutex_lock(((CamelNNTPNewsrc *)f)->l))
-#define NEWSRC_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPNewsrc *)f)->l))
-
-typedef struct {
-	guint low;
-	guint high;
-} ArticleRange;
-
-typedef struct {
-	char *name;
-	GArray *ranges;
-	gboolean subscribed;
-} NewsrcGroup;
-
-struct CamelNNTPNewsrc {
-	gchar *filename;
-	GHashTable *groups;
-	gboolean dirty;
-	GMutex *lock;
-};
-
-
-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);
-
-	if (group)
-		ret = camel_nntp_newsrc_group_get_highest_article_read (newsrc, group);
-	else
-		ret = 0;
-
-	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);
-
-	if (group)
-		ret = camel_nntp_newsrc_group_get_num_articles_read (newsrc, group);
-	else
-		ret = 0;
-
-	NEWSRC_UNLOCK(newsrc, lock);
-
-	return ret;
-}
-
-void
-camel_nntp_newsrc_mark_article_read (CamelNNTPNewsrc *newsrc, const char *group_name, int num)
-{
-	camel_nntp_newsrc_mark_range_read (newsrc, group_name, num, num);
-}
-
-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);
-
-	if (group)
-		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);
-
-	if (group) {
-		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) {
-		NEWSRC_UNLOCK(newsrc, lock);
-		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);
-	newsrc->lock = g_mutex_new();
-	
-	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-private.h b/camel/providers/nntp/camel-nntp-private.h
deleted file mode 100644
index 520c9db134..0000000000
--- a/camel/providers/nntp/camel-nntp-private.h
+++ /dev/null
@@ -1,64 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
- *  camel-nntp-private.h: Private info for nntp.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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_PRIVATE_H
-#define CAMEL_NNTP_PRIVATE_H 1
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-/* need a way to configure and save this data, if this header is to
-   be installed.  For now, dont install it */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include "libedataserver/e-msgport.h"
-
-struct _CamelNNTPStorePrivate {
-	int dummy;
-};
-
-#define CAMEL_NNTP_STORE_LOCK(f, l) (e_mutex_lock(((CamelNNTPStore *)f)->priv->l))
-#define CAMEL_NNTP_STORE_UNLOCK(f, l) (e_mutex_unlock(((CamelNNTPStore *)f)->priv->l))
-
-
-struct _CamelNNTPFolderPrivate {
-	GMutex *search_lock;	/* for locking the search object */
-	GMutex *cache_lock;     /* for locking the cache object */
-};
-
-#define CAMEL_NNTP_FOLDER_LOCK(f, l) (g_mutex_lock(((CamelNNTPFolder *)f)->priv->l))
-#define CAMEL_NNTP_FOLDER_UNLOCK(f, l) (g_mutex_unlock(((CamelNNTPFolder *)f)->priv->l))
-#else
-#define CAMEL_NNTP_FOLDER_LOCK(f, l)
-#define CAMEL_NNTP_FOLDER_UNLOCK(f, l)
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_PRIVATE_H */
-
diff --git a/camel/providers/nntp/camel-nntp-provider.c b/camel/providers/nntp/camel-nntp-provider.c
deleted file mode 100644
index 5780c41f9d..0000000000
--- a/camel/providers/nntp/camel-nntp-provider.c
+++ /dev/null
@@ -1,138 +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@ximian.com>
- *
- * Copyright (C) 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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"
-#include "camel-i18n.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);
-
-CamelProviderConfEntry nntp_conf_entries[] = {
-	{ CAMEL_PROVIDER_CONF_SECTION_START, "folders", NULL,
-	  N_("Folders") },
-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "show_short_notation", NULL,
-	  N_("Show folders in short notation (e.g. c.o.linux rather than comp.os.linux)"), "1" },
-	{ CAMEL_PROVIDER_CONF_CHECKBOX, "folder_hierarchy_relative", NULL,
-	  N_("In the subscription dialog, show relative folder names"), "1" },
-	{ CAMEL_PROVIDER_CONF_SECTION_END },
-	{ CAMEL_PROVIDER_CONF_END }
-};
-
-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_SOURCE |
-	CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_SUPPORTS_SSL,
-
-	CAMEL_URL_NEED_HOST | CAMEL_URL_ALLOW_USER |
-	CAMEL_URL_ALLOW_PASSWORD | CAMEL_URL_ALLOW_AUTH,
-
-	nntp_conf_entries
-
-	/* ... */
-};
-
-CamelServiceAuthType camel_nntp_password_authtype = {
-	N_("Password"),
-
-	N_("This option will authenticate with the NNTP server using a "
-	   "plaintext password."),
-
-	"",
-	TRUE
-};
-
-void
-camel_provider_module_init(void)
-{
-	news_provider.object_types[CAMEL_PROVIDER_STORE] = camel_nntp_store_get_type();
-
-	news_provider.url_hash = nntp_url_hash;
-	news_provider.url_equal = nntp_url_equal;
-	news_provider.authtypes = g_list_append (NULL, &camel_nntp_password_authtype);
-	
-	camel_provider_register(&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->protocol, u2->protocol)
-		&& 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 d9aace81ef..0000000000
--- a/camel/providers/nntp/camel-nntp-resp-codes.h
+++ /dev/null
@@ -1,55 +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 Ximian, Inc. <toshok@ximian.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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_EXTENSIONS_SUPPORTED     202
-#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
-
-#define NNTP_NO_PERMISSION          502
-
-/* 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-summary.c b/camel/providers/nntp/camel-nntp-store-summary.c
deleted file mode 100644
index 4c7e3df1aa..0000000000
--- a/camel/providers/nntp/camel-nntp-store-summary.c
+++ /dev/null
@@ -1,438 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2002 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 <unistd.h>
-#include <ctype.h>
-#include <string.h>
-#include <errno.h>
-#include <stdlib.h>
-
-#include "camel-nntp-store-summary.h"
-
-#include "camel-file-utils.h"
-
-#include "libedataserver/md5-utils.h"
-#include "libedataserver/e-memory.h"
-
-#include "camel-private.h"
-#include "camel-utf8.h"
-
-#define d(x)
-#define io(x)			/* io debug */
-
-#define CAMEL_NNTP_STORE_SUMMARY_VERSION_0 (0)
-#define CAMEL_NNTP_STORE_SUMMARY_VERSION_1 (1)
-
-#define CAMEL_NNTP_STORE_SUMMARY_VERSION (1)
-
-#define _PRIVATE(o) (((CamelNNTPStoreSummary *)(o))->priv)
-
-static int summary_header_load(CamelStoreSummary *, FILE *);
-static int summary_header_save(CamelStoreSummary *, FILE *);
-
-/*static CamelStoreInfo * store_info_new(CamelStoreSummary *, const char *);*/
-static CamelStoreInfo * store_info_load(CamelStoreSummary *, FILE *);
-static int		 store_info_save(CamelStoreSummary *, FILE *, CamelStoreInfo *);
-static void		 store_info_free(CamelStoreSummary *, CamelStoreInfo *);
-
-static const char *store_info_string(CamelStoreSummary *, const CamelStoreInfo *, int);
-static void store_info_set_string(CamelStoreSummary *, CamelStoreInfo *, int, const char *);
-
-static void camel_nntp_store_summary_class_init (CamelNNTPStoreSummaryClass *klass);
-static void camel_nntp_store_summary_init       (CamelNNTPStoreSummary *obj);
-static void camel_nntp_store_summary_finalise   (CamelObject *obj);
-
-static CamelStoreSummaryClass *camel_nntp_store_summary_parent;
-
-static void
-camel_nntp_store_summary_class_init (CamelNNTPStoreSummaryClass *klass)
-{
-	CamelStoreSummaryClass *ssklass = (CamelStoreSummaryClass *)klass;
-
-	ssklass->summary_header_load = summary_header_load;
-	ssklass->summary_header_save = summary_header_save;
-
-	/*ssklass->store_info_new  = store_info_new;*/
-	ssklass->store_info_load = store_info_load;
-	ssklass->store_info_save = store_info_save;
-	ssklass->store_info_free = store_info_free;
-
-	ssklass->store_info_string = store_info_string;
-	ssklass->store_info_set_string = store_info_set_string;
-}
-
-static void
-camel_nntp_store_summary_init (CamelNNTPStoreSummary *s)
-{
-	/*struct _CamelNNTPStoreSummaryPrivate *p;
-
-	  p = _PRIVATE(s) = g_malloc0(sizeof(*p));*/
-
-	((CamelStoreSummary *) s)->store_info_size = sizeof (CamelNNTPStoreInfo);
-	s->version = CAMEL_NNTP_STORE_SUMMARY_VERSION;
-	memset (&s->last_newslist, 0, sizeof (s->last_newslist));
-}
-
-static void
-camel_nntp_store_summary_finalise (CamelObject *obj)
-{
-	/*struct _CamelNNTPStoreSummaryPrivate *p;*/
-	/*CamelNNTPStoreSummary *s = (CamelNNTPStoreSummary *)obj;*/
-
-	/*p = _PRIVATE(obj);
-	  g_free(p);*/
-}
-
-CamelType
-camel_nntp_store_summary_get_type (void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		camel_nntp_store_summary_parent = (CamelStoreSummaryClass *)camel_store_summary_get_type();
-		type = camel_type_register((CamelType)camel_nntp_store_summary_parent, "CamelNNTPStoreSummary",
-					   sizeof (CamelNNTPStoreSummary),
-					   sizeof (CamelNNTPStoreSummaryClass),
-					   (CamelObjectClassInitFunc) camel_nntp_store_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_nntp_store_summary_init,
-					   (CamelObjectFinalizeFunc) camel_nntp_store_summary_finalise);
-	}
-	
-	return type;
-}
-
-/**
- * camel_nntp_store_summary_new:
- *
- * Create a new CamelNNTPStoreSummary object.
- *
- * Return value: A new CamelNNTPStoreSummary widget.
- **/
-CamelNNTPStoreSummary *
-camel_nntp_store_summary_new (void)
-{
-	return (CamelNNTPStoreSummary *) camel_object_new (camel_nntp_store_summary_get_type ());
-}
-
-/**
- * camel_nntp_store_summary_full_name:
- * @s:
- * @path:
- *
- * Retrieve a summary item by full name.
- *
- * A referenced to the summary item is returned, which may be
- * ref'd or free'd as appropriate.
- *
- * Return value: The summary item, or NULL if the @full_name name
- * is not available.
- * It must be freed using camel_store_summary_info_free().
- **/
-CamelNNTPStoreInfo *
-camel_nntp_store_summary_full_name(CamelNNTPStoreSummary *s, const char *full_name)
-{
-	int count, i;
-	CamelNNTPStoreInfo *info;
-	
-	count = camel_store_summary_count ((CamelStoreSummary *) s);
-	for (i = 0; i < count; i++) {
-		info = (CamelNNTPStoreInfo *)camel_store_summary_index ((CamelStoreSummary *) s, i);
-		if (info) {
-			if (strcmp (info->full_name, full_name) == 0)
-				return info;
-			camel_store_summary_info_free ((CamelStoreSummary *) s, (CamelStoreInfo *)info);
-		}
-	}
-	
-	return NULL;
-}
-
-char *
-camel_nntp_store_summary_full_to_path (CamelNNTPStoreSummary *s, const char *full_name, char dir_sep)
-{
-	char *path, *p;
-	int c;
-	const char *f;
-
-	if (dir_sep != '/') {
-		p = path = g_alloca (strlen (full_name) * 3 + 1);
-		f = full_name;
-		while ((c = *f++ & 0xff)) {
-			if (c == dir_sep)
-				*p++ = '/';
-			else if (c == '/' || c == '%')
-				p += sprintf (p, "%%%02X", c);
-			else
-				*p++ = c;
-		}
-		*p = 0;
-	} else
-		path = (char *) full_name;
-	
-	return camel_utf7_utf8 (path);
-}
-
-static guint32
-hexnib (guint32 c)
-{
-	if (c >= '0' && c <= '9')
-		return c-'0';
-	else if (c >= 'A' && c <= 'Z')
-		return c - 'A' + 10;
-	else
-		return 0;
-}
-
-char *
-camel_nntp_store_summary_path_to_full (CamelNNTPStoreSummary *s, const char *path, char dir_sep)
-{
-	unsigned char *full, *f;
-	guint32 c, v = 0;
-	const char *p;
-	int state=0;
-	char *subpath, *last = NULL;
-	CamelStoreInfo *si;
-	
-	/* check to see if we have a subpath of path already defined */
-	subpath = g_alloca (strlen (path) + 1);
-	strcpy (subpath, path);
-	do {
-		si = camel_store_summary_path ((CamelStoreSummary *) s, subpath);
-		if (si == NULL) {
-			last = strrchr (subpath, '/');
-			if (last)
-				*last = 0;
-		}
-	} while (si == NULL && last);
-	
-	/* path is already present, use the raw version we have */
-	if (si && strlen (subpath) == strlen (path)) {
-		f = g_strdup (camel_nntp_store_info_full_name (s, si));
-		camel_store_summary_info_free ((CamelStoreSummary *) s, si);
-		return f;
-	}
-	
-	f = full = g_alloca (strlen (path)*2+1);
-	if (si)
-		p = path + strlen (subpath);
-	else
-		p = path;
-	
-	while ((c = camel_utf8_getc ((const unsigned char **) &p))) {
-		switch (state) {
-		case 0:
-			if (c == '%') {
-				state = 1;
-			} else {
-				if (c == '/')
-					c = dir_sep;
-				camel_utf8_putc(&f, c);
-			}
-			break;
-		case 1:
-			state = 2;
-			v = hexnib (c) << 4;
-			break;
-		case 2:
-			state = 0;
-			v |= hexnib (c);
-			camel_utf8_putc (&f, v);
-			break;
-		}
-	}
-	camel_utf8_putc (&f, c);
-	
-	/* merge old path part if required */
-	f = camel_utf8_utf7 (full);
-	if (si) {
-		full = g_strdup_printf ("%s%s", camel_nntp_store_info_full_name (s, si), f);
-		g_free (f);
-		camel_store_summary_info_free ((CamelStoreSummary *) s, si);
-		f = full;
-	}
-	
-	return f;
-}
-
-CamelNNTPStoreInfo *
-camel_nntp_store_summary_add_from_full (CamelNNTPStoreSummary *s, const char *full, char dir_sep)
-{
-	CamelNNTPStoreInfo *info;
-	char *pathu8;
-	int len;
-	char *full_name;
-	
-	d(printf("adding full name '%s' '%c'\n", full, dir_sep));
-	
-	len = strlen (full);
-	full_name = g_alloca (len+1);
-	strcpy(full_name, full);
-	if (full_name[len-1] == dir_sep)
-		full_name[len-1] = 0;
-	
-	info = camel_nntp_store_summary_full_name (s, full_name);
-	if (info) {
-		camel_store_summary_info_free ((CamelStoreSummary *) s, (CamelStoreInfo *) info);
-		d(printf("  already there\n"));
-		return info;
-	}
-	
-	pathu8 = camel_nntp_store_summary_full_to_path (s, full_name, dir_sep);
-	
-	info = (CamelNNTPStoreInfo *) camel_store_summary_add_from_path ((CamelStoreSummary *) s, pathu8);
-	if (info) {
-		d(printf("  '%s' -> '%s'\n", pathu8, full_name));
-		camel_store_info_set_string((CamelStoreSummary *)s, (CamelStoreInfo *)info, CAMEL_NNTP_STORE_INFO_FULL_NAME, full_name);
-	} else
-		d(printf("  failed\n"));
-	
-	return info;
-}
-
-static int
-summary_header_load (CamelStoreSummary *s, FILE *in)
-{
-	CamelNNTPStoreSummary *is = (CamelNNTPStoreSummary *) s;
-	gint32 version, nil;
-	
-	if (camel_nntp_store_summary_parent->summary_header_load ((CamelStoreSummary *) s, in) == -1
-	    || camel_file_util_decode_fixed_int32 (in, &version) == -1)
-		return -1;
-	
-	is->version = version;
-	
-	if (version < CAMEL_NNTP_STORE_SUMMARY_VERSION_0) {
-		g_warning("Store summary header version too low");
-		return -1;
-	}
-	
-	if (fread (is->last_newslist, 1, NNTP_DATE_SIZE, in) < NNTP_DATE_SIZE)
-		return -1;
-	
-	camel_file_util_decode_fixed_int32 (in, &nil);
-
-	return 0;
-}
-
-static int
-summary_header_save (CamelStoreSummary *s, FILE *out)
-{
-	CamelNNTPStoreSummary *is = (CamelNNTPStoreSummary *) s;
-	
-	/* always write as latest version */
-	if (camel_nntp_store_summary_parent->summary_header_save ((CamelStoreSummary *) s, out) == -1
-	    || camel_file_util_encode_fixed_int32 (out, CAMEL_NNTP_STORE_SUMMARY_VERSION) == -1
-	    || fwrite (is->last_newslist, 1, NNTP_DATE_SIZE, out) < NNTP_DATE_SIZE
-	    || camel_file_util_encode_fixed_int32 (out, 0) == -1)
-		return -1;
-	
-	return 0;
-}
-
-static CamelStoreInfo *
-store_info_load (CamelStoreSummary *s, FILE *in)
-{
-	CamelNNTPStoreInfo *ni;
-	
-	ni = (CamelNNTPStoreInfo *) camel_nntp_store_summary_parent->store_info_load (s, in);
-	if (ni) {
-		if (camel_file_util_decode_string (in, &ni->full_name) == -1) {
-			camel_store_summary_info_free (s, (CamelStoreInfo *) ni);
-			return NULL;
-		}
-		if (((CamelNNTPStoreSummary *)s)->version >= CAMEL_NNTP_STORE_SUMMARY_VERSION_1) {
-			if (camel_file_util_decode_uint32(in, &ni->first) == -1
-			    || camel_file_util_decode_uint32(in, &ni->last) == -1) {
-				camel_store_summary_info_free (s, (CamelStoreInfo *) ni);
-				return NULL;
-			}
-		}
-		/* set the URL */
-	}
-	
-	return (CamelStoreInfo *) ni;
-}
-
-static int
-store_info_save (CamelStoreSummary *s, FILE *out, CamelStoreInfo *mi)
-{
-	CamelNNTPStoreInfo *isi = (CamelNNTPStoreInfo *)mi;
-	
-	if (camel_nntp_store_summary_parent->store_info_save (s, out, mi) == -1
-	    || camel_file_util_encode_string (out, isi->full_name) == -1
-	    || camel_file_util_encode_uint32(out, isi->first) == -1
-	    || camel_file_util_encode_uint32(out, isi->last) == -1)
-		return -1;
-	
-	return 0;
-}
-
-static void
-store_info_free (CamelStoreSummary *s, CamelStoreInfo *mi)
-{
-	CamelNNTPStoreInfo *nsi = (CamelNNTPStoreInfo *) mi;
-	
-	g_free (nsi->full_name);
-	camel_nntp_store_summary_parent->store_info_free (s, mi);
-}
-
-static const char *
-store_info_string(CamelStoreSummary *s, const CamelStoreInfo *mi, int type)
-{
-	CamelNNTPStoreInfo *nsi = (CamelNNTPStoreInfo *)mi;
-	
-	/* FIXME: Locks? */
-	
-	g_assert (mi != NULL);
-	
-	switch (type) {
-	case CAMEL_NNTP_STORE_INFO_FULL_NAME:
-		return nsi->full_name;
-	default:
-		return camel_nntp_store_summary_parent->store_info_string(s, mi, type);
-	}
-}
-
-static void
-store_info_set_string(CamelStoreSummary *s, CamelStoreInfo *mi, int type, const char *str)
-{
-	CamelNNTPStoreInfo *nsi = (CamelNNTPStoreInfo *)mi;
-	
-	g_assert(mi != NULL);
-	
-	switch (type) {
-	case CAMEL_NNTP_STORE_INFO_FULL_NAME:
-		d(printf("Set full name %s -> %s\n", nsi->full_name, str));
-		CAMEL_STORE_SUMMARY_LOCK(s, summary_lock);
-		g_free (nsi->full_name);
-		nsi->full_name = g_strdup (str);
-		CAMEL_STORE_SUMMARY_UNLOCK(s, summary_lock);
-		break;
-	default:
-		camel_nntp_store_summary_parent->store_info_set_string (s, mi, type, str);
-		break;
-	}
-}
diff --git a/camel/providers/nntp/camel-nntp-store-summary.h b/camel/providers/nntp/camel-nntp-store-summary.h
deleted file mode 100644
index 2e442a8166..0000000000
--- a/camel/providers/nntp/camel-nntp-store-summary.h
+++ /dev/null
@@ -1,102 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/*
- * Copyright (C) 2002 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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.
- */
-
-/* currently, this is just a straigt s/imap/nntp from the IMAP file*/
-
-
-#ifndef _CAMEL_NNTP_STORE_SUMMARY_H
-#define _CAMEL_NNTP_STORE_SUMMARY_H
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
-
-#include <camel/camel-object.h>
-#include <camel/camel-store-summary.h>
-
-#define CAMEL_NNTP_STORE_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_store_summary_get_type (), CamelNNTPStoreSummary)
-#define CAMEL_NNTP_STORE_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_store_summary_get_type (), CamelNNTPStoreSummaryClass)
-#define CAMEL_IS_NNTP_STORE_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_nntp_store_summary_get_type ())
-
-typedef struct _CamelNNTPStoreSummary      CamelNNTPStoreSummary;
-typedef struct _CamelNNTPStoreSummaryClass CamelNNTPStoreSummaryClass;
-
-typedef struct _CamelNNTPStoreInfo CamelNNTPStoreInfo;
-
-enum {
-	CAMEL_NNTP_STORE_INFO_FULL_NAME = CAMEL_STORE_INFO_LAST,
-	CAMEL_NNTP_STORE_INFO_LAST,
-};
-
-struct _CamelNNTPStoreInfo {
-	CamelStoreInfo info;
-	char *full_name;
-	guint32 first;		/* from LIST or NEWGROUPS return */
-	guint32 last;
-};
-
-#define NNTP_DATE_SIZE 14
-
-struct _CamelNNTPStoreSummary {
-	CamelStoreSummary summary;
-
-	struct _CamelNNTPStoreSummaryPrivate *priv;
-
-	/* header info */
-	guint32 version;	/* version of base part of file */
-	char last_newslist[NNTP_DATE_SIZE];
-};
-
-struct _CamelNNTPStoreSummaryClass {
-	CamelStoreSummaryClass summary_class;
-};
-
-CamelType			 camel_nntp_store_summary_get_type	(void);
-CamelNNTPStoreSummary      *camel_nntp_store_summary_new	(void);
-
-/* TODO: this api needs some more work, needs to support lists */
-/*CamelNNTPStoreNamespace *camel_nntp_store_summary_namespace_new(CamelNNTPStoreSummary *s, const char *full_name, char dir_sep);*/
-/*void camel_nntp_store_summary_namespace_set(CamelNNTPStoreSummary *s, CamelNNTPStoreNamespace *ns);*/
-/*CamelNNTPStoreNamespace *camel_nntp_store_summary_namespace_find_path(CamelNNTPStoreSummary *s, const char *path);*/
-/*CamelNNTPStoreNamespace *camel_nntp_store_summary_namespace_find_full(CamelNNTPStoreSummary *s, const char *full_name);*/
-
-/* helper macro's */
-#define camel_nntp_store_info_full_name(s, i) (camel_store_info_string((CamelStoreSummary *)s, (const CamelStoreInfo *)i, CAMEL_NNTP_STORE_INFO_FULL_NAME))
-
-/* converts to/from utf8 canonical nasmes */
-char *camel_nntp_store_summary_full_to_path(CamelNNTPStoreSummary *s, const char *full_name, char dir_sep);
-
-char *camel_nntp_store_summary_path_to_full(CamelNNTPStoreSummary *s, const char *path, char dir_sep);
-char *camel_nntp_store_summary_dotted_to_full(CamelNNTPStoreSummary *s, const char *dotted, char dir_sep);
-
-CamelNNTPStoreInfo *camel_nntp_store_summary_full_name(CamelNNTPStoreSummary *s, const char *full_name);
-CamelNNTPStoreInfo *camel_nntp_store_summary_add_from_full(CamelNNTPStoreSummary *s, const char *full_name, char dir_sep);
-
-/* a convenience lookup function. always use this if path known */
-char *camel_nntp_store_summary_full_from_path(CamelNNTPStoreSummary *s, const char *path);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* ! _CAMEL_NNTP_STORE_SUMMARY_H */
diff --git a/camel/providers/nntp/camel-nntp-store.c b/camel/providers/nntp/camel-nntp-store.c
deleted file mode 100644
index f9daad8515..0000000000
--- a/camel/providers/nntp/camel-nntp-store.c
+++ /dev/null
@@ -1,1391 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
-/* 
- *
- * Copyright (C) 2001-2003 Ximian, Inc. <www.ximain.com>
- *
- * Authors: Christopher Toshok <toshok@ximian.com>
- *    	    Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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 <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <errno.h>
-
-#include <camel/camel-url.h>
-#include <camel/camel-string-utils.h>
-#include <camel/camel-session.h>
-#include <camel/camel-tcp-stream-raw.h>
-#include <camel/camel-tcp-stream-ssl.h>
-
-#include <camel/camel-stream-mem.h>
-#include <camel/camel-data-cache.h>
-
-#include <camel/camel-disco-store.h>
-#include <camel/camel-disco-diary.h>
-#include "camel/camel-private.h"
-#include <camel/camel-debug.h>
-
-#include "camel-nntp-summary.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-store-summary.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-private.h"
-#include "camel-nntp-resp-codes.h"
-#include "camel-i18n.h"
-#include "camel-net-utils.h"
-
-#define w(x)
-#define dd(x) (camel_debug("nntp")?(x):0)
-
-#define NNTP_PORT  "119"
-#define NNTPS_PORT "563"
-
-#define DUMP_EXTENSIONS
-
-static CamelDiscoStoreClass *parent_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 int camel_nntp_try_authenticate (CamelNNTPStore *store, CamelException *ex);
-
-static void nntp_construct (CamelService *service, CamelSession *session,
-		            CamelProvider *provider, CamelURL *url,
-		            CamelException *ex);
-
-
-static gboolean
-nntp_can_work_offline(CamelDiscoStore *store)
-{
-	return TRUE;
-}
-
-static struct {
-	const char *name;
-	int type;
-} headers[] = {
-	{ "subject", 0 },
-	{ "from", 0 },
-	{ "date", 0 },
-	{ "message-id", 1 },
-	{ "references", 0 },
-	{ "bytes", 2 },
-};
-
-static int
-xover_setup(CamelNNTPStore *store, CamelException *ex)
-{
-	int ret, i;
-	char *line;
-	unsigned int len;
-	unsigned char c, *p;
-	struct _xover_header *xover, *last;
-
-	/* manual override */
-	if (store->xover || getenv("CAMEL_NNTP_DISABLE_XOVER") != NULL)
-		return 0;
-
-	ret = camel_nntp_raw_command_auth(store, ex, &line, "list overview.fmt");
-	if (ret == -1) {
-		return -1;
-	} else if (ret != 215)
-		/* unsupported command?  ignore */
-		return 0;
-
-	last = (struct _xover_header *)&store->xover;
-
-	/* supported command */
-	while ((ret = camel_nntp_stream_line(store->stream, (unsigned char **)&line, &len)) > 0) {
-		p = line;
-		xover = g_malloc0(sizeof(*xover));
-		last->next = xover;
-		last = xover;
-		while ((c = *p++)) {
-			if (c == ':') {
-				p[-1] = 0;
-				for (i=0;i<sizeof(headers)/sizeof(headers[0]);i++) {
-					if (strcmp(line, headers[i].name) == 0) {
-						xover->name = headers[i].name;
-						if (strncmp(p, "full", 4) == 0)
-							xover->skip = strlen(xover->name)+1;
-						else
-							xover->skip = 0;
-						xover->type = headers[i].type;
-						break;
-					}
-				}
-				break;
-			} else {
-				p[-1] = camel_tolower(c);
-			}
-		}
-	}
-
-	return ret;
-}
-
-enum {
-	MODE_CLEAR,
-	MODE_SSL,
-	MODE_TLS,
-};
-
-#define SSL_PORT_FLAGS (CAMEL_TCP_STREAM_SSL_ENABLE_SSL2 | CAMEL_TCP_STREAM_SSL_ENABLE_SSL3)
-#define STARTTLS_FLAGS (CAMEL_TCP_STREAM_SSL_ENABLE_TLS)
-
-static gboolean
-connect_to_server (CamelService *service, struct addrinfo *ai, int ssl_mode, CamelException *ex)
-{
-	CamelNNTPStore *store = (CamelNNTPStore *) service;
-	CamelDiscoStore *disco_store = (CamelDiscoStore*) service;
-	CamelStream *tcp_stream;
-	gboolean retval = FALSE;
-	unsigned char *buf;
-	unsigned int len;
-	int ret;
-	char *path;
-	
-	CAMEL_SERVICE_LOCK(store, connect_lock);
-
-	/* setup store-wide cache */
-	if (store->cache == NULL) {
-		if (store->storage_path == NULL)
-			goto fail;
-		
-		store->cache = camel_data_cache_new (store->storage_path, 0, ex);
-		if (store->cache == NULL)
-			goto fail;
-		
-		/* Default cache expiry - 2 weeks old, or not visited in 5 days */
-		camel_data_cache_set_expire_age (store->cache, 60*60*24*14);
-		camel_data_cache_set_expire_access (store->cache, 60*60*24*5);
-	}
-	
-	if (ssl_mode != MODE_CLEAR) {
-#ifdef HAVE_SSL
-		if (ssl_mode == MODE_TLS) {
-			tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, STARTTLS_FLAGS);
-		} else {
-			tcp_stream = camel_tcp_stream_ssl_new (service->session, service->url->host, SSL_PORT_FLAGS);
-		}
-#else
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-				      _("Could not connect to %s: %s"),
-				      service->url->host, _("SSL unavailable"));
-		
-		goto fail;
-#endif /* HAVE_SSL */
-	} else {
-		tcp_stream = camel_tcp_stream_raw_new ();
-	}
-	
-	if ((ret = camel_tcp_stream_connect ((CamelTcpStream *) tcp_stream, ai)) == -1) {
-		if (errno == EINTR)
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not connect to %s: %s"),
-					      service->url->host,
-					      g_strerror (errno));
-		
-		camel_object_unref (tcp_stream);
-		
-		goto fail;
-	}
-	
-	store->stream = (CamelNNTPStream *) camel_nntp_stream_new (tcp_stream);
-	camel_object_unref (tcp_stream);
-	
-	/* Read the greeting, if any. */
-	if (camel_nntp_stream_line (store->stream, &buf, &len) == -1) {
-		if (errno == EINTR)
-			camel_exception_set (ex, CAMEL_EXCEPTION_USER_CANCEL,
-					     _("Connection cancelled"));
-		else
-			camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
-					      _("Could not read greeting from %s: %s"),
-					      service->url->host, g_strerror (errno));
-		
-		camel_object_unref (store->stream);
-		store->stream = NULL;
-		
-		goto fail;
-	}
-	
-	len = strtoul (buf, (char **) &buf, 10);
-	if (len != 200 && len != 201) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_SYSTEM,
-				      _("NNTP server %s returned error code %d: %s"),
-				      service->url->host, len, buf);
-		
-		camel_object_unref (store->stream);
-		store->stream = NULL;
-		
-		goto fail;
-	}
-
-	/* if we have username, try it here */
-	if (service->url->user != NULL
-	    && camel_nntp_try_authenticate(store, ex) != NNTP_AUTH_ACCEPTED)
-		goto fail;
-  	
-  	/* set 'reader' mode & ignore return code, also ping the server, inn goes offline very quickly otherwise */
-	if (camel_nntp_raw_command_auth (store, ex, (char **) &buf, "mode reader") == -1
-	    || camel_nntp_raw_command_auth (store, ex, (char **) &buf, "date") == -1)
-  		goto fail;
-
-	if (xover_setup(store, ex) == -1)
-		goto fail;
-	
-	path = g_build_filename (store->storage_path, ".ev-journal", NULL);
-	disco_store->diary = camel_disco_diary_new (disco_store, path, ex);
-	g_free (path);	
-	
-	retval = TRUE;
-
-	g_free(store->current_folder);
-	store->current_folder = NULL;
-	
- fail:
-	CAMEL_SERVICE_UNLOCK(store, connect_lock);
-	return retval;
-}
-
-static struct {
-	char *value;
-	char *serv;
-	char *port;
-	int mode;
-} ssl_options[] = {
-	{ "",              "nntps", NNTPS_PORT, MODE_SSL   },  /* really old (1.x) */
-	{ "always",        "nntps", NNTPS_PORT, MODE_SSL   },
-	{ "when-possible", "nntp",  NNTP_PORT, MODE_TLS   },
-	{ "never",         "nntp",  NNTP_PORT, MODE_CLEAR },
-	{ NULL,            "nntp",  NNTP_PORT, MODE_CLEAR },
-};
-
-static gboolean
-nntp_connect_online (CamelService *service, CamelException *ex)
-{
-	struct addrinfo hints, *ai;
-	const char *ssl_mode;
-	int mode, ret, i;
-	char *serv;
-	const char *port;
-	
-	if ((ssl_mode = camel_url_get_param (service->url, "use_ssl"))) {
-		for (i = 0; ssl_options[i].value; i++)
-			if (!strcmp (ssl_options[i].value, ssl_mode))
-				break;
-		mode = ssl_options[i].mode;
-		serv = ssl_options[i].serv;
-		port = ssl_options[i].port;
-	} else {
-		mode = MODE_CLEAR;
-		serv = "nntp";
-		port = NNTP_PORT;
-	}
-	
-	if (service->url->port) {
-		serv = g_alloca (16);
-		sprintf (serv, "%d", service->url->port);
-		port = NULL;
-	}
-	
-	memset (&hints, 0, sizeof (hints));
-	hints.ai_socktype = SOCK_STREAM;
-	hints.ai_family = PF_UNSPEC;
-	ai = camel_getaddrinfo(service->url->host, serv, &hints, ex);
-	if (ai == NULL && port != NULL && camel_exception_get_id(ex) != CAMEL_EXCEPTION_USER_CANCEL) {
-		camel_exception_clear (ex);
-		ai = camel_getaddrinfo(service->url->host, port, &hints, ex);
-	}
-	if (ai == NULL)
-		return FALSE;
-	
-	ret = connect_to_server (service, ai, mode, ex);
-	
-	camel_freeaddrinfo (ai);
-	
-	return ret;
-}
-
-static gboolean
-nntp_connect_offline (CamelService *service, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(service);
-	CamelDiscoStore *disco_store = (CamelDiscoStore *) nntp_store;
-	char *path;
-	
-	if (nntp_store->storage_path == NULL)
-		return FALSE;
-	
-	/* setup store-wide cache */
-	if (nntp_store->cache == NULL) {
-		nntp_store->cache = camel_data_cache_new (nntp_store->storage_path, 0, ex);
-		if (nntp_store->cache == NULL)
-			return FALSE;
-		
-		/* Default cache expiry - 2 weeks old, or not visited in 5 days */
-		camel_data_cache_set_expire_age (nntp_store->cache, 60*60*24*14);
-		camel_data_cache_set_expire_access (nntp_store->cache, 60*60*24*5);
-	}	
-	
-	path = g_build_filename (nntp_store->storage_path, ".ev-journal", NULL);
-	disco_store->diary = camel_disco_diary_new (disco_store, path, ex);
-	g_free (path);
-	
-	if (!disco_store->diary)
-		return FALSE;
-	
-	return TRUE;
-}
-
-static gboolean
-nntp_disconnect_online (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelNNTPStore *store = CAMEL_NNTP_STORE (service);
-	char *line;
-	
-	CAMEL_SERVICE_LOCK(store, connect_lock);
-	
-	if (clean) {
-		camel_nntp_raw_command (store, ex, &line, "quit");
-		camel_exception_clear(ex);
-	}
-	
-	if (!service_class->disconnect (service, clean, ex)) {
-		CAMEL_SERVICE_UNLOCK(store, connect_lock);	
-		return FALSE;
-	}
-	
-	camel_object_unref (store->stream);
-	store->stream = NULL;
-	g_free(store->current_folder);
-	store->current_folder = NULL;
-
-	CAMEL_SERVICE_UNLOCK(store, connect_lock);
-	
-	return TRUE;
-}
-
-static gboolean
-nntp_disconnect_offline (CamelService *service, gboolean clean, CamelException *ex)
-{
-	CamelDiscoStore *disco = CAMEL_DISCO_STORE(service);
-	
-	if (!service_class->disconnect (service, clean, ex))
-		return FALSE;
-	
-	if (disco->diary) {
-		camel_object_unref (disco->diary);
-		disco->diary = NULL;
-	}
-	
-	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);
-	
-}
-
-extern CamelServiceAuthType camel_nntp_password_authtype;
-
-static GList *
-nntp_store_query_auth_types (CamelService *service, CamelException *ex)
-{
-	return g_list_append (NULL, &camel_nntp_password_authtype);
-}
-
-static CamelFolder *
-nntp_get_folder(CamelStore *store, const char *folder_name, guint32 flags, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-	CamelFolder *folder;
-	
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	folder = camel_nntp_folder_new(store, folder_name, ex);
-	
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-	
-	return folder;
-}
-
-/*
- * Converts a fully-fledged newsgroup name to a name in short dotted notation,
- * e.g. nl.comp.os.linux.programmeren becomes n.c.o.l.programmeren
- */
-
-static char *
-nntp_newsgroup_name_short (const char *name)
-{
-	char *resptr, *tmp;
-	const char *ptr2;
-	
-	resptr = tmp = g_malloc0 (strlen (name) + 1);
-	
-	while ((ptr2 = strchr (name, '.'))) {
-		if (ptr2 == name) {
-			name++;
-			continue;
-		}
-		
-		*resptr++ = *name;
-		*resptr++ = '.';
-		name = ptr2 + 1;
-	}
-	
-	strcpy (resptr, name);
-	return tmp;
-}
-
-/*
- * This function converts a NNTPStoreSummary item to a FolderInfo item that
- * can be returned by the get_folders() call to the store. Both structs have
- * essentially the same fields.
- */
-
-static CamelFolderInfo *
-nntp_folder_info_from_store_info (CamelNNTPStore *store, gboolean short_notation, CamelStoreInfo *si)
-{
-	CamelURL *base_url = ((CamelService *) store)->url;
-	CamelFolderInfo *fi = g_malloc0(sizeof(*fi));
-	CamelURL *url;
-	char *path;
-	
-	fi->full_name = g_strdup (si->path);
-	
-	if (short_notation)
-		fi->name = nntp_newsgroup_name_short (si->path);
-	else
-		fi->name = g_strdup (si->path);
-	
-	fi->unread = si->unread;
-	fi->total = si->total;
-	path = alloca(strlen(fi->full_name)+2);
-	sprintf(path, "/%s", fi->full_name);
-	url = camel_url_new_with_base (base_url, path);
-	fi->uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-	camel_url_free (url);
-	
-	return fi;
-}
-
-static CamelFolderInfo *
-nntp_folder_info_from_name (CamelNNTPStore *store, gboolean short_notation, const char *name)
-{
-	CamelFolderInfo *fi = g_malloc0(sizeof(*fi));
-	CamelURL *base_url = ((CamelService *)store)->url;
-	CamelURL *url;
-	char *path;
-
-	fi->full_name = g_strdup (name);
-	
-	if (short_notation)
-		fi->name = nntp_newsgroup_name_short (name);
-	else
-		fi->name = g_strdup (name);
-	
-	fi->unread = -1;
-	
-	path = alloca(strlen(fi->full_name)+2);
-	sprintf(path, "/%s", fi->full_name);
-	url = camel_url_new_with_base (base_url, path);
-	fi->uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-	camel_url_free (url);
-	
-	return fi;
-}
-
-/* handle list/newgroups response */
-static CamelNNTPStoreInfo *
-nntp_store_info_update(CamelNNTPStore *store, char *line)
-{
-	CamelStoreSummary *summ = (CamelStoreSummary *)store->summary;
-	CamelURL *base_url = ((CamelService *)store)->url;
-	CamelNNTPStoreInfo *si, *fsi;
-	CamelURL *url;
-	char *relpath, *tmp;
-	guint32 last = 0, first = 0, new = 0;
-
-	tmp = strchr(line, ' ');
-	if (tmp)
-		*tmp++ = 0;
-
-	fsi = si = (CamelNNTPStoreInfo *)camel_store_summary_path((CamelStoreSummary *)store->summary, line);
-	if (si == NULL) {
-		si = (CamelNNTPStoreInfo*)camel_store_summary_info_new(summ);
-
-		relpath = g_alloca(strlen(line)+2);
-		sprintf(relpath, "/%s", line);
-		url = camel_url_new_with_base (base_url, relpath);
-		si->info.uri = camel_url_to_string (url, CAMEL_URL_HIDE_ALL);
-		camel_url_free (url);
-
-		si->info.path = g_strdup (line);
-		si->full_name = g_strdup (line); /* why do we keep this? */
-		camel_store_summary_add((CamelStoreSummary *)store->summary, &si->info);
-	} else {
-		first = si->first;
-		last = si->last;
-	}
-
-	if (tmp && *tmp >= '0' && *tmp <= '9') {
-		last = strtoul(tmp, &tmp, 10);
-		if (*tmp == ' ' && tmp[1] >= '0' && tmp[1] <= '9') {
-			first = strtoul(tmp+1, &tmp, 10);
-			if (*tmp == ' ' && tmp[1] != 'y')
-				si->info.flags |= CAMEL_STORE_INFO_FOLDER_READONLY;
-		}
-	}
-
-	printf("store info update '%s' first '%d' last '%d'\n", line, first, last);
-
-	if (si->last) {
-		if (last > si->last)
-			new = last-si->last;
-	} else {
-		if (last > first)
-			new = last - first;
-	}
-
-	si->info.total = last > first?last-first:0;
-	si->info.unread += new;	/* this is a _guess_ */
-	si->last = last;
-	si->first = first;
-
-	if (fsi)
-		camel_store_summary_info_free((CamelStoreSummary *)store->summary, &fsi->info);
-	else			/* TODO see if we really did touch it */
-		camel_store_summary_touch ((CamelStoreSummary *)store->summary);
-
-	return si;
-}
-
-static CamelFolderInfo *
-nntp_store_get_subscribed_folder_info (CamelNNTPStore *store, const char *top, guint flags, CamelException *ex)
-{
-	int i;
-	CamelStoreInfo *si;
-	CamelFolderInfo *first = NULL, *last = NULL, *fi = NULL;
-	
-	/* since we do not do a tree, any request that is not for root is sure to give no results */
-	if (top != NULL && top[0] != 0)
-		return NULL;
-	
-	for (i=0;(si = camel_store_summary_index ((CamelStoreSummary *) store->summary, i));i++) {
-		if (si == NULL)
-			continue;
-
-		if (si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) {
-			/* slow mode?  open and update the folder, always! this will implictly update
-			   our storeinfo too; in a very round-about way */
-			if ((flags & CAMEL_STORE_FOLDER_INFO_FAST) == 0) {
-				CamelNNTPFolder *folder;
-				char *line;
-
-				folder = (CamelNNTPFolder *)camel_store_get_folder((CamelStore *)store, si->path, 0, ex);
-				if (folder) {
-					CAMEL_SERVICE_LOCK(store, connect_lock);
-					camel_nntp_command(store, ex, folder, &line, NULL);
-					CAMEL_SERVICE_UNLOCK(store, connect_lock);
-					camel_object_unref(folder);
-				}
-				camel_exception_clear(ex);
-			}
-			fi = nntp_folder_info_from_store_info (store, store->do_short_folder_notation, si);
-			fi->flags |= CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN | CAMEL_FOLDER_SYSTEM;
-			if (last)
-				last->next = fi;
-			else
-				first = fi;
-			last = fi;
-		}
-		camel_store_summary_info_free ((CamelStoreSummary *) store->summary, si);
-	}
-	
-	return first;
-}
-
-/*
- * get folder info, using the information in our StoreSummary
- */
-static CamelFolderInfo *
-nntp_store_get_cached_folder_info (CamelNNTPStore *store, const char *orig_top, guint flags, CamelException *ex)
-{
-	int i;
-	int subscribed_or_flag = (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED) ? 0 : 1,
-	    root_or_flag = (orig_top == NULL || orig_top[0] == '\0') ? 1 : 0,
-	    recursive_flag = flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE;
-	CamelStoreInfo *si;
-	CamelFolderInfo *first = NULL, *last = NULL, *fi = NULL;
-	char *tmpname;
-	char *top = g_strconcat(orig_top?orig_top:"", ".", NULL);
-	int toplen = strlen(top);
-	
-	for (i = 0; (si = camel_store_summary_index ((CamelStoreSummary *) store->summary, i)); i++) {
-		if ((subscribed_or_flag || (si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED))
-		    && (root_or_flag || strncmp (si->path, top, toplen) == 0)) {
-			if (recursive_flag || strchr (si->path + toplen, '.') == NULL) {
-				/* add the item */
-				fi = nntp_folder_info_from_store_info(store, FALSE, si);
-				if (!fi)
-					continue;
-				if (store->folder_hierarchy_relative) {
-					g_free (fi->name);
-					fi->name = g_strdup (si->path + ((toplen == 1) ? 0 : toplen));
-				}
-			} else {
-				/* apparently, this is an indirect subitem. if it's not a subitem of
-				   the item we added last, we need to add a portion of this item to
-				   the list as a placeholder */
-				if (!last ||
-				    strncmp(si->path, last->full_name, strlen(last->full_name)) != 0 || 
-				    si->path[strlen(last->full_name)] != '.') {
-					tmpname = g_strdup(si->path);
-					*(strchr(tmpname + toplen, '.')) = '\0';
-					fi = nntp_folder_info_from_name(store, FALSE, tmpname);
-					fi->flags |= CAMEL_FOLDER_NOSELECT;
-					if (store->folder_hierarchy_relative) {
-						g_free(fi->name);
-						fi->name = g_strdup(tmpname + ((toplen==1) ? 0 : toplen));
-					}
-					g_free(tmpname);
-				} else {
-					continue;
-				}
-			}
-			if (last)
-				last->next = fi;
-			else
-				first = fi;
-			last = fi;
-		} else if (subscribed_or_flag && first) {
-			/* we have already added subitems, but this item is no longer a subitem */
-			camel_store_summary_info_free((CamelStoreSummary *)store->summary, si);
-			break;
-		}
-		camel_store_summary_info_free((CamelStoreSummary *)store->summary, si);
-	}
-	
-	g_free(top);
-	return first;
-}
-
-/* retrieves the date from the NNTP server */
-static gboolean
-nntp_get_date(CamelNNTPStore *nntp_store, CamelException *ex)
-{
-	unsigned char *line;
-	int ret = camel_nntp_command(nntp_store, ex, NULL, (char **)&line, "date");
-	char *ptr;
-
-	nntp_store->summary->last_newslist[0] = 0;
-	
-	if (ret == 111) {
-		ptr = line + 3;
-		while (*ptr == ' ' || *ptr == '\t')
-			ptr++;
-		
-		if (strlen (ptr) == NNTP_DATE_SIZE) {
-			memcpy (nntp_store->summary->last_newslist, ptr, NNTP_DATE_SIZE);
-			return TRUE;
-		}
-	}
-	return FALSE;
-}
-
-static void
-store_info_remove(void *key, void *value, void *data)
-{
-	CamelStoreSummary *summary = data;
-	CamelStoreInfo *si = value;
-
-	camel_store_summary_remove(summary, si);
-}
-
-static gint
-store_info_sort (gconstpointer a, gconstpointer b)
-{
-	return strcmp ((*(CamelNNTPStoreInfo**) a)->full_name, (*(CamelNNTPStoreInfo**) b)->full_name);
-}
-
-static CamelFolderInfo *
-nntp_store_get_folder_info_all(CamelNNTPStore *nntp_store, const char *top, guint32 flags, gboolean online, CamelException *ex)
-{
-	CamelNNTPStoreSummary *summary = nntp_store->summary;
-	CamelNNTPStoreInfo *si;
-	unsigned int len;
-	unsigned char *line;
-	int ret = -1;
-	CamelFolderInfo *fi = NULL;
-
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	if (top == NULL)
-		top = "";
-	
-	if (online && (top == NULL || top[0] == 0)) {
-		/* we may need to update */
-		if (summary->last_newslist[0] != 0) {
-			char date[14];
-			memcpy(date, summary->last_newslist + 2, 6); /* YYMMDDD */
-			date[6] = ' ';
-			memcpy(date + 7, summary->last_newslist + 8, 6); /* HHMMSS */
-			date[13] = '\0';
-			
-			if (!nntp_get_date (nntp_store, ex))
-				goto error;
-			
-			ret = camel_nntp_command (nntp_store, ex, NULL, (char **) &line, "newgroups %s", date);
-			if (ret == -1)
-				goto error;
-			else if (ret != 231) {
-				/* newgroups not supported :S so reload the complete list */
-				summary->last_newslist[0] = 0;
-				goto do_complete_list;
-			}
-
-			while ((ret = camel_nntp_stream_line (nntp_store->stream, &line, &len)) > 0)
-				nntp_store_info_update(nntp_store, line);
-		} else {
-			GHashTable *all;
-			int i;
-
-		do_complete_list:
-			/* seems we do need a complete list */
-			/* at first, we do a DATE to find out the last load occasion */
-			if (!nntp_get_date (nntp_store, ex))
-				goto error;
-			
-			ret = camel_nntp_command (nntp_store, ex, NULL, (char **)&line, "list");
-			if (ret == -1)
-				goto error;
-			else if (ret != 215) {
-				camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_INVALID,
-						      _("Error retrieving newsgroups:\n\n%s"), line);
-				goto error;
-			}
-
-			all = g_hash_table_new(g_str_hash, g_str_equal);
-			for (i = 0; (si = (CamelNNTPStoreInfo *)camel_store_summary_index ((CamelStoreSummary *)nntp_store->summary, i)); i++)
-				g_hash_table_insert(all, si->info.path, si);
-
-			while ((ret = camel_nntp_stream_line(nntp_store->stream, &line, &len)) > 0) {
-				si = nntp_store_info_update(nntp_store, line);
-				g_hash_table_remove(all, si->info.path);
-			}
-
-			g_hash_table_foreach(all, store_info_remove, nntp_store->summary);
-			g_hash_table_destroy(all);
-		}
-		
-		/* sort the list */
-		g_ptr_array_sort (CAMEL_STORE_SUMMARY (nntp_store->summary)->folders, store_info_sort);
-		if (ret < 0)
-			goto error;
-		
-		camel_store_summary_save ((CamelStoreSummary *) nntp_store->summary);
-	}
-	
-	fi = nntp_store_get_cached_folder_info (nntp_store, top, flags, ex);
- error:
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-
-	return fi;
-}
-
-static CamelFolderInfo *
-nntp_get_folder_info (CamelStore *store, const char *top, guint32 flags, gboolean online, CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(store);
-	CamelFolderInfo *first = NULL;
-	
-	dd(printf("g_f_i: fast %d subscr %d recursive %d online %d top \"%s\"\n",
-		flags & CAMEL_STORE_FOLDER_INFO_FAST,
-		flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED,
-		flags & CAMEL_STORE_FOLDER_INFO_RECURSIVE,
-		online,
-		top?top:""));
-	
-	if (flags & CAMEL_STORE_FOLDER_INFO_SUBSCRIBED)
-		first = nntp_store_get_subscribed_folder_info (nntp_store, top, flags, ex);
-	else
-		first = nntp_store_get_folder_info_all (nntp_store, top, flags, online, ex);
-	
-	return first;
-}
-
-static CamelFolderInfo *
-nntp_get_folder_info_online (CamelStore *store, const char *top, guint32 flags, CamelException *ex)
-{
-	return nntp_get_folder_info (store, top, flags, TRUE, ex);
-}
-
-static CamelFolderInfo *
-nntp_get_folder_info_offline(CamelStore *store, const char *top, guint32 flags, CamelException *ex)
-{
-	return nntp_get_folder_info (store, top, flags, FALSE, ex);
-}
-
-static gboolean
-nntp_store_folder_subscribed (CamelStore *store, const char *folder_name)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (store);
-	CamelStoreInfo *si;
-	int truth = FALSE;
-	
-	si = camel_store_summary_path ((CamelStoreSummary *) nntp_store->summary, folder_name);
-	if (si) {
-		truth = (si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) != 0;
-		camel_store_summary_info_free ((CamelStoreSummary *) nntp_store->summary, si);
-	}
-
-	return truth;
-}
-
-static void
-nntp_store_subscribe_folder (CamelStore *store, const char *folder_name,
-			     CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(store);
-	CamelStoreInfo *si;
-	CamelFolderInfo *fi;
-	
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	si = camel_store_summary_path(CAMEL_STORE_SUMMARY(nntp_store->summary), folder_name);
-	if (!si) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-				      _("You cannot subscribe to this newsgroup:\n\n"
-				        "No such newsgroup. The selected item is a probably a parent folder."));
-	} else {
-		if (!(si->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED)) {
-			si->flags |= CAMEL_STORE_INFO_FOLDER_SUBSCRIBED;
-			fi = nntp_folder_info_from_store_info(nntp_store, nntp_store->do_short_folder_notation, si);
-			fi->flags |= CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN;
-			camel_store_summary_touch ((CamelStoreSummary *) nntp_store->summary);
-			camel_store_summary_save ((CamelStoreSummary *) nntp_store->summary);
-			CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-			camel_object_trigger_event ((CamelObject *) nntp_store, "folder_subscribed", fi);
-			camel_folder_info_free (fi);
-			return;
-		}
-	}
-	
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-}
-
-static void
-nntp_store_unsubscribe_folder (CamelStore *store, const char *folder_name,
-			       CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(store);
-	CamelFolderInfo *fi;
-	CamelStoreInfo *fitem;
-	CAMEL_SERVICE_LOCK(nntp_store, connect_lock);
-	
-	fitem = camel_store_summary_path(CAMEL_STORE_SUMMARY(nntp_store->summary), folder_name);
-	
-	if (!fitem) {
-		camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-				      _("You cannot unsubscribe to this newsgroup:\n\n"
-				        "newsgroup does not exist!"));
-	} else {
-		if (fitem->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) {
-			fitem->flags &= ~CAMEL_STORE_INFO_FOLDER_SUBSCRIBED;
-			fi = nntp_folder_info_from_store_info (nntp_store, nntp_store->do_short_folder_notation, fitem);
-			camel_store_summary_touch ((CamelStoreSummary *) nntp_store->summary);
-			camel_store_summary_save ((CamelStoreSummary *) nntp_store->summary);
-			CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-			camel_object_trigger_event ((CamelObject *) nntp_store, "folder_unsubscribed", fi);
-			camel_folder_info_free (fi);
-			return;
-		}
-	}
-	
-	CAMEL_SERVICE_UNLOCK(nntp_store, connect_lock);
-}
-
-/* stubs for various folder operations we're not implementing */
-
-static CamelFolderInfo *
-nntp_create_folder (CamelStore *store, const char *parent_name,
-                    const char *folder_name, CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-	            _("You cannot create a folder in a News store: subscribe instead."));
-	return NULL;
-}
-
-static void
-nntp_rename_folder (CamelStore *store, const char *old_name, const char *new_name_in, CamelException *ex)
-{
-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-	          _("You cannot rename a folder in a News store."));
-}
-
-static void
-nntp_delete_folder (CamelStore *store, const char *folder_name, CamelException *ex)
-{
-	nntp_store_subscribe_folder (store, folder_name, ex);
-	camel_exception_setv (ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-	          _("You cannot remove a folder in a News store: unsubscribe instead."));
-	return;
-}
-
-static void
-nntp_store_finalize (CamelObject *object)
-{
-	/* call base finalize */
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE (object);
-	struct _CamelNNTPStorePrivate *p = nntp_store->priv;
-	struct _xover_header *xover, *xn;
-	
-	camel_service_disconnect ((CamelService *)object, TRUE, NULL);
-	
-	if (nntp_store->summary) {
-		camel_store_summary_save ((CamelStoreSummary *) nntp_store->summary);
-		camel_object_unref (nntp_store->summary);
-	}	
-
-	camel_object_unref (nntp_store->mem);
-	nntp_store->mem = NULL;
-	if (nntp_store->stream)
-		camel_object_unref (nntp_store->stream);
-	
-	if (nntp_store->base_url)
-		g_free (nntp_store->base_url);
-	if (nntp_store->storage_path)
-		g_free (nntp_store->storage_path);
-
-	xover = nntp_store->xover;
-	while (xover) {
-		xn = xover->next;
-		g_free(xover);
-		xover = xn;
-	}
-	
-	g_free(p);
-}
-
-static void
-nntp_store_class_init (CamelNNTPStoreClass *camel_nntp_store_class)
-{
-	CamelDiscoStoreClass *camel_disco_store_class = CAMEL_DISCO_STORE_CLASS (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);
-
-	parent_class = CAMEL_DISCO_STORE_CLASS (camel_type_get_global_classfuncs (camel_disco_store_get_type ()));
-	service_class = CAMEL_SERVICE_CLASS (camel_type_get_global_classfuncs (camel_service_get_type ()));
-	
-	/* virtual method overload */
-	camel_service_class->construct = nntp_construct;
-	camel_service_class->query_auth_types = nntp_store_query_auth_types;
-	camel_service_class->get_name = nntp_store_get_name;
-	
-	camel_disco_store_class->can_work_offline = nntp_can_work_offline;
-	camel_disco_store_class->connect_online = nntp_connect_online;
-	camel_disco_store_class->connect_offline = nntp_connect_offline;
-	camel_disco_store_class->disconnect_online = nntp_disconnect_online;
-	camel_disco_store_class->disconnect_offline = nntp_disconnect_offline;
-	camel_disco_store_class->get_folder_online = nntp_get_folder;
-	camel_disco_store_class->get_folder_resyncing = nntp_get_folder;
-	camel_disco_store_class->get_folder_offline = nntp_get_folder;
-	
-	camel_disco_store_class->get_folder_info_online = nntp_get_folder_info_online;
-	camel_disco_store_class->get_folder_info_resyncing = nntp_get_folder_info_online;
-	camel_disco_store_class->get_folder_info_offline = nntp_get_folder_info_offline;
-	
-	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;
-
-	camel_store_class->create_folder = nntp_create_folder;
-	camel_store_class->delete_folder = nntp_delete_folder;
-	camel_store_class->rename_folder = nntp_rename_folder;
-}
-
-/* construction function in which we set some basic store properties */
-static void
-nntp_construct (CamelService *service, CamelSession *session,
-		CamelProvider *provider, CamelURL *url,
-		CamelException *ex)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(service);
-	CamelURL *summary_url;
-	char *tmp;
-	
-	/* construct the parent first */
-	CAMEL_SERVICE_CLASS (parent_class)->construct (service, session, provider, url, ex);
-	if (camel_exception_is_set (ex))
-		return;
-	
-	/* find out the storage path, base url */
-	nntp_store->storage_path = camel_session_get_storage_path (session, service, ex);
-	if (!nntp_store->storage_path)
-		return;
-	
-	/* FIXME */
-	nntp_store->base_url = camel_url_to_string (service->url, (CAMEL_URL_HIDE_PASSWORD |
-								   CAMEL_URL_HIDE_PARAMS |
-								   CAMEL_URL_HIDE_AUTH));
-	
-	tmp = g_build_filename (nntp_store->storage_path, ".ev-store-summary", NULL);
-	nntp_store->summary = camel_nntp_store_summary_new ();
-	camel_store_summary_set_filename ((CamelStoreSummary *) nntp_store->summary, tmp);	
-	summary_url = camel_url_new (nntp_store->base_url, NULL);
-	camel_store_summary_set_uri_base ((CamelStoreSummary *) nntp_store->summary, summary_url);
-	g_free (tmp);
-	
-	camel_url_free (summary_url);
-	if (camel_store_summary_load ((CamelStoreSummary *)nntp_store->summary) == 0)
-		;
-	
-	/* get options */
-	if (camel_url_get_param (url, "show_short_notation"))
-		nntp_store->do_short_folder_notation = TRUE;
-	else
-		nntp_store->do_short_folder_notation = FALSE;
-	if (camel_url_get_param (url, "folder_hierarchy_relative"))
-		nntp_store->folder_hierarchy_relative = TRUE;
-	else
-		nntp_store->folder_hierarchy_relative = FALSE;
-}
-
-
-static void
-nntp_store_init (gpointer object, gpointer klass)
-{
-	CamelNNTPStore *nntp_store = CAMEL_NNTP_STORE(object);
-	CamelStore *store = CAMEL_STORE (object);
-	struct _CamelNNTPStorePrivate *p;
-	
-	store->flags = CAMEL_STORE_SUBSCRIPTIONS;
-	
-	nntp_store->mem = (CamelStreamMem *)camel_stream_mem_new();
-	
-	p = nntp_store->priv = g_malloc0(sizeof(*p));
-}
-
-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_DISCO_STORE_TYPE,
-					     "CamelNNTPStore",
-					     sizeof (CamelNNTPStore),
-					     sizeof (CamelNNTPStoreClass),
-					     (CamelObjectClassInitFunc) nntp_store_class_init,
-					     NULL,
-					     (CamelObjectInitFunc) nntp_store_init,
-					     (CamelObjectFinalizeFunc) nntp_store_finalize);
-	}
-	
-	return camel_nntp_store_type;
-}
-
-static int
-camel_nntp_try_authenticate (CamelNNTPStore *store, CamelException *ex)
-{
-	CamelService *service = (CamelService *) store;
-	CamelSession *session = camel_service_get_session (service);
-	int ret;
-	char *line = NULL;
-	
-	if (!service->url->user) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_INVALID_PARAM,
-				     _("Authentication requested but no username provided"));
-		return -1;
-	}
-
-	/* if nessecary, prompt for the password */
-	if (!service->url->passwd) {
-		char *prompt, *base;
-	retry:
-		base = g_strdup_printf (_("Please enter the NNTP password for %s@%s"),
-					service->url->user,
-					service->url->host);
-		if (line) {
-			char *top = g_strdup_printf(_("Cannot authenticate to server: %s"), line);
-
-			prompt = g_strdup_printf("%s\n\n%s", top, base);
-			g_free(top);
-		} else {
-			prompt = base;
-			base = NULL;
-		}
-
-		service->url->passwd =
-			camel_session_get_password (session, service, NULL,
-						    prompt, "password", CAMEL_SESSION_PASSWORD_SECRET, ex);
-		g_free(prompt);
-		g_free(base);
-		
-		if (!service->url->passwd)
-			return -1;
-	}
-
-	/* now, send auth info (currently, only authinfo user/pass is supported) */
-	ret = camel_nntp_raw_command(store, ex, &line, "authinfo user %s", service->url->user);
-	if (ret == NNTP_AUTH_CONTINUE)
-		ret = camel_nntp_raw_command(store, ex, &line, "authinfo pass %s", service->url->passwd);
-
-	if (ret != NNTP_AUTH_ACCEPTED) {
-		if (ret != -1) {
-			/* Need to forget the password here since we have no context on it */
-			camel_session_forget_password(session, service, NULL, "password", ex);
-			goto retry;
-		}
-		return -1;
-	}
-
-	return ret;
-}
-
-/* Enter owning lock */
-int
-camel_nntp_raw_commandv (CamelNNTPStore *store, CamelException *ex, char **line, const char *fmt, va_list ap)
-{
-	const unsigned char *p, *ps;
-	unsigned char c;
-	char *s;
-	int d;
-	unsigned int u, u2;
-	
-	e_mutex_assert_locked(((CamelService *)store)->priv->connect_lock);
-	g_assert(store->stream->mode != CAMEL_NNTP_STREAM_DATA);
-
-	camel_nntp_stream_set_mode(store->stream, CAMEL_NNTP_STREAM_LINE);
-	
-	ps = p = fmt;
-	while ((c = *p++)) {
-		switch (c) {
-		case '%':
-			c = *p++;
-			camel_stream_write ((CamelStream *) store->mem, ps, p - ps - (c == '%' ? 1 : 2));
-			ps = p;
-			switch (c) {
-			case 's':
-				s = va_arg(ap, char *);
-				camel_stream_write((CamelStream *)store->mem, s, strlen(s));
-				break;
-			case 'd':
-				d = va_arg(ap, int);
-				camel_stream_printf((CamelStream *)store->mem, "%d", d);
-				break;
-			case 'u':
-				u = va_arg(ap, unsigned int);
-				camel_stream_printf((CamelStream *)store->mem, "%u", u);
-				break;
-			case 'm':
-				s = va_arg(ap, char *);
-				camel_stream_printf((CamelStream *)store->mem, "<%s>", s);
-				break;
-			case 'r':
-				u = va_arg(ap, unsigned int);
-				u2 = va_arg(ap, unsigned int);
-				if (u == u2)
-					camel_stream_printf((CamelStream *)store->mem, "%u", u);
-				else
-					camel_stream_printf((CamelStream *)store->mem, "%u-%u", u, u2);
-				break;
-			default:
-				g_warning("Passing unknown format to nntp_command: %c\n", c);
-				g_assert(0);
-			}
-		}
-	}
-	
-	camel_stream_write ((CamelStream *) store->mem, ps, p-ps-1);
-	dd(printf("NNTP_COMMAND: '%.*s'\n", (int)store->mem->buffer->len, store->mem->buffer->data));
-	camel_stream_write ((CamelStream *) store->mem, "\r\n", 2);
-	
-	if (camel_stream_write((CamelStream *) store->stream, store->mem->buffer->data, store->mem->buffer->len) == -1)
-		goto ioerror;
-
-	/* FIXME: hack */
-	camel_stream_reset ((CamelStream *) store->mem);
-	g_byte_array_set_size (store->mem->buffer, 0);
-	
-	if (camel_nntp_stream_line (store->stream, (unsigned char **) line, &u) == -1)
-		goto ioerror;
-	
-	u = strtoul (*line, NULL, 10);
-	
-	/* Handle all switching to data mode here, to make callers job easier */
-	if (u == 215 || (u >= 220 && u <=224) || (u >= 230 && u <= 231))
-		camel_nntp_stream_set_mode(store->stream, CAMEL_NNTP_STREAM_DATA);
-	
-	return u;
-
-ioerror:
-	if (errno == EINTR)
-		camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Cancelled."));
-	else
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("NNTP Command failed: %s"), g_strerror(errno));
-	return -1;
-}
-
-int
-camel_nntp_raw_command(CamelNNTPStore *store, CamelException *ex, char **line, const char *fmt, ...)
-{
-	int ret;
-	va_list ap;
-
-	va_start(ap, fmt);
-	ret = camel_nntp_raw_commandv(store, ex, line, fmt, ap);
-	va_end(ap);
-
-	return ret;
-}
-
-/* use this where you also need auth to be handled, i.e. most cases where you'd try raw command */
-int
-camel_nntp_raw_command_auth(CamelNNTPStore *store, CamelException *ex, char **line, const char *fmt, ...)
-{
-	int ret, retry, go;
-	va_list ap;
-
-	retry = 0;
-
-	do {
-		go = FALSE;
-		retry++;
-
-		va_start(ap, fmt);
-		ret = camel_nntp_raw_commandv(store, ex, line, fmt, ap);
-		va_end(ap);
-
-		if (ret == NNTP_AUTH_REQUIRED) {
-			if (camel_nntp_try_authenticate(store, ex) != NNTP_AUTH_ACCEPTED)
-				return -1;
-			go = TRUE;
-		}
-	} while (retry < 3 && go);
-
-	return ret;
-}
-
-int
-camel_nntp_command (CamelNNTPStore *store, CamelException *ex, CamelNNTPFolder *folder, char **line, const char *fmt, ...)
-{
-	const unsigned char *p;
-	va_list ap;
-	int ret, retry;
-	unsigned int u;
-	
-	e_mutex_assert_locked(((CamelService *)store)->priv->connect_lock);
-
-	if (((CamelDiscoStore *)store)->status == CAMEL_DISCO_STORE_OFFLINE) {
-		camel_exception_setv(ex, CAMEL_EXCEPTION_SERVICE_NOT_CONNECTED,
-				     _("Not connected."));
-		return -1;
-	}
-	
-	retry = 0;
-	do {
-		retry ++;
-
-		if (store->stream == NULL
-		    && !camel_service_connect (CAMEL_SERVICE (store), ex))
-			return -1;
-
-		/* Check for unprocessed data, ! */
-		if (store->stream->mode == CAMEL_NNTP_STREAM_DATA) {
-			g_warning("Unprocessed data left in stream, flushing");
-			while (camel_nntp_stream_getd(store->stream, (unsigned char **)&p, &u) > 0)
-				;
-		}
-		camel_nntp_stream_set_mode(store->stream, CAMEL_NNTP_STREAM_LINE);
-
-		if (folder != NULL
-		    && (store->current_folder == NULL || strcmp(store->current_folder, ((CamelFolder *)folder)->full_name) != 0)) {
-			ret = camel_nntp_raw_command_auth(store, ex, line, "group %s", ((CamelFolder *)folder)->full_name);
-			if (ret == 211) {
-				g_free(store->current_folder);
-				store->current_folder = g_strdup(((CamelFolder *)folder)->full_name);
-				camel_nntp_folder_selected(folder, *line, ex);
-				if (camel_exception_is_set(ex)) {
-					ret = -1;
-					goto error;
-				}
-			} else {
-				goto error;
-			}
-		}
-
-		/* dummy fmt, we just wanted to select the folder */
-		if (fmt == NULL)
-			return 0;
-
-		va_start(ap, fmt);
-		ret = camel_nntp_raw_commandv(store, ex, line, fmt, ap);
-		va_end(ap);
-	error:
-		switch (ret) {
-		case NNTP_AUTH_REQUIRED:
-			if (camel_nntp_try_authenticate(store, ex) != NNTP_AUTH_ACCEPTED)
-				return -1;
-			retry--;
-			ret = -1;
-			continue;
-		case 411:	/* no such group */
-			camel_exception_setv(ex, CAMEL_EXCEPTION_FOLDER_INVALID,
-					     _("No such folder: %s"), line);
-			return -1;
-		case 400:	/* service discontinued */
-		case 401:	/* wrong client state - this should quit but this is what the old code did */
-		case 503:	/* information not available - this should quit but this is what the old code did (?) */
-			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-			ret = -1;
-			continue;
-		case -1:	/* i/o error */
-			camel_service_disconnect (CAMEL_SERVICE (store), FALSE, NULL);
-			if (camel_exception_get_id(ex) == CAMEL_EXCEPTION_USER_CANCEL || retry >= 3)
-				return -1;
-			camel_exception_clear(ex);
-			break;
-		}
-	} while (ret == -1 && retry < 3);
-
-	return ret;
-}
diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
deleted file mode 100644
index a9bd682cbd..0000000000
--- a/camel/providers/nntp/camel-nntp-store.h
+++ /dev/null
@@ -1,114 +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 Ximian, Inc. <toshok@ximian.com>
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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/camel-disco-store.h>
-
-#include "camel-nntp-stream.h"
-#include "camel-nntp-store-summary.h"
-
-struct _CamelNNTPFolder;
-struct _CamelException;
-
-#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))
-
-#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)
-
-typedef struct _CamelNNTPStore CamelNNTPStore;
-typedef struct _CamelNNTPStoreClass CamelNNTPStoreClass;
-
-enum _xover_t {
-	XOVER_STRING = 0,
-	XOVER_MSGID,
-	XOVER_SIZE,
-};
-
-struct _xover_header {
-	struct _xover_header *next;
-
-	const char *name;
-	unsigned int skip:8;
-	enum _xover_t type:8;
-};
-
-struct _CamelNNTPStore {
-	CamelDiscoStore parent_object;	
-	
-	struct _CamelNNTPStorePrivate *priv;
-	
-	guint32 extensions;
-	
-	unsigned int posting_allowed:1;
-	unsigned int do_short_folder_notation:1;
-	unsigned int folder_hierarchy_relative:1;
-
-	struct _CamelNNTPStoreSummary *summary;
-	
-	struct _CamelNNTPStream *stream;
-	struct _CamelStreamMem *mem;
-	
-	struct _CamelDataCache *cache;
-	
-	char *current_folder, *storage_path, *base_url;
-
-	struct _xover_header *xover;
-};
-
-struct _CamelNNTPStoreClass {
-	CamelDiscoStoreClass parent_class;
-
-};
-
-/* Standard Camel function */
-CamelType camel_nntp_store_get_type (void);
-
-int camel_nntp_raw_commandv (CamelNNTPStore *store, struct _CamelException *ex, char **line, const char *fmt, va_list ap);
-int camel_nntp_raw_command(CamelNNTPStore *store, struct _CamelException *ex, char **line, const char *fmt, ...);
-int camel_nntp_raw_command_auth(CamelNNTPStore *store, struct _CamelException *ex, char **line, const char *fmt, ...);
-int camel_nntp_command (CamelNNTPStore *store, struct _CamelException *ex, struct _CamelNNTPFolder *folder, char **line, const char *fmt, ...);
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-#endif /* CAMEL_NNTP_STORE_H */
-
-
diff --git a/camel/providers/nntp/camel-nntp-stream.c b/camel/providers/nntp/camel-nntp-stream.c
deleted file mode 100644
index 244b67acb1..0000000000
--- a/camel/providers/nntp/camel-nntp-stream.c
+++ /dev/null
@@ -1,464 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*-
- *
- * Author:
- *  Michael Zucchi <notzed@ximian.com>
- *
- * Copyright 1999, 2000 Ximian, Inc. (www.ximian.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 <errno.h>
-
-#include <string.h>
-#include <stdio.h>
-
-#include <glib.h>
-
-#include "camel-nntp-stream.h"
-#include "camel-debug.h"
-
-#define dd(x) (camel_debug("nntp:stream")?(x):0)
-
-static CamelObjectClass *parent_class = NULL;
-
-/* Returns the class for a CamelStream */
-#define CS_CLASS(so) CAMEL_NNTP_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
-
-#define CAMEL_NNTP_STREAM_SIZE (4096)
-#define CAMEL_NNTP_STREAM_LINE_SIZE (1024) /* maximum line size */
-
-static int
-stream_fill(CamelNNTPStream *is)
-{
-	int left = 0;
-
-	if (is->source) {
-		left = is->end - is->ptr;
-		memcpy(is->buf, is->ptr, left);
-		is->end = is->buf + left;
-		is->ptr = is->buf;
-		left = camel_stream_read(is->source, is->end, CAMEL_NNTP_STREAM_SIZE - (is->end - is->buf));
-		if (left > 0) {
-			is->end += left;
-			is->end[0] = '\n';
-			return is->end - is->ptr;
-		} else {
-			if (left == 0)
-				errno = ECONNRESET;
-			dd(printf("NNTP_STREAM_FILL(ERROR): %d - '%s'\n", left, strerror(errno)));
-			return -1;
-		}
-	}
-
-	return 0;
-}
-
-static ssize_t
-stream_read(CamelStream *stream, char *buffer, size_t n)
-{
-	CamelNNTPStream *is = (CamelNNTPStream *)stream;
-	char *o, *oe;
-	unsigned char *p, *e, c;
-	int state;
-
-	if (is->mode != CAMEL_NNTP_STREAM_DATA || n == 0)
-		return 0;
-
-	o = buffer;
-	oe = buffer + n;
-	state = is->state;
-
-	/* Need to copy/strip '.'s and whatnot */
-	p = is->ptr;
-	e = is->end;
-
-	switch(state) {
-	state_0:
-	case 0:		/* start of line, always read at least 3 chars */
-		while (e - p < 3) {
-			is->ptr = p;
-			if (stream_fill(is) == -1)
-				return -1;
-			p = is->ptr;
-			e = is->end;
-		}
-		if (p[0] == '.') {
-			if (p[1] == '\r' && p[2] == '\n') {
-				is->ptr = p+3;
-				is->mode = CAMEL_NNTP_STREAM_EOD;
-				is->state = 0;
-				dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));
-				return o-buffer;
-			}
-			p++;
-		}
-		state = 1;
-		/* FALLS THROUGH */
-	case 1:		/* looking for next sol */
-		while (o < oe) {
-			c = *p++;
-			if (c == '\n') {
-				/* end of input sentinal check */
-				if (p > e) {
-					is->ptr = e;
-					if (stream_fill(is) == -1)
-						return -1;
-					p = is->ptr;
-					e = is->end;
-				} else {
-					*o++ = '\n';
-					state = 0;
-					goto state_0;
-				}
-			} else if (c != '\r') {
-				*o++ = c;
-			}
-		}
-		break;
-	}
-
-	is->ptr = p;
-	is->state = state;
-
-	dd(printf("NNTP_STREAM_READ(%d):\n%.*s\n", o-buffer, o-buffer, buffer));
-
-	return o-buffer;
-}
-
-static ssize_t
-stream_write(CamelStream *stream, const char *buffer, size_t n)
-{
-	CamelNNTPStream *is = (CamelNNTPStream *)stream;
-
-	return camel_stream_write(is->source, buffer, n);
-}
-
-static int
-stream_close(CamelStream *stream)
-{
-	/* nop? */
-	return 0;
-}
-
-static int
-stream_flush(CamelStream *stream)
-{
-	/* nop? */
-	return 0;
-}
-
-static gboolean
-stream_eos(CamelStream *stream)
-{
-	CamelNNTPStream *is = (CamelNNTPStream *)stream;
-
-	return is->mode != CAMEL_NNTP_STREAM_DATA;
-}
-
-static int
-stream_reset(CamelStream *stream)
-{
-	/* nop?  reset literal mode? */
-	return 0;
-}
-
-static void
-camel_nntp_stream_class_init (CamelStreamClass *camel_nntp_stream_class)
-{
-	CamelStreamClass *camel_stream_class = (CamelStreamClass *)camel_nntp_stream_class;
-
-	parent_class = camel_type_get_global_classfuncs( CAMEL_OBJECT_TYPE );
-
-	/* virtual method definition */
-	camel_stream_class->read = stream_read;
-	camel_stream_class->write = stream_write;
-	camel_stream_class->close = stream_close;
-	camel_stream_class->flush = stream_flush;
-	camel_stream_class->eos = stream_eos;
-	camel_stream_class->reset = stream_reset;
-}
-
-static void
-camel_nntp_stream_init(CamelNNTPStream *is, CamelNNTPStreamClass *isclass)
-{
-	/* +1 is room for appending a 0 if we need to for a line */
-	is->ptr = is->end = is->buf = g_malloc(CAMEL_NNTP_STREAM_SIZE+1);
-	is->lineptr = is->linebuf = g_malloc(CAMEL_NNTP_STREAM_LINE_SIZE+1);
-	is->lineend = is->linebuf + CAMEL_NNTP_STREAM_LINE_SIZE;
-
-	/* init sentinal */
-	is->ptr[0] = '\n';
-
-	is->state = 0;
-	is->mode = CAMEL_NNTP_STREAM_LINE;
-}
-
-static void
-camel_nntp_stream_finalise(CamelNNTPStream *is)
-{
-	g_free(is->buf);
-	g_free(is->linebuf);
-	if (is->source)
-		camel_object_unref((CamelObject *)is->source);
-}
-
-CamelType
-camel_nntp_stream_get_type (void)
-{
-	static CamelType camel_nntp_stream_type = CAMEL_INVALID_TYPE;
-
-	if (camel_nntp_stream_type == CAMEL_INVALID_TYPE) {
-		camel_nntp_stream_type = camel_type_register( camel_stream_get_type(),
-							    "CamelNNTPStream",
-							    sizeof( CamelNNTPStream ),
-							    sizeof( CamelNNTPStreamClass ),
-							    (CamelObjectClassInitFunc) camel_nntp_stream_class_init,
-							    NULL,
-							    (CamelObjectInitFunc) camel_nntp_stream_init,
-							    (CamelObjectFinalizeFunc) camel_nntp_stream_finalise );
-	}
-
-	return camel_nntp_stream_type;
-}
-
-/**
- * camel_nntp_stream_new:
- *
- * Returns a NULL stream.  A null stream is always at eof, and
- * always returns success for all reads and writes.
- *
- * Return value: the stream
- **/
-CamelStream *
-camel_nntp_stream_new(CamelStream *source)
-{
-	CamelNNTPStream *is;
-
-	is = (CamelNNTPStream *)camel_object_new(camel_nntp_stream_get_type ());
-	camel_object_ref((CamelObject *)source);
-	is->source = source;
-
-	return (CamelStream *)is;
-}
-
-/* Get one line from the nntp stream */
-int
-camel_nntp_stream_line(CamelNNTPStream *is, unsigned char **data, unsigned int *len)
-{
-	register unsigned char c, *p, *o, *oe;
-	int newlen, oldlen;
-	unsigned char *e;
-
-	if (is->mode == CAMEL_NNTP_STREAM_EOD) {
-		*data = is->linebuf;
-		*len = 0;
-		return 0;
-	}
-
-	o = is->linebuf;
-	oe = is->lineend - 1;
-	p = is->ptr;
-	e = is->end;
-
-	/* Data mode, convert leading '..' to '.', and stop when we reach a solitary '.' */
-	if (is->mode == CAMEL_NNTP_STREAM_DATA) {
-		/* need at least 3 chars in buffer */
-		while (e-p < 3) {
-			is->ptr = p;
-			if (stream_fill(is) == -1)
-				return -1;
-			p = is->ptr;
-			e = is->end;
-		}
-
-		/* check for isolated '.\r\n' or begging of line '.' */
-		if (p[0] == '.') {
-			if (p[1] == '\r' && p[2] == '\n') {
-				is->ptr = p+3;
-				is->mode = CAMEL_NNTP_STREAM_EOD;
-				*data = is->linebuf;
-				*len = 0;
-				is->linebuf[0] = 0;
-
-				dd(printf("NNTP_STREAM_LINE(END)\n"));
-
-				return 0;
-			}
-			p++;
-		}
-	}
-
-	while (1) {
-		while (o < oe) {
-			c = *p++;
-			if (c == '\n') {
-				/* sentinal? */
-				if (p> e) {
-					is->ptr = e;
-					if (stream_fill(is) == -1)
-						return -1;
-					p = is->ptr;
-					e = is->end;
-				} else {
-					is->ptr = p;
-					*data = is->linebuf;
-					*len = o - is->linebuf;
-					*o = 0;
-
-					dd(printf("NNTP_STREAM_LINE(%d): '%s'\n", *len, *data));
-
-					return 1;
-				}
-			} else if (c != '\r') {
-				*o++ = c;
-			}
-		}
-
-		/* limit this for bad server data? */
-		oldlen = o - is->linebuf;
-		newlen = (is->lineend - is->linebuf) * 3 / 2;
-		is->lineptr = is->linebuf = g_realloc(is->linebuf, newlen);
-		is->lineend = is->linebuf + newlen;
-		oe = is->lineend - 1;
-		o = is->linebuf + oldlen;
-	}
-
-	return -1;
-}
-
-/* returns -1 on error, 0 if last lot of data, >0 if more remaining */
-int camel_nntp_stream_gets(CamelNNTPStream *is, unsigned char **start, unsigned int *len)
-{
-	int max;
-	unsigned char *end;
-
-	*len = 0;
-
-	max = is->end - is->ptr;
-	if (max == 0) {
-		max = stream_fill(is);
-		if (max <= 0)
-			return max;
-	}
-
-	*start = is->ptr;
-	end = memchr(is->ptr, '\n', max);
-	if (end)
-		max = (end - is->ptr) + 1;
-	*start = is->ptr;
-	*len = max;
-	is->ptr += max;
-
-	dd(printf("NNTP_STREAM_GETS(%s,%d): '%.*s'\n", end==NULL?"more":"last", *len, (int)*len, *start));
-
-	return end == NULL?1:0;
-}
-
-void camel_nntp_stream_set_mode(CamelNNTPStream *is, camel_nntp_stream_mode_t mode)
-{
-	is->mode = mode;
-}
-
-/* returns -1 on erorr, 0 if last data, >0 if more data left */
-int camel_nntp_stream_getd(CamelNNTPStream *is, unsigned char **start, unsigned int *len)
-{
-	unsigned char *p, *e, *s;
-	int state;
-
-	*len = 0;
-
-	if (is->mode == CAMEL_NNTP_STREAM_EOD)
-		return 0;
-
-	if (is->mode == CAMEL_NNTP_STREAM_LINE) {
-		g_warning("nntp_stream reading data in line mode\n");
-		return 0;
-	}
-
-	state = is->state;
-	p = is->ptr;
-	e = is->end;
-
-	while (e - p < 3) {
-		is->ptr = p;
-		if (stream_fill(is) == -1)
-			return -1;
-		p = is->ptr;
-		e = is->end;
-	}
-
-	s = p;
-
-	do {
-		switch(state) {
-		case 0:
-			/* check leading '.', ... */
-			if (p[0] == '.') {
-				if (p[1] == '\r' && p[2] == '\n') {
-					is->ptr = p+3;
-					*len = p-s;
-					*start = s;
-					is->mode = CAMEL_NNTP_STREAM_EOD;
-					is->state = 0;
-
-					dd(printf("NNTP_STREAM_GETD(%s,%d): '%.*s'\n", "last", *len, (int)*len, *start));
-
-					return 0;
-				}
-
-				/* If at start, just skip '.', else return data upto '.' but skip it */
-				if (p == s) {
-					s++;
-					p++;
-				} else {
-					is->ptr = p+1;
-					*len = p-s;
-					*start = s;
-					is->state = 1;
-
-					dd(printf("NNTP_STREAM_GETD(%s,%d): '%.*s'\n", "more", *len, (int)*len, *start));
-
-					return 1;
-				}
-			}
-			state = 1;
-		case 1:
-			/* Scan for sentinal */
-			while ((*p++)!='\n')
-				;
-
-			if (p > e) {
-				p = e;
-			} else {
-				state = 0;
-			}
-			break;
-		}
-	} while ((e-p) >= 3);
-
-	is->state = state;
-	is->ptr = p;
-	*len = p-s;
-	*start = s;
-
-	dd(printf("NNTP_STREAM_GETD(%s,%d): '%.*s'\n", "more", *len, (int)*len, *start));
-	return 1;
-}
-
diff --git a/camel/providers/nntp/camel-nntp-stream.h b/camel/providers/nntp/camel-nntp-stream.h
deleted file mode 100644
index eef217cef2..0000000000
--- a/camel/providers/nntp/camel-nntp-stream.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2001 Ximian Inc.
- *
- * Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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_STREAM_H
-#define _CAMEL_NNTP_STREAM_H
-
-#include <camel/camel-stream.h>
-
-#define CAMEL_NNTP_STREAM(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_stream_get_type (), CamelNNTPStream)
-#define CAMEL_NNTP_STREAM_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_stream_get_type (), CamelNNTPStreamClass)
-#define CAMEL_IS_NNTP_STREAM(obj)      CAMEL_CHECK_TYPE (obj, camel_nntp_stream_get_type ())
-
-typedef struct _CamelNNTPStreamClass CamelNNTPStreamClass;
-typedef struct _CamelNNTPStream CamelNNTPStream;
-
-typedef enum {
-	CAMEL_NNTP_STREAM_LINE,
-	CAMEL_NNTP_STREAM_DATA,
-	CAMEL_NNTP_STREAM_EOD,	/* end of data, acts as if end of stream */
-} camel_nntp_stream_mode_t;
-
-struct _CamelNNTPStream {
-	CamelStream parent;
-
-	CamelStream *source;
-
-	camel_nntp_stream_mode_t mode;
-	int state;
-
-	unsigned char *buf, *ptr, *end;
-	unsigned char *linebuf, *lineptr, *lineend;
-};
-
-struct _CamelNNTPStreamClass {
-	CamelStreamClass parent_class;
-};
-
-CamelType		 camel_nntp_stream_get_type	(void);
-
-CamelStream     *camel_nntp_stream_new		(CamelStream *source);
-
-
-void		 camel_nntp_stream_set_mode     (CamelNNTPStream *is, camel_nntp_stream_mode_t mode);
-
-int              camel_nntp_stream_line		(CamelNNTPStream *is, unsigned char **data, unsigned int *len);
-int 		 camel_nntp_stream_gets		(CamelNNTPStream *is, unsigned char **start, unsigned int *len);
-int 		 camel_nntp_stream_getd		(CamelNNTPStream *is, unsigned char **start, unsigned int *len);
-
-#endif /* ! _CAMEL_NNTP_STREAM_H */
diff --git a/camel/providers/nntp/camel-nntp-summary.c b/camel/providers/nntp/camel-nntp-summary.c
deleted file mode 100644
index e6c02b95af..0000000000
--- a/camel/providers/nntp/camel-nntp-summary.c
+++ /dev/null
@@ -1,507 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8; fill-column: 160 -*- */
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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 <ctype.h>
-#include <sys/stat.h>
-#include <sys/uio.h>
-#include <unistd.h>
-#include <errno.h>
-#include <string.h>
-#include <stdlib.h>
-
-#include "camel/camel-file-utils.h"
-#include "camel/camel-mime-message.h"
-#include "camel/camel-stream-null.h"
-#include "camel/camel-operation.h"
-#include "camel/camel-data-cache.h"
-#include "camel/camel-i18n.h"
-#include "camel/camel-debug.h"
-
-#include "camel-nntp-summary.h"
-#include "camel-nntp-folder.h"
-#include "camel-nntp-store.h"
-#include "camel-nntp-stream.h"
-
-#define w(x)
-#define io(x)
-#define d(x) /*(printf("%s(%d): ", __FILE__, __LINE__),(x))*/
-#define dd(x) (camel_debug("nntp")?(x):0)
-
-#define CAMEL_NNTP_SUMMARY_VERSION (1)
-
-struct _CamelNNTPSummaryPrivate {
-	char *uid;
-
-	struct _xover_header *xover; /* xoverview format */
-	int xover_setup;
-};
-
-#define _PRIVATE(o) (((CamelNNTPSummary *)(o))->priv)
-
-static CamelMessageInfo * message_info_new_from_header (CamelFolderSummary *, struct _camel_header_raw *);
-static int summary_header_load(CamelFolderSummary *, FILE *);
-static int summary_header_save(CamelFolderSummary *, FILE *);
-
-static void camel_nntp_summary_class_init (CamelNNTPSummaryClass *klass);
-static void camel_nntp_summary_init       (CamelNNTPSummary *obj);
-static void camel_nntp_summary_finalise   (CamelObject *obj);
-static CamelFolderSummaryClass *camel_nntp_summary_parent;
-
-CamelType
-camel_nntp_summary_get_type(void)
-{
-	static CamelType type = CAMEL_INVALID_TYPE;
-	
-	if (type == CAMEL_INVALID_TYPE) {
-		type = camel_type_register(camel_folder_summary_get_type(), "CamelNNTPSummary",
-					   sizeof (CamelNNTPSummary),
-					   sizeof (CamelNNTPSummaryClass),
-					   (CamelObjectClassInitFunc) camel_nntp_summary_class_init,
-					   NULL,
-					   (CamelObjectInitFunc) camel_nntp_summary_init,
-					   (CamelObjectFinalizeFunc) camel_nntp_summary_finalise);
-	}
-	
-	return type;
-}
-
-static void
-camel_nntp_summary_class_init(CamelNNTPSummaryClass *klass)
-{
-	CamelFolderSummaryClass *sklass = (CamelFolderSummaryClass *) klass;
-	
-	camel_nntp_summary_parent = CAMEL_FOLDER_SUMMARY_CLASS(camel_type_get_global_classfuncs(camel_folder_summary_get_type()));
-
-	sklass->message_info_new_from_header  = message_info_new_from_header;
-	sklass->summary_header_load = summary_header_load;
-	sklass->summary_header_save = summary_header_save;
-}
-
-static void
-camel_nntp_summary_init(CamelNNTPSummary *obj)
-{
-	struct _CamelNNTPSummaryPrivate *p;
-	struct _CamelFolderSummary *s = (CamelFolderSummary *)obj;
-
-	p = _PRIVATE(obj) = g_malloc0(sizeof(*p));
-
-	/* subclasses need to set the right instance data sizes */
-	s->message_info_size = sizeof(CamelMessageInfoBase);
-	s->content_info_size = sizeof(CamelMessageContentInfo);
-
-	/* and a unique file version */
-	s->version += CAMEL_NNTP_SUMMARY_VERSION;
-}
-
-static void
-camel_nntp_summary_finalise(CamelObject *obj)
-{
-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(obj);
-
-	g_free(cns->priv);
-}
-
-CamelNNTPSummary *
-camel_nntp_summary_new(struct _CamelFolder *folder, const char *path)
-{
-	CamelNNTPSummary *cns = (CamelNNTPSummary *)camel_object_new(camel_nntp_summary_get_type());
-
-	((CamelFolderSummary *)cns)->folder = folder;
-
-	camel_folder_summary_set_filename((CamelFolderSummary *)cns, path);
-	camel_folder_summary_set_build_content((CamelFolderSummary *)cns, FALSE);
-	
-	return cns;
-}
-
-static CamelMessageInfo *
-message_info_new_from_header(CamelFolderSummary *s, struct _camel_header_raw *h)
-{
-	CamelMessageInfoBase *mi;
-	CamelNNTPSummary *cns = (CamelNNTPSummary *)s;
-
-	/* error to call without this setup */
-	if (cns->priv->uid == NULL)
-		return NULL;
-
-	/* we shouldn't be here if we already have this uid */
-	g_assert(camel_folder_summary_uid(s, cns->priv->uid) == NULL);
-
-	mi = (CamelMessageInfoBase *)((CamelFolderSummaryClass *)camel_nntp_summary_parent)->message_info_new_from_header(s, h);
-	if (mi) {
-		mi->uid = g_strdup(cns->priv->uid);
-		cns->priv->uid = NULL;
-	}
-	
-	return (CamelMessageInfo *)mi;
-}
-
-static int
-summary_header_load(CamelFolderSummary *s, FILE *in)
-{
-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);
-
-	if (((CamelFolderSummaryClass *)camel_nntp_summary_parent)->summary_header_load(s, in) == -1)
-		return -1;
-
-	/* Legacy version */
-	if (s->version == 0x20c) {
-		camel_file_util_decode_fixed_int32(in, &cns->high);
-		return camel_file_util_decode_fixed_int32(in, &cns->low);
-	}
-
-	if (camel_file_util_decode_fixed_int32(in, &cns->version) == -1)
-		return -1;
-
-	if (cns->version > CAMEL_NNTP_SUMMARY_VERSION) {
-		g_warning("Unknown NNTP summary version");
-		errno = EINVAL;
-		return -1;
-	}
-
-	if (camel_file_util_decode_fixed_int32(in, &cns->high) == -1
-	    || camel_file_util_decode_fixed_int32(in, &cns->low) == -1)
-		return -1;
-
-	return 0;
-}
-
-static int
-summary_header_save(CamelFolderSummary *s, FILE *out)
-{
-	CamelNNTPSummary *cns = CAMEL_NNTP_SUMMARY(s);
-
-	if (((CamelFolderSummaryClass *)camel_nntp_summary_parent)->summary_header_save(s, out) == -1
-	    || camel_file_util_encode_fixed_int32(out, CAMEL_NNTP_SUMMARY_VERSION) == -1
-	    || camel_file_util_encode_fixed_int32(out, cns->high) == -1
-	    || camel_file_util_encode_fixed_int32(out, cns->low) == -1)
-		return -1;
-
-	return 0;
-}
-
-/* ********************************************************************** */
-
-/* Note: This will be called from camel_nntp_command, so only use camel_nntp_raw_command */
-static int
-add_range_xover(CamelNNTPSummary *cns, CamelNNTPStore *store, unsigned int high, unsigned int low, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	CamelFolderSummary *s;
-	CamelMessageInfoBase *mi;
-	struct _camel_header_raw *headers = NULL;
-	char *line, *tab;
-	int len, ret;
-	unsigned int n, count, total, size;
-	struct _xover_header *xover;
-
-	s = (CamelFolderSummary *)cns;
-
-	camel_operation_start(NULL, _("%s: Scanning new messages"), ((CamelService *)store)->url->host);
-
-	ret = camel_nntp_raw_command_auth(store, ex, &line, "xover %r", low, high);
-	if (ret != 224) {
-		camel_operation_end(NULL);
-		if (ret != -1)
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM,
-					     _("Unexpected server response from xover: %s"), line);
-		return -1;
-	}
-
-	count = 0;
-	total = high-low+1;
-	while ((ret = camel_nntp_stream_line(store->stream, (unsigned char **)&line, &len)) > 0) {
-		camel_operation_progress(NULL, (count * 100) / total);
-		count++;
-		n = strtoul(line, &tab, 10);
-		if (*tab != '\t')
-			continue;
-		tab++;
-		xover = store->xover;
-		size = 0;
-		for (;tab[0] && xover;xover = xover->next) {
-			line = tab;
-			tab = strchr(line, '\t');
-			if (tab)
-				*tab++ = 0;
-			else
-				tab = line+strlen(line);
-
-			/* do we care about this column? */
-			if (xover->name) {
-				line += xover->skip;
-				if (line < tab) {
-					camel_header_raw_append(&headers, xover->name, line, -1);
-					switch(xover->type) {
-					case XOVER_STRING:
-						break;
-					case XOVER_MSGID:
-						cns->priv->uid = g_strdup_printf("%u,%s", n, line);
-						break;
-					case XOVER_SIZE:
-						size = strtoul(line, NULL, 10);
-						break;
-					}
-				}
-			}
-		}
-
-		/* skip headers we don't care about, incase the server doesn't actually send some it said it would. */
-		while (xover && xover->name == NULL)
-			xover = xover->next;
-
-		/* truncated line? ignore? */
-		if (xover == NULL) {
-			mi = (CamelMessageInfoBase *)camel_folder_summary_uid(s, cns->priv->uid);
-			if (mi == NULL) {
-				mi = (CamelMessageInfoBase *)camel_folder_summary_add_from_header(s, headers);
-				if (mi) {
-					mi->size = size;
-					cns->high = n;
-					camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi));
-				}
-			} else {
-				camel_message_info_free(mi);
-			}
-		}
-
-		if (cns->priv->uid) {
-			g_free(cns->priv->uid);
-			cns->priv->uid = NULL;
-		}
-
-		camel_header_raw_clear(&headers);
-	}
-
-	camel_operation_end(NULL);
-
-	return ret;
-}
-
-/* Note: This will be called from camel_nntp_command, so only use camel_nntp_raw_command */
-static int
-add_range_head(CamelNNTPSummary *cns, CamelNNTPStore *store, unsigned int high, unsigned int low, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	CamelFolderSummary *s;
-	int i, ret = -1;
-	char *line, *msgid;
-	unsigned int n, count, total;
-	CamelMessageInfo *mi;
-	CamelMimeParser *mp;
-
-	s = (CamelFolderSummary *)cns;
-
-	mp = camel_mime_parser_new();
-
-	camel_operation_start(NULL, _("%s: Scanning new messages"), ((CamelService *)store)->url->host);
-
-	count = 0;
-	total = high-low+1;
-	for (i=low;i<high+1;i++) {
-		camel_operation_progress(NULL, (count * 100) / total);
-		count++;
-		ret = camel_nntp_raw_command_auth(store, ex, &line, "head %u", i);
-		/* unknown article, ignore */
-		if (ret == 423)
-			continue;
-		else if (ret == -1)
-			goto ioerror;
-		else if (ret != 221) {
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Unexpected server response from head: %s"), line);
-			goto ioerror;
-		}
-		line += 3;
-		n = strtoul(line, &line, 10);
-		if (n != i)
-			g_warning("retrieved message '%d' when i expected '%d'?\n", n, i);
-		
-		/* FIXME: use camel-mime-utils.c function for parsing msgid? */
-		if ((msgid = strchr(line, '<')) && (line = strchr(msgid+1, '>'))){
-			line[1] = 0;
-			cns->priv->uid = g_strdup_printf("%u,%s\n", n, msgid);
-			mi = camel_folder_summary_uid(s, cns->priv->uid);
-			if (mi == NULL) {
-				if (camel_mime_parser_init_with_stream(mp, (CamelStream *)store->stream) == -1)
-					goto error;
-				mi = camel_folder_summary_add_from_parser(s, mp);
-				while (camel_mime_parser_step(mp, NULL, NULL) != CAMEL_MIME_PARSER_STATE_EOF)
-					;
-				if (mi == NULL) {
-					goto error;
-				}
-				cns->high = i;
-				camel_folder_change_info_add_uid(changes, camel_message_info_uid(mi));
-			} else {
-				/* already have, ignore */
-				camel_message_info_free(mi);
-			}
-			if (cns->priv->uid) {
-				g_free(cns->priv->uid);
-				cns->priv->uid = NULL;
-			}
-		}
-	}
-
-	ret = 0;
-error:
-
-	if (ret == -1) {
-		if (errno == EINTR)
-			camel_exception_setv(ex, CAMEL_EXCEPTION_USER_CANCEL, _("Use cancel"));
-		else
-			camel_exception_setv(ex, CAMEL_EXCEPTION_SYSTEM, _("Operation failed: %s"), strerror(errno));
-	}
-ioerror:
-
-	if (cns->priv->uid) {
-		g_free(cns->priv->uid);
-		cns->priv->uid = NULL;
-	}
-	camel_object_unref((CamelObject *)mp);
-
-	camel_operation_end(NULL);
-
-	return ret;
-}
-
-/* Assumes we have the stream */
-/* Note: This will be called from camel_nntp_command, so only use camel_nntp_raw_command */
-int
-camel_nntp_summary_check(CamelNNTPSummary *cns, CamelNNTPStore *store, char *line, CamelFolderChangeInfo *changes, CamelException *ex)
-{
-	CamelFolderSummary *s;
-	int ret = 0, i;
-	unsigned int n, f, l;
-	int count;
-	char *folder = NULL;
-	CamelNNTPStoreInfo *si;
-
-	s = (CamelFolderSummary *)cns;
-
-	line +=3;
-	n = strtoul(line, &line, 10);
-	f = strtoul(line, &line, 10);
-	l = strtoul(line, &line, 10);
-	if (line[0] == ' ') {
-		char *tmp;
-
-		folder = line+1;
-		tmp = strchr(folder, ' ');
-		if (tmp)
-			*tmp = 0;
-		tmp = g_alloca(strlen(folder)+1);
-		strcpy(tmp, folder);
-		folder = tmp;
-	}
-
-	if (cns->low == f && cns->high == l) {
-		dd(printf("nntp_summary: no work to do!\n"));
-		goto update;
-	}
-
-	/* Need to work out what to do with our messages */
-
-	/* Check for messages no longer on the server */
-	if (cns->low != f) {
-		count = camel_folder_summary_count(s);
-		for (i = 0; i < count; i++) {
-			CamelMessageInfo *mi = camel_folder_summary_index(s, i);
-
-			if (mi) {
-				const char *uid = camel_message_info_uid(mi);
-				const char *msgid;
-
-				n = strtoul(uid, NULL, 10);
-				if (n < f || n > l) {
-					dd(printf("nntp_summary: %u is lower/higher than lowest/highest article, removed\n", n));
-					/* Since we use a global cache this could prematurely remove
-					   a cached message that might be in another folder - not that important as
-					   it is a true cache */
-					msgid = strchr(uid, ',');
-					if (msgid)
-						camel_data_cache_remove(store->cache, "cache", msgid+1, NULL);
-					camel_folder_change_info_remove_uid(changes, uid);
-					camel_folder_summary_remove(s, mi);
-					count--;
-					i--;
-				}
-				
-				camel_message_info_free(mi);
-			}
-		}
-		cns->low = f;
-	}
-
-	if (cns->high < l) {
-		if (cns->high < f)
-			cns->high = f-1;
-
-		if (store->xover) {
-			ret = add_range_xover(cns, store, l, cns->high+1, changes, ex);
-		} else {
-			ret = add_range_head(cns, store, l, cns->high+1, changes, ex);
-		}
-	}
-
-	/* TODO: not from here */
-	camel_folder_summary_touch(s);
-	camel_folder_summary_save(s);
-update:
-	/* update store summary if we have it */
-	if (folder
-	    && (si = (CamelNNTPStoreInfo *)camel_store_summary_path((CamelStoreSummary *)store->summary, folder))) {
-		int unread = 0;
-
-		count = camel_folder_summary_count(s);
-		for (i = 0; i < count; i++) {
-			CamelMessageInfoBase *mi = (CamelMessageInfoBase *)camel_folder_summary_index(s, i);
-
-			if (mi) {
-				if ((mi->flags & CAMEL_MESSAGE_SEEN) == 0)
-					unread++;
-				camel_message_info_free(mi);
-			}
-		}
-		
-		if (si->info.unread != unread
-		    || si->info.total != count
-		    || si->first != f
-		    || si->last != l) {
-			si->info.unread = unread;
-			si->info.total = count;
-			si->first = f;
-			si->last = l;
-			camel_store_summary_touch((CamelStoreSummary *)store->summary);
-			camel_store_summary_save((CamelStoreSummary *)store->summary);
-		}
-		camel_store_summary_info_free ((CamelStoreSummary *)store->summary, (CamelStoreInfo *)si);
-	} else {
-		if (folder)
-			g_warning("Group '%s' not present in summary", folder);
-		else
-			g_warning("Missing group from group response");
-	}
-
-	return ret;
-}
diff --git a/camel/providers/nntp/camel-nntp-summary.h b/camel/providers/nntp/camel-nntp-summary.h
deleted file mode 100644
index 2aff4319e1..0000000000
--- a/camel/providers/nntp/camel-nntp-summary.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  Copyright (C) 2000 Ximian Inc.
- *
- *  Authors: Michael Zucchi <notzed@ximian.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public
- * License as published by the Free Software Foundation.
- *
- * 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_SUMMARY_H
-#define _CAMEL_NNTP_SUMMARY_H
-
-#include <camel/camel-folder-summary.h>
-
-struct _CamelNNTPStore;
-struct _CamelFolderChangeInfo;
-struct _CamelException;
-
-#define CAMEL_NNTP_SUMMARY(obj)         CAMEL_CHECK_CAST (obj, camel_nntp_summary_get_type (), CamelNNTPSummary)
-#define CAMEL_NNTP_SUMMARY_CLASS(klass) CAMEL_CHECK_CLASS_CAST (klass, camel_nntp_summary_get_type (), CamelNNTPSummaryClass)
-#define CAMEL_IS_LOCAL_SUMMARY(obj)      CAMEL_CHECK_TYPE (obj, camel_nntp_summary_get_type ())
-
-typedef struct _CamelNNTPSummary      CamelNNTPSummary;
-typedef struct _CamelNNTPSummaryClass CamelNNTPSummaryClass;
-
-struct _CamelNNTPSummary {
-	CamelFolderSummary parent;
-
-	struct _CamelNNTPSummaryPrivate *priv;
-
-	guint32 version;
-	guint32 high, low;
-};
-
-struct _CamelNNTPSummaryClass {
-	CamelFolderSummaryClass parent_class;
-};
-
-CamelType	camel_nntp_summary_get_type	(void);
-CamelNNTPSummary *camel_nntp_summary_new(struct _CamelFolder *folder, const char *path);
-
-int camel_nntp_summary_check(CamelNNTPSummary *cns, struct _CamelNNTPStore *store, char *line, struct _CamelFolderChangeInfo *changes, struct _CamelException *ex);
-
-#endif /* ! _CAMEL_NNTP_SUMMARY_H */
-
diff --git a/camel/providers/nntp/camel-nntp-types.h b/camel/providers/nntp/camel-nntp-types.h
deleted file mode 100644
index a37179c521..0000000000
--- a/camel/providers/nntp/camel-nntp-types.h
+++ /dev/null
@@ -1,33 +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@ximian.com> 
- *
- * Copyright (C) 2000 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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 43cbb0eedb..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.c
+++ /dev/null
@@ -1,299 +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@ximian.com> 
- *
- * Copyright (C) 2000 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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 "libedataserver/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(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 = camel_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 (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 = camel_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
-
-static inline int
-uid_num (CamelFolderSummary *summary, int index)
-{
-	char *tmp;
-	char *brk;
-	CamelMessageInfo *minfo;
-	int ret;
-	
-	minfo = camel_folder_summary_index(summary, index);
-	if(minfo == NULL)
-		return 0;
-
-	tmp = g_strdup(camel_message_info_uid(minfo));
-	camel_message_info_free(minfo);
-	
-	if((brk = strchr(tmp, ',')) == NULL)
-		ret = 0;
-	else {
-		*brk = 0;
-		ret = atoi(tmp);
-	}
-	
-	g_free(tmp);
-	
-	return ret;
-}
-
-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, last_summary;
-	int status;
-	int i;
-
-	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);
-
-	i = camel_folder_summary_count(folder->summary);
-	if(i != 0) {
-		last_summary = uid_num(folder->summary, i-1);
-
-		if(last_summary < first_message)
-			camel_folder_summary_clear(folder->summary);
-		else {
-			while(uid_num(folder->summary, 0) < first_message) 
-				camel_folder_summary_remove_index(folder->summary, 0);
-			
-			if(last_summary >= last_message)
-				return;
-			
-			first_message = last_summary;
-		}
-	}
-			
-	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 48fd7490c9..0000000000
--- a/camel/providers/nntp/camel-nntp-utils.h
+++ /dev/null
@@ -1,41 +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@ximian.com> 
- *
- * Copyright (C) 1999 Ximian .
- *
- * This program is free software; you can redistribute it and/or 
- * modify it under the terms of version 2 of the GNU General Public 
- * License as published by the Free Software Foundation.
- *
- * 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);
-}