aboutsummaryrefslogtreecommitdiff
path: root/src/qt/optionsmodel.cpp
diff options
context:
space:
mode:
authorGavin Andresen <[email protected]>2013-08-22 01:54:28 -0700
committerGavin Andresen <[email protected]>2013-08-22 01:54:28 -0700
commite62f8d72f349aec0865268c089ae99fedd314af1 (patch)
tree7735f34781f1ced27553b202bceaa74048018636 /src/qt/optionsmodel.cpp
parentMerge pull request #2922 from Diapolo/translations (diff)
parentPayment Protocol: X509-validated payment requests (diff)
downloaddiscoin-e62f8d72f349aec0865268c089ae99fedd314af1.tar.xz
discoin-e62f8d72f349aec0865268c089ae99fedd314af1.zip
Merge pull request #2539 from gavinandresen/paymentrequest
Payment Protocol Work
Diffstat (limited to 'src/qt/optionsmodel.cpp')
-rw-r--r--src/qt/optionsmodel.cpp11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/qt/optionsmodel.cpp b/src/qt/optionsmodel.cpp
index 7ebe5b475..d93a60e1b 100644
--- a/src/qt/optionsmodel.cpp
+++ b/src/qt/optionsmodel.cpp
@@ -290,3 +290,14 @@ qint64 OptionsModel::getTransactionFee()
{
return nTransactionFee;
}
+
+bool OptionsModel::getProxySettings(QString& proxyIP, quint16 &proxyPort) const
+{
+ std::string proxy = GetArg("-proxy", "");
+ if (proxy.empty()) return false;
+
+ CService addrProxy(proxy);
+ proxyIP = QString(addrProxy.ToStringIP().c_str());
+ proxyPort = addrProxy.GetPort();
+ return true;
+}