-
Committer:
Tarmac
-
Author(s):
Diego Sarmentero, Manuel de la Pena, Alejandro J. Cura, Natalia B. Bidart, manuel.delapena at canonical
-
Date:
2012-04-03 13:45:14 UTC
-
mfrom:
(832.1.2 stable-3-0-update-2.99.92)
-
Revision ID:
tarmac-20120403134514-433lrkf76tc3pr8m
- Updating from trunk up to revno 940:
[ Alejandro J. Cura <alecu@canonical.com> ]
- Make windows Keyring no longer depend on twisted (LP: #969159).
- Daemonize the network state thread under windows (LP: #963404).
[ Diego Sarmentero <diego.sarmentero@canonical.com> ]
- Setting the style directly to the widget to remove the one
from the application (LP: #969455).
[ Manuel de la Pena <manuel.delapena@canonical.com> ]
- Fixed the issue where we use an empty proxy url when the proxy
was not set in gsettings (LP: #969280).
- Changed the way in which the proxy settings are retrieved on
windows to ensure that proxy() returns the correct one and not a
null initialized one. This fixes the creds retrieval issue
because the hostName is not longer '' (LP: #958938).