summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-11-13 10:15:29 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-11-13 10:50:15 (GMT)
commit59c1b26ba8f85bfb52f7c8e95bf1eca208d3de7b (patch)
tree8b911fee527973ec3406640b0dfa8c7dcd6cf8b6 /Swift
parentd26ad781dd4d1fa2019d31d5effabb9d662a8417 (diff)
downloadswift-contrib-59c1b26ba8f85bfb52f7c8e95bf1eca208d3de7b.zip
swift-contrib-59c1b26ba8f85bfb52f7c8e95bf1eca208d3de7b.tar.bz2
Allow BOSH URL setting again.
Also fixes use of getPort() so that HTTP headers aren't all for port :1. Change-Id: I8ead8a7f4826d1105bf1feafea21e6139e803de7 Resolves: #1178
Diffstat (limited to 'Swift')
-rw-r--r--Swift/Controllers/MainController.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 1b0b595..28d890d 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -473,7 +473,8 @@ void MainController::handleLoginRequest(const std::string &username, const std::
profileSettings_->storeString("jid", username);
profileSettings_->storeString("certificate", certificatePath);
profileSettings_->storeString("pass", (remember || loginAutomatically) ? password : "");
- profileSettings_->storeString("options", serializeClientOptions(options));
+ std::string optionString = serializeClientOptions(options);
+ profileSettings_->storeString("options", optionString);
settings_->storeSetting(SettingConstants::LAST_LOGIN_JID, username);
settings_->storeSetting(SettingConstants::LOGIN_AUTOMATICALLY, loginAutomatically);
loginWindow_->addAvailableAccount(profileSettings_->getStringSetting("jid"), profileSettings_->getStringSetting("pass"), profileSettings_->getStringSetting("certificate"), options);