From 848c3fb88548ba5507fa0c14e3291a70de9ef465 Mon Sep 17 00:00:00 2001
From: Marco Pesenti Gritti <mpgritti@gmail.com>
Date: Fri, 03 Oct 2008 10:59:32 +0000
Subject: 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.
---
(limited to 'src/jarabe/controlpanel')

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()
--
cgit v0.9.1