-rw-r--r-- | noncore/net/mail/libmailwrapper/statusmail.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/noncore/net/mail/libmailwrapper/statusmail.cpp b/noncore/net/mail/libmailwrapper/statusmail.cpp index 7e14df3..4d87e56 100644 --- a/noncore/net/mail/libmailwrapper/statusmail.cpp +++ b/noncore/net/mail/libmailwrapper/statusmail.cpp | |||
@@ -44,13 +44,13 @@ void StatusMail::initAccounts(QList<Account>&accounts) | |||
44 | connectionList.append(current); | 44 | connectionList.append(current); |
45 | current->statusFolder(currentStat); | 45 | current->statusFolder(currentStat); |
46 | currentPop3Stat.message_count+=currentStat.message_count; | 46 | currentPop3Stat.message_count+=currentStat.message_count; |
47 | } | 47 | } |
48 | current->logout(); | 48 | current->logout(); |
49 | } | 49 | } |
50 | odebug << "Pop3 init count: " << currentPop3Stat.message_count << "" << oendl; | 50 | odebug << "Pop3 init count: " << currentPop3Stat.message_count << "" << oendl; |
51 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; | 51 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; |
52 | lastPop3Stat.message_unseen = currentPop3Stat.message_unseen; | 52 | lastPop3Stat.message_unseen = currentPop3Stat.message_unseen; |
53 | lastPop3Stat.message_recent = currentPop3Stat.message_recent; | 53 | lastPop3Stat.message_recent = currentPop3Stat.message_recent; |
54 | lastPop3Stat.message_count = currentPop3Stat.message_count; | 54 | lastPop3Stat.message_count = currentPop3Stat.message_count; |
55 | } | 55 | } |
56 | 56 | ||
@@ -73,22 +73,28 @@ void StatusMail::check_current_stat(folderStat&targetStat) | |||
73 | if (it->getType() == MAILLIB::A_IMAP) { | 73 | if (it->getType() == MAILLIB::A_IMAP) { |
74 | currentImapStat.message_unseen+=currentStat.message_unseen; | 74 | currentImapStat.message_unseen+=currentStat.message_unseen; |
75 | currentImapStat.message_recent+=currentStat.message_recent; | 75 | currentImapStat.message_recent+=currentStat.message_recent; |
76 | currentImapStat.message_count+=currentStat.message_count; | 76 | currentImapStat.message_count+=currentStat.message_count; |
77 | } else if (it->getType() == MAILLIB::A_POP3) { | 77 | } else if (it->getType() == MAILLIB::A_POP3) { |
78 | currentPop3Stat.message_count+=currentStat.message_count; | 78 | currentPop3Stat.message_count+=currentStat.message_count; |
79 | odebug << "Pop3 count: " << currentPop3Stat.message_count << "" << oendl; | 79 | odebug << "Pop3 count: " << currentPop3Stat.message_count << "" << oendl; |
80 | } | 80 | } |
81 | } | 81 | } |
82 | odebug << "Pop3 last: " << lastPop3Stat.message_count << "" << oendl; | 82 | odebug << "Pop3 last: " << lastPop3Stat.message_count << "" << oendl; |
83 | |||
84 | #if 0 | ||
83 | if (currentPop3Stat.message_count > lastPop3Stat.message_count) { | 85 | if (currentPop3Stat.message_count > lastPop3Stat.message_count) { |
84 | currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count; | 86 | currentPop3Stat.message_recent = currentPop3Stat.message_count - lastPop3Stat.message_count; |
85 | currentPop3Stat.message_unseen = currentPop3Stat.message_recent; | 87 | currentPop3Stat.message_unseen = currentPop3Stat.message_recent; |
86 | } else { | 88 | } else { |
87 | lastPop3Stat.message_count = currentPop3Stat.message_count; | 89 | lastPop3Stat.message_count = currentPop3Stat.message_count; |
88 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; | 90 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen = 0; |
89 | } | 91 | } |
92 | #else | ||
93 | currentPop3Stat.message_recent = currentPop3Stat.message_unseen=currentPop3Stat.message_count; | ||
94 | #endif | ||
95 | |||
90 | targetStat = currentImapStat; | 96 | targetStat = currentImapStat; |
91 | targetStat.message_unseen+=currentPop3Stat.message_unseen; | 97 | targetStat.message_unseen+=currentPop3Stat.message_unseen; |
92 | targetStat.message_recent+=currentPop3Stat.message_recent; | 98 | targetStat.message_recent+=currentPop3Stat.message_recent; |
93 | targetStat.message_count+=currentPop3Stat.message_count; | 99 | targetStat.message_count+=currentPop3Stat.message_count; |
94 | } | 100 | } |