imap_expunge should now give more meaningful errors

diff --git a/camel/ChangeLog b/camel/ChangeLog
index e8344c9..8c8dedb 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,8 @@
+2000-06-29  Jeffrey Stedfast  <fejj@helixcode.com>
+
+       * providers/imap/camel-imap-folder.c (imap_expunge): Should now
+       print a meaningful error message when it doesn't succeed
+
 2000-06-28  Jeffrey Stedfast  <fejj@helixcode.com>
 
        * providers/imap/camel-imap-store.c (imap_connect): Changed to

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 6ab0fff..602d0bc 100644 (file)
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -349,13 +349,13 @@ imap_expunge (CamelFolder *folder, CamelException *ex)
                camel_exception_setv (ex, CAMEL_EXCEPTION_SERVICE_UNAVAILABLE,
                                      "Could not EXPUNGE from IMAP server %s: %s.",
                                      service->url->host,
-                                     status == CAMEL_IMAP_ERR ? result :
+                                     status == CAMEL_IMAP_ERR && result ? result :
                                      "Unknown error");
                g_free (result);
                return;
        }
        
-       g_free(result);
+       g_free (result);
 }
 
 #if 0