In the ic1 error case, xfer the ic1 exception, not the ic0 exception

2005-01-28  Jeffrey Stedfast  <fejj@novell.com>

	* camel-imap4-store.c (imap4_get_folder_info): In the ic1 error
	case, xfer the ic1 exception, not the ic0 exception (which might
	not even exist). Fixes bug #71919.

diff --git a/camel/providers/imap4/ChangeLog b/camel/providers/imap4/ChangeLog
index 60aee26..f88b84b 100644 (file)
--- a/camel/providers/imap4/ChangeLog
+++ b/camel/providers/imap4/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-28  Jeffrey Stedfast  <fejj@novell.com>
+
+       * camel-imap4-store.c (imap4_get_folder_info): In the ic1 error
+       case, xfer the ic1 exception, not the ic0 exception (which might
+       not even exist). Fixes bug #71919.
 
 Refer to main changelog for earlier changes.
 

diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 31800d3..f13c8cf 100644 (file)
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -1266,7 +1266,7 @@ imap4_get_folder_info (CamelStore *store, const char *top, guint32 flags, CamelE
        
        if (id == -1 || ic->status != CAMEL_IMAP4_COMMAND_COMPLETE) {
                if (ic1 && ic1->status != CAMEL_IMAP4_COMMAND_COMPLETE)
-                       camel_exception_xfer (ex, &ic0->ex);
+                       camel_exception_xfer (ex, &ic1->ex);
                else if (ic0 && ic0->status != CAMEL_IMAP4_COMMAND_COMPLETE)
                        camel_exception_xfer (ex, &ic0->ex);
                else