** Fix for bug #561069

2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #561069

	* camel-imap-folder.c (imap_expunge): If nothing to expunge, don't
	crash.

svn path=/trunk/; revision=9772

diff --git a/camel/providers/imap/ChangeLog b/camel/providers/imap/ChangeLog
index d900fe0..04ac21c 100644 (file)
--- a/camel/providers/imap/ChangeLog
+++ b/camel/providers/imap/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-19  Srinivasa Ragavan  <sragavan@novell.com>
+
+       ** Fix for bug #561069
+
+       * camel-imap-folder.c (imap_expunge): If nothing to expunge, don't
+       crash.
+
 2008-11-07  Srinivasa Ragavan  <sragavan@novell.com>
 
        ** Fix for bug #558883

diff --git a/camel/providers/imap/camel-imap-folder.c b/camel/providers/imap/camel-imap-folder.c
index 2984058..eeee0a2 100644 (file)
--- a/camel/providers/imap/camel-imap-folder.c
+++ b/camel/providers/imap/camel-imap-folder.c
@@ -1587,6 +1587,8 @@ imap_expunge (CamelFolder *folder, CamelException *ex)
 
        camel_folder_summary_save_to_db (folder->summary, ex);
        uids = camel_db_get_folder_deleted_uids (folder->parent_store->cdb_r, folder->full_name, ex);
+       if (!uids)
+               return;
 
        if (CAMEL_OFFLINE_STORE (store)->state == CAMEL_OFFLINE_STORE_NETWORK_AVAIL)
                imap_expunge_uids_online (folder, uids, ex);