Changeset 1845

Timestamp:

04/27/07 13:44:14

Author:

pvanhoof

Message:

unread and read counts of folders

Files:

• trunk/libtinymail-camel/camel-lite/camel/camel-folder.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-folder.c (modified) (12 diffs)
• trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c (modified) (2 diffs)

trunk/libtinymail-camel/camel-lite/camel/camel-folder.c

@@ -320 +320 @@
-        int unread = -1, deleted = 0, junked = 0, visible = 0, count = -1;
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                case CAMEL_OBJECT_ARG_DESCRIPTION:
-                        if (folder->description == NULL)
@@ -351 +353 @@
-                case CAMEL_FOLDER_ARG_UNREAD:
-                case CAMEL_FOLDER_ARG_DELETED:
-
+
+
+
+
-                        if (unread == -1) {
-                                int j;
@@ -358 +363 @@
-                                /* TODO: Locking? */
-                                unread = 0;
-
-<
+ 
+ < 
-                                {
-
+ 
-                                        if (info) 
-                                        {
-
-
-
-
+
+
-                                                if (flags & CAMEL_MESSAGE_DELETED)
-                                                        deleted++;
+                                                else
+                                                        if ((flags & CAMEL_MESSAGE_SEEN) == 0)
+                                                                unread++;
+
-                                                camel_message_info_free(info);
-                                        }
@@ -410 +417 @@
-                default:
-                        continue;
-       
-
-       
+  
+
+  
-        }
-

trunk/libtinymail-camel/tny-camel-folder.c

@@ -173 +173 @@
-                {
-                        guint32 flags = camel_message_info_flags(info);
-SEEN) == 0
+DELETED) && (flags & CAMEL_MESSAGE_SEEN)
-                                priv->unread_length++;
-                        priv->cached_length++;
@@ -213 +213 @@
-                           unread messages (yes I know it sucks, but get_unread_msg_cnt
-                           walks the entire summary to count the unread ones).
-
-                           TNY TODO: a better solution for this */
-
-                        priv->unread_length = camel_folder_get_unread_message_count (priv->folder);
-                        priv->unread_sync = 0;
@@ -711 +709 @@
-        GError *err;
-        TnySessionCamel *session;
-        guint oldlen, oldurlen;
-} RefreshFolderInfo;
-
@@ -740 +737 @@
-        TnyFolder *self = info->self;
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
+        TnyFolderChange *change = tny_folder_change_new (self);
-
-        if (info->callback)
-                info->callback (info->self, info->cancelled, &info->err, info->user_data);
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        return FALSE;
@@ -970 +962 @@
-
-        info = g_slice_new (RefreshFolderInfo);
-        info->oldlen = priv->cached_length;
-        info->oldurlen = priv->unread_length;
-        info->session = TNY_FOLDER_PRIV_GET_SESSION (priv);
-        info->err = NULL;
@@ -1031 +1021 @@
-        priv->cached_length = camel_folder_get_message_count (priv->folder);    
-        if (G_LIKELY (priv->folder) && CAMEL_IS_FOLDER (priv->folder) && G_LIKELY (priv->has_summary_cap))
-
+ 
-
-        if (camel_exception_is_set (&ex))
@@ -1090 +1080 @@
-        tny_list_prepend (headers, (GObject*)header);
-
-        if ((flags & CAMEL_MESSAGE_SEEN) == 0)
-                priv->unread_length++;
-
-        g_object_unref (G_OBJECT (header));
-
-        priv->cached_length++;
-
-        return;
@@ -1113 +1098 @@
-        CamelException ex = CAMEL_EXCEPTION_INITIALISER;
-        FldAndPriv *ptr = NULL;
-        guint oldlen = priv->cached_length;
-        guint oldurlen = priv->unread_length;
-
-        g_assert (TNY_IS_LIST (headers));
@@ -1153 +1136 @@
-
-        if (priv->folder && CAMEL_IS_FOLDER (priv->folder))
-
-
-
-
-
+
+
-
-        g_slice_free (FldAndPriv, ptr);
@@ -1163 +1143 @@
-        g_object_unref (G_OBJECT (headers));
-        g_static_rec_mutex_unlock (priv->folder_lock);
-
-        if (oldlen != priv->cached_length || oldurlen != priv->unread_length)
-        {
-                TnyFolderChange *change = tny_folder_change_new (self);
-                if (oldlen != priv->cached_length)
-                        tny_folder_change_set_new_all_count (change, priv->cached_length);
-                if (oldurlen != priv->unread_length)
-                        tny_folder_change_set_new_unread_count (change, priv->unread_length);
-                notify_folder_observers_about (self, change);
-                g_object_unref (change);
-        }
-
-        _tny_session_stop_operation (TNY_FOLDER_PRIV_GET_SESSION (priv));
@@ -2843 +2812 @@
-        TnyCamelFolderPriv *priv = TNY_CAMEL_FOLDER_GET_PRIVATE (self);
-        guint newlen, newurlen;
+        TnyFolderChange *change;
+
+
+        /* TODO: This causes a memory peak at the application's startup.
+         * We can improve this by only reading the unread and read counts
+         * from the summary.mmap file (in camel-lite). */
-
-        g_static_rec_mutex_lock (priv->folder_lock);
-
-        if (!priv->folder || !priv->loaded || !CAMEL_IS_FOLDER (priv->folder))
-                if (!load_folder_no_lock (priv)) 
@@ -2852 +2826 @@
-                        return;
-                }
-
-        newurlen = camel_folder_get_unread_message_count (priv->folder);
-        newlen = camel_folder_get_message_count (priv->folder);
-
-        g_static_rec_mutex_unlock (priv->folder_lock);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        return FALSE;

trunk/libtinymailui-gtk/tny-gtk-folder-store-tree-model.c

@@ -86 +86 @@
-                        folder, -1);
-
+                /* TODO: This causes a memory peak at the application's startup.
+                *Also look at tny-camel-folder:c:2818... for more information */
+
+                tny_folder_poke_status (TNY_FOLDER (folder));
+
-                recurse_folders_async (hlrp->self, folder, tree_iter);
-
@@ -163 +168 @@
-
-                recurse_folders_sync (self, folder, &tree_iter);
+
+
+                /* TODO: This causes a memory peak at the application's startup.
+                *Also look at tny-camel-folder:c:2818... for more information */
+
+                tny_folder_poke_status (TNY_FOLDER (folder));
-
-                g_object_unref (G_OBJECT (folder));