2 files changed, 16 insertions, 3 deletions
diff --git a/Swiften/Client/ClientSessionStanzaChannel.cpp b/Swiften/Client/ClientSessionStanzaChannel.cpp
index 3d7b9f7..3dc8c59 100644
--- a/Swiften/Client/ClientSessionStanzaChannel.cpp
+++ b/Swiften/Client/ClientSessionStanzaChannel.cpp
@@ -1,16 +1,27 @@
 /*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #include <Swiften/Client/ClientSessionStanzaChannel.h>
-#include <boost/bind.hpp>
 #include <iostream>
+#include <boost/bind.hpp>
 namespace Swift {
+ClientSessionStanzaChannel::~ClientSessionStanzaChannel() {
+        if (session) {
+                session->onFinished.disconnect(boost::bind(&ClientSessionStanzaChannel::handleSessionFinished, this, _1));
+                session->onStanzaReceived.disconnect(boost::bind(&ClientSessionStanzaChannel::handleStanza, this, _1));
+                session->onStanzaAcked.disconnect(boost::bind(&ClientSessionStanzaChannel::handleStanzaAcked, this, _1));
+                session->onInitialized.disconnect(boost::bind(&ClientSessionStanzaChannel::handleSessionInitialized, this));
+                session.reset();
+        }
+}
 void ClientSessionStanzaChannel::setSession(boost::shared_ptr<ClientSession> session) {
        assert(!this->session);
        this->session = session;
diff --git a/Swiften/Client/ClientSessionStanzaChannel.h b/Swiften/Client/ClientSessionStanzaChannel.h
index 1104416..0ffcd9d 100644
--- a/Swiften/Client/ClientSessionStanzaChannel.h
+++ b/Swiften/Client/ClientSessionStanzaChannel.h
@@ -12,8 +12,8 @@
 #include <Swiften/Base/IDGenerator.h>
 #include <Swiften/Client/ClientSession.h>
 #include <Swiften/Client/StanzaChannel.h>
-#include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/IQ.h>
+#include <Swiften/Elements/Message.h>
 #include <Swiften/Elements/Presence.h>
 namespace Swift {
@@ -22,6 +22,8 @@ namespace Swift {
         */
        class SWIFTEN_API ClientSessionStanzaChannel : public StanzaChannel {
                public:
+                        virtual ~ClientSessionStanzaChannel();
                        void setSession(boost::shared_ptr<ClientSession> session);
                        void sendIQ(boost::shared_ptr<IQ> iq);