Only assign a uid if indexing is enabled. This stops us always assigning a

2002-07-13  Not Zed  <NotZed@Ximian.com>

        * camel-folder-summary.c
        (camel_folder_summary_info_new_from_message): Only assign a uid if
        indexing is enabled.  This stops us always assigning a uid in the
        imap folder and disco folder?

        * providers/imap/camel-imap-folder.c (imap_update_summary): Also
        check the uid is set at all, another bit of a fix for #15667.

2002-07-09  Not Zed  <NotZed@Ximian.com>

        * providers/imap/camel-imap-folder.c (imap_update_summary): Check
        for existing messages of the same uid before doing anything.  If
        it exists, do nothing (perhaps it should merge?).  A dirty hack for
        #15667.

svn path=/trunk/; revision=17450

1 files changed, 3 insertions, 2 deletions

diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index d0d24b8820..665ffab795 100644
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -935,8 +935,9 @@ CamelMessageInfo *camel_folder_summary_info_new_from_message(CamelFolderSummary
 	info = ((CamelFolderSummaryClass *)(CAMEL_OBJECT_GET_CLASS(s)))->message_info_new_from_message(s, msg);
 
 	/* assign a unique uid, this is slightly 'wrong' as we do not really
-	 * know if we are going to store this in the summary, but no matter */
-	summary_assign_uid(s, info);
+	 * know if we are going to store this in the summary, but we need it set for indexing */
+	if (p->index)
+		summary_assign_uid(s, info);
 
 	CAMEL_SUMMARY_LOCK(s, filter_lock);