From 7b110fc4aee889bd5cbec9ed74f83bcde8a50c5b Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Fri, 13 Aug 2021 09:35:56 +0200
Subject: Revert "Fix schema path"

This reverts commit fb3029c0a3121b83f1bca05006e5f95512c709e2.
---
 data/CMakeLists.txt                            | 12 +-----------
 data/org.ayatana.display.gschema.xml           | 24 ++++++++++++++++++++++++
 data/org.ayatana.indicator.display.gschema.xml | 24 ------------------------
 src/rotation-lock.cpp                          |  2 +-
 4 files changed, 26 insertions(+), 36 deletions(-)
 create mode 100644 data/org.ayatana.display.gschema.xml
 delete mode 100644 data/org.ayatana.indicator.display.gschema.xml

diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index aea23cb..177e8fd 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -5,7 +5,7 @@ find_package(GSettings)
 ##
 
 if(NOT EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.touch.system.gschema.xml)
-  add_schema ("org.ayatana.indicator.display.gschema.xml")
+  add_schema ("org.ayatana.display.gschema.xml")
 endif()
 
 ##
@@ -28,16 +28,6 @@ configure_file ("${SYSTEMD_USER_FILE_IN}" "${SYSTEMD_USER_FILE}")
 install (FILES "${SYSTEMD_USER_FILE}"
          DESTINATION "${SYSTEMD_USER_DIR}")
 
-##
-##  XDG Autostart Config File
-##
-
-# build it
-configure_file ("${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.desktop.in" "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop")
-
-# install it
-install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop" DESTINATION "/etc/xdg/autostart")
-
 ##
 ##  Ayatana Indicator File
 ##
diff --git a/data/org.ayatana.display.gschema.xml b/data/org.ayatana.display.gschema.xml
new file mode 100644
index 0000000..70d6e46
--- /dev/null
+++ b/data/org.ayatana.display.gschema.xml
@@ -0,0 +1,24 @@
+<schemalist gettext-domain="ayatana-indicator-display">
+  <enum id="org.ayatana.display.ScreenOrientation">
+    <value value="0" nick="none"/>
+    <value value="1" nick="PrimaryOrientation"/>
+    <value value="2" nick="LandscapeOrientation"/>
+    <value value="3" nick="PortraitOrientation"/>
+    <value value="4" nick="InvertedLandscapeOrientation"/>
+    <value value="5" nick="InvertedPortraitOrientation"/>
+  </enum>
+  <schema id="org.ayatana.display" path="/org/ayatana/display/">
+    <key name="rotation-lock" type="b">
+      <default>false</default>
+      <summary>Lock rotation</summary>
+      <description>
+      Lock automatic display rotation.
+      </description>
+    </key>
+    <key name="orientation-lock" enum="org.ayatana.display.ScreenOrientation">
+      <default>"none"</default>
+      <summary>Orientation lock</summary>
+      <description>Locks orientation to a specific value.</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.ayatana.indicator.display.gschema.xml b/data/org.ayatana.indicator.display.gschema.xml
deleted file mode 100644
index 9afa253..0000000
--- a/data/org.ayatana.indicator.display.gschema.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<schemalist gettext-domain="ayatana-indicator-display">
-  <enum id="org.ayatana.indicator.display.ScreenOrientation">
-    <value value="0" nick="none"/>
-    <value value="1" nick="PrimaryOrientation"/>
-    <value value="2" nick="LandscapeOrientation"/>
-    <value value="3" nick="PortraitOrientation"/>
-    <value value="4" nick="InvertedLandscapeOrientation"/>
-    <value value="5" nick="InvertedPortraitOrientation"/>
-  </enum>
-  <schema id="org.ayatana.indicator.display" path="/org/ayatana/indicator/display/">
-    <key name="rotation-lock" type="b">
-      <default>false</default>
-      <summary>Lock rotation</summary>
-      <description>
-      Lock automatic display rotation.
-      </description>
-    </key>
-    <key name="orientation-lock" enum="org.ayatana.indicator.display.ScreenOrientation">
-      <default>"none"</default>
-      <summary>Orientation lock</summary>
-      <description>Locks orientation to a specific value.</description>
-    </key>
-  </schema>
-</schemalist>
diff --git a/src/rotation-lock.cpp b/src/rotation-lock.cpp
index f671c4c..b27be71 100644
--- a/src/rotation-lock.cpp
+++ b/src/rotation-lock.cpp
@@ -198,7 +198,7 @@ private:
 #ifdef HAS_UBUNTU_TOUCH_SCHEMA
   static constexpr char const * m_schema_name {"com.ubuntu.touch.system"};
 #else
-  static constexpr char const * m_schema_name {"org.ayatana.indicator.display"};
+  static constexpr char const * m_schema_name {"org.ayatana.display"};
 #endif
   GSettings* m_settings = nullptr;
   GSimpleActionGroup* m_action_group = nullptr;
-- 
cgit v1.2.3