diff options
| author | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 10:59:32 (GMT) |
|---|---|---|
| committer | Marco Pesenti Gritti <mpgritti@gmail.com> | 2008-10-03 10:59:32 (GMT) |
| commit | 848c3fb88548ba5507fa0c14e3291a70de9ef465 (patch) | |
| tree | 977fb6f7a199a9d76d92b117a1d489a40bcbf992 /src/jarabe/controlpanel | |
| parent | a388428f0635e66b0e57225a357ef05c313b77ca (diff) | |
Merge nmclient and nminfo and move them in the model.
Split the gtk dialog out with the service.
I cannot test this until we build it for joyride or we support nm 0.7.
Diffstat (limited to 'src/jarabe/controlpanel')
| -rw-r--r-- | src/jarabe/controlpanel/network/model.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/jarabe/controlpanel/network/model.py b/src/jarabe/controlpanel/network/model.py index b6f71a0..101297c 100644 --- a/src/jarabe/controlpanel/network/model.py +++ b/src/jarabe/controlpanel/network/model.py @@ -19,7 +19,8 @@ import dbus from gettext import gettext as _ from sugar import profile -from jarabe.hardware import hardwaremanager + +from jarabe.model.network import get_manager NM_SERVICE_NAME = 'org.freedesktop.NetworkManager' NM_SERVICE_PATH = '/org/freedesktop/NetworkManager' @@ -94,7 +95,7 @@ def clear_registration(): def clear_networks(): """Clear saved passwords and network configurations. """ - network_manager = hardwaremanager.get_network_manager() + network_manager = get_manager() if not network_manager: return network_manager.nminfo.delete_all_networks() |