evolution-data-server r9200 - in trunk/camel: . providers/imap

[sragavan svn gnome org]

Author: sragavan
Date: Sun Jul 27 19:05:40 2008
New Revision: 9200
URL: http://svn.gnome.org/viewvc/evolution-data-server?rev=9200&view=rev

Log:
2008-07-27  Srinivasa Ragavan  <sragavan novell com>

	* camel/camel-folder-summary.c: Fix unread count updates in folder
	tree.

2008-07-27  Srinivasa Ragavan  <sragavan novell com>

	* camel/providers/imap/camel-imap-folder.c: Fix unread count issue
	with imap providers.


Modified:
   trunk/camel/ChangeLog
   trunk/camel/camel-folder-summary.c
   trunk/camel/providers/imap/ChangeLog
   trunk/camel/providers/imap/camel-imap-folder.c

Modified: trunk/camel/camel-folder-summary.c
==============================================================================
--- trunk/camel/camel-folder-summary.c	(original)
+++ trunk/camel/camel-folder-summary.c	Sun Jul 27 19:05:40 2008
@@ -4333,14 +4333,6 @@
 	if (((old & ~CAMEL_MESSAGE_SYSTEM_MASK) == (mi->flags & ~CAMEL_MESSAGE_SYSTEM_MASK)) && !((set & CAMEL_MESSAGE_JUNK_LEARN) && !(set & CAMEL_MESSAGE_JUNK)))
 		return FALSE;
 
-	if (mi->summary && mi->summary->folder && mi->uid) {
-		CamelFolderChangeInfo *changes = camel_folder_change_info_new();
-
-		camel_folder_change_info_change_uid(changes, camel_message_info_uid(info));
-		camel_object_trigger_event(mi->summary->folder, "folder_changed", changes);
-		camel_folder_change_info_free(changes);
-	}
-
 	if (mi->summary) {
 		if (read)
 			mi->summary->unread_count -= read;
@@ -4354,6 +4346,16 @@
 			mi->summary->visible_count -= junk ? junk : deleted;
 	}
 
+	if (mi->summary && mi->summary->folder && mi->uid) {
+		CamelFolderChangeInfo *changes = camel_folder_change_info_new();
+
+		camel_folder_change_info_change_uid(changes, camel_message_info_uid(info));
+		camel_object_trigger_event(mi->summary->folder, "folder_changed", changes);
+		camel_folder_change_info_free(changes);
+	}
+
+
+
 	d(printf("%d %d %d %d %d\n", mi->summary->unread_count, mi->summary->deleted_count, mi->summary->junk_count, mi->summary->junk_not_deleted_count, mi->summary->visible_count));
 	return TRUE;
 }

Modified: trunk/camel/providers/imap/camel-imap-folder.c
==============================================================================
--- trunk/camel/providers/imap/camel-imap-folder.c	(original)
+++ trunk/camel/providers/imap/camel-imap-folder.c	Sun Jul 27 19:05:40 2008
@@ -1133,14 +1133,6 @@
 	if (folder->summary && (folder->summary->flags & CAMEL_SUMMARY_DIRTY) != 0) {
 		CamelStoreInfo *si;
 
-		/* Update also summary count info in folder's summary...  */
-		camel_object_get (folder, NULL,
-					CAMEL_FOLDER_UNREAD, &folder->summary->unread_count,
-					CAMEL_FOLDER_TOTAL, &folder->summary->saved_count,
-					CAMEL_FOLDER_DELETED, &folder->summary->deleted_count,
-					CAMEL_FOLDER_JUNKED, &folder->summary->junk_count,
-					NULL);
-
 		/* ... and store's summary when folder's summary is dirty */
 		si = camel_store_summary_path ((CamelStoreSummary *)((CamelImapStore *)folder->parent_store)->summary, folder->full_name);
 		if (si) {