aboutsummaryrefslogtreecommitdiffstats
path: root/camel
diff options
context:
space:
mode:
Diffstat (limited to 'camel')
-rw-r--r--camel/ChangeLog7
-rw-r--r--camel/providers/imap/camel-imap-store.c4
2 files changed, 10 insertions, 1 deletions
diff --git a/camel/ChangeLog b/camel/ChangeLog
index c21d4cfcef..4e850ff49b 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2003-04-22 Jeffrey Stedfast <fejj@ximian.com>
+
+ * providers/imap/camel-imap-store.c (imap_connect_online): #if 0
+ out some code that parsed the namespaces since the results aren't
+ used and they generate debugging output.
+
2003-04-23 Not Zed <NotZed@Ximian.com>
* camel-session.c (get_service): oops, the service owns the url
@@ -27,6 +33,7 @@
object bag instead of a hash table for the service 'cache'.
(service_cache_remove): Removed, no longer required.
+>>>>>>> 1.1801
2003-04-21 Jeffrey Stedfast <fejj@ximian.com>
* camel-gpg-context.c (gpg_ctx_parse_status): Don't set seen_eof1
diff --git a/camel/providers/imap/camel-imap-store.c b/camel/providers/imap/camel-imap-store.c
index 3b045fd084..f4ec3579c8 100644
--- a/camel/providers/imap/camel-imap-store.c
+++ b/camel/providers/imap/camel-imap-store.c
@@ -1172,7 +1172,7 @@ imap_connect_online (CamelService *service, CamelException *ex)
CamelImapStore *store = CAMEL_IMAP_STORE (service);
CamelDiscoStore *disco_store = CAMEL_DISCO_STORE (service);
CamelImapResponse *response;
- struct _namespaces *namespaces;
+ /*struct _namespaces *namespaces;*/
char *result, *name, *path;
int i;
size_t len;
@@ -1197,10 +1197,12 @@ imap_connect_online (CamelService *service, CamelException *ex)
if (!result)
goto done;
+#if 0
/* new code... */
namespaces = imap_parse_namespace_response (result);
imap_namespaces_destroy (namespaces);
/* end new code */
+#endif
name = camel_strstrcase (result, "NAMESPACE ((");
if (name) {