diff options
author | Sascha Silbe <sascha@silbe.org> | 2009-11-11 17:00:49 (GMT) |
---|---|---|
committer | Sascha Silbe <sascha@silbe.org> | 2009-11-11 17:00:49 (GMT) |
commit | 737a2927a6cd70f3d3cb16655d164e794cb87daa (patch) | |
tree | 87e5c6982e29477f26f175f35ce4ce0e1aa0915f | |
parent | ff03e39499c140bd79f2889df03eb87dba2ad2a7 (diff) | |
parent | fde1a7efdc4a9789ab9da486a3b88ca6ad28b0e8 (diff) |
Merge commit 'refs/top-bases/t/vnc' into t/vnc
-rw-r--r-- | extensions/deviceicon/network.py | 2 | ||||
-rw-r--r-- | src/jarabe/desktop/meshbox.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/extensions/deviceicon/network.py b/extensions/deviceicon/network.py index 0803936..dd1a70c 100644 --- a/extensions/deviceicon/network.py +++ b/extensions/deviceicon/network.py @@ -424,7 +424,7 @@ class WirelessDeviceView(ToolButton): settings.wireless.band = 'bg' settings.wireless.mode = 'adhoc' settings.ip4_config = IP4Config() - settings.ip4_config.method = 'shared' + settings.ip4_config.method = 'link-local' connection = network.add_connection(connection_name, settings) diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index 2ba23d5..f8c446d 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -373,7 +373,7 @@ class AccessPointView(CanvasPulsingIcon): settings.wireless.mode = 'adhoc' settings.wireless.band = 'bg' settings.ip4_config = IP4Config() - settings.ip4_config.method = 'shared' + settings.ip4_config.method = 'link-local' wireless_security = self._get_security() settings.wireless_security = wireless_security |