diff options
author | Sascha Silbe <silbe@activitycentral.com> | 2011-03-12 17:40:44 (GMT) |
---|---|---|
committer | Sascha Silbe <silbe@activitycentral.com> | 2011-03-12 17:40:44 (GMT) |
commit | c63cc7235205633917f3b69a76cc660b2b63dddb (patch) | |
tree | b9d68a5ad2a4c1df2f9ecc84765b29b2d929ca34 | |
parent | 9f4be6b0d970093991c579bfbf85e6af8cdb3597 (diff) |
fix merge left-oversrefs/top-bases/t/bug-1608t/bug-1673
-rw-r--r-- | extensions/cpsection/network/model.py | 1 | ||||
-rw-r--r-- | src/jarabe/model/network.py | 15 |
2 files changed, 0 insertions, 16 deletions
diff --git a/extensions/cpsection/network/model.py b/extensions/cpsection/network/model.py index a7ae17e..916ce8c 100644 --- a/extensions/cpsection/network/model.py +++ b/extensions/cpsection/network/model.py @@ -17,7 +17,6 @@ import dbus from gettext import gettext as _ -from jarabe.model import network import gconf from jarabe.model import network diff --git a/src/jarabe/model/network.py b/src/jarabe/model/network.py index 8d7d056..f265ae4 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -917,21 +917,6 @@ def load_wifi_connections(): add_connection(uuid, settings, secrets) -def clear_networks(): - global _nm_settings - _nm_settings = None - - profile_path = env.get_profile_path() - config_path = os.path.join(profile_path, 'nm', 'connections.cfg') - config = ConfigParser.ConfigParser() - - 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() - - def load_gsm_connection(): _BAUD_RATE = 115200 |