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 'bin')

diff --git a/bin/sugar-shell b/bin/sugar-shell
index 5dc7e7a..d1b68a0 100644
--- a/bin/sugar-shell
+++ b/bin/sugar-shell
@@ -17,6 +17,7 @@
 
 import os
 import gettext
+import logging
 
 import gtk
 import gobject
@@ -34,6 +35,7 @@ from jarabe.hardware import hardwaremanager
 from jarabe.intro.window import IntroWindow
 from jarabe.intro.window import create_profile
 from jarabe.session import get_session_manager
+from jarabe.nmservice import NMService
 from jarabe import logsmanager
 from jarabe import config
 
@@ -87,6 +89,11 @@ def main():
     session_manager.start()
 
     try:
+        nm_service = NMService()
+    except dbus.DBusException:
+        logging.error("Network manager is already running.")
+
+    try:
         gtk.main()
     except KeyboardInterrupt:
         print 'Ctrl+C pressed, exiting...'
--
cgit v0.9.1