1 files changed, 8 insertions, 2 deletions
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 2406b0f..bf651cc 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -35,11 +35,11 @@ Client::~Client() {
        delete timerFactory_;
        delete connectionFactory_;
 }
 bool Client::isAvailable() {
-        return session_;
+        return session_ && session_->getState() == ClientSession::Initialized;
 }
 void Client::connect() {
        connect(jid_.getDomain());
 }
@@ -78,11 +78,11 @@ void Client::handleConnectorFinished(boost::shared_ptr<Connection> connection, C
                sessionStream_->onDataRead.connect(boost::bind(&Client::handleDataRead, this, _1));
                sessionStream_->onDataWritten.connect(boost::bind(&Client::handleDataWritten, this, _1));
                sessionStream_->initialize();
                session_ = ClientSession::create(jid_, sessionStream_);
-                session_->onInitialized.connect(boost::bind(boost::ref(onConnected)));
+                session_->onInitialized.connect(boost::bind(&Client::handleSessionInitialized, this));
                session_->onStanzaAcked.connect(boost::bind(&Client::handleStanzaAcked, this, _1));
                session_->onFinished.connect(boost::bind(&Client::handleSessionFinished, this, _1));
                session_->onNeedCredentials.connect(boost::bind(&Client::handleNeedCredentials, this));
                session_->onStanzaReceived.connect(boost::bind(&Client::handleStanza, this, _1));
                session_->start();
@@ -160,10 +160,11 @@ void Client::setCertificate(const String& certificate) {
 }
 void Client::handleSessionFinished(boost::shared_ptr<Error> error) {
        session_.reset();
        closeConnection();
+        onAvailableChanged(false);
        if (error) {
                ClientError clientError;
                if (boost::shared_ptr<ClientSession::Error> actualError = boost::dynamic_pointer_cast<ClientSession::Error>(error)) {
                        switch(actualError->type) {
                                case ClientSession::Error::AuthenticationFailedError:
@@ -240,6 +241,11 @@ void Client::handleDataWritten(const String& data) {
 void Client::handleStanzaAcked(boost::shared_ptr<Stanza> stanza) {
        onStanzaAcked(stanza);
 }
+void Client::handleSessionInitialized() {
+        onConnected();
+        onAvailableChanged(true);
+}
 }