2 files changed, 9 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index c4d34d8..2ae110b 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -181,12 +181,17 @@ void MainController::handleConnected() {
 }
 
 void MainController::handleEventQueueLengthChange(int count) {
 	application_->getApplicationMessageDisplay()->setMessage(count == 0 ? "" : boost::lexical_cast<std::string>(count).c_str());
 }
 
+void MainController::reconnectAfterError() {
+	performLoginFromCachedCredentials();
+	sendPresence(queuedPresence_);
+}
+
 void MainController::handleChangeStatusRequest(StatusShow::Type show, const String &statusText) {
 	boost::shared_ptr<Presence> presence(new Presence());
 	if (show == StatusShow::None) {
 		// FIXME: This is wrong. None doesn't mean unavailable
 		presence->setType(Presence::Unavailable);
 	}
@@ -284,12 +289,15 @@ void MainController::handleError(const ClientError& error) {
 	}
 	if (!rosterController_) { //hasn't been logged in yet
 		signOut();
 		loginWindow_->setMessage(message);
 	}
 	logout();
+	if (rosterController_) {
+		//reconnectAfterError();
+	}
 }
 
 void MainController::handleCancelLoginRequest() {
 	signOut();
 }
 
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index db6a110..df6901d 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -74,12 +74,13 @@ namespace Swift {
 			void logout();
 			void signOut();
 
 			virtual bool isMUC(const JID& muc) const;
 	
 			void performLoginFromCachedCredentials();
+			void reconnectAfterError();
 			void setManagersEnabled(bool enabled);
 			Client* client_;
 			ChatWindowFactory* chatWindowFactory_;
 			MainWindowFactory* mainWindowFactory_;
 			LoginWindowFactory* loginWindowFactory_;
 			TreeWidgetFactory* treeWidgetFactory_;