From 27204cd12a02dbfe5d29b3de2c985f7d72b1fbf8 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Mon, 21 Jul 2008 11:46:23 +0000 Subject: [PATCH] Fix info/summaries. Ignore vfolder counts for sometime. svn path=/trunk/; revision=9160 --- camel/camel-db.c | 2 +- camel/camel-folder.c | 6 +++--- camel/camel-vee-folder.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/camel/camel-db.c b/camel/camel-db.c index c807ee1..d087028 100644 --- a/camel/camel-db.c +++ b/camel/camel-db.c @@ -35,7 +35,7 @@ #include #include -#define d(x) +#define d(x) static GStaticRecMutex trans_lock = G_STATIC_REC_MUTEX_INIT; diff --git a/camel/camel-folder.c b/camel/camel-folder.c index 4b37c5b..8f226c0 100644 --- a/camel/camel-folder.c +++ b/camel/camel-folder.c @@ -402,7 +402,7 @@ folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args) //camel_db_count_junk_not_deleted_message_info (folder->cdb, folder->full_name, &junked_not_deleted, ex); //camel_db_count_visible_message_info (folder->cdb, folder->full_name, &visible, ex); } else { - count = camel_folder_summary_count (folder->summary); + /* count = camel_folder_summary_count (folder->summary); for (j = 0; j < count; j++) { if ((info = camel_folder_summary_index (folder->summary, j))) { guint32 flags = camel_message_info_flags(info); @@ -421,10 +421,10 @@ folder_getv(CamelObject *object, CamelException *ex, CamelArgGetV *args) camel_message_info_free(info); } - } + }*/ #warning "I added it for vfolders summary storage, does it harm ?" if (unread == -1) { - unread = folder->summary->unread_count; + //unread = folder->summary->unread_count; /* folder->summary->junk_count = junked; folder->summary->deleted_count = deleted; diff --git a/camel/camel-vee-folder.c b/camel/camel-vee-folder.c index 5fdaaf1..56c07b5 100644 --- a/camel/camel-vee-folder.c +++ b/camel/camel-vee-folder.c @@ -1042,7 +1042,7 @@ vee_rebuild_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex) g_hash_table_insert(matchhash, match->pdata[i], GINT_TO_POINTER (1)); allhash = g_hash_table_new(g_str_hash, g_str_equal); - all = camel_folder_get_uids(f); + all = camel_folder_summary_array(f->summary); for (i=0;ilen;i++) if (g_hash_table_lookup(matchhash, all->pdata[i]) == NULL) g_hash_table_insert(allhash, all->pdata[i], GINT_TO_POINTER (1)); @@ -1153,7 +1153,7 @@ vee_rebuild_folder(CamelVeeFolder *vf, CamelFolder *source, CamelException *ex) g_ptr_array_free(match, TRUE); } else camel_folder_search_free(f, match); - camel_folder_free_uids(f, all); + camel_folder_free_summary (f, all); if (unmatched_changes) { camel_object_trigger_event((CamelObject *)folder_unmatched, "folder_changed", unmatched_changes); -- 2.7.4