- don't rely on the QSettings for cases ProxyUse and ProxySocksVersion and query the real values via the GetProxy() call
- add a missing "succesful =" for case ProxyUse in ::setData()
This is based on #1859!
make optionsmodel query real proxy state for ::data() #1899
pull Diapolo wants to merge 1 commits into bitcoin:master from Diapolo:proxy_optionsmodel changing 1 files +12 −5-
Diapolo commented at 11:34 AM on October 2, 2012: none
-
TheBlueMatt commented at 7:07 PM on October 2, 2012: member
See-also: https://github.com/TheBlueMatt/bitcoin/commit/22e96a1aee5196fe2f33c2faa35320d00c6499f4 which was the first commit in #1453
-
laanwj commented at 7:55 PM on October 2, 2012: member
@TheBlueMatt why is that part of the windows upgrader pull? :)
-
TheBlueMatt commented at 7:57 PM on October 2, 2012: member
Because there was discussion of the proxy stuff in that pull, so I coded it while I was on that branch...probably should have been separate, but...meh
-
Diapolo commented at 8:16 PM on October 2, 2012: none
@TheBlueMatt I didn't know that you had worked on that part, sorry. Apart from that I think my pull is smoother in the end, as we don't need a GetProxySocksVersion() function, which is the result from a discussion with @sipa and @laanwj.
I'm currently trying to overhaul the whole proxy stuff in the core and afterwards want to extend the Qt proxy / networking options with it.
Btw. funny thing is, that the starting point for my work on that part was your issue that we miss a lock for proxy structures :-D.
-
TheBlueMatt commented at 8:29 PM on October 2, 2012: member
No big deal, I just found it funny since IIRC that proxy stuff that I wrote was a result of a discussion with you on the auto-update thread.
-
Diapolo commented at 8:43 PM on October 2, 2012: none
I have to admit I did not have that in my mind anymore :-/, sorry. But I want to support you, to get that Windows update stuff in before 0.8. I hope this proxy stuff get's in soon (unsure about 0.7.1 though), so you don't need to rebase too often as some other code parts that are touched by your pull have changed already.
The more time I'm working on Bitcoin-Qt and with other devs the more insight I get, which leads to question former views I had on certain pulls / ideas :).
-
-
Diapolo commented at 11:16 AM on October 4, 2012: none
@laanwj The current proxy related pulls are not there, only because I have some GUI ideas in my mind, they make proxy usage better and extend it with nice new stuff + fix the missing lock. @TheBlueMatt As you opened the proxy lock issue, can you perhaps take a look at the code and ACK or give a short feedback? Can you rebase your Windows-update pull to current master or (if you want to) onto this one? I'll then try that whole stuff out in the following days :).
Edit: Btw., is the Pull tester offline?
-
sipa commented at 9:20 PM on October 4, 2012: member
Didn't test, but ACK on changes to core.
-
TheBlueMatt commented at 4:09 AM on October 5, 2012: member
@Diapolo Ill look at this in the next few days, and...not sure when Ill get around to updating the auto-update stuff... re: pull-tester, dont think so, but it seems like the jenkins server has mysteriously slowed down even more recently...not sure whats up with that (I chose to blame dnsseed, but I havent looked into it, so I cant blame @sipa for that)...Ive got some new hardware I may be able to throw into the mix, though, if I get the time to set up some sync mechanism...
-
BitcoinPullTester commented at 8:03 PM on October 6, 2012: none
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/63275485658818fa52ae5245e9a5dfd7f87ee84c for binaries and test log.
-
5e5c102f2f
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 - add a missing "succesful =" for case ProxyUse in ::setData()
-
BitcoinPullTester commented at 12:52 PM on October 20, 2012: none
Automatic sanity-testing: PASSED, see http://jenkins.bluematt.me/pull-tester/5e5c102f2f901a19fda6ff877ab4195a88e4b703 for binaries and test log.
- sipa referenced this in commit e74d0ab675 on Oct 25, 2012
- sipa merged this on Oct 25, 2012
- sipa closed this on Oct 25, 2012
- laudney referenced this in commit 08e82859a8 on Mar 19, 2014
- DrahtBot locked this on Sep 8, 2021
