use camel_remote_store_recv_line.

2000-08-31  Chris Toshok  <toshok@helixcode.com>

	* providers/nntp/camel-nntp-utils.c (get_OVER_headers): use
	camel_remote_store_recv_line.

	* providers/nntp/camel-nntp-folder.c (nntp_folder_get_message):
	use camel_remote_store_recv_line to build message.  also, free our
	buffer so we don't leak like mad.

	* providers/nntp/camel-nntp-store.c:
	(camel_nntp_store_get_additional_data) remove.
	(camel_nntp_store_get_extensions): use
	camel_remote_store_recv_line.
	(camel_nntp_store_get_overview_fmt): same.  also, don't rely on
	_get_additional_data anymore since it's easier to parse without.
	(camel_nntp_command): use camel_remote_store_send_string and
	camel_remote_store_recv_line.

	* providers/nntp/camel-nntp-store.h: CamelRemoteStore is the
	parent class now.  remove istream/ostream since CamelRemoteStore
	takes care of that for us.  also remove the prototype for
	camel_nntp_store_get_additional_data.

	* providers/nntp/camel-nntp-newsrc.c (camel_nntp_newsrc_write):
	make sure to clear dirty bit.
	(camel_nntp_newsrc_read_for_server): don't worry about continually
	trying to open the file - if it fails we just return an
	unpopulated .newsrc file.

svn path=/trunk/; revision=5153

1 files changed, 3 insertions, 5 deletions

diff --git a/camel/providers/nntp/camel-nntp-store.h b/camel/providers/nntp/camel-nntp-store.h
index a74ea84f5e..77f04d87ee 100644
--- a/camel/providers/nntp/camel-nntp-store.h
+++ b/camel/providers/nntp/camel-nntp-store.h
@@ -31,7 +31,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus }*/
 
-#include "camel-store.h"
+#include "camel-remote-store.h"
 #include "camel-nntp-newsrc.h"
 
 #define CAMEL_NNTP_STORE_TYPE     (camel_nntp_store_get_type ())
@@ -58,7 +58,7 @@ typedef struct {
 } CamelNNTPOverField;
 
 typedef struct {
-	CamelStore parent_object;	
+	CamelRemoteStore parent_object;	
 
 #define CAMEL_NNTP_EXT_SEARCH     (1<<0)
 #define CAMEL_NNTP_EXT_SETGET     (1<<1)
@@ -77,13 +77,12 @@ typedef struct {
 
 	CamelNNTPNewsrc *newsrc;
 
-	CamelStream *istream, *ostream;
 } CamelNNTPStore;
 
 
 
 typedef struct {
-	CamelStoreClass parent_class;
+	CamelRemoteStoreClass parent_class;
 
 } CamelNNTPStoreClass;
 
@@ -102,7 +101,6 @@ gchar *camel_nntp_store_get_toplevel_dir (CamelNNTPStore *store);
 /* support functions */
 enum { CAMEL_NNTP_OK, CAMEL_NNTP_ERR, CAMEL_NNTP_FAIL };
 int camel_nntp_command (CamelNNTPStore *store, char **ret, char *fmt, ...);
-char *camel_nntp_command_get_additional_data (CamelNNTPStore *store);
 
 /* Standard Camel function */
 CamelType camel_nntp_store_get_type (void);