4 files changed, 20 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index fdfab98..7ff3ed0 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -247,6 +247,7 @@ void MainController::resetCurrentError() {
 }
 
 void MainController::handleConnected() {
+	boundJID_ = client_->getBoundJID();
 	loginWindow_->setIsLoggingIn(false);
 	resetCurrentError();
 	resetPendingReconnects();
@@ -419,7 +420,11 @@ void MainController::performLoginFromCachedCredentials() {
 		/* In case we're in the middle of another login, make sure they don't overlap */
 		client_->disconnect();
 	}
-	client_->connect();
+	if (boundJID_.isValid() && jid_.isBare()) {
+		client_->connect(boundJID_);
+	} else {
+		client_->connect();
+	}
 }
 
 void MainController::handleError(const ClientError& error) {
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index c0885b6..ed2cee2 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -157,6 +157,7 @@ namespace Swift {
 			boost::shared_ptr<DiscoInfo> serverDiscoInfo_;
 			XMPPRoster* xmppRoster_;;
 			JID jid_;
+			JID boundJID_;
 			PresenceOracle* presenceOracle_;
 			SystemTrayController* systemTrayController_;
 			SoundEventController* soundEventController_;
diff --git a/Swiften/Client/Client.cpp b/Swiften/Client/Client.cpp
index 13e7a9b..fe9bc60 100644
--- a/Swiften/Client/Client.cpp
+++ b/Swiften/Client/Client.cpp
@@ -42,10 +42,20 @@ bool Client::isAvailable() {
 	return session_ && session_->getState() == ClientSession::Initialized;
 }
 
+/** FIXME: implement */
+JID Client::getBoundJID() {
+	return JID();
+}
+
 void Client::connect() {
 	connect(jid_.getDomain());
 }
 
+void Client::connect(const JID& jid) {
+	jid_ = jid;
+	connect();
+}
+
 void Client::connect(const String& host) {
 	assert(!connector_); // Crash on reconnect is here.
 	connector_ = Connector::create(host, &resolver_, connectionFactory_, timerFactory_);
diff --git a/Swiften/Client/Client.h b/Swiften/Client/Client.h
index cb07036..ca729a7 100644
--- a/Swiften/Client/Client.h
+++ b/Swiften/Client/Client.h
@@ -39,6 +39,7 @@ namespace Swift {
 			void setCertificate(const String& certificate);
 
 			void connect();
+			void connect(const JID& jid);
 			void connect(const String& host);
 			void disconnect();
 			
@@ -54,6 +55,8 @@ namespace Swift {
 				return iqRouter_;
 			}
 
+			JID getBoundJID();
+
 		public:
 			boost::signal<void (const ClientError&)> onError;
 			boost::signal<void ()> onConnected;