diff options
Diffstat (limited to 'caribou')
| -rw-r--r-- | caribou/antler/main.py | 5 | ||||
| -rw-r--r-- | caribou/daemon/main.py | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/caribou/antler/main.py b/caribou/antler/main.py index ce0eca3..d5d9a1b 100644 --- a/caribou/antler/main.py +++ b/caribou/antler/main.py @@ -2,6 +2,7 @@ from gi.repository import Caribou from window import AntlerWindowEntry from keyboard_view import AntlerKeyboardView import gobject +import sys class AntlerKeyboardService(Caribou.KeyboardService): def __init__(self): @@ -25,6 +26,10 @@ class AntlerKeyboardService(Caribou.KeyboardService): def do_set_entry_location (self, x, y, w, h): self.window.set_entry_location(x, y, w, h) + def do_name_lost (self, name): + sys.stderr.write("Another service acquired %s, quitting..\n") + sys.exit(0) + if __name__ == "__main__": antler_keyboard_service = AntlerKeyboardService() antler_keyboard_service.run() diff --git a/caribou/daemon/main.py b/caribou/daemon/main.py index 4f3def9..63eb444 100644 --- a/caribou/daemon/main.py +++ b/caribou/daemon/main.py @@ -9,13 +9,13 @@ from caribou import APP_NAME debug = False class CaribouDaemon: - def __init__(self, keyboard_name="Antler"): + def __init__(self): if not self._get_a11y_enabled(): self._show_no_a11y_dialogs() bus = dbus.SessionBus() try: - dbus_obj = bus.get_object("org.gnome.Caribou.%s" % keyboard_name, - "/org/gnome/Caribou/%s" % keyboard_name) + dbus_obj = bus.get_object("org.gnome.Caribou.Keyboard", + "/org/gnome/Caribou/Keyboard") except dbus.DBusException, e: self._show_error_dialog(e.message) self.keyboard_proxy = dbus.Interface(dbus_obj, "org.gnome.Caribou.Keyboard") |