From 49dd7403b966b12dee5e062a0a016708b12f32d9 Mon Sep 17 00:00:00 2001 From: Jeffrey Stedfast Date: Thu, 17 Jun 2004 16:59:44 +0000 Subject: Make sure we have elements in the array, if not then we're done (return a 2004-06-15 Jeffrey Stedfast * 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). svn path=/trunk/; revision=26394 --- camel/ChangeLog | 8 +++++++- camel/providers/imap4/camel-imap4-store.c | 6 ++++++ 2 files changed, 13 insertions(+), 1 deletion(-) (limited to 'camel') diff --git a/camel/ChangeLog b/camel/ChangeLog index d49962db6c..f405aea854 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,9 @@ +2004-06-15 Jeffrey Stedfast + + * 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 * 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 518b8ab137..1dfb934780 100644 --- 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); -- cgit