diff options
author | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-07-10 15:25:39 (GMT) |
---|---|---|
committer | Tomeu Vizoso <tomeu@sugarlabs.org> | 2009-07-10 15:25:39 (GMT) |
commit | 410fd4e62af94bc84c81e71d95ca8acb5e2370bb (patch) | |
tree | 0831c579169fc06cfaed42ab732487f76d53005f /src | |
parent | 1f10112d8ac2bb7609c23882bac6462a0f50af62 (diff) | |
parent | 5af716160e6cbb39a4853ee2cb89eb4abed04c76 (diff) |
Merge branch 'master' of gitorious@git.sugarlabs.org:sugar/mainline
Diffstat (limited to 'src')
-rw-r--r-- | src/jarabe/desktop/meshbox.py | 8 | ||||
-rw-r--r-- | src/jarabe/model/network.py | 9 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/jarabe/desktop/meshbox.py b/src/jarabe/desktop/meshbox.py index abbdaa6..5e3658c 100644 --- a/src/jarabe/desktop/meshbox.py +++ b/src/jarabe/desktop/meshbox.py @@ -1,4 +1,5 @@ # Copyright (C) 2006-2007 Red Hat, Inc. +# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -46,6 +47,7 @@ from jarabe.model import bundleregistry from jarabe.model import network from jarabe.model import shell from jarabe.model.network import Settings +from jarabe.model.network import IP4Config from jarabe.model.network import WirelessSecurity _NM_SERVICE = 'org.freedesktop.NetworkManager' @@ -228,7 +230,8 @@ class AccessPointView(CanvasPulsingIcon): if state == network.DEVICE_STATE_ACTIVATED: connection = network.find_connection(self._name) if connection: - connection.set_connected() + if self._mode == network.NM_802_11_MODE_INFRA: + connection.set_connected() icon_name = '%s-connected' % _ICON_NAME else: @@ -357,6 +360,9 @@ class AccessPointView(CanvasPulsingIcon): settings.wireless.mode = 'infrastructure' elif self._mode == network.NM_802_11_MODE_ADHOC: settings.wireless.mode = 'adhoc' + settings.wireless.band = 'bg' + settings.ip4_config = IP4Config() + settings.ip4_config.method = 'shared' wireless_security = self._get_security() settings.wireless_security = wireless_security diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index bff5197..2607005 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -1,4 +1,5 @@ # Copyright (C) 2008 Red Hat, Inc. +# Copyright (C) 2009 Tomeu Vizoso, Simon Schampijer # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -103,7 +104,7 @@ class Wireless(object): self.ssid = None self.security = None self.mode = None - self.channel = None + self.band = None def get_dict(self): wireless = {'ssid': self.ssid} @@ -111,8 +112,8 @@ class Wireless(object): wireless['security'] = self.security if self.mode: wireless['mode'] = self.mode - if self.channel: - wireless['channel'] = self.channel + if self.band: + wireless['band'] = self.band return wireless class Connection(object): @@ -138,7 +139,6 @@ class IP4Config(object): def get_dict(self): ip4_config = {} - print self.method if self.method is not None: ip4_config['method'] = self.method return ip4_config @@ -269,7 +269,6 @@ class NMSettingsConnection(dbus.service.Object): if self._settings.connection.timestamp is not None: config.set(identifier, 'timestamp', self._settings.connection.timestamp) - if self._settings.wireless_security is not None: if self._settings.wireless_security.key_mgmt is not None: config.set(identifier, 'key-mgmt', |