Ticket #1608: 1608.patch

extensions/deviceicon/network.py

@@ -508 +508 @@
         self._icon.props.base_color = self._color
 
     def __deactivate_connection_cb(self, palette, data=None):
+        connection = network.find_connection_by_ssid(self._name)
+        if connection:
+            if self._mode == network.NM_802_11_MODE_INFRA:
+                connection.set_disconnected()
+
         if self._active_ap_op is not None:
             obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
             netmgr = dbus.Interface(obj, _NM_IFACE)

src/jarabe/desktop/meshbox.py

@@ -267 +267 @@
             self.props.base_color = self._color
 
     def _disconnect_activate_cb(self, item):
-        pass
+        connection = network.find_connection_by_ssid(self._name)
+        if connection:
+            if self._mode == network.NM_802_11_MODE_INFRA:
+                connection.set_disconnected()
+
+        obj = self._bus.get_object(_NM_SERVICE, _NM_PATH)
+        netmgr = dbus.Interface(obj, _NM_IFACE)
+
+        if self._connection is not None:
+            netmgr.DeactivateConnection(self._connection)
+            return
+
+        netmgr_props = dbus.Interface(netmgr, 'org.freedesktop.DBus.Properties')
+        active_connections_o = netmgr_props.Get(_NM_IFACE, 'ActiveConnections')
+
+        for conn_o in active_connections_o:
+            obj = self._bus.get_object(_NM_IFACE, conn_o)
+            props = dbus.Interface(obj, 'org.freedesktop.DBus.Properties')
+            state = props.Get(_NM_ACTIVE_CONN_IFACE, 'State')
+            if state == network.NM_ACTIVE_CONNECTION_STATE_ACTIVATED:
+                ap_o = props.Get(_NM_ACTIVE_CONN_IFACE, 'SpecificObject')
+                found = False
+                if ap_o != '/' and self.find_ap(ap_o) is not None:
+                    found = True
+                    netmgr.DeactivateConnection(conn_o)
+                if not found:
+                    logging.error('Could not determine AP for'
+                                  ' specific object %s' % conn_o)
 
     def _add_ciphers_from_flags(self, flags, pairwise):
         ciphers = []
@@ -373 +400 @@
                                   error_handler=self.__activate_error_cb)
 
     def __activate_reply_cb(self, connection):
+        self._connection = connection
         logging.debug('Connection activated: %s', connection)
 
     def __activate_error_cb(self, err):

src/jarabe/model/network.py

@@ -330 +330 @@
         self.secrets_request.send(self, connection=sender,
                                   response=kwargs['response'])
 
+    def clear_connections(self):
+        for connection in self.connections.values():
+            connection.Removed()
+        self.connections = {}
+
 class SecretsResponse(object):
     ''' Intermediate object to report the secrets from the dialog
     back to the connection object and which will inform NM
@@ -358 +363 @@
         self._settings = settings
         self._secrets = secrets
 
+    @dbus.service.signal(dbus_interface=NM_CONNECTION_IFACE,
+                         signature='')
+    def Removed(self):
+        pass
+
+    @dbus.service.signal(dbus_interface=NM_CONNECTION_IFACE,
+                         signature='a{sa{sv}}')
+    def Updated(self, settings):
+        pass
+
     def set_connected(self):
         if self._settings.connection.type == NM_CONNECTION_TYPE_GSM:
             self._settings.connection.timestamp = int(time.time())
@@ -366 +381 @@
                 self._settings.connection.autoconnect = True
                 self._settings.connection.timestamp = int(time.time())
                 if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
+                    self.Updated(self._settings.get_dict())
                     self.save()
 
+    def set_disconnected(self):
+        if self._settings.connection.autoconnect:
+            self._settings.connection.autoconnect = False
+            self._settings.connection.timestamp = None
+            self.Updated(self._settings.get_dict())
+            self.save()
+
     def set_secrets(self, secrets):
         self._secrets = secrets
         if self._settings.connection.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
@@ -454 +477 @@
         else:
             reply(self._secrets.get_dict())
 
-
 class AccessPoint(gobject.GObject):
     __gsignals__ = {
         'props-changed': (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE,
@@ -659 +681 @@
 
 
 def clear_networks():
-    global _nm_settings
-    _nm_settings = None
+    _nm_settings.clear_connections()
 
     profile_path = env.get_profile_path()
     config_path = os.path.join(profile_path, 'nm', 'connections.cfg')