[evolution-patches] 73112, imap fails after check auth types if already online

[Not Zed <notzed ximian com>]

Index: camel/providers/imap/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/ChangeLog,v
retrieving revision 1.10
diff -u -p -r1.10 ChangeLog
--- camel/providers/imap/ChangeLog	23 Feb 2005 06:17:15 -0000	1.10
+++ camel/providers/imap/ChangeLog	1 Mar 2005 05:06:01 -0000
@@ -1,3 +1,10 @@
+2005-03-01  Not Zed  <NotZed Ximian com>
+
+	** See bug #73112
+
+	* camel-imap-store.c (query_auth_types): don't re-connect if we're
+	already connected.
+
 2005-02-22  Not Zed  <NotZed Ximian com>
 
 	** See bug #61468
Index: camel/providers/imap/camel-imap-store.c
===================================================================
RCS file: /cvs/gnome/evolution-data-server/camel/providers/imap/camel-imap-store.c,v
retrieving revision 1.316
diff -u -p -r1.316 camel-imap-store.c
--- camel/providers/imap/camel-imap-store.c	16 Feb 2005 19:47:08 -0000	1.316
+++ camel/providers/imap/camel-imap-store.c	1 Mar 2005 05:06:02 -0000
@@ -972,7 +972,9 @@ query_auth_types (CamelService *service,
 		return NULL;
 	
 	CAMEL_SERVICE_LOCK (store, connect_lock);
-	connected = connect_to_server_wrapper (service, ex);
+	connected = store->istream != NULL && store->connected;
+	if (!connected)
+		connected = connect_to_server_wrapper (service, ex);
 	CAMEL_SERVICE_UNLOCK (store, connect_lock);
 	if (!connected)
 		return NULL;