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 /bin | |
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 'bin')
-rw-r--r-- | bin/sugar-shell | 7 |
1 files changed, 7 insertions, 0 deletions
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...' |