From 85522e4281c75222ee02134908fa61e97484c79b Mon Sep 17 00:00:00 2001
From: David Faure <faure@kde.org>
Date: Fri, 17 Sep 2004 13:00:43 +0000
Subject: [PATCH] Fix crash in systray notification when folders are deleted.
 (#89520)

svn path=/trunk/kdepim/; revision=347173
---
 kmsystemtray.cpp | 4 +++-
 kmsystemtray.h   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/kmsystemtray.cpp b/kmsystemtray.cpp
index e7d17ec15..6e37cf34f 100644
--- a/kmsystemtray.cpp
+++ b/kmsystemtray.cpp
@@ -482,10 +482,12 @@ void KMSystemTray::updateNewMessageNotification(KMFolder * fldr)
 
 void KMSystemTray::updateNewMessages()
 {
-  for ( QMap<KMFolder*, bool>::Iterator it = mPendingUpdates.begin();
+  for ( QMap<QGuardedPtr<KMFolder>, bool>::Iterator it = mPendingUpdates.begin();
         it != mPendingUpdates.end(); ++it)
   {
   KMFolder *fldr = it.key();
+  if ( !fldr ) // deleted folder
+    continue;
 
   /** The number of unread messages in that folder */
   int unread = fldr->countUnread();
diff --git a/kmsystemtray.h b/kmsystemtray.h
index bed91281a..cad384f1e 100644
--- a/kmsystemtray.h
+++ b/kmsystemtray.h
@@ -84,7 +84,7 @@ private:
 
   QPtrVector<KMFolder> mPopupFolders;
   QMap<QGuardedPtr<KMFolder>, int> mFoldersWithUnread;
-  QMap<KMFolder*, bool> mPendingUpdates;
+  QMap<QGuardedPtr<KMFolder>, bool> mPendingUpdates;
   QTimer *mUpdateTimer;
   time_t mLastUpdate;
 };