[evolution-patches] nntp typo bug fix (69982?)

[Not Zed <notzed ximian com>]

CAMEL_NNTP_LINE is used for the nntp stream mode, but the code overrides it for use as a line length, this may be triggering some assertions, as in bug 69982, although i'm really not sure on that one at this point.



Index: camel/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/camel/ChangeLog,v
retrieving revision 1.2251.2.23
diff -u -p -r1.2251.2.23 ChangeLog
--- camel/ChangeLog	22 Nov 2004 01:51:18 -0000	1.2251.2.23
+++ camel/ChangeLog	30 Nov 2004 07:36:57 -0000
@@ -1,3 +1,10 @@
+2004-11-30  Not Zed  <NotZed Ximian com>
+
+	* providers/nntp/camel-nntp-stream.c (CAMEL_NNTP_STREAM_LINE):
+	rename to STREAM_LINE_SIZE so it doesn't override the STREAM_LINE
+	enum.  Sigh.
+	(camel_nntp_stream_init): fix for above change.
+
 2004-11-10  Not Zed  <NotZed Ximian com>
 
 	** See bug #69109.
Index: camel/providers/nntp/camel-nntp-stream.c
===================================================================
RCS file: /cvs/gnome/evolution/camel/providers/nntp/camel-nntp-stream.c,v
retrieving revision 1.2.62.1
diff -u -p -r1.2.62.1 camel-nntp-stream.c
--- camel/providers/nntp/camel-nntp-stream.c	19 Nov 2004 02:13:46 -0000	1.2.62.1
+++ camel/providers/nntp/camel-nntp-stream.c	30 Nov 2004 07:36:58 -0000
@@ -42,7 +42,7 @@ static CamelObjectClass *parent_class = 
 #define CS_CLASS(so) CAMEL_NNTP_STREAM_CLASS(CAMEL_OBJECT_GET_CLASS(so))
 
 #define CAMEL_NNTP_STREAM_SIZE (4096)
-#define CAMEL_NNTP_STREAM_LINE (1024) /* maximum line size */
+#define CAMEL_NNTP_STREAM_LINE_SIZE (1024) /* maximum line size */
 
 static int
 stream_fill(CamelNNTPStream *is)
@@ -198,8 +198,8 @@ camel_nntp_stream_init(CamelNNTPStream *
 {
 	/* +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+1);
-	is->lineend = is->linebuf + CAMEL_NNTP_STREAM_LINE;
+	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';