If we aren't going to even check the resp/free buffer that gets returned

2001-03-27  Jeffrey Stedfast  <fejj@ximian.com>

	* providers/pop3/camel-pop3-folder.c (pop3_sync): If we aren't
	going to even check the resp/free buffer that gets returned from
	camel_pop3_command, don't even bother using it. Send in NULL
	instead.
	(pop3_get_message): Check to make sure that the `result' string is
	non-NULL. It's possible that some POP servers may return with
	"+OK\r\n<message>..." rather than the expected
	"+OK ### octets\r\n<message>..."

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 8f1c231..fb091ec 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-27  Jeffrey Stedfast  <fejj@ximian.com>
+
+       * providers/pop3/camel-pop3-folder.c (pop3_sync): If we aren't
+       going to even check the resp/free buffer that gets returned from
+       camel_pop3_command, don't even bother using it. Send in NULL
+       instead.
+       (pop3_get_message): Check to make sure that the `result' string is
+       non-NULL. It's possible that some POP servers may return with
+       "+OK\r\n<message>..." rather than the expected 
+       "+OK ### octets\r\n<message>..."
+
 2001-03-27  Not Zed  <NotZed@Ximian.com>
 
        * camel-folder-summary.c (camel_folder_summary_finalize): Unref

diff --git a/camel/Makefile.am b/camel/Makefile.am
index 67f65f3..decc13d 100644 (file)
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = providers tests
+SUBDIRS = providers #tests
 
 libcamelincludedir = $(includedir)/camel
 providerdir = $(libdir)/evolution/camel-providers/$(VERSION)

diff --git a/camel/providers/pop3/camel-pop3-folder.c b/camel/providers/pop3/camel-pop3-folder.c
index 7478470..3b1366b 100644 (file)
--- a/camel/providers/pop3/camel-pop3-folder.c
+++ b/camel/providers/pop3/camel-pop3-folder.c
@@ -206,8 +206,7 @@ pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
        CamelPop3Folder *pop3_folder;
        CamelPop3Store *pop3_store;
        int i, status;
-       char *resp;
-
+       
        if (!expunge)
                return;
 
@@ -216,7 +215,7 @@ pop3_sync (CamelFolder *folder, gboolean expunge, CamelException *ex)
 
        for (i = 0; i < pop3_folder->uids->len; i++) {
                if (pop3_folder->flags[i] & CAMEL_MESSAGE_DELETED) {
-                       status = camel_pop3_command (pop3_store, &resp, ex,
+                       status = camel_pop3_command (pop3_store, NULL, ex,
                                                     "DELE %d", i + 1);
                        if (status != CAMEL_POP3_OK)
                                return;
@@ -297,7 +296,7 @@ pop3_get_message (CamelFolder *folder, const char *uid, CamelException *ex)
        }
 
        /* this should be "nnn octets" ? */
-       if (sscanf(result, "%d", &total) != 1)
+       if (result && sscanf (result, "%d", &total) != 1)
                total = 0;
 
        g_free (result);