From bccc8102b7c03db93756c3e8ddfd787bf037f12d Mon Sep 17 00:00:00 2001
From: Victor Tran <vicr12345@gmail.com>
Date: Sat, 3 Apr 2021 00:45:51 +1100
Subject: [PATCH] Fix polkit autostarting

---
 desktop/bar/taskbarwidget.ui          | 5 +----
 dist/thedesk-blueprint.spec           | 2 +-
 startdesk/splash/splashcontroller.cpp | 3 +++
 startdesk/startdesk.pro               | 7 ++++++-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/desktop/bar/taskbarwidget.ui b/desktop/bar/taskbarwidget.ui
index 10ac46b0..1bdc2e5f 100644
--- a/desktop/bar/taskbarwidget.ui
+++ b/desktop/bar/taskbarwidget.ui
@@ -37,7 +37,7 @@
     </layout>
    </item>
    <item>
-    <widget class="QPushButton" name="lastDesktopButton">
+    <widget class="QToolButton" name="lastDesktopButton">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -50,9 +50,6 @@
      <property name="checkable">
       <bool>true</bool>
      </property>
-     <property name="flat">
-      <bool>true</bool>
-     </property>
     </widget>
    </item>
    <item>
diff --git a/dist/thedesk-blueprint.spec b/dist/thedesk-blueprint.spec
index 354e5fe5..050c36b1 100755
--- a/dist/thedesk-blueprint.spec
+++ b/dist/thedesk-blueprint.spec
@@ -1,6 +1,6 @@
 Name:           thedesk-blueprint
 Version:        beta4
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Desktop Environment built on Qt
 
 License:        GPLv3+
diff --git a/startdesk/splash/splashcontroller.cpp b/startdesk/splash/splashcontroller.cpp
index 2aedfa18..3525b2a1 100644
--- a/startdesk/splash/splashcontroller.cpp
+++ b/startdesk/splash/splashcontroller.cpp
@@ -179,6 +179,9 @@ void SplashController::runAutostart() {
         if (!app->getStringList("OnlyShowIn", {"thedesk"}).contains("thedesk")) continue;
         if (app->getStringList("NotShowIn").contains("thedesk")) continue;
 
+        //Blacklist Touchegg
+        if (desktopEntry == "touchegg") continue;
+
         if (app->hasProperty("TryExec")) {
             QString tryExecPath = app->getProperty("TryExec").toString();
             if (tryExecPath.startsWith("/")) {
diff --git a/startdesk/startdesk.pro b/startdesk/startdesk.pro
index e0b9e487..3eb1fa2d 100644
--- a/startdesk/startdesk.pro
+++ b/startdesk/startdesk.pro
@@ -5,7 +5,12 @@ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
 CONFIG += c++11
 
 # Include the-libs build tools
-include(/usr/share/the-libs/pri/gentranslations.pri)
+# Include the-libs build tools
+equals(THELIBS_BUILDTOOLS_PATH, "") {
+    THELIBS_BUILDTOOLS_PATH = $$[QT_INSTALL_PREFIX]/share/the-libs/pri
+}
+include($$THELIBS_BUILDTOOLS_PATH/gentranslations.pri)
+include($$THELIBS_BUILDTOOLS_PATH/varset.pri)
 
 # The following define makes your compiler emit warnings if you use
 # any Qt feature that has been marked deprecated (the exact warnings