From 297bf0a1bd4c38dff059d3aa131426d4337f3af1 Mon Sep 17 00:00:00 2001
From: Ken Moore <moorekou@gmail.com>
Date: Fri, 24 Apr 2020 17:50:05 -0400
Subject: Disable xscreensaver from auto-start. Enable lumina-checkpass

---
 src-qt5/core/core.pro                   |  4 ++--
 src-qt5/core/lumina-desktop/Globals.h   | 31 -------------------------------
 src-qt5/core/lumina-session/session.cpp |  4 ++--
 3 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro
index 4b3edb88..452d2fb7 100644
--- a/src-qt5/core/core.pro
+++ b/src-qt5/core/core.pro
@@ -10,8 +10,8 @@ SUBDIRS+= lumina-desktop \
 	lumina-info \
 	lumina-pingcursor \
 	$${PWD}/../../icon-theme \
-	lumina-theme-engine
-#	lumina-checkpass
+	lumina-theme-engine \
+	lumina-checkpass
 #	lumina-desktop-unified
 
 #Also install any special menu scripts
diff --git a/src-qt5/core/lumina-desktop/Globals.h b/src-qt5/core/lumina-desktop/Globals.h
index f7821466..109731d2 100644
--- a/src-qt5/core/lumina-desktop/Globals.h
+++ b/src-qt5/core/lumina-desktop/Globals.h
@@ -45,37 +45,6 @@ public:
 	  }
 	  return QString::fromLocal8Bit(name,count);
 	}
-	/*//Shutdown the system
-#ifdef __linux
-	static void shutdown(){ system("(shutdown -h now) &"); }
-#else // #ifdef __linux
-	static void shutdown(){ system("(shutdown -p now) &"); }
-#endif // #ifdef __linux
-	//Restart the system
-	static void restart(){ system("(shutdown -r now) &"); }
-
-	//Determine if there is battery support
-	static bool hasBattery(){
-	  int val = LUtils::getCmdOutput("apm -l").join("").toInt();
-	  return (val >= 0 && val <= 100);
-	}
-
-	//Get the current battery charge percentage
-	static int batteryCharge(){
-	  int charge = LUtils::getCmdOutput("apm -l").join("").toInt();
-	  if(charge > 100){ charge = -1; } //invalid charge
-	  return charge;
-	}
-
-	//Get the current battery charge percentage
-	static bool batteryIsCharging(){
-	  return (LUtils::getCmdOutput("apm -a").join("").simplified() == "1");
-	}
-
-	//Get the amount of time remaining for the battery
-	static int batterySecondsLeft(){
-	  return LUtils::getCmdOutput("apm -t").join("").toInt();
-	}*/
 };
 
 #endif
diff --git a/src-qt5/core/lumina-session/session.cpp b/src-qt5/core/lumina-session/session.cpp
index fb6e84a5..aed63f7e 100644
--- a/src-qt5/core/lumina-session/session.cpp
+++ b/src-qt5/core/lumina-session/session.cpp
@@ -196,12 +196,12 @@ void LSession::start(bool unified){
 	startProcess("wm", WM);
   }
   //Compositing manager
-  setupCompositor();
+  setupCompositor(true);
   //Desktop Next
   LSingleApplication::removeLocks("lumina-desktop");
   startProcess("runtime","lumina-desktop");
   //ScreenSaver
-  if(LUtils::isValidBinary("xscreensaver")){ startProcess("screensaver","xscreensaver -no-splash"); }
+  //if(LUtils::isValidBinary("xscreensaver")){ startProcess("screensaver","xscreensaver -no-splash"); }
  }else{
   //unified process
   setupCompositor(true); //required for Lumina 2
-- 
cgit