diff options
| author | Sascha Silbe <silbe@activitycentral.com> | 2011-03-12 17:41:32 (GMT) |
|---|---|---|
| committer | Sascha Silbe <silbe@activitycentral.com> | 2011-03-12 17:41:32 (GMT) |
| commit | 6e2b8150283e94ed4961dacb2d605dfc3329fd4b (patch) | |
| tree | e7be1ea2e0ad73a1ae2d426ef46270629a6d9049 | |
| parent | a89f365d901a76f499ff80698891cd02b64a7de4 (diff) | |
| parent | c63cc7235205633917f3b69a76cc660b2b63dddb (diff) | |
Merge branch 't/bug-1673' into refs/top-bases/t/versionsrefs/top-bases/t/versions
* t/bug-1673:
fix merge left-overs
Conflicts:
src/jarabe/model/network.py
| -rw-r--r-- | extensions/cpsection/network/model.py | 1 | ||||
| -rw-r--r-- | src/jarabe/model/network.py | 14 |
2 files changed, 0 insertions, 15 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 504c723..4ee7bea 100644 --- a/src/jarabe/model/network.py +++ b/src/jarabe/model/network.py @@ -925,20 +925,6 @@ def load_wifi_connections(): add_connection(uuid, settings, secrets) -def clear_networks(): - _nm_settings.clear_connections() - - 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 |