aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/broken-date-parser.c2
-rw-r--r--camel/providers/pop3/camel-pop3-engine.c6
3 files changed, 12 insertions, 4 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 69fc8a3a42..7ea58c89d4 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2003-06-01 Jeffrey Stedfast <fejj@ximian.com>
+
+ * broken-date-parser.c (d): Turn off debugging.
+
+ * providers/pop3/camel-pop3-engine.c (get_capabilities): Move the
+ code that prepends the 'password' authtype to the auth list so
+ that we don't add it again when regetting the capabilities.
+
2003-05-30 Jeffrey Stedfast <fejj@ximian.com>
* camel-filter-driver.c (run_only_once): Turned off a debugging
diff --git a/camel/broken-date-parser.c b/camel/broken-date-parser.c
index 7dcdf1e61e..60e5f1760a 100644
--- a/camel/broken-date-parser.c
+++ b/camel/broken-date-parser.c
@@ -36,7 +36,7 @@
#include "broken-date-parser.h"
#include "e-time-utils.h"
-#define d(x) x
+#define d(x)
#define NUMERIC_CHARS "1234567890"
#define WEEKDAY_CHARS "SundayMondayTuesdayWednesdayThursdayFridaySaturday"
diff --git a/camel/providers/pop3/camel-pop3-engine.c b/camel/providers/pop3/camel-pop3-engine.c
index 6ea3704667..762212388e 100644
--- a/camel/providers/pop3/camel-pop3-engine.c
+++ b/camel/providers/pop3/camel-pop3-engine.c
@@ -209,10 +209,10 @@ get_capabilities(CamelPOP3Engine *pe, int read_greeting)
pe->capa = CAMEL_POP3_CAP_APOP;
pe->auth = g_list_append(pe->auth, &camel_pop3_apop_authtype);
}
+
+ pe->auth = g_list_prepend(pe->auth, &camel_pop3_password_authtype);
}
-
- pe->auth = g_list_prepend(pe->auth, &camel_pop3_password_authtype);
-
+
pc = camel_pop3_engine_command_new(pe, CAMEL_POP3_COMMAND_MULTI, cmd_capa, NULL, "CAPA\r\n");
while (camel_pop3_engine_iterate(pe, pc) > 0)
;