From 812b0987119a199e6559b6ba9c96797b3cf33525 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Wed, 1 Mar 2023 12:36:02 +0100 Subject: src/arctica-greeter.vala: Don't launch Lomiri-related DBus listeners in test mode. Allows one to run arctica-greeter in test-mode within a Lomiri session. --- src/arctica-greeter.vala | 62 +++++++++++++++++++++++++----------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'src/arctica-greeter.vala') diff --git a/src/arctica-greeter.vala b/src/arctica-greeter.vala index 9b3b735..58ca6c7 100644 --- a/src/arctica-greeter.vala +++ b/src/arctica-greeter.vala @@ -685,39 +685,41 @@ public class ArcticaGreeter : Object return false; }); - Bus.own_name (BusType.SESSION, "com.lomiri.LomiriGreeter", BusNameOwnerFlags.NONE); + if (!test_mode) { + Bus.own_name (BusType.SESSION, "com.lomiri.LomiriGreeter", BusNameOwnerFlags.NONE); - dbus_object = new DialogDBusInterface (); - dbus_object.open_dialog.connect ((type) => - { - ShutdownDialogType dialog_type; - switch (type) + dbus_object = new DialogDBusInterface (); + dbus_object.open_dialog.connect ((type) => { - default: - case 1: - dialog_type = ShutdownDialogType.SHUTDOWN; - break; - case 2: - dialog_type = ShutdownDialogType.RESTART; - break; - } - main_window.show_shutdown_dialog (dialog_type); - }); - dbus_object.close_dialog.connect ((type) => { main_window.close_shutdown_dialog (); }); - Bus.own_name (BusType.SESSION, "com.lomiri.Shell", BusNameOwnerFlags.NONE, - (c) => - { - try - { - c.register_object ("/org/gnome/SessionManager/EndSessionDialog", dbus_object); - } - catch (Error e) + ShutdownDialogType dialog_type; + switch (type) + { + default: + case 1: + dialog_type = ShutdownDialogType.SHUTDOWN; + break; + case 2: + dialog_type = ShutdownDialogType.RESTART; + break; + } + main_window.show_shutdown_dialog (dialog_type); + }); + dbus_object.close_dialog.connect ((type) => { main_window.close_shutdown_dialog (); }); + Bus.own_name (BusType.SESSION, "com.lomiri.Shell", BusNameOwnerFlags.NONE, + (c) => { - warning ("Failed to register /org/gnome/SessionManager/EndSessionDialog: %s", e.message); - } - }, - null, - () => debug ("Failed to acquire name com.lomiri.Shell")); + try + { + c.register_object ("/org/gnome/SessionManager/EndSessionDialog", dbus_object); + } + catch (Error e) + { + warning ("Failed to register /org/gnome/SessionManager/EndSessionDialog: %s", e.message); + } + }, + null, + () => debug ("Failed to acquire name com.lomiri.Shell")); + } start_fake_wm (); Gdk.threads_add_idle (ready_cb); -- cgit v1.2.3