summaryrefslogtreecommitdiffstats
path: root/kmail/kmsystemtray.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-09-01 00:37:02 +0000
commitcc29364f06178f8f6b457384f2ec37a042bd9d43 (patch)
tree7c77a3184c698bbf9d98cef09fb1ba8124daceba /kmail/kmsystemtray.cpp
parent4f6c584bacc8c3c694228f36ada3de77a76614a6 (diff)
downloadtdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.tar.gz
tdepim-cc29364f06178f8f6b457384f2ec37a042bd9d43.zip
* Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch
* Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kmail/kmsystemtray.cpp')
-rw-r--r--kmail/kmsystemtray.cpp9
1 files changed, 8 insertions, 1 deletions
diff --git a/kmail/kmsystemtray.cpp b/kmail/kmsystemtray.cpp
index e4d3a9879..8dc4eee94 100644
--- a/kmail/kmsystemtray.cpp
+++ b/kmail/kmsystemtray.cpp
@@ -110,7 +110,6 @@ void KMSystemTray::buildPopupMenu()
{
// Delete any previously created popup menu
delete mPopupMenu;
- mPopupMenu = 0;
mPopupMenu = new KPopupMenu();
KMMainWidget * mainWidget = kmkernel->getKMMainWidget();
@@ -293,6 +292,9 @@ void KMSystemTray::foldersChanged()
/** Check all new folders to see if we started with any new messages */
updateNewMessageNotification(currentFolder);
}
+ else {
+ disconnect(currentFolder, TQT_SIGNAL(numUnreadMsgsChanged(KMFolder *)), this, TQT_SLOT(updateNewMessageNotification(KMFolder *)) );
+ }
}
}
@@ -588,4 +590,9 @@ void KMSystemTray::selectedAccount(int id)
ft->selectCurrentFolder();
}
+bool KMSystemTray::hasUnreadMail() const
+{
+ return ( mCount != 0 );
+}
+
#include "kmsystemtray.moc"