projects
/
modest
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Fixes NB#64093 the message count in folders is now recursive
[modest]
/
src
/
modest-tny-account.c
diff --git
a/src/modest-tny-account.c
b/src/modest-tny-account.c
index
1627859
..
6c7158b
100644
(file)
--- a/
src/modest-tny-account.c
+++ b/
src/modest-tny-account.c
@@
-983,7
+983,6
@@
modest_tny_folder_store_get_folder_count (TnyFolderStore *self)
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_FOLDER_COUNT;
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_FOLDER_COUNT;
- helper->sum = 0;
helper->folders = 0;
recurse_folders (self, NULL, helper);
helper->folders = 0;
recurse_folders (self, NULL, helper);
@@
-1006,7
+1005,8
@@
modest_tny_folder_store_get_message_count (TnyFolderStore *self)
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_ALL_COUNT;
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_ALL_COUNT;
- helper->sum = 0;
+ if (TNY_IS_FOLDER (self))
+ helper->sum = tny_folder_get_all_count (TNY_FOLDER (self));
recurse_folders (self, NULL, helper);
recurse_folders (self, NULL, helper);
@@
-1028,7
+1028,8
@@
modest_tny_folder_store_get_local_size (TnyFolderStore *self)
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_LOCAL_SIZE;
/* Create helper */
helper = g_malloc0 (sizeof (RecurseFoldersHelper));
helper->task = TASK_GET_LOCAL_SIZE;
- helper->sum = 0;
+ if (TNY_IS_FOLDER (self))
+ helper->sum = tny_folder_get_local_size (TNY_FOLDER (self));
recurse_folders (self, NULL, helper);
recurse_folders (self, NULL, helper);