3 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Controllers/EventNotifier.cpp b/Swift/Controllers/EventNotifier.cpp
index 7ecc27c..e643ab3 100644
--- a/Swift/Controllers/EventNotifier.cpp
+++ b/Swift/Controllers/EventNotifier.cpp
@@ -1,64 +1,65 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #include "Swift/Controllers/EventNotifier.h"
 
 #include <boost/bind.hpp>
 
 #include <Swift/Controllers/Intl.h>
 #include <Swiften/Base/format.h>
 #include "Swift/Controllers/XMPPEvents/EventController.h"
 #include "SwifTools/Notifier/Notifier.h"
 #include "Swiften/Avatars/AvatarManager.h"
 #include "Swiften/Client/NickResolver.h"
 #include "Swiften/JID/JID.h"
 #include "Swift/Controllers/XMPPEvents/MessageEvent.h"
 #include "Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h"
 #include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
 #include "Swift/Controllers/Settings/SettingsProvider.h"
 
 namespace Swift {
 
 EventNotifier::EventNotifier(EventController* eventController, Notifier* notifier, AvatarManager* avatarManager, NickResolver* nickResolver) : eventController(eventController), notifier(notifier), avatarManager(avatarManager), nickResolver(nickResolver) {
 	eventController->onEventQueueEventAdded.connect(boost::bind(&EventNotifier::handleEventAdded, this, _1));
 }
 
 EventNotifier::~EventNotifier() {
+	notifier->purgeCallbacks();
 	eventController->onEventQueueEventAdded.disconnect(boost::bind(&EventNotifier::handleEventAdded, this, _1));
 }
 
 void EventNotifier::handleEventAdded(boost::shared_ptr<StanzaEvent> event) {
 	if (event->getConcluded()) {
 		return;
 	}
 	if (boost::shared_ptr<MessageEvent> messageEvent = boost::dynamic_pointer_cast<MessageEvent>(event)) {
 		JID jid = messageEvent->getStanza()->getFrom();
 		std::string title = nickResolver->jidToNick(jid);
 		if (!messageEvent->getStanza()->isError() && !messageEvent->getStanza()->getBody().empty()) {
 			JID activationJID = jid;
 			if (messageEvent->getStanza()->getType() == Message::Groupchat) {
 				activationJID = jid.toBare();
 			}
 			notifier->showMessage(Notifier::IncomingMessage, title, messageEvent->getStanza()->getBody(), avatarManager->getAvatarPath(jid), boost::bind(&EventNotifier::handleNotificationActivated, this, activationJID));
 		}
 	}
 	else if(boost::shared_ptr<SubscriptionRequestEvent> subscriptionEvent = boost::dynamic_pointer_cast<SubscriptionRequestEvent>(event)) {
 		JID jid = subscriptionEvent->getJID();
 		std::string title = jid;
 		std::string message = str(format(QT_TRANSLATE_NOOP("", "%1% wants to add you to his/her contact list")) % nickResolver->jidToNick(jid));
 		notifier->showMessage(Notifier::SystemMessage, title, message, boost::filesystem::path(), boost::function<void()>());
 	}
 	else if(boost::shared_ptr<ErrorEvent> errorEvent = boost::dynamic_pointer_cast<ErrorEvent>(event)) {
 		notifier->showMessage(Notifier::SystemMessage, QT_TRANSLATE_NOOP("", "Error"), errorEvent->getText(), boost::filesystem::path(), boost::function<void()>());
 	}
 }
 
 
 void EventNotifier::handleNotificationActivated(JID jid) {
 	onNotificationActivated(jid);
 }
 
 }
diff --git a/Swift/QtUI/WindowsNotifier.cpp b/Swift/QtUI/WindowsNotifier.cpp
index 1789451..212f0ca 100644
--- a/Swift/QtUI/WindowsNotifier.cpp
+++ b/Swift/QtUI/WindowsNotifier.cpp
@@ -15,36 +15,40 @@
 #include "QtSwiftUtil.h"
 
 namespace Swift {
 
 WindowsNotifier::WindowsNotifier(const std::string& name, const boost::filesystem::path& icon, QSystemTrayIcon* tray) : tray(tray) {
 	notifierWindow = new QtWin32NotifierWindow();
 	snarlNotifier = new SnarlNotifier(name, notifierWindow, icon);
 	connect(tray, SIGNAL(messageClicked()), SLOT(handleMessageClicked()));
 }
 
 WindowsNotifier::~WindowsNotifier() {
 	delete snarlNotifier;
 	delete notifierWindow;
 }
 
 void WindowsNotifier::showMessage(Type type, const std::string& subject, const std::string& description, const boost::filesystem::path& picture, boost::function<void()> callback) {
 	if (snarlNotifier->isAvailable()) {
 		snarlNotifier->showMessage(type, subject, description, picture, callback);
 		return;
 	}
 	std::vector<Notifier::Type> defaultTypes = getDefaultTypes();
 	if (std::find(defaultTypes.begin(), defaultTypes.end(), type) == defaultTypes.end()) {
 		return;
 	}
 	lastCallback = callback;
 	int timeout = (type == IncomingMessage || type == SystemMessage) ? DEFAULT_MESSAGE_NOTIFICATION_TIMEOUT_SECONDS : DEFAULT_STATUS_NOTIFICATION_TIMEOUT_SECONDS;
 	tray->showMessage(P2QSTRING(subject), P2QSTRING(description), type == SystemMessage ? QSystemTrayIcon::Information : QSystemTrayIcon::NoIcon, timeout * 1000);
 }
 
 void WindowsNotifier::handleMessageClicked() {
 	if (lastCallback) {
 		lastCallback();
 	}
 }
 
+void WindowsNotifier::purgeCallbacks() {
+	lastCallback = boost::function<void()>();
+}
+
 }
diff --git a/Swift/QtUI/WindowsNotifier.h b/Swift/QtUI/WindowsNotifier.h
index 062b76f..b2b5577 100644
--- a/Swift/QtUI/WindowsNotifier.h
+++ b/Swift/QtUI/WindowsNotifier.h
@@ -1,36 +1,37 @@
 /*
  * Copyright (c) 2010 Remko Tronçon
  * Licensed under the GNU General Public License v3.
  * See Documentation/Licenses/GPLv3.txt for more information.
  */
 
 #pragma once
 
 #include <map>
 
 #include <QObject>
 #include <SwifTools/Notifier/Notifier.h>
 #include <SwifTools/Notifier/SnarlNotifier.h>
 
 class QSystemTrayIcon;
 
 namespace Swift {
 	class WindowsNotifier : public QObject, public Notifier {
 			Q_OBJECT
 
 		public:
 			WindowsNotifier(const std::string& name, const boost::filesystem::path& icon, QSystemTrayIcon* tray);
 			~WindowsNotifier();
 
 			virtual void showMessage(Type type, const std::string& subject, const std::string& description, const boost::filesystem::path& picture, boost::function<void()> callback);
-		
+			virtual void purgeCallbacks();
+
 		private slots:
 			void handleMessageClicked();
 
 		private:
 			QSystemTrayIcon* tray;
 			Win32NotifierWindow* notifierWindow;
 			SnarlNotifier* snarlNotifier;
 			boost::function<void()> lastCallback;
 	};
 }