** Fix for bug #545099

2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #545099

	* camel/camel-folder-summary.c: When new mails added, update the
	summary.
2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>

	** Fix for bug #545099

	* camel/providers/local/camel-local-summary.c: Improve flag sync. Make
	it work for append mails

svn path=/trunk/; revision=9219

diff --git a/camel/ChangeLog b/camel/ChangeLog
index 5927a8f..ca1bc07 100644 (file)
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,5 +1,12 @@
 2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>
 
+       ** Fix for bug #545099
+
+       * camel/camel-folder-summary.c: When new mails added, update the
+       summary.
+
+2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>
+
        * camel/camel-folder.c: Remove Update folder function.
 
 2008-07-28  Srinivasa Ragavan  <sragavan@novell.com>

diff --git a/camel/camel-folder-summary.c b/camel/camel-folder-summary.c
index fdac04a..1b2f1cb 100644 (file)
--- a/camel/camel-folder-summary.c
+++ b/camel/camel-folder-summary.c
@@ -1602,6 +1602,43 @@ camel_folder_summary_insert (CamelFolderSummary *s, CamelMessageInfo *info, gboo
 }
 
 
+static void
+update_summary (CamelFolderSummary *summary, CamelMessageInfoBase *info)
+{
+       int unread=0, deleted=0, junk=0;
+       guint32 flags = info->flags;
+
+       if (!(flags & CAMEL_MESSAGE_SEEN))
+               unread = 1;
+       
+       if (flags & CAMEL_MESSAGE_DELETED)
+               deleted = 1;
+
+       if (flags & CAMEL_MESSAGE_JUNK)
+               junk = 1;
+       
+       info->flags |= CAMEL_MESSAGE_FOLDER_FLAGGED;
+       info->dirty = TRUE;
+
+       if (summary) {
+
+               if (unread)
+                       summary->unread_count += unread;
+               if (deleted)
+                       summary->deleted_count += deleted;
+               if (junk)
+                       summary->junk_count += junk;
+               if (junk && !deleted)
+                       summary->junk_not_deleted_count += junk;
+               summary->visible_count++;
+               if (junk ||  deleted) 
+                       summary->visible_count -= junk ? junk : deleted;
+
+               summary->saved_count++;
+               camel_folder_summary_touch(summary);
+       }
+}
+
 /**
  * camel_folder_summary_add_from_header:
  * @summary: a #CamelFolderSummary object
@@ -1621,7 +1658,7 @@ camel_folder_summary_add_from_header(CamelFolderSummary *s, struct _camel_header
        CamelMessageInfo *info = camel_folder_summary_info_new_from_header(s, h);
 
        camel_folder_summary_add (s, info);
-
+       update_summary (s, (CamelMessageInfoBase *) info);
        return info;
 }
 
@@ -1650,7 +1687,7 @@ camel_folder_summary_add_from_parser(CamelFolderSummary *s, CamelMimeParser *mp)
        info = camel_folder_summary_info_new_from_parser(s, mp);
 
        camel_folder_summary_add (s, info);
-
+       update_summary (s, (CamelMessageInfoBase *) info);
        return info;
 }
 
@@ -1670,7 +1707,7 @@ camel_folder_summary_add_from_message (CamelFolderSummary *s, CamelMimeMessage *
        CamelMessageInfo *info = camel_folder_summary_info_new_from_message(s, msg);
 
        camel_folder_summary_add (s, info);
-
+       update_summary (s, (CamelMessageInfoBase *) info);
        return info;
 }
 

diff --git a/camel/providers/local/ChangeLog b/camel/providers/local/ChangeLog
index 837cf0e..8efcf80 100644 (file)
--- a/camel/providers/local/ChangeLog
+++ b/camel/providers/local/ChangeLog
@@ -1,3 +1,10 @@
+2008-07-29  Srinivasa Ragavan  <sragavan@novell.com>
+
+       ** Fix for bug #545099
+
+       * camel/providers/local/camel-local-summary.c: Improve flag sync. Make
+       it work for append mails
+
 2008-07-28  Srinivasa Ragavan  <sragavan@novell.com>
 
        * camel/providers/local/camel-mbox-summary.c: Fix compiler warnings.

diff --git a/camel/providers/local/camel-local-summary.c b/camel/providers/local/camel-local-summary.c
index 652938d..f4125ae 100644 (file)
--- a/camel/providers/local/camel-local-summary.c
+++ b/camel/providers/local/camel-local-summary.c
@@ -421,10 +421,45 @@ local_summary_sync(CamelLocalSummary *cls, gboolean expunge, CamelFolderChangeIn
        return ret;
 }
 
+static void
+update_summary (CamelFolderSummary *summary, CamelMessageInfoBase *info, CamelMessageInfoBase *old)
+{
+       int unread=0, deleted=0, junk=0;
+       guint32 flags = info->flags;
+       guint32 oldflags = old->flags;
+
+       if ((flags & CAMEL_MESSAGE_SEEN) != (oldflags & CAMEL_MESSAGE_SEEN))
+               unread = (oldflags & CAMEL_MESSAGE_SEEN) ? 1 : -1;
+       
+       if ((flags & CAMEL_MESSAGE_DELETED) != (oldflags & CAMEL_MESSAGE_DELETED))
+               deleted = (oldflags & CAMEL_MESSAGE_DELETED) ? 1 : -1;
+
+       if ((flags & CAMEL_MESSAGE_JUNK) != (oldflags & CAMEL_MESSAGE_JUNK))
+               junk = (oldflags & CAMEL_MESSAGE_JUNK) ? 1 : -1;
+       
+       /* Things would already be flagged */
+       
+       if (summary) {
+               
+               if (unread)
+                       summary->unread_count -= unread;
+               if (deleted)
+                       summary->deleted_count += deleted;
+               if (junk)
+                       summary->junk_count += junk;
+               if (junk && !deleted)
+                       summary->junk_not_deleted_count += junk;
+               if (junk ||  deleted) 
+                       summary->visible_count -= junk ? junk : deleted;
+       }
+
+}
+
 static CamelMessageInfo *
 local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMessageInfo *info, CamelFolderChangeInfo *ci, CamelException *ex)
 {
        CamelLocalMessageInfo *mi;
+       CamelFolderSummary *s = (CamelFolderSummary *)cls;
        char *xev;
 
        d(printf("Adding message to summary\n"));
@@ -445,7 +480,8 @@ local_summary_add(CamelLocalSummary *cls, CamelMimeMessage *msg, const CamelMess
                                camel_message_info_set_user_tag((CamelMessageInfo *)mi, tag->name, tag->value);
                                tag = tag->next;
                        }
-
+                       
+                       update_summary (s, (CamelMessageInfoBase *) mi, (CamelMessageInfoBase *) info);
                        mi->info.flags |= (camel_message_info_flags(info) & 0xffff);
                        mi->info.size = camel_message_info_size(info);
                }