Ticket #1673: 0001-fix-discard-history-1673-for-uruguay-consensus.patch

extensions/cpsection/network/model.py

@@ -17 +17 @@
 
 import dbus
 from gettext import gettext as _
+from jarabe.model import network
 import gconf
 
 _NM_SERVICE = 'org.freedesktop.NetworkManager'
@@ -116 +117 @@
 def clear_networks():
     """Clear saved passwords and network configurations.
     """
-    pass
+    network.clear_wifi_connections()
+
+def count_networks():
+    return network.count_wifi_connections()
 
 def get_publish_information():
     client = gconf.client_get_default()

extensions/cpsection/network/view.py

@@ -104 +104 @@
         self._clear_history_button = gtk.Button()
         self._clear_history_button.set_label(_('Discard network history'))
         box_clear_history.pack_start(self._clear_history_button, expand=False)
+        if self._model.count_networks() == 0:
+            self._clear_history_button.set_sensitive(False)
         self._clear_history_button.show()
         box_wireless.pack_start(box_clear_history, expand=False)
         box_clear_history.show()
@@ -217 +219 @@
             self._radio_alert.props.msg = detail
             self._radio_valid = False
         else:
-            self._radio_valid = True            
+            self._radio_valid = True
+            if self._model.count_networks() != 0:
+                self._clear_history_button.set_sensitive(True)
 
         self._validate()
         return False
@@ -248 +252 @@
 
     def __network_configuration_reset_cb(self, widget):
         self._model.clear_networks()
+        if self._model.count_networks() == 0:
+            self._clear_history_button.set_sensitive(False)

src/jarabe/model/network.py

@@ -508 +508 @@
         self.secrets_request.send(self, connection=sender,
                                   response=kwargs['response'])
 
+    def clear_wifi_connections(self):
+        for uuid in self.connections.keys():
+            conn = self.connections[uuid]
+            if conn.type == NM_CONNECTION_TYPE_802_11_WIRELESS:
+                conn.Removed()
+                self.connections.pop(uuid)
+
 class SecretsResponse(object):
     ''' Intermediate object to report the secrets from the dialog
     back to the connection object and which will inform NM
@@ -536 +543 @@
         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())
@@ -544 +561 @@
                 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.type != NM_CONNECTION_TYPE_GSM and \
+               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:
@@ -555 +581 @@
         return self._settings
 
     def save(self):
-        profile_path = env.get_profile_path()
-        config_path = os.path.join(profile_path, 'nm', 'connections.cfg')
+        config_path = get_wifi_connections_path()
 
         config = ConfigParser.ConfigParser()
         try:
@@ -777 +802 @@
     _nm_settings.add_connection(uuid, conn)
     return conn
 
-def load_wifi_connections():
+def get_wifi_connections_path():
     profile_path = env.get_profile_path()
-    config_path = os.path.join(profile_path, 'nm', 'connections.cfg')
+    return os.path.join(profile_path, 'nm', 'connections.cfg')
 
-    config = ConfigParser.ConfigParser()
+def create_wifi_connections(config_path):
+    if not os.path.exists(os.path.dirname(config_path)):
+        os.makedirs(os.path.dirname(config_path), 0755)
+    f = open(config_path, 'w')
+    f.close()
+
+def load_wifi_connections():
+    config_path = get_wifi_connections_path()
 
     if not os.path.exists(config_path):
-        if not os.path.exists(os.path.dirname(config_path)):
-            os.makedirs(os.path.dirname(config_path), 0755)
-        f = open(config_path, 'w')
-        config.write(f)
-        f.close()
+        create_wifi_connections(config_path)
 
+    config = ConfigParser.ConfigParser()
     try:
         if not config.read(config_path):
             logging.error('Error reading the nm config file')
@@ -895 +924 @@
 
     logging.debug('There is no gsm connection in the NMSettings.')
     return None
+
+def count_wifi_connections():
+    return len(get_settings().connections)
+
+def clear_wifi_connections():
+    _nm_settings.clear_wifi_connections()
+
+    config_path = get_wifi_connections_path()
+    create_wifi_connections(config_path)