Revert "Add our wayland compatible screenlocker"

This reverts commit aa1dacf.

meson.build

@@ -22,6 +22,17 @@ am_cflags = [
 ]
 add_global_arguments(am_cflags, language: 'c')
 
+budgie_screensaver  = find_program('budgie-screensaver', required: false)
+gnome_screensaver = find_program('gnome-screensaver', required: false)
+with_gnome_screensaver = get_option('with-gnome-screensaver')
+if with_gnome_screensaver == false
+    assert(budgie_screensaver.found(), 'Budgie Screensaver is a required separate component of Budgie Desktop. Please ensure budgie-screensaver is available at configure and run time. You can find this at https://github.com/BuddiesOfBudgie/budgie-screensaver')
+    budgie_screensaver_vala_args = []
+else
+    assert(gnome_screensaver.found(), 'Either GNOME Screensaver or Budgie Screensaver is a required separate component of Budgie Desktop. Please ensure one of these is available at configure and run time.')
+    budgie_screensaver_vala_args = ['-D', 'HAVE_GNOME_SCREENSAVER']
+endif
+
 meson.add_install_script('scripts/mesonPostInstall.sh')
 
 fs = import('fs')

meson_options.txt

@@ -1,6 +1,7 @@
 option('ci', type: 'boolean', value: false, description: 'Continuous Integration flag (internal use only)')
 option('use-old-zenity', type: 'boolean', value: false, description: 'Use old zenity CLI API for out-of-process dialog handling')
 option('with-bluetooth', type: 'boolean', value: true, description: 'Enable Bluetooth (Vala option)')
+option('with-gnome-screensaver', type: 'boolean', value: false, description: 'Build using gnome-screensaver as a dependency')
 option('with-gtk-doc', type: 'boolean', value: true, description: 'Build gtk-doc documentation')
 option('with-hibernate', type: 'boolean', value: true, description: 'Include support for system hibernation')
 option('with-libuuid-time-safe', type: 'boolean', value: true, description: 'Enable use of LIBUUID.generate_time_safe (Vala option)')

src/daemon/manager.vala

@@ -28,8 +28,6 @@ namespace Budgie {
 		Budgie.XDGDirTracker? xdg_tracker;
 		Budgie.Background? background;
 
-		/* Screenlock */
-		Budgie.Screenlock? screenlock;
 		/**
 		* Construct a new ServiceManager and initialiase appropriately
 		*/
@@ -60,10 +58,6 @@ namespace Budgie {
 			}
 			xdg_tracker = new Budgie.XDGDirTracker();
 			xdg_tracker.setup_dbus(replace);
-
-
-			var screenlock = Screenlock.init();
-			screenlock.setup_dbus();
 		}
 
 		/**

src/daemon/meson.build

@@ -35,7 +35,6 @@ daemon_sources = [
     'menus.vala',
     'osd.vala',
     'settings.vala',
-    'screenlock.vala',
     'tabswitcher.vala',
     'xdgdirtracker/dbus.vala',
 ]

src/dialogs/power/dbus.vala

@@ -40,7 +40,7 @@ namespace Budgie {
 		public abstract async void Shutdown() throws Error;
 	}
 
-	[DBus (name="org.buddiesofbudgie.BudgieScreenlock")]
+	[DBus (name="org.gnome.ScreenSaver")]
 	public interface ScreensaverRemote : GLib.Object {
 		public abstract void lock() throws Error;
 	}

src/dialogs/power/window.vala

@@ -182,9 +182,14 @@ namespace Budgie {
 			}
 
 			try {
-				screensaver = yield Bus.get_proxy(BusType.SESSION, "org.buddiesofbudgie.BudgieScreenlock", "/org/buddiesofbudgie/Screenlock");
+				screensaver = yield Bus.get_proxy(BusType.SESSION, "org.gnome.ScreenSaver", "/org/gnome/ScreenSaver");
 			} catch (Error e) {
-				warning("Unable to connect to budgie-screenlock: %s", e.message);
+#if HAVE_GNOME_SCREENSAVER
+				warning("Unable to connect to gnome-screensaver: %s", e.message);
+#else
+				warning("Unable to connect to budgie-screensaver: %s", e.message);
+#endif
+				return;
 			}
 
 			try {
@@ -291,9 +296,17 @@ namespace Budgie {
 			hide();
 			Idle.add(() => {
 				try {
+#if HAVE_GNOME_SCREENSAVER
+					if (screensaver == null) { // attempt to connect to dbus if not started previously
+						screensaver = Bus.get_proxy_sync(BusType.SESSION, "org.gnome.ScreenSaver", "/org/gnome/ScreenSaver");
+					}
+#endif
 					screensaver.lock();
 				} catch (Error e) {
 					warning("Cannot lock screen: %s", e.message);
+#if HAVE_GNOME_SCREENSAVER
+					screensaver = null; // allow another retry to lock the screen on a failure
+#endif
 				}
 				return false;
 			});

src/panel/applets/user-indicator/UserIndicatorWindow.vala

@@ -67,9 +67,14 @@ public class UserIndicatorWindow : Budgie.Popover {
 		}
 
 		try {
-			saver = yield Bus.get_proxy(BusType.SESSION, "org.buddiesofbudgie.BudgieScreenlock", "/org/buddiesofbudgie/Screenlock");
+			saver = yield Bus.get_proxy(BusType.SESSION, "org.gnome.ScreenSaver", "/org/gnome/ScreenSaver");
 		} catch (Error e) {
-			warning(UNABLE_CONTACT + "budgie-screenlock: %s", e.message);
+#if HAVE_GNOME_SCREENSAVER
+			warning(UNABLE_CONTACT + "gnome-screensaver: %s", e.message);
+#else
+			warning(UNABLE_CONTACT + "budgie-screensaver: %s", e.message);
+#endif
+			return;
 		}
 
 		try {
@@ -364,9 +369,17 @@ public class UserIndicatorWindow : Budgie.Popover {
 		hide();
 		Idle.add(() => {
 			try {
+#if HAVE_GNOME_SCREENSAVER
+				if (saver == null) { // attempt to connect to dbus if not started previously
+					saver = Bus.get_proxy_sync(BusType.SESSION, "org.gnome.ScreenSaver", "/org/gnome/ScreenSaver");
+				}
+#endif
 				saver.lock();
 			} catch (Error e) {
 				warning("Cannot lock screen: %s", e.message);
+#if HAVE_GNOME_SCREENSAVER
+				saver = null; // allow another retry to lock the screen on a failure
+#endif
 			}
 			return false;
 		});

src/session/budgie-desktop-screensaver-gnome.desktop.in.in

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Name=Screensaver (Budgie Desktop)
+Comment=Launch screensaver and locker program
+Icon=preferences-desktop-screensaver
+Exec=gnome-screensaver
+TryExec=gnome-screensaver
+OnlyShowIn=Budgie;
+NoDisplay=true
+X-GNOME-Autostart-Phase=Application
+X-GNOME-Autostart-Notify=true
+X-GNOME-Bugzilla-Bugzilla=GNOME
+X-GNOME-Bugzilla-Product=gnome-screensaver
+X-GNOME-Bugzilla-Component=general