bitcoin/bitcoin — pull request #1899 by Diapolo (2012-10-02 11:34:27+00:00)
Title: make optionsmodel query real proxy state for ::data()

- don't rely on the QSettings for cases ProxyUse and ProxySocksVersion and
query the real values via the GetProxy() call

This is based on #1859!