Make sure we have elements in the array, if not then we're done (return a

2004-06-15  Jeffrey Stedfast  <fejj@novell.com>

	* providers/imap4/camel-imap4-store.c (imap4_build_folder_info):
	Make sure we have elements in the array, if not then we're done
	(return a NULL fi).

diff --git a/camel/ChangeLog b/camel/ChangeLog
index d49962d..f405aea 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,9 @@
+2004-06-15  Jeffrey Stedfast  <fejj@novell.com>
+
+       * providers/imap4/camel-imap4-store.c (imap4_build_folder_info):
+       Make sure we have elements in the array, if not then we're done
+       (return a NULL fi).
+
 2004-06-17  Jeffrey Stedfast  <fejj@ximian.com>
 
        * providers/imap4/camel-imap4-folder.c (imap4_get_uid_set): Fixed
@@ -463,7 +469,7 @@
        Fix for #58738 ja_JP.UTF-8: Evolution crashes when certain 
        ASCII/non-ASCII combination is used in mail subject
 
-       * camel-mime-utils.c: (camel_header_encode_string) Use 
+       * camel-mime-utils.c (camel_header_encode_string) Use 
        camel_mime_is_lwsp for determining word separators, 
        according to rfc822 (which's also same for rfc2047). 
        g_unichar_isspace as word separator is illegal.

diff --git a/camel/providers/imap4/camel-imap4-store.c b/camel/providers/imap4/camel-imap4-store.c
index 518b8ab..1dfb934 100644 (file)
--- a/camel/providers/imap4/camel-imap4-store.c
+++ b/camel/providers/imap4/camel-imap4-store.c
@@ -40,6 +40,7 @@
 #include "camel-imap4-stream.h"
 #include "camel-imap4-command.h"
 #include "camel-imap4-utils.h"
+#include "camel-imap4-summary.h"
 
 
 static void camel_imap4_store_class_init (CamelIMAP4StoreClass *klass);
@@ -1055,6 +1056,11 @@ imap4_build_folder_info (CamelStore *store, const char *top, guint32 flags, GPtr
        CamelURL *url;
        int i;
        
+       if (array->len == 0) {
+               g_ptr_array_free (array, TRUE);
+               return NULL;
+       }
+       
        g_ptr_array_sort (array, (GCompareFunc) list_sort);
        
        list_remove_duplicates (array);