diff --git a/gui/src/linux/main.py b/gui/src/linux/main.py index 4591050..f04500d 100644 --- a/gui/src/linux/main.py +++ b/gui/src/linux/main.py @@ -27,8 +27,8 @@ def main(): import dbus bus = dbus.SessionBus() - the_object = bus.get_objeect("com.quexten.Goldwarden.dbus", "/com/quexten/Goldwarden") - the_interface = dbus.Interface(the_object, "com.quexten.Goldwarden.Settings") + the_object = bus.get_object("com.quexten.Goldwarden.gui", "/com/quexten/Goldwarden/gui") + the_interface = dbus.Interface(the_object, "com.quexten.Goldwarden.gui.actions") reply = the_interface.settings() exit() diff --git a/gui/src/linux/monitors/dbus_monitor.py b/gui/src/linux/monitors/dbus_monitor.py index acfc053..766fb85 100644 --- a/gui/src/linux/monitors/dbus_monitor.py +++ b/gui/src/linux/monitors/dbus_monitor.py @@ -11,19 +11,19 @@ daemon_token = None class GoldwardenDBUSService(dbus.service.Object): def __init__(self): - bus_name = dbus.service.BusName('com.quexten.Goldwarden.ui', bus=dbus.SessionBus()) - dbus.service.Object.__init__(self, bus_name, '/com/quexten/Goldwarden/ui') + bus_name = dbus.service.BusName('com.quexten.Goldwarden.gui', bus=dbus.SessionBus()) + dbus.service.Object.__init__(self, bus_name, '/com/quexten/Goldwarden/gui') - @dbus.service.method('com.quexten.Goldwarden.ui.QuickAccess') + @dbus.service.method('com.quexten.Goldwarden.gui.actions') def quickaccess(self): p = subprocess.Popen(["python3", "-m", "src.gui.quickaccess"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, cwd=root_path, start_new_session=True) p.stdin.write(f"{daemon_token}\n".encode()) p.stdin.flush() return "" - @dbus.service.method('com.quexten.Goldwarden.ui.Settings') + @dbus.service.method('com.quexten.Goldwarden.gui.actions') def settings(self): - subprocess.Popen(["python3", "-m", "src.gui.settings"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, cwd=root_path, start_new_session=True) + p = subprocess.Popen(["python3", "-m", "src.gui.settings"], stdin=subprocess.PIPE, stdout=subprocess.PIPE, cwd=root_path, start_new_session=True) p.stdin.write(f"{daemon_token}\n".encode()) p.stdin.flush() return ""