Merge lp://qastaging/~cszikszoy/docky/proxydocky into lp://qastaging/docky
Proposed by
Chris S.
Status: | Merged |
---|---|
Merged at revision: | 1296 |
Proposed branch: | lp://qastaging/~cszikszoy/docky/proxydocky |
Merge into: | lp://qastaging/docky |
Diff against target: |
362 lines (+158/-29) 9 files modified
Docky.Services/Docky.Services/DockServices.cs (+5/-0) Docky.Services/Docky.Services/IPreferences.cs (+3/-0) Docky.Services/Docky.Services/Preferences.cs (+20/-0) Docky.Services/Docky.Services/SystemService.cs (+74/-3) Docky/Docky/Docky.cs (+2/-1) StandardPlugins/GMail/src/GMailAtom.cs (+15/-10) StandardPlugins/NPR/src/NPR.cs (+19/-0) StandardPlugins/NPR/src/Station.cs (+16/-12) StandardPlugins/Weather/src/Sources/AbstractWeatherSource.cs (+4/-3) |
To merge this branch: | bzr merge lp://qastaging/~cszikszoy/docky/proxydocky |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Robert Dyer (community) | Needs Information | ||
Review via email:
|
Description of the change
add proxy support and update all docklets to use proxy settings.
To post a comment you must log in.
Ignore lines 55-58 of the diff. That was just there for debug. I've already removed that in my branch. It's now just: http_proxy/ use_http_ proxy", false);
return GConf.Get<bool> ("/system/