summaryrefslogtreecommitdiffstats
path: root/Swift
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2012-11-24 12:34:44 (GMT)
committerSwift Review <review@swift.im>2012-11-24 14:10:23 (GMT)
commit4ff5cc2b1f3889ba631f523d14ec2bab1092bfb4 (patch)
tree1fa563a7ce575649f0bc12c908f7a76900d9dc6d /Swift
parent1c5bbbaa4e5247d86f6336ebba8a4c704589f11a (diff)
downloadswift-4ff5cc2b1f3889ba631f523d14ec2bab1092bfb4.zip
swift-4ff5cc2b1f3889ba631f523d14ec2bab1092bfb4.tar.bz2
Fixed bug in connection settings dialog.
Host and proxy port in manual tab were not initialized correctly. Change-Id: Ie2bc059afae59541a12ea905d443fa541217ec19 Resolves: #1179
Diffstat (limited to 'Swift')
-rw-r--r--Swift/QtUI/QtConnectionSettingsWindow.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtConnectionSettingsWindow.cpp b/Swift/QtUI/QtConnectionSettingsWindow.cpp
index 040b92a..ea693cf 100644
--- a/Swift/QtUI/QtConnectionSettingsWindow.cpp
+++ b/Swift/QtUI/QtConnectionSettingsWindow.cpp
@@ -69,25 +69,25 @@ QtConnectionSettingsWindow::QtConnectionSettingsWindow(const ClientOptions& opti
ui.manual_allowCompression->setChecked(options.useStreamCompression);
if (!options.manualHostname.empty()) {
ui.manual_manualHost->setChecked(true);
ui.manual_manualHostName->setText(P2QSTRING(options.manualHostname));
if (options.manualPort >=0) {
ui.manual_manualHostPort->setText(P2QSTRING(boost::lexical_cast<std::string>(options.manualPort)));
}
}
ui.manual_proxyType->setCurrentIndex(options.proxyType);
if (!options.manualProxyHostname.empty()) {
ui.manual_manualProxy->setChecked(true);
ui.manual_manualProxyHost->setText(P2QSTRING(options.manualProxyHostname));
- ui.manual_manualHostPort->setText(P2QSTRING(boost::lexical_cast<std::string>(options.manualProxyPort)));
+ ui.manual_manualProxyPort->setText(P2QSTRING(boost::lexical_cast<std::string>(options.manualProxyPort)));
}
}
} else {
ui.connectionMethod->setCurrentIndex(2);
ui.bosh_uri->setText(P2QSTRING(options.boshURL.toString()));
if (!options.boshHTTPConnectProxyURL.isEmpty()) {
ui.bosh_manualProxy->setChecked(true);
ui.bosh_manualProxyHost->setText(P2QSTRING(options.boshHTTPConnectProxyURL.getHost()));
ui.bosh_manualProxyPort->setText(P2QSTRING(boost::lexical_cast<std::string>(options.boshHTTPConnectProxyURL.getPort())));
}
}
}