Merge

shell/Makefile.am

@@ -1,4 +1,4 @@
-SUBDIRS = data model view intro
+SUBDIRS = data hardware model view intro
 
 bin_SCRIPTS = 				\
 	sugar-activity			\

shell/hardware/Makefile.am

@@ -0,0 +1,7 @@
+sugardir = $(pkgdatadir)/shell/hardware
+sugar_PYTHON =				\
+	__init__.py			\
+	hardwaremanager.py		\
+	nmclient.py			\
+	nminfo.py			\
+	wepkeydialog.py

shell/hardware/hardwaremanager.py

@@ -18,20 +18,23 @@ import logging
 
 import dbus
 
-HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
-HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
-HARDWARE_MANAGER_OBJECT_PATH = '/org/laptop/HardwareManager'
+from hardware.nmclient import NMClient
+from _sugar import AudioManager
+
+_HARDWARE_MANAGER_INTERFACE = 'org.laptop.HardwareManager'
+_HARDWARE_MANAGER_SERVICE = 'org.laptop.HardwareManager'
+_HARDWARE_MANAGER_OBJECT_PATH = '/org/laptop/HardwareManager'
+
+COLOR_MODE = 0
+B_AND_W_MODE = 1
 
 class HardwareManager(object):
-    COLOR_MODE = 0
-    B_AND_W_MODE = 1
-
     def __init__(self):
         try:
             bus = dbus.SystemBus()
-            proxy = bus.get_object(HARDWARE_MANAGER_SERVICE,
-                                   HARDWARE_MANAGER_OBJECT_PATH)
-            self._service = dbus.Interface(proxy, HARDWARE_MANAGER_INTERFACE)
+            proxy = bus.get_object(_HARDWARE_MANAGER_SERVICE,
+                                   _HARDWARE_MANAGER_OBJECT_PATH)
+            self._service = dbus.Interface(proxy, _HARDWARE_MANAGER_INTERFACE)
         except dbus.DBusException:
             self._service = None
             logging.error('Hardware manager service not found.')
@@ -56,3 +59,16 @@ class HardwareManager(object):
             self._service.set_keyboard_brightness(False)
         else:
             self._service.set_keyboard_brightness(True)            
+
+def get_hardware_manager():
+    return _hardware_manager
+
+def get_audio_manager():
+    return _audio_manager
+
+def get_network_manager():
+    return _network_manager
+
+_hardware_manager = HardwareManager()
+_audio_manager = AudioManager()
+_network_manager = NMClient()

shell/hardware/nmclient.py

@@ -0,0 +1,577 @@
+#
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import logging
+import os
+
+import dbus
+import dbus.glib
+import dbus.decorators
+import gobject
+import gtk
+
+from hardware.wepkeydialog import WEPKeyDialog
+from hardware import nminfo
+
+IW_AUTH_ALG_OPEN_SYSTEM = 0x00000001
+IW_AUTH_ALG_SHARED_KEY  = 0x00000002
+
+NM_DEVICE_STAGE_STRINGS=("Unknown",
+    "Prepare",
+    "Config",
+    "Need Users Key",
+    "IP Config",
+    "IP Config Get",
+    "IP Config Commit",
+    "Activated",
+    "Failed",
+    "Cancled"
+)
+
+NM_SERVICE = 'org.freedesktop.NetworkManager'
+NM_IFACE = 'org.freedesktop.NetworkManager'
+NM_IFACE_DEVICES = 'org.freedesktop.NetworkManager.Devices'
+NM_PATH = '/org/freedesktop/NetworkManager'
+
+DEVICE_TYPE_UNKNOWN = 0
+DEVICE_TYPE_802_3_ETHERNET = 1
+DEVICE_TYPE_802_11_WIRELESS = 2
+
+NM_DEVICE_CAP_NONE = 0x00000000
+NM_DEVICE_CAP_NM_SUPPORTED = 0x00000001
+NM_DEVICE_CAP_CARRIER_DETECT = 0x00000002
+NM_DEVICE_CAP_WIRELESS_SCAN = 0x00000004
+
+sys_bus = dbus.SystemBus()
+
+NM_802_11_CAP_NONE            = 0x00000000
+NM_802_11_CAP_PROTO_NONE      = 0x00000001
+NM_802_11_CAP_PROTO_WEP       = 0x00000002
+NM_802_11_CAP_PROTO_WPA       = 0x00000004
+NM_802_11_CAP_PROTO_WPA2      = 0x00000008
+NM_802_11_CAP_KEY_MGMT_PSK    = 0x00000040
+NM_802_11_CAP_KEY_MGMT_802_1X = 0x00000080
+NM_802_11_CAP_CIPHER_WEP40    = 0x00001000
+NM_802_11_CAP_CIPHER_WEP104   = 0x00002000
+NM_802_11_CAP_CIPHER_TKIP     = 0x00004000
+NM_802_11_CAP_CIPHER_CCMP     = 0x00008000
+
+class Network(gobject.GObject):
+    __gsignals__ = {
+        'init-failed'     : (gobject.SIGNAL_RUN_FIRST,
+                             gobject.TYPE_NONE, ([])),
+        'strength-changed': (gobject.SIGNAL_RUN_FIRST,
+                             gobject.TYPE_NONE, ([])),
+        'ssid-changed'    : (gobject.SIGNAL_RUN_FIRST,
+                             gobject.TYPE_NONE, ([]))
+    }
+
+    def __init__(self, op):
+        gobject.GObject.__init__(self)
+        self._op = op
+        self._ssid = None
+        self._mode = None
+        self._strength = 0
+        self._valid = False
+
+        obj = sys_bus.get_object(NM_SERVICE, self._op)
+        net = dbus.Interface(obj, NM_IFACE_DEVICES)
+        net.getProperties(reply_handler=self._update_reply_cb,
+                error_handler=self._update_error_cb)
+
+    def _update_reply_cb(self, *props):
+        self._ssid = props[1]
+        self._strength = props[3]
+        self._mode = props[6]
+        caps = props[7]
+        if caps & NM_802_11_CAP_PROTO_WPA or caps & NM_802_11_CAP_PROTO_WPA2:
+            # We do not support WPA at this time, so don't show
+            # WPA-enabled access points in the menu
+            logging.debug("Net(%s): ssid '%s' dropping because WPA[2] unsupported" % (self._op,
+                    self._ssid))
+            self._valid = False
+            self.emit('init-failed')
+        else:
+            self._valid = True
+            logging.debug("Net(%s): ssid '%s', mode %d, strength %d" % (self._op,
+                    self._ssid, self._mode, self._strength))
+
+        self.emit('strength-changed')
+        self.emit('ssid-changed')
+
+    def _update_error_cb(self, err):
+        logging.debug("Net(%s): failed to update. (%s)" % (self._op, err))
+        self._valid = False
+        self.emit('init-failed')
+
+    def get_ssid(self):
+        return self._ssid
+
+    def get_op(self):
+        return self._op
+
+    def get_strength(self):
+        return self._strength
+
+    def set_strength(self, strength):
+        self._strength = strength
+        self.emit('strength-changed')
+
+    def is_valid(self):
+        return self._valid
+
+class Device(gobject.GObject):
+    __gsignals__ = {
+        'init-failed':         (gobject.SIGNAL_RUN_FIRST,
+                                gobject.TYPE_NONE, ([])),
+        'activated':           (gobject.SIGNAL_RUN_FIRST,
+                                gobject.TYPE_NONE, ([])),
+        'deactivated':         (gobject.SIGNAL_RUN_FIRST,
+                                gobject.TYPE_NONE, ([])),
+        'strength-changed':    (gobject.SIGNAL_RUN_FIRST,
+                                gobject.TYPE_NONE,
+                               ([gobject.TYPE_PYOBJECT])),
+        'network-appeared':    (gobject.SIGNAL_RUN_FIRST,
+                                gobject.TYPE_NONE,
+                               ([gobject.TYPE_PYOBJECT])),
+        'network-disappeared': (gobject.SIGNAL_RUN_FIRST,
+                                gobject.TYPE_NONE,
+                               ([gobject.TYPE_PYOBJECT]))
+    }
+
+    def __init__(self, op):
+        gobject.GObject.__init__(self)
+        self._op = op
+        self._iface = None
+        self._type = DEVICE_TYPE_UNKNOWN
+        self._udi = None
+        self._active = False
+        self._strength = 0
+        self._link = False
+        self._valid = False
+        self._networks = {}
+        self._active_net = None
+        self._caps = 0
+
+        obj = sys_bus.get_object(NM_SERVICE, self._op)
+        dev = dbus.Interface(obj, NM_IFACE_DEVICES)
+        dev.getProperties(reply_handler=self._update_reply_cb,
+                error_handler=self._update_error_cb)
+
+    def _update_reply_cb(self, *props):
+        self._iface = props[1]
+        self._type = props[2]
+        self._udi = props[3]
+        self._active = props[4]
+        self._link = props[15]
+        self._caps = props[17]
+
+        if self._type == DEVICE_TYPE_802_11_WIRELESS:
+            old_strength = self._strength
+            self._strength = props[14]
+            if self._strength != old_strength:
+                self.emit('strength-changed', self._strength)
+            self._update_networks(props[20], props[19])
+
+        self._valid = True
+
+        if self._active:
+            self.emit('activated')
+        else:
+            self.emit('deactivated')
+
+    def _update_networks(self, net_ops, active_op):
+        for op in net_ops:
+            net = Network(op)
+            self._networks[op] = net
+            net.connect('init-failed', self._net_init_failed)
+            if op == active_op:
+                self._active_net = op
+
+    def _update_error_cb(self, err):
+        logging.debug("Device(%s): failed to update. (%s)" % (self._op, err))
+        self._valid = False
+        self.emit('init-failed')
+
+    def _net_init_failed(self, net):
+        net_op = net.get_op()
+        if not self._networks.has_key(net_op):
+            return
+        if net_op == self._active_net:
+            self._active_net = None
+        del self._networks[net_op]
+
+    def get_op(self):
+        return self._op
+
+    def get_networks(self):
+        return self._networks.values()
+
+    def get_active_network(self):
+        return self.get_network(self._active_net)
+    
+    def get_network(self, op):
+        if self._networks.has_key(op):
+            return self._networks[op]
+        return None
+
+    def get_network_ops(self):
+        return self._networks.keys()
+
+    def get_strength(self):
+        return self._strength
+
+    def set_strength(self, strength):
+        if strength == self._strength:
+            return False
+
+        if strength >= 0 and strength <= 100:
+            self._strength = strength
+        else:
+            self._strength = 0
+
+        self.emit('strength-changed', self._strength)
+
+    def network_appeared(self, network):
+        if self._networks.has_key(network):
+            return
+        net = Network(network)
+        self._networks[network] = net
+        net.connect('init-failed', self._net_init_failed)
+        self.emit('network-appeared', net)
+
+    def network_disappeared(self, network):
+        if not self._networks.has_key(network):
+            return
+        if network == self._active_net:
+            self._active_net = None
+
+        self.emit('network-disappeared', self._networks[network])
+
+        del self._networks[network]
+
+    def get_active(self):
+        return self._active
+
+    def set_active(self, active, ssid=None):
+        self._active = active
+        if self._type == DEVICE_TYPE_802_11_WIRELESS:
+            if not ssid:
+                self._active_net = None
+            else:
+                for (op, net) in self._networks.items():
+                    if net.get_ssid() == ssid:
+                        self._active_net = op
+
+    def get_type(self):
+        return self._type
+
+    def is_valid(self):
+        return self._valid
+
+    def set_carrier(self, on):
+        self._link = on
+
+    def get_capabilities(self):
+        return self._caps
+
+NM_STATE_UNKNOWN = 0
+NM_STATE_ASLEEP = 1
+NM_STATE_CONNECTING = 2
+NM_STATE_CONNECTED = 3
+NM_STATE_DISCONNECTED = 4
+
+class NMClient(gobject.GObject):
+    __gsignals__ = {
+        'device-activated' : (gobject.SIGNAL_RUN_FIRST,
+                              gobject.TYPE_NONE, 
+                             ([gobject.TYPE_PYOBJECT])),
+        'device-removed'   : (gobject.SIGNAL_RUN_FIRST,
+                              gobject.TYPE_NONE, 
+                             ([gobject.TYPE_PYOBJECT]))
+    }
+
+    def __init__(self):
+        gobject.GObject.__init__(self)
+
+        self.nminfo = None
+        self._nm_present = False
+        self._nm_state = NM_STATE_UNKNOWN
+        self._update_timer = 0
+        self._active_device = None
+        self._devices = {}
+
+        try:
+            self.nminfo = nminfo.NMInfo(self)
+        except RuntimeError:
+            pass
+        self._setup_dbus()
+        if self._nm_present:
+            self._get_nm_state()
+            self._get_initial_devices()
+
+    def get_devices(self):
+        return self._devices
+
+    def _get_nm_state(self):
+        # Grab NM's state
+        self._nm_obj.state(reply_handler=self._get_state_reply_cb, \
+                error_handler=self._get_state_error_cb)
+
+    def _get_state_reply_cb(self, state):
+        self._nm_state = state
+
+    def _get_state_error_cb(self, err):
+        logging.debug("Failed to get NetworkManager state! %s" % err)
+
+    def _get_initial_devices_reply_cb(self, ops):
+        for op in ops:
+            self._add_device(op)
+
+    def _dev_init_failed_cb(self, dev):
+        # Device failed to initialize, likely due to dbus errors or something
+        op = dev.get_op()
+        self._remove_device(op)
+
+    def _get_initial_devices_error_cb(self, err):
+        logging.debug("Error updating devices (%s)" % err)
+
+    def _get_initial_devices(self):
+        self._nm_obj.getDevices(reply_handler=self._get_initial_devices_reply_cb, \
+                error_handler=self._get_initial_devices_error_cb)
+
+    def _add_device(self, dev_op):
+        if self._devices.has_key(dev_op):
+            return
+        dev = Device(dev_op)
+        self._devices[dev_op] = dev
+        dev.connect('init-failed', self._dev_init_failed_cb)
+        dev.connect('activated', self._dev_activated_cb)
+        dev.connect('strength-changed', self._dev_strength_changed_cb)
+
+    def _remove_device(self, dev_op):
+        if not self._devices.has_key(dev_op):
+            return
+        if self._active_device == dev_op:
+            self._active_device = None
+        dev = self._devices[dev_op]
+        dev.disconnect('activated')
+        dev.disconnect('init-failed')
+        dev.disconnect('strength-changed')
+        del self._devices[dev_op]
+
+        self.emit('device-removed', dev)
+
+    def _dev_activated_cb(self, dev):
+        op = dev.get_op()
+        if not self._devices.has_key(op):
+            return
+        if not dev.get_active():
+            return
+        self._active_device = op
+
+        self.emit('device-activated', dev)
+
+    def _dev_strength_changed_cb(self, dev, strength):
+        op = dev.get_op()
+        if not self._devices.has_key(op):
+            return
+        if not dev.get_active():
+            return
+
+    def get_device(self, dev_op):
+        if not self._devices.has_key(dev_op):
+            return None
+        return self._devices[dev_op]
+
+    def _setup_dbus(self):
+        self._sig_handlers = {
+            'StateChange': self.state_change_sig_handler,
+            'DeviceAdded': self.device_added_sig_handler,
+            'DeviceRemoved': self.device_removed_sig_handler,
+            'DeviceActivationStage': self.device_activation_stage_sig_handler,
+            'DeviceActivating': self.device_activating_sig_handler,
+            'DeviceNowActive': self.device_now_active_sig_handler,
+            'DeviceNoLongerActive': self.device_no_longer_active_sig_handler,
+            'DeviceCarrierOn': self.device_carrier_on_sig_handler,
+            'DeviceCarrierOff': self.device_carrier_off_sig_handler,
+            'DeviceStrengthChanged': self.wireless_device_strength_changed_sig_handler,
+            'WirelessNetworkAppeared': self.wireless_network_appeared_sig_handler,
+            'WirelessNetworkDisappeared': self.wireless_network_disappeared_sig_handler,
+            'WirelessNetworkStrengthChanged': self.wireless_network_strength_changed_sig_handler
+        }
+
+        self._nm_proxy = sys_bus.get_object(NM_SERVICE, NM_PATH)
+        self._nm_obj = dbus.Interface(self._nm_proxy, NM_IFACE)
+
+        sys_bus.add_signal_receiver(self.name_owner_changed_sig_handler,
+                                         signal_name="NameOwnerChanged",
+                                         dbus_interface="org.freedesktop.DBus")
+
+        for (signal, handler) in self._sig_handlers.items():
+            sys_bus.add_signal_receiver(handler, signal_name=signal, dbus_interface=NM_IFACE)
+
+        # Find out whether or not NM is running
+        try:
+            bus_object = sys_bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
+            name = bus_object.GetNameOwner("org.freedesktop.NetworkManagerInfo", \
+                    dbus_interface='org.freedesktop.DBus')
+            if name:
+                self._nm_present = True
+        except dbus.DBusException:
+            pass
+
+    def set_active_device(self, device, network):
+        net_op = ""
+        if network:
+            net_op = network.get_op()
+        try:
+            # NM 0.6.4 and earlier have a bug which returns an
+            # InvalidArguments error if no security information is passed
+            # for wireless networks
+            self._nm_obj.setActiveDevice(device.get_op(), network.get_ssid())
+        except dbus.DBusException, e:
+            if str(e).find("invalid arguments"):
+                pass
+            else:
+                raise dbus.DBusException(e)
+
+    def get_key_for_network(self, net, async_cb, async_err_cb):
+        # Throw up a dialog asking for the key here, and set
+        # the authentication algorithm to the given one, if any
+        #
+        # Key needs to be limited to _either_ 10 or 26 digits long,
+        # and contain _only_ _hex_ digits, 0-9 or a-f
+        #
+        # Auth algorithm should be a dropdown of: [Open System, Shared Key],
+        # mapping to the values [IW_AUTH_ALG_OPEN_SYSTEM, IW_AUTH_ALG_SHARED_KEY]
+        # above
+
+        self._key_dialog = WEPKeyDialog(net, async_cb, async_err_cb)
+        self._key_dialog.connect("response", self._key_dialog_response_cb)
+        self._key_dialog.connect("destroy", self._key_dialog_destroy_cb)
+        self._key_dialog.show_all()
+
+    def _key_dialog_destroy_cb(self, widget, foo=None):
+        if widget != self._key_dialog:
+            return
+        self._key_dialog_response_cb(widget, gtk.RESPONSE_CANCEL)
+
+    def _key_dialog_response_cb(self, widget, response_id):
+        if widget != self._key_dialog:
+            return
+        key = self._key_dialog.get_key()
+        wep_auth_alg = self._key_dialog.get_auth_alg()
+        net = self._key_dialog.get_network()
+        (async_cb, async_err_cb) = self._key_dialog.get_callbacks()
+
+        # Clear self._key_dialog before we call destroy(), otherwise
+        # the destroy will trigger and we'll get called again by
+        # self._key_dialog_destroy_cb
+        self._key_dialog = None
+        widget.destroy()
+
+        if response_id == gtk.RESPONSE_OK:
+            self.nminfo.get_key_for_network_cb(
+                    net, key, wep_auth_alg, async_cb, async_err_cb, canceled=False)
+        else:
+            self.nminfo.get_key_for_network_cb(
+                    net, None, None, async_cb, async_err_cb, canceled=True)
+
+    def cancel_get_key_for_network(self):
+        # Close the wireless key dialog and just have it return
+        # with the 'canceled' argument set to true
+        if not self._key_dialog:
+            return
+        self._key_dialog_destroy_cb(self._key_dialog)
+
+    def device_activation_stage_sig_handler(self, device, stage):
+        logging.debug('Device Activation Stage "%s" for device %s' % (NM_DEVICE_STAGE_STRINGS[stage], device))
+
+    def state_change_sig_handler(self, state):
+        self._nm_state = state
+
+    def device_activating_sig_handler(self, device):
+        self._active_device = device
+
+    def device_now_active_sig_handler(self, device, ssid=None):
+        if not self._devices.has_key(device):
+            return
+        self._active_device = device
+        self._devices[device].set_active(True, ssid)
+
+    def device_no_longer_active_sig_handler(self, device):
+        if not self._devices.has_key(device):
+            return
+        if self._active_device == device:
+            self._active_device = None
+        self._devices[device].set_active(False)
+
+    def name_owner_changed_sig_handler(self, name, old, new):
+        if name != NM_SERVICE:
+            return
+        if (old and len(old)) and (not new and not len(new)):
+            # NM went away
+            self._nm_present = False
+            for op in self._devices.keys():
+                del self._devices[op]
+            self._devices = {}
+            self._active_device = None
+            self._nm_state = NM_STATE_UNKNOWN
+        elif (not old and not len(old)) and (new and len(new)):
+            # NM started up
+            self._nm_present = True
+            self._get_nm_state()
+            self._get_initial_devices()
+
+    def device_added_sig_handler(self, device):
+        self._add_device(device)
+
+    def device_removed_sig_handler(self, device):
+        self._remove_device(device)
+
+    def wireless_network_appeared_sig_handler(self, device, network):
+        if not self._devices.has_key(device):
+            return
+        self._devices[device].network_appeared(network)
+
+    def wireless_network_disappeared_sig_handler(self, device, network):
+        if not self._devices.has_key(device):
+            return
+        self._devices[device].network_disappeared(network)
+
+    def wireless_device_strength_changed_sig_handler(self, device, strength):
+        if not self._devices.has_key(device):
+            return
+        self._devices[device].set_strength(strength)
+
+    def wireless_network_strength_changed_sig_handler(self, device, network, strength):
+        if not self._devices.has_key(device):
+            return
+        net = self._devices[device].get_network(network)
+        if net:
+            net.set_strength(strength)
+
+    def device_carrier_on_sig_handler(self, device):
+        if not self._devices.has_key(device):
+            return
+        self._devices[device].set_carrier(True)
+
+    def device_carrier_off_sig_handler(self, device):
+        if not self._devices.has_key(device):
+            return
+        self._devices[device].set_carrier(False)

shell/hardware/nminfo.py

@@ -0,0 +1,467 @@
+# vi: ts=4 ai noet
+#
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import dbus
+import dbus.service
+import time
+import os
+import binascii
+import ConfigParser
+import logging
+
+import nmclient
+try:
+    from sugar import env
+except ImportError:
+    pass
+
+NM_INFO_IFACE='org.freedesktop.NetworkManagerInfo'
+NM_INFO_PATH='/org/freedesktop/NetworkManagerInfo'
+
+
+class NoNetworks(dbus.DBusException):
+    def __init__(self):
+        dbus.DBusException.__init__(self)
+        self._dbus_error_name = NM_INFO_IFACE + '.NoNetworks'
+
+class CanceledKeyRequestError(dbus.DBusException):
+    def __init__(self):
+        dbus.DBusException.__init__(self)
+        self._dbus_error_name = NM_INFO_IFACE + '.CanceledError'
+
+
+class NetworkInvalidError(Exception):
+    pass
+
+
+class NMConfig(ConfigParser.ConfigParser):
+    def get_bool(self, section, name):
+        opt = self.get(section, name)
+        if type(opt) == type(""):
+            if opt.lower() == 'yes' or opt.lower() == 'true':
+                return True
+            elif opt.lower() == 'no' or opt.lower() == 'false':
+                return False
+        raise ValueError("Invalid format for %s/%s.  Should be one of [yes, no, true, false]." % (section, name))
+
+    def get_list(self, section, name):
+        opt = self.get(section, name)
+        if type(opt) == type(""):
+            if not len(opt):
+                return []
+            try:
+                return opt.split()
+            except Exception:
+                pass
+        raise ValueError("Invalid format for %s/%s.  Should be a space-separate list." % (section, name))
+
+    def get_int(self, section, name):
+        opt = self.get(section, name)
+        try:
+            return int(opt)
+        except Exception:
+            pass
+        raise ValueError("Invalid format for %s/%s.  Should be a valid integer." % (section, name))
+
+    def get_float(self, section, name):
+        opt = self.get(section, name)
+        try:
+            return float(opt)
+        except Exception:
+            pass
+        raise ValueError("Invalid format for %s/%s.  Should be a valid float." % (section, name))
+
+
+IW_AUTH_CIPHER_NONE   = 0x00000001
+IW_AUTH_CIPHER_WEP40  = 0x00000002
+IW_AUTH_CIPHER_TKIP   = 0x00000004
+IW_AUTH_CIPHER_CCMP   = 0x00000008
+IW_AUTH_CIPHER_WEP104 = 0x00000010
+
+IW_AUTH_ALG_OPEN_SYSTEM = 0x00000001
+IW_AUTH_ALG_SHARED_KEY  = 0x00000002
+
+NETWORK_TYPE_UNKNOWN = 0
+NETWORK_TYPE_ALLOWED = 1
+NETWORK_TYPE_INVALID = 2
+
+
+class Security(object):
+    def __init__(self, we_cipher):
+        self._we_cipher = we_cipher
+
+    def read_from_config(self, cfg, name):
+        pass
+
+    def read_from_args(self, args):
+        pass
+
+    def new_from_config(cfg, name):
+        security = None
+        try:
+            we_cipher = cfg.get_int(name, "we_cipher")
+            if we_cipher == IW_AUTH_CIPHER_NONE:
+                security = Security(we_cipher)
+            elif we_cipher == IW_AUTH_CIPHER_WEP40 or we_cipher == IW_AUTH_CIPHER_WEP104:
+                security = WEPSecurity(we_cipher)
+            else:
+                # FIXME: find a way to make WPA config option matrix not
+                # make you want to throw up
+                raise ValueError("Unsupported security combo")
+            security.read_from_config(cfg, name)
+        except (ConfigParser.NoOptionError, ValueError), e:
+            return None
+        return security
+    new_from_config = staticmethod(new_from_config)
+
+    def new_from_args(we_cipher, args):
+        security = None
+        try:
+            if we_cipher == IW_AUTH_CIPHER_NONE:
+                security = Security(we_cipher)
+            elif we_cipher == IW_AUTH_CIPHER_WEP40 or we_cipher == IW_AUTH_CIPHER_WEP104:
+                security = WEPSecurity(we_cipher)
+            else:
+                # FIXME: find a way to make WPA config option matrix not
+                # make you want to throw up
+                raise ValueError("Unsupported security combo")
+            security.read_from_args(args)
+        except ValueError, e:
+            logging.debug("Error reading security information: %s" % e)
+            del security
+            return None
+        return security
+    new_from_args = staticmethod(new_from_args)
+
+    def get_properties(self):
+        return [dbus.Int32(self._we_cipher)]
+
+    def write_to_config(self, section, config):
+        config.set(section, "we_cipher", self._we_cipher)
+
+
+class WEPSecurity(Security):
+    def read_from_args(self, args):
+        if len(args) != 2:
+            raise ValueError("not enough arguments")
+        key = args[0]
+        auth_alg = args[1]
+        if isinstance(key, unicode):
+            key = key.encode()
+        if not isinstance(key, str):
+            raise ValueError("wrong argument type for key")
+        if not isinstance(auth_alg, int):
+            raise ValueError("wrong argument type for auth_alg")
+        self._key = key
+        self._auth_alg = auth_alg
+
+    def read_from_config(self, cfg, name):
+        # Key should be a hex encoded string
+        self._key = cfg.get(name, "key")
+        if self._we_cipher == IW_AUTH_CIPHER_WEP40 and len(self._key) != 10:
+            raise ValueError("Key length not right for 40-bit WEP")
+        if self._we_cipher == IW_AUTH_CIPHER_WEP104 and len(self._key) != 26:
+            raise ValueError("Key length not right for 104-bit WEP")
+
+        try:
+            a = binascii.a2b_hex(self._key)
+        except TypeError:
+            raise ValueError("Key was not a hexadecimal string.")
+            
+        self._auth_alg = cfg.get_int(name, "auth_alg")
+        if self._auth_alg != IW_AUTH_ALG_OPEN_SYSTEM and self._auth_alg != IW_AUTH_ALG_SHARED_KEY:
+            raise ValueError("Invalid authentication algorithm %d" % self._auth_alg)
+
+    def get_properties(self):
+        args = Security.get_properties(self)
+        args.append(dbus.String(self._key))
+        args.append(dbus.Int32(self._auth_alg))
+        return args
+
+    def write_to_config(self, section, config):
+        Security.write_to_config(self, section, config)
+        config.set(section, "key", self._key)
+        config.set(section, "auth_alg", self._auth_alg)
+
+
+class Network:
+    def __init__(self, ssid):
+        self.ssid = ssid
+        self.timestamp = int(time.time())
+        self.bssids = []
+        self.we_cipher = 0
+        self._security = None
+
+    def get_properties(self):
+        bssid_list = dbus.Array([], signature="s")
+        for item in self.bssids:
+            bssid_list.append(dbus.String(item))
+        args = [dbus.String(self.ssid), dbus.Int32(self.timestamp), dbus.Boolean(True), bssid_list]
+        args += self._security.get_properties()
+        return tuple(args)
+
+    def get_security(self):
+        return self._security.get_properties()
+
+    def set_security(self, security):
+        self._security = security
+
+    def read_from_args(self, auto, bssid, we_cipher, args):
+        if auto == False:
+            self.timestamp = int(time.time())
+        if not bssid in self.bssids:
+            self.bssids.append(bssid)
+
+        self._security = Security.new_from_args(we_cipher, args)
+        if not self._security:
+            raise NetworkInvalidError("Invalid security information")
+
+    def read_from_config(self, config):
+        try:
+            self.timestamp = config.get_int(self.ssid, "timestamp")
+        except (ConfigParser.NoOptionError, ValueError), e:
+            raise NetworkInvalidError(e)
+
+        self._security = Security.new_from_config(config, self.ssid)
+        if not self._security:
+            raise NetworkInvalidError(e)
+
+        # The following don't need to be present
+        try:
+            self.bssids = config.get_list(self.ssid, "bssids")
+        except (ConfigParser.NoOptionError, ValueError), e:
+            pass
+
+    def write_to_config(self, config):
+        try:
+            config.add_section(self.ssid)
+            config.set(self.ssid, "timestamp", self.timestamp)
+            if len(self.bssids) > 0:
+                opt = " "
+                opt.join(self.bssids)
+                config.set(self.ssid, "bssids", opt)
+            self._security.write_to_config(self.ssid, config)
+        except Exception, e:
+            logging.debug("Error writing '%s': %s" % (self.ssid, e))
+
+
+class NotFoundError(dbus.DBusException):
+    pass
+class UnsupportedError(dbus.DBusException):
+    pass
+
+class NMInfoDBusServiceHelper(dbus.service.Object):
+    def __init__(self, parent):
+        self._parent = parent
+        bus = dbus.SystemBus()
+
+        # If NMI is already around, don't grab the NMI service
+        bus_object = bus.get_object('org.freedesktop.DBus', '/org/freedesktop/DBus')
+        name = None
+        try:
+            name = bus_object.GetNameOwner("org.freedesktop.NetworkManagerInfo", \
+                    dbus_interface='org.freedesktop.DBus')
+        except dbus.DBusException:
+            pass
+        if name:
+            logging.debug("NMI service already owned by %s, won't claim it." % name)
+            raise RuntimeError
+
+        bus_name = dbus.service.BusName(NM_INFO_IFACE, bus=bus)
+        dbus.service.Object.__init__(self, bus_name, NM_INFO_PATH)
+
+    @dbus.service.method(NM_INFO_IFACE, in_signature='i', out_signature='as')
+    def getNetworks(self, net_type):
+        ssids = self._parent.get_networks(net_type)
+        if len(ssids) > 0:
+            return dbus.Array(ssids)
+
+        raise NoNetworks()
+
+    @dbus.service.method(NM_INFO_IFACE, in_signature='si', async_callbacks=('async_cb', 'async_err_cb'))
+    def getNetworkProperties(self, ssid, net_type, async_cb, async_err_cb):
+        self._parent.get_network_properties(ssid, net_type, async_cb, async_err_cb)
+
+    @dbus.service.method(NM_INFO_IFACE)
+    def updateNetworkInfo(self, ssid, bauto, bssid, cipher, *args):
+        self._parent.update_network_info(ssid, bauto, bssid, cipher, args)
+
+    @dbus.service.method(NM_INFO_IFACE, async_callbacks=('async_cb', 'async_err_cb'))
+    def getKeyForNetwork(self, dev_path, net_path, ssid, attempt, new_key, async_cb, async_err_cb):
+        self._parent.get_key_for_network(dev_path, net_path, ssid,
+                attempt, new_key, async_cb, async_err_cb)
+
+    @dbus.service.method(NM_INFO_IFACE)
+    def cancelGetKeyForNetwork(self):
+        self._parent.cancel_get_key_for_network()
+
+class NMInfo(object):
+    def __init__(self, client):
+        try:
+            profile_path = env.get_profile_path()
+        except NameError:
+            home = os.path.expanduser("~")
+            profile_path = os.path.join(home, ".sugar", "default")
+        self._cfg_file = os.path.join(profile_path, "nm", "networks.cfg")
+        self._nmclient = client
+        self._allowed_networks = self._read_config()
+        self._dbus_helper = NMInfoDBusServiceHelper(self)
+
+    def save_config(self):
+        self._write_config(self._allowed_networks)
+
+    def _read_config(self):
+        if not os.path.exists(os.path.dirname(self._cfg_file)):
+            os.makedirs(os.path.dirname(self._cfg_file), 0755)
+        if not os.path.exists(self._cfg_file):
+            self._write_config({})
+            return {}
+
+        config = NMConfig()
+        config.read(self._cfg_file)
+        networks = {}
+        for name in config.sections():
+            if not isinstance(name, unicode):
+                name = unicode(name)
+            net = Network(name)
+            try:
+                net.read_from_config(config)
+                networks[name] = net
+            except NetworkInvalidError, e:
+                logging.debug("Error: invalid stored network config: %s" % e)
+                del net
+        del config
+        return networks
+
+    def _write_config(self, networks):
+        fp = open(self._cfg_file, 'w')
+        config = NMConfig()
+        for net in networks.values():
+            net.write_to_config(config)
+        config.write(fp)
+        fp.close()
+        del config
+
+    def get_networks(self, net_type):
+        if net_type != NETWORK_TYPE_ALLOWED:
+            raise ValueError("Bad network type")
+        nets = []
+        for net in self._allowed_networks.values():
+            nets.append(net.ssid)
+        logging.debug("Returning networks: %s" % nets)
+        return nets
+
+    def get_network_properties(self, ssid, net_type, async_cb, async_err_cb):
+        if not isinstance(ssid, unicode):
+            async_err_cb(ValueError("Invalid arguments; ssid must be unicode."))
+        if net_type != NETWORK_TYPE_ALLOWED:
+            async_err_cb(ValueError("Bad network type"))
+        if not self._allowed_networks.has_key(ssid):
+            async_err_cb(NotFoundError("Network '%s' not found." % ssid))
+        network = self._allowed_networks[ssid]
+        props = network.get_properties()
+
+        # DBus workaround: the normal method return handler wraps
+        # the returned arguments in a tuple and then converts that to a
+        # struct, but NetworkManager expects a plain list of arguments.
+        # It turns out that the async callback method return code _doesn't_
+        # wrap the returned arguments in a tuple, so as a workaround use
+        # the async callback stuff here even though we're not doing it
+        # asynchronously.
+        async_cb(*props)
+
+    def update_network_info(self, ssid, auto, bssid, we_cipher, args):
+        if not isinstance(ssid, unicode):
+            raise ValueError("Invalid arguments; ssid must be unicode.")
+        if self._allowed_networks.has_key(ssid):
+            del self._allowed_networks[ssid]
+        net = Network(ssid)
+        try:
+            net.read_from_args(auto, bssid, we_cipher, args)
+            logging.debug("Updated network information for '%s'." % ssid)
+            self._allowed_networks[ssid] = net
+            self.save_config()
+        except NetworkInvalidError, e:
+            logging.debug("Error updating network information: %s" % e)
+            del net
+
+    def get_key_for_network(self, dev_op, net_op, ssid, attempt, new_key, async_cb, async_err_cb):
+        if not isinstance(ssid, unicode):
+            raise ValueError("Invalid arguments; ssid must be unicode.")
+        if self._allowed_networks.has_key(ssid) and not new_key:
+            # We've got the info already
+            net = self._allowed_networks[ssid]
+            async_cb(tuple(net.get_security()))
+            return
+
+        # Otherwise, ask the user for it
+        net = None
+        dev = self._nmclient.get_device(dev_op)
+        if not dev:
+            async_err_cb(NotFoundError("Device was unknown."))
+            return
+
+        if dev.get_type() == nmclient.DEVICE_TYPE_802_3_ETHERNET:
+            # We don't support wired 802.1x yet...
+            async_err_cb(UnsupportedError("Device type is unsupported by NMI."))
+            return
+
+        net = dev.get_network(net_op)
+        if not net:
+            async_err_cb(NotFoundError("Network was unknown."))
+            return
+
+        self._nmclient.get_key_for_network(net, async_cb, async_err_cb)
+
+    def get_key_for_network_cb(self, net, key, auth_alg, async_cb, async_err_cb, canceled=False):
+        """
+        Called by the NMClient when the Wireless Network Key dialog
+        is closed.
+        """
+        if canceled:
+            e = CanceledKeyRequestError("Request was canceled.")
+            # key dialog dialog was canceled; send the error back to NM
+            async_err_cb(e)
+            return
+
+        if not key or not auth_alg:
+            # no key returned, *** BUG ***; the key dialog
+            # should always return either a key + auth_alg, or a
+            #cancel error
+            raise RuntimeError("No key or auth alg given! Bug!")
+
+        we_cipher = None
+        if len(key) == 26:
+            we_cipher = IW_AUTH_CIPHER_WEP104
+        elif len(key) == 10:
+            we_cipher = IW_AUTH_CIPHER_WEP40
+        else:
+            raise RuntimeError("Invalid key length!")
+
+        # Stuff the returned key and auth algorithm into a security object
+        # and return it to NetworkManager
+        sec = Security.new_from_args(we_cipher, (key, auth_alg))
+        if not sec:
+            raise RuntimeError("Invalid security arguments.")
+        props = sec.get_properties()
+        a = tuple(props)
+        async_cb(*a)
+
+    def cancel_get_key_for_network(self):
+        # Tell the NMClient to close the key request dialog
+        self._nmclient.cancel_get_key_for_network()

shell/hardware/wepkeydialog.py

@@ -0,0 +1,81 @@
+# vi: ts=4 ai noet
+#
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+import gtk
+
+IW_AUTH_ALG_OPEN_SYSTEM = 0x00000001
+IW_AUTH_ALG_SHARED_KEY  = 0x00000002
+
+class WEPKeyDialog(gtk.Dialog):
+    def __init__(self, net, async_cb, async_err_cb):
+        gtk.Dialog.__init__(self)
+        self.set_title("Wireless Key Required")
+
+        self._net = net
+        self._async_cb = async_cb
+        self._async_err_cb = async_err_cb
+
+        self.set_has_separator(False)        
+
+        label = gtk.Label("A wireless encryption key is required for\n" \
+            " the wireless network '%s'." % net.get_ssid())
+        self.vbox.pack_start(label)
+
+        self._entry = gtk.Entry()
+        self._entry.props.visibility = False
+        self._entry.connect('changed', self._entry_changed_cb)
+        self.vbox.pack_start(self._entry)
+        self.vbox.show_all()
+
+        self.add_buttons(gtk.STOCK_CANCEL, gtk.RESPONSE_CANCEL,
+                         gtk.STOCK_OK, gtk.RESPONSE_OK)
+
+        self.set_default_response(gtk.RESPONSE_OK)
+        self._update_response_sensitivity()
+
+    def get_key(self):
+        return self._entry.get_text()
+
+    def get_auth_alg(self):
+        return IW_AUTH_ALG_OPEN_SYSTEM
+
+    def get_network(self):
+        return self._net
+
+    def get_callbacks(self):
+        return (self._async_cb, self._async_err_cb)
+
+    def _entry_changed_cb(self, entry):
+        self._update_response_sensitivity()
+
+    def _update_response_sensitivity(self):
+        key = self.get_key()
+
+        is_hex = True
+        for c in key:
+            if not 'a' <= c <= 'f' and not '0' <= c <= '9':
+                is_hex = False
+
+        valid_len = (len(key) == 10 or len(key) == 26)
+        self.set_response_sensitive(gtk.RESPONSE_OK, is_hex and valid_len)
+
+if __name__ == "__main__":
+    dialog = WEPKeyDialog()
+    dialog.run()
+
+    print dialog.get_key()

shell/model/MeshModel.py

@@ -20,6 +20,46 @@ from sugar.graphics.xocolor import XoColor
 from sugar.presence import PresenceService
 from sugar.activity import bundleregistry
 from model.BuddyModel import BuddyModel
+from hardware import hardwaremanager
+
+class AccessPointModel(gobject.GObject):
+    __gproperties__ = {
+        'name'     : (str, None, None, None,
+                      gobject.PARAM_READABLE),
+        'strength' : (int, None, None, 0, 100, 0,
+                      gobject.PARAM_READABLE)
+    }
+
+    def __init__(self, nm_device, nm_network):
+        gobject.GObject.__init__(self)
+        self._nm_network = nm_network
+        self._nm_device = nm_device
+
+        self._nm_network.connect('strength-changed',
+                                 self._strength_changed_cb)
+        self._nm_network.connect('ssid-changed',
+                                 self._essid_changed_cb)
+
+    def _strength_changed_cb(self, nm_network):
+        self.notify('strength')
+
+    def _essid_changed_cb(self, nm_network):
+        self.notify('name')
+
+    def get_id(self):
+        return self._nm_network.get_op()
+
+    def get_nm_device(self):
+        return self._nm_device
+
+    def get_nm_network(self):
+        return self._nm_network
+
+    def do_get_property(self, pspec):
+        if pspec.name == 'strength':
+            return self._nm_network.get_strength()
+        elif pspec.name == 'name':
+            return self._nm_network.get_ssid()
 
 class ActivityModel:
     def __init__(self, activity, bundle, service):
@@ -41,17 +81,22 @@ class ActivityModel:
 
 class MeshModel(gobject.GObject):
     __gsignals__ = {
-        'activity-added':   (gobject.SIGNAL_RUN_FIRST,
-                             gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
-        'activity-removed': (gobject.SIGNAL_RUN_FIRST,
-                             gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
-        'buddy-added':      (gobject.SIGNAL_RUN_FIRST,
-                             gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
-        'buddy-moved':      (gobject.SIGNAL_RUN_FIRST,
-                             gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT,
-                                                  gobject.TYPE_PYOBJECT])),
-        'buddy-removed':    (gobject.SIGNAL_RUN_FIRST,
-                             gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT]))
+        'activity-added':       (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+        'activity-removed':     (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+        'buddy-added':          (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+        'buddy-moved':          (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE,
+                                ([gobject.TYPE_PYOBJECT,
+                                  gobject.TYPE_PYOBJECT])),
+        'buddy-removed':        (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+        'access-point-added':   (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT])),
+        'access-point-removed': (gobject.SIGNAL_RUN_FIRST,
+                                 gobject.TYPE_NONE, ([gobject.TYPE_PYOBJECT]))
     }
 
     def __init__(self):
@@ -59,6 +104,7 @@ class MeshModel(gobject.GObject):
 
         self._activities = {}
         self._buddies = {}
+        self._access_points = {}
         self._bundle_registry = bundleregistry.get_registry()
 
         self._pservice = PresenceService.get_instance()
@@ -78,6 +124,42 @@ class MeshModel(gobject.GObject):
         for service in self._pservice.get_services():
             self._check_service(service)
 
+        network_manager = hardwaremanager.get_network_manager()
+        for nm_device in network_manager.get_devices():
+            self._add_network_device(nm_device)
+        network_manager.connect('device-activated',
+                                self._nm_device_activated_cb)
+
+    def _nm_device_activated_cb(self, manager, nm_device):
+        self._add_network_device(nm_device)
+
+    def _nm_network_appeared_cb(self, nm_device, nm_network):
+        self._add_access_point(nm_device, nm_network)
+
+    def _nm_network_disappeared_cb(self, nm_device, nm_network):
+        self._remove_access_point(nm_device, nm_network)
+
+    def _add_network_device(self, nm_device):
+        for nm_network in nm_device.get_networks():
+            self._add_access_point(nm_device, nm_network)
+        nm_device.connect('network-appeared',
+                          self._nm_network_appeared_cb)
+        nm_device.connect('network-disappeared',
+                          self._nm_network_disappeared_cb)
+
+    def _add_access_point(self, nm_device, nm_network):
+        model = AccessPointModel(nm_device, nm_network)
+        self._access_points[nm_network.get_op()] = model
+        self.emit('access-point-added', model)
+
+    def _remove_access_point(self, nm_network):
+        self.emit('access-point-removed',
+                  self._access_points[nm_network.get_op()])
+        del self._access_points[nm_network.get_op()]
+
+    def get_access_points(self):
+        return self._access_points.values()
+
     def get_activities(self):
         return self._activities.values()
 

shell/model/devices/Makefile.am

@@ -4,4 +4,5 @@ sugar_PYTHON =			\
 	device.py		\
 	devicesmodel.py		\
 	battery.py		\
-	network.py
+	wirednetwork.py		\
+	wirelessnetwork.py

shell/model/devices/battery.py

@@ -5,7 +5,7 @@ class Device(device.Device):
         device.Device.__init__(self)
 
     def get_type(self):
-        return 'network'
+        return 'battery'
 
     def get_level(self):
         return 0

shell/model/devices/device.py

@@ -1,7 +1,10 @@
+import gobject
+
 from sugar import util
 
-class Device(object):
+class Device(gobject.GObject):
     def __init__(self):
+        gobject.GObject.__init__(self)
         self._id = util.unique_id()
 
     def get_type(self):

shell/model/devices/devicesmodel.py

@@ -1,8 +1,11 @@
 import gobject
 
 from model.devices import device
-from model.devices import network
+from model.devices import wirednetwork
+from model.devices import wirelessnetwork
 from model.devices import battery
+from hardware import hardwaremanager
+from hardware import nmclient
 
 class DevicesModel(gobject.GObject):
     __gsignals__ = {
@@ -17,13 +20,56 @@ class DevicesModel(gobject.GObject):
     def __init__(self):
         gobject.GObject.__init__(self)
 
-        self._devices = []
-
-        self.add_device(network.Device())
+        self._devices = {}
         self.add_device(battery.Device())
 
+        self._observe_network_manager()
+
+    def _observe_network_manager(self):
+        network_manager = hardwaremanager.get_network_manager()
+
+        for device in network_manager.get_devices():
+            self._check_network_device(device)
+
+        network_manager.connect('device-activated',
+                                self._network_device_activated_cb)
+        network_manager.connect('device-removed',
+                                self._network_device_removed_cb)
+
+    def _network_device_activated_cb(self, network_manager, nm_device):
+        self._check_network_device(nm_device)
+
+    def _network_device_removed_cb(self, nm_device):
+        self._remove_network_device(nm_device)
+
+    def _network_device_deactivated_cb(self, nm_device):
+        self._remove_network_device(nm_device)
+
+    def _check_network_device(self, nm_device):
+        if not nm_device.is_valid():
+            return
+
+        if nm_device.get_type() == nmclient.DEVICE_TYPE_802_11_WIRELESS:
+            self._add_network_device(nm_device)
+
+    def _get_network_device(self, nm_device):
+        return self._devices[nm_device.get_op()]
+
+    def _add_network_device(self, nm_device):
+        self.add_device(wirelessnetwork.Device(nm_device))
+        nm_device.connect('deactivated',
+                            self._network_device_deactivated_cb)
+
+    def _remove_network_device(self, nm_device):
+        self.remove_device(self._get_network_device(nm_device))
+
     def __iter__(self):
-        return iter(self._devices)
+        return iter(self._devices.values())
 
     def add_device(self, device):
-        self._devices.append(device)
+        self._devices[device.get_id()] = device
+        self.emit('device-appeared', device)
+
+    def remove_device(self, device):
+        self.emit('device-disappeared', self._devices[device.get_id()])
+        del self._devices[device.get_id()]

shell/model/devices/network.py

@@ -1,11 +0,0 @@
-from model.devices import device
-
-class Device(device.Device):
-    def __init__(self):
-        device.Device.__init__(self)
-
-    def get_type(self):
-        return 'network'
-
-    def get_level(self):
-        return 0

shell/model/devices/wirednetwork.py

@@ -0,0 +1,12 @@
+from model.devices import device
+
+class Device(device.Device):
+    def __init__(self, nm_device):
+        device.Device.__init__(self)
+        self._nm_device = device
+
+    def get_id(self):
+        return self._nm_device.get_op()
+
+    def get_type(self):
+        return 'wirednetwork'

shell/model/devices/wirelessnetwork.py

@@ -0,0 +1,37 @@
+import gobject
+
+from model.devices import device
+
+class Device(device.Device):
+    __gproperties__ = {
+        'name'     : (str, None, None, None,
+                      gobject.PARAM_READABLE),
+        'strength' : (int, None, None, 0, 100, 0,
+                      gobject.PARAM_READABLE)
+    }
+
+    def __init__(self, nm_device):
+        device.Device.__init__(self)
+        self._nm_device = nm_device
+
+        self._nm_device.connect('strength-changed',
+                                self._strength_changed_cb)
+
+    def _strength_changed_cb(self, nm_device, strength):
+        self.notify('strength')
+
+    def _essid_changed_cb(self, nm_device):
+        self.notify('name')
+
+    def do_get_property(self, pspec):
+        if pspec.name == 'strength':
+            return self._nm_device.get_strength()
+        elif pspec.name == 'name':
+            # FIXME
+            return None
+
+    def get_type(self):
+        return 'wirelessnetwork'
+
+    def get_id(self):
+        return self._nm_device.get_op()

shell/shellservice.py

@@ -1,5 +1,7 @@
 import dbus
 
+from sugar.activity import bundleregistry
+
 _DBUS_SERVICE = "org.laptop.Shell"
 _DBUS_INTERFACE = "org.laptop.Shell"
 _DBUS_PATH = "/org/laptop/Shell"
@@ -15,5 +17,5 @@ class ShellService(dbus.service.Object):
         
     @dbus.service.method(_DBUS_INTERFACE, in_signature="s", out_signature="b")
     def add_bundle(self, bundle_path):
-        registry = self._shellModel.get_bundle_registry()
+        registry = bundleregistry.get_registry()
         return registry.add_bundle(bundle_path)

shell/sugar-shell

@@ -64,12 +64,6 @@ model = ShellModel()
 service = ShellService(model)
 shell = Shell(model)
 
-# Start the NetworkManager applet
-# FIXME: do this somewhere else, better planned out
-args = ["sugar-nm-applet"]
-flags = gobject.SPAWN_SEARCH_PATH
-result = gobject.spawn_async(args, flags=flags, standard_output=False)
-
 tbh = TracebackUtils.TracebackHelper()
 try:
 	gtk.main()

shell/view/BuddyMenu.py

@@ -35,6 +35,8 @@ class BuddyMenu(Menu):
         self._shell = shell
 
         Menu.__init__(self, buddy.get_name())
+        self.props.border = 0
+        self.props.padding = units.points_to_pixels(5)
         pixbuf = self._get_buddy_icon_pixbuf()
         if pixbuf:
             icon_item = hippo.CanvasImage()

shell/view/Makefile.am

@@ -11,5 +11,4 @@ sugar_PYTHON =				\
 	clipboardmenu.py		\
 	keyhandler.py			\
 	OverlayWindow.py		\
-	Shell.py			\
-	hardwaremanager.py
+	Shell.py

shell/view/Shell.py

@@ -26,8 +26,6 @@ from view.ActivityHost import ActivityHost
 from sugar.activity import activityfactory
 from view.frame.frame import Frame
 from view.keyhandler import KeyHandler
-from view.hardwaremanager import HardwareManager
-from _sugar import AudioManager
 import sugar
 
 class Shell(gobject.GObject):
@@ -40,9 +38,6 @@ class Shell(gobject.GObject):
         self._current_host = None
         self._screen_rotation = 0
 
-        self._hw_manager = HardwareManager()
-        self._audio_manager = AudioManager()
-
         self._home_window = HomeWindow(self)
         self._home_window.show()
         self.set_zoom_level(sugar.ZOOM_HOME)
@@ -88,12 +83,6 @@ class Shell(gobject.GObject):
         if self._current_host:
             self._current_host.set_active(True)
 
-    def get_hardware_manager(self):
-        return self._hw_manager
-
-    def get_audio_manager(self):
-        return self._audio_manager
-
     def get_model(self):
         return self._model
 

shell/view/clipboardicon.py

@@ -4,6 +4,7 @@ from sugar.graphics.canvasicon import CanvasIcon
 from view.clipboardmenu import ClipboardMenu
 from sugar.graphics.xocolor import XoColor
 from sugar.graphics import units
+from sugar.graphics import color
 from sugar.activity import activityfactory
 from sugar.clipboard import clipboardservice
 from sugar import util
@@ -43,9 +44,9 @@ class ClipboardIcon(CanvasIcon):
             self._menu.set_state(name, percent, preview, activity)
 
         if activity and percent < 100:
-            self.set_property('color', XoColor("#000000,#424242"))
+            self.props.xo_color = XoColor("#000000,#424242")
         else:
-            self.set_property('color', XoColor("#000000,#FFFFFF"))
+            self.props.xo_color = XoColor("#000000,#FFFFFF")
     
     def _activity_create_success_cb(self, handler, activity):
         activity.start(util.unique_id())
@@ -81,3 +82,9 @@ class ClipboardIcon(CanvasIcon):
         
     def get_object_id(self):
         return self._object_id
+
+    def prelight(self, enter):
+        if enter:
+            self.props.background_color = color.BLACK.get_int()
+        else:
+            self.props.background_color = color.TOOLBAR_BACKGROUND.get_int()

shell/view/clipboardmenu.py

@@ -13,7 +13,7 @@ class ClipboardProgressBar(ClipboardBubble):
     def __init__(self, percent = 0):
         self._text_item = None
         ClipboardBubble.__init__(self, percent=percent)
-                
+
         self._text_item = hippo.CanvasText(text=str(percent) + ' %')
         self._text_item.props.color = color.LABEL_TEXT.get_int()
         self._text_item.props.font_desc = font.DEFAULT.get_pango_desc()
@@ -35,6 +35,7 @@ class ClipboardMenu(Menu):
     
     def __init__(self, name, percent, preview, activity):
         Menu.__init__(self, name)
+        self.props.border = 0
 
         if percent < 100:        
             self._progress_bar = ClipboardProgressBar(percent)

shell/view/devices/Makefile.am

@@ -3,4 +3,5 @@ sugar_PYTHON =				\
 	__init__.py			\
 	battery.py			\
 	deviceview.py			\
-	network.py
+	wirednetwork.py			\
+	wirelessnetwork.py

shell/view/devices/battery.py

@@ -1,6 +1,6 @@
 from view.devices import deviceview
 
-class DeviceView(deviceview.DeviceView)
+class DeviceView(deviceview.DeviceView):
     def __init__(self, model):
         deviceview.DeviceView.__init__(self, model)
         self.props.icon_name = 'theme:stock-close'

shell/view/devices/wirednetwork.py

@@ -3,4 +3,4 @@ from view.devices import deviceview
 class DeviceView(deviceview.DeviceView):
     def __init__(self, model):
         deviceview.DeviceView.__init__(self, model)
-        self.props.icon_name = 'theme:stock-close'
+        self.props.icon_name = 'theme:stock-net-wired'

shell/view/devices/wirelessnetwork.py

@@ -0,0 +1,34 @@
+from view.devices import deviceview
+
+class DeviceView(deviceview.DeviceView):
+    def __init__(self, model):
+        deviceview.DeviceView.__init__(self, model)
+        self._model = model
+
+        model.connect('notify::name', self._name_changed_cb)
+        model.connect('notify::strength', self._strength_changed_cb)
+
+        self._update_name()
+        self._update_icon()
+
+    def _strength_changed_cb(self, model, pspec):
+        self._update_icon()
+
+    def _name_changed_cb(self, model, pspec):
+        self._update_name()
+
+    def _update_name(self):
+        self.props.tooltip = self._model.props.name
+
+    def _update_icon(self):
+        strength = self._model.props.strength
+        if strength < 21:
+            self.props.icon_name = 'theme:stock-net-wireless-00'
+        elif strength < 41:
+            self.props.icon_name = 'theme:stock-net-wireless-21-40'
+        elif strength < 61:
+            self.props.icon_name = 'theme:stock-net-wireless-41-60'
+        elif strength < 81:
+            self.props.icon_name = 'theme:stock-net-wireless-61-80'
+        else:
+            self.props.icon_name = 'theme:stock-net-wireless-81-100'

shell/view/frame/FriendsBox.py

@@ -17,15 +17,30 @@
 import hippo
 
 from sugar.graphics.canvasicon import CanvasIcon
+from sugar.graphics import color
 from sugar.presence import PresenceService
 from view.BuddyIcon import BuddyIcon
 from model.BuddyModel import BuddyModel
 
+class FriendIcon(BuddyIcon):
+    def __init__(self, shell, popup_context, buddy):
+        BuddyIcon.__init__(self, shell, popup_context, buddy)
+        self._popup_context = popup_context
+
+    def get_popup_context(self):
+        return self._popup_context
+
+    def prelight(self, enter):
+        if enter:
+            self.props.background_color = color.BLACK.get_int()
+        else:
+            self.props.background_color = color.TOOLBAR_BACKGROUND.get_int()
+
 class FriendsBox(hippo.CanvasBox):
-    def __init__(self, shell, menu_shell):
+    def __init__(self, shell, popup_context):
         hippo.CanvasBox.__init__(self)
         self._shell = shell
-        self._menu_shell = menu_shell
+        self._popup_context = popup_context
         self._activity_ps = None
         self._joined_hid = -1
         self._left_hid = -1
@@ -48,7 +63,7 @@ class FriendsBox(hippo.CanvasBox):
             return
 
         model = BuddyModel(buddy=buddy)
-        icon = BuddyIcon(self._shell, self._menu_shell, model)
+        icon = FriendIcon(self._shell, self._popup_context, model)
         self.append(icon)
 
         self._buddies[buddy.get_name()] = icon

shell/view/frame/Makefile.am

@@ -8,7 +8,6 @@ sugar_PYTHON =				\
 	eventframe.py			\
 	frame.py			\
 	ZoomBox.py			\
-	notificationtray.py		\
 	overlaybox.py			\
 	PanelWindow.py			\
 	framepopupcontext.py

shell/view/frame/PanelWindow.py

@@ -22,6 +22,7 @@ from sugar.graphics import units
 class PanelWindow(gtk.Window):
     def __init__(self, orientation):
         gtk.Window.__init__(self)
+        self._orientation = orientation
 
         self.set_decorated(False)
         self.connect('realize', self._realize_cb)
@@ -29,35 +30,46 @@ class PanelWindow(gtk.Window):
         self._canvas = hippo.Canvas()
 
         self._bg = hippo.CanvasBox(background_color=0x414141ff,
-                                   orientation=orientation)
-
-        padding = units.grid_to_pixels(1)
-        if orientation == hippo.ORIENTATION_HORIZONTAL:
-            self._bg.props.padding_left = padding
-            self._bg.props.padding_right = padding
-
-            width = gtk.gdk.screen_width()
-            height = units.grid_to_pixels(1)
-        else:
-            self._bg.props.padding_top = padding
-            self._bg.props.padding_bottom = padding
-
-            width = units.grid_to_pixels(1)
-            height = gtk.gdk.screen_height()
+                                   orientation=self._orientation)
 
+        self._update_size()
         self._canvas.set_root(self._bg)
 
         self.add(self._canvas)
         self._canvas.show()
-
-        self.resize(width, height)
+                
+        screen = gtk.gdk.screen_get_default()
+        screen.connect('size-changed', self._size_changed_cb)
 
     def get_root(self):
         return self._bg
 
     def get_canvas(self):
         return self._canvas
+        
+    def _update_size(self):
+        padding = units.grid_to_pixels(1)
+        if self._orientation == hippo.ORIENTATION_HORIZONTAL:
+            self._bg.props.padding_left = padding
+            self._bg.props.padding_right = padding
+            self._bg.props.padding_top = 0
+            self._bg.props.padding_bottom = 0
+
+            width = gtk.gdk.screen_width()
+            height = units.grid_to_pixels(1)
+        else:
+            self._bg.props.padding_left = 0
+            self._bg.props.padding_right = 0
+            self._bg.props.padding_top = padding
+            self._bg.props.padding_bottom = padding
+
+            width = units.grid_to_pixels(1)
+            height = gtk.gdk.screen_height()
+        self.resize(width, height)
 
     def _realize_cb(self, widget):
         self.window.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_DIALOG)
         self.window.set_accept_focus(False)
+        
+    def _size_changed_cb(self, screen):
+        self._update_size()

shell/view/frame/frame.py

@@ -26,7 +26,6 @@ from view.frame.overlaybox import OverlayBox
 from view.frame.FriendsBox import FriendsBox
 from view.frame.PanelWindow import PanelWindow
 from view.frame.clipboardpanelwindow import ClipboardPanelWindow
-from view.frame.notificationtray import NotificationTray
 from view.frame.framepopupcontext import FramePopupContext
 from model.ShellModel import ShellModel
 from sugar.graphics.timeline import Timeline
@@ -50,6 +49,7 @@ class Frame:
         self._hover_frame = False
         self._shell = shell
         self._mode = Frame.INACTIVE
+        self._current_position = 0
 
         self._timeline = Timeline(self)
         self._timeline.add_tag('slide_in', 18, 24)
@@ -75,6 +75,9 @@ class Frame:
 
         shell.get_model().connect('notify::state',
                                   self._shell_state_changed_cb)
+                                  
+        screen = gtk.gdk.screen_get_default()
+        screen.connect('size-changed', self._size_changed_cb)
 
     def _create_top_panel(self):
         panel = self._create_panel(hippo.ORIENTATION_HORIZONTAL)
@@ -83,16 +86,6 @@ class Frame:
         box = ZoomBox(self._shell, self._popup_context)
         root.append(box)
 
-        tray = NotificationTray()
-        tray_box = hippo.CanvasBox(box_width=units.grid_to_pixels(1),
-                                   box_height=units.grid_to_pixels(1),
-                                   xalign=hippo.ALIGNMENT_END)
-
-        tray_widget = hippo.CanvasWidget()
-        tray_widget.props.widget = tray
-        tray_box.append(tray_widget, gtk.EXPAND)
-        root.append(tray_box)
-
         box = OverlayBox(self._shell)
         root.append(box, hippo.PACK_FIXED)
 
@@ -219,24 +212,28 @@ class Frame:
     def notify_key_release(self):
         if self._mode == Frame.TEMPORARY:
             self._timeline.play('before_slide_out', 'slide_out')
-
+            
     def _move(self, pos):
+        self._current_position = pos
+        self._update_position()
+
+    def _update_position(self):
         screen_h = gtk.gdk.screen_height()
         screen_w = gtk.gdk.screen_width()
 
-        self._move_panel(self._top_panel, pos,
+        self._move_panel(self._top_panel, self._current_position,
                          0, units.grid_to_pixels(-1),
                          0, 0)
 
-        self._move_panel(self._bottom_panel, pos,
+        self._move_panel(self._bottom_panel, self._current_position,
                          0, screen_h,
                          0, screen_h - units.grid_to_pixels(1))
 
-        self._move_panel(self._left_panel, pos,
+        self._move_panel(self._left_panel, self._current_position,
                          units.grid_to_pixels(-1), 0,
                          0, 0)
 
-        self._move_panel(self._right_panel, pos,
+        self._move_panel(self._right_panel, self._current_position,
                          screen_w, 0,
                          screen_w - units.grid_to_pixels(1), 0)
 
@@ -255,7 +252,10 @@ class Frame:
             self._move(0)
         if not self._event_frame.is_visible():
             self._event_frame.show()
-
+            
+    def _size_changed_cb(self, screen):
+       self._update_position()
+               
     def is_visible(self):
         return self._top_panel.props.visible
 

shell/view/frame/framepopupcontext.py

@@ -36,7 +36,7 @@ class FramePopupContext(PopupContext):
 
         left_x = item_x + item_w
         left_y = item_y
-        right_x = item_x + item_w
+        right_x = item_x - popup_w
         right_y = item_y
         top_x = item_x
         top_y = item_y + item_h

shell/view/frame/notificationtray.py

@@ -1,18 +0,0 @@
-import gtk
-
-from _sugar import TrayManager
-
-class NotificationTray(gtk.HBox):
-    def __init__(self):
-        gtk.HBox.__init__(self)
-
-        self._manager = TrayManager()
-        self._manager.connect('tray-icon-added', self._icon_added_cb)
-        self._manager.connect('tray-icon-removed', self._icon_removed_cb)
-        self._manager.manage_screen(gtk.gdk.screen_get_default())
-
-    def _icon_added_cb(self, manager, icon):
-        self.pack_start(icon, False)
-
-    def _icon_removed_cb(self, manager, icon):
-        icon.destroy()

shell/view/home/HomeBox.py

@@ -45,14 +45,31 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
         shell_model.connect('notify::state',
                             self._shell_state_changed_cb)
 
-        self._device_icons = []
-        for device in shell_model.get_devices():
+        self._device_icons = {}
+
+        devices_model = shell_model.get_devices()
+        for device in devices_model:
             self._add_device(device)
 
+        devices_model.connect('device-appeared',
+                              self._device_appeared_cb)
+        devices_model.connect('device-disappeared',
+                              self._device_disappeared_cb)
+
     def _add_device(self, device):
         view = deviceview.create(device)
         self.append(view, hippo.PACK_FIXED)
-        self._device_icons.append(view)
+        self._device_icons[device.get_id()] = view
+
+    def _remove_device(self, device):
+        self.remove(self._device_icons[device.get_id()])
+        del self._device_icons[device.get_id()]
+
+    def _device_appeared_cb(self, model, device):
+        self._add_device(device)
+
+    def _device_disappeared_cb(self, model, device):
+        self._remove_device(device)
 
     def _shell_state_changed_cb(self, model, pspec):
         # FIXME handle all possible mode switches
@@ -74,7 +91,7 @@ class HomeBox(hippo.CanvasBox, hippo.CanvasItem):
                           (height - icon_height) / 2)
 
         i = 0
-        for icon in self._device_icons:
+        for icon in self._device_icons.values():
             angle = 2 * math.pi / len(self._device_icons) * i + math.pi / 2
             radius = units.grid_to_pixels(5)
 

shell/view/home/MeshBox.py

@@ -22,8 +22,52 @@ import gobject
 from sugar.graphics.spreadbox import SpreadBox
 from sugar.graphics.snowflakebox import SnowflakeBox
 from sugar.graphics.canvasicon import CanvasIcon
+from hardware import hardwaremanager
 from view.BuddyIcon import BuddyIcon
 
+class AccessPointView(CanvasIcon):
+    def __init__(self, model):
+        CanvasIcon.__init__(self)
+        self._model = model
+
+        self.connect('activated', self._activate_cb)
+
+        model.connect('notify::strength', self._strength_changed_cb)
+        model.connect('notify::name', self._name_changed_cb)
+
+        self._update_icon()
+        self._update_name()
+
+    def _strength_changed_cb(self, model, pspec):
+        self._update_icon()
+
+    def _name_changed_cb(self, model, pspec):
+        self._update_name()
+
+    def _activate_cb(self, icon):
+        network_manager = hardwaremanager.get_network_manager()
+
+        device = self._model.get_nm_device()
+        network = self._model.get_nm_network()
+
+        network_manager.set_active_device(device, network)
+
+    def _update_name(self):
+        self.props.tooltip = self._model.props.name
+
+    def _update_icon(self):
+        strength = self._model.props.strength
+        if strength < 21:
+            self.props.icon_name = 'theme:stock-net-wireless-00'
+        elif strength < 41:
+            self.props.icon_name = 'theme:stock-net-wireless-21-40'
+        elif strength < 61:
+            self.props.icon_name = 'theme:stock-net-wireless-41-60'
+        elif strength < 81:
+            self.props.icon_name = 'theme:stock-net-wireless-61-80'
+        else:
+            self.props.icon_name = 'theme:stock-net-wireless-81-100'
+
 class ActivityView(SnowflakeBox):
     def __init__(self, shell, menu_shell, model):
         SnowflakeBox.__init__(self)
@@ -63,6 +107,7 @@ class MeshBox(SpreadBox):
         self._model = shell.get_model().get_mesh()
         self._buddies = {}
         self._activities = {}
+        self._access_points = {}
         self._buddy_to_activity = {}
 
         for buddy_model in self._model.get_buddies():
@@ -78,6 +123,14 @@ class MeshBox(SpreadBox):
         self._model.connect('activity-added', self._activity_added_cb)
         self._model.connect('activity-removed', self._activity_removed_cb)
 
+        for ap_model in self._model.get_access_points():
+            self._add_access_point(ap_model)
+
+        self._model.connect('access-point-added',
+                            self._access_point_added_cb)
+        self._model.connect('access-point-removed',
+                            self._access_point_removed_cb)
+
     def _buddy_added_cb(self, model, buddy_model):
         self._add_alone_buddy(buddy_model)
 
@@ -93,6 +146,12 @@ class MeshBox(SpreadBox):
     def _activity_removed_cb(self, model, activity_model):
         self._remove_activity(activity_model) 
 
+    def _access_point_added_cb(self, model, ap_model):
+        self._add_access_point(ap_model)
+
+    def _access_point_removed_cb(self, model, ap_model):
+        self._add_access_point(ap_model) 
+
     def _add_alone_buddy(self, buddy_model):
         icon = BuddyIcon(self._shell, self._menu_shell, buddy_model)
         self.add_item(icon)
@@ -136,3 +195,14 @@ class MeshBox(SpreadBox):
         icon = self._activities[activity_model.get_id()]
         self.remove_item(icon)
         del self._activities[activity_model.get_id()]
+
+    def _add_access_point(self, ap_model):
+        icon = AccessPointView(ap_model)
+        self.add_item(icon)
+
+        self._access_points[ap_model.get_id()] = icon
+
+    def _remove_access_point(self, ap_model):
+        icon = self._access_points[ap_model.get_id()]
+        self.remove_item(icon)
+        del self._access_points[ap_model.get_id()]

shell/view/keyhandler.py

@@ -2,7 +2,7 @@ import dbus
 import gobject
 
 from sugar import env
-from view.hardwaremanager import HardwareManager
+from hardware import hardwaremanager
 from model.ShellModel import ShellModel
 from _sugar import KeyGrabber
 import sugar
@@ -40,8 +40,8 @@ _actions_table = {
 class KeyHandler(object):
     def __init__(self, shell):
         self._shell = shell
-        self._hw_manager = shell.get_hardware_manager()
-        self._audio_manager = shell.get_audio_manager()
+        self._hw_manager = hardwaremanager.get_hardware_manager()
+        self._audio_manager = hardwaremanager.get_audio_manager()
         self._screen_rotation = 0
 
         self._key_grabber = KeyGrabber()
@@ -90,10 +90,10 @@ class KeyHandler(object):
         self._audio_manager.set_volume(100)
 
     def handle_color_mode(self):
-        self._hw_manager.set_display_mode(HardwareManager.COLOR_MODE)
+        self._hw_manager.set_display_mode(hardwaremanager.COLOR_MODE)
 
     def handle_b_and_w_mode(self):
-        self._hw_manager.set_display_mode(HardwareManager.B_AND_W_MODE)
+        self._hw_manager.set_display_mode(hardwaremanager.B_AND_W_MODE)
 
     def handle_console(self):
         gobject.idle_add(self._toggle_console_visibility_cb)