Ticket #10532: cpsection-network-model.patch

model.py

@@ -94 +94 @@
 def set_radio_nm(state):
     """Turn Radio 'on' or 'off'
     state : 'on/off'
-    """    
+    """
+    if not state in ('on', 1, 'off', 0):
+        raise ValueError(_("Error in specified radio argument use on/off."))
+    
+    bus = dbus.SystemBus()
+    try:
+        obj = bus.get_object(_NM_SERVICE, _NM_PATH)
+        nm_props = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
+        nm = dbus.Interface(obj, _NM_IFACE)
+    except dbus.DBusException:
+        raise ReadError('%s service not available' % _NM_SERVICE)
+        
     if state == 'on' or state == 1:
-        bus = dbus.SystemBus()
-        try:
-            obj = bus.get_object(_NM_SERVICE, _NM_PATH)
-            nm_props = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
-        except dbus.DBusException:
-            raise ReadError('%s service not available' % _NM_SERVICE)
-        nm_props.Set(_NM_IFACE, 'WirelessEnabled', True)
-    elif state == 'off' or state == 0:
-        bus = dbus.SystemBus()
-        try:
-            obj = bus.get_object(_NM_SERVICE, _NM_PATH)
-            nm_props = dbus.Interface(obj, dbus.PROPERTIES_IFACE)
-        except dbus.DBusException:
-            raise ReadError('%s service not available' % _NM_SERVICE)
-        nm_props.Set(_NM_IFACE, 'WirelessEnabled', False)
+        newstate = True
     else:
-        raise ValueError(_("Error in specified radio argument use on/off."))
+        newstate = False
+        
+    nm.Enable(newstate)
+    nm_props.Set(_NM_IFACE, 'WirelessEnabled', newstate)
 
     return 0
 
@@ -157 +157 @@
 
 # get current status from rfkill
 def get_radio():
-    return get_radio_rfkill()
+    rf_state = get_radio_rfkill()
+    nm_state = get_radio_nm()
+    if rf_state == 1 and nm_state == 1:
+        return 1
+    else:
+        return 0
 
 # set new status to both the dot-file and rfkill
 def set_radio(state):
     set_radio_rfkill(state)
+    set_radio_nm(state)
 
 def clear_registration():
     """Clear the registration with the schoolserver