* 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

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"