Gwibber

Merge lp:~mhall119/gwibber/fixes-658554 into lp:gwibber

  1. fixes-658554
  2. Merge into trunk
Proposed by Michael Hall
Status: Rejected
Rejected by: Robert Bruce Park
Proposed branch: lp:~mhall119/gwibber/fixes-658554
Merge into: lp:gwibber
Diff against target: 12 lines (+2/-0)
1 file modified
gwibber/microblog/network.py (+2/-0)
To merge this branch: bzr merge lp:~mhall119/gwibber/fixes-658554
Reviewer Review Type Date Requested Status
Robert Bruce Park Disapprove
gwibber-committers Pending
Review via email: mp+38861@code.launchpad.net
To post a comment you must log in.
lp:~mhall119/gwibber/fixes-658554 updated
903. By Jay Deiman

Applied patch from Jay Deiman, makes Gwibber run over SOCKS4/5 proxy

Revision history for this message
Robert Bruce Park (robru) wrote :

Thanks for taking the time to submit this patch, unfortunately Gwibber has gone through extensive changes recently and your patch no longer applies to the latest codebase.

Fortunately, the bug you were attempting to fix is no longer present in the current codebase. The gwibber-service backend has been radically overhauled, and renamed to friends-service. The new friends-service is using libsoup, which allows us to honor the GNOME proxy settings transparently.

Please try out the latest Gwibber, I think you'll be quite pleased with what we've accomplished.

review: Disapprove

Unmerged revisions

903. By Jay Deiman

Applied patch from Jay Deiman, makes Gwibber run over SOCKS4/5 proxy

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber/microblog/network.py'
2--- gwibber/microblog/network.py 2010-10-13 18:58:23 +0000
3+++ gwibber/microblog/network.py 2010-10-19 17:08:40 +0000
4@@ -47,6 +47,8 @@
5 if (proxy.find("direct://") != 0):
6 log.logger.debug("using proxy %s", proxy)
7 self.curl.setopt(pycurl.PROXY, proxy)
8+ if proxy.startswith("socks"):
9+ self.curl.setopt(pycurl.PROXYTYPE, pycurl.PROXYTYPE_SOCKS4)
10
11 try:
12 self.curl.perform()