diff --git a/cli/wicd-cli.py b/cli/wicd-cli.py index 570ea25..33f33c2 100644 --- a/cli/wicd-cli.py +++ b/cli/wicd-cli.py @@ -43,6 +43,10 @@ except dbus.DBusException: print 'Error: Could not connect to the daemon. Please make sure it is running.' sys.exit(3) +if not daemon: + print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' + sys.exit(3) + parser = optparse.OptionParser() parser.add_option('--network', '-n', type='int', default=-1) diff --git a/curses/wicd-curses.py b/curses/wicd-curses.py index b2429a5..60b5f16 100755 --- a/curses/wicd-curses.py +++ b/curses/wicd-curses.py @@ -1018,6 +1018,10 @@ def setup_dbus(force=True): wireless = dbus_ifaces['wireless'] wired = dbus_ifaces['wired'] + if not daemon: + print 'Error connecting to wicd via D-Bus. Please make sure the wicd service is running.' + sys.exit(3) + netentry_curses.dbus_init(dbus_ifaces) return True diff --git a/gtk/gui.py b/gtk/gui.py index e29f3c1..a90b199 100644 --- a/gtk/gui.py +++ b/gtk/gui.py @@ -145,6 +145,17 @@ class appGui(object): """ Initializes everything needed for the GUI. """ setup_dbus() + if not daemon: + errmsg = "Error connecting to wicd service via D-Bus." + \ + "Please ensure the wicd service is running." + d = gtk.MessageDialog(parent=None, + flags=gtk.DIALOG_MODAL, + type=gtk.MESSAGE_ERROR, + buttons=gtk.BUTTONS_OK, + message_format=errmsg) + d.run() + sys.exit(1) + self.tray = tray gladefile = os.path.join(wpath.gtk, "wicd.ui")