← Back to branch summary

~noskcaj/ubuntu/vivid/banshee-community-extensions/merge

« back to all changes in this revision

Viewing changes to src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Network/HttpUtils.cs

  • Committer: Package Import Robot
  • Author(s): Chow Loong Jin
  • Date: 2012-04-09 22:56:37 UTC
  • mfrom: (4.2.11 sid)
  • Revision ID: package-import@ubuntu.com-20120409225637-95tnzf6blgujwiff
Tags: 2.4.0-1ubuntu1
https://launchpad.net/bugs/977236
* [8075ffb] Merge from Debian Unstable (LP: #977236), remaining changes:
  + Enable AppIndicator extension

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Lyrics/Banshee.Lyrics/Banshee.Lyrics.Network/HttpUtils.cs
48
48
            HttpWebRequest request = (HttpWebRequest)WebRequest.Create (url);
49
49
            request.Timeout = 6000;
50
50
 
51
 
            if (ProxyManager.Instance.isHttpProxy ()) {
52
 
                try {
53
 
                    request.Proxy = ProxyManager.Instance.getProxy (url);
54
 
                } catch (Exception e) {
55
 
                    Hyena.Log.Exception ("Cannot get the proxy", e);
56
 
                    return null;
57
 
                }
58
 
            }
59
 
 
60
51
            using (var response = (HttpWebResponse)request.GetResponse ()) {
61
52
                if (response.ContentLength == 0) {
62
53
                    return null;