diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-13 09:35:56 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-08-13 09:35:56 +0200 |
| commit | 7b110fc4aee889bd5cbec9ed74f83bcde8a50c5b (patch) | |
| tree | 702bd2bc84523c6949042d98de7413261af87455 | |
| parent | 30f951b9ff276a53f8b0d9a79fcb6a074c909393 (diff) | |
| download | ayatana-indicator-display-7b110fc4aee889bd5cbec9ed74f83bcde8a50c5b.tar.gz ayatana-indicator-display-7b110fc4aee889bd5cbec9ed74f83bcde8a50c5b.tar.bz2 ayatana-indicator-display-7b110fc4aee889bd5cbec9ed74f83bcde8a50c5b.zip | |
Revert "Fix schema path"
This reverts commit fb3029c0a3121b83f1bca05006e5f95512c709e2.
| -rw-r--r-- | data/CMakeLists.txt | 12 | ||||
| -rw-r--r-- | data/org.ayatana.display.gschema.xml (renamed from data/org.ayatana.indicator.display.gschema.xml) | 6 | ||||
| -rw-r--r-- | src/rotation-lock.cpp | 2 |
3 files changed, 5 insertions, 15 deletions
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() ## @@ -29,16 +29,6 @@ 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.indicator.display.gschema.xml b/data/org.ayatana.display.gschema.xml index 9afa253..70d6e46 100644 --- a/data/org.ayatana.indicator.display.gschema.xml +++ b/data/org.ayatana.display.gschema.xml @@ -1,5 +1,5 @@ <schemalist gettext-domain="ayatana-indicator-display"> - <enum id="org.ayatana.indicator.display.ScreenOrientation"> + <enum id="org.ayatana.display.ScreenOrientation"> <value value="0" nick="none"/> <value value="1" nick="PrimaryOrientation"/> <value value="2" nick="LandscapeOrientation"/> @@ -7,7 +7,7 @@ <value value="4" nick="InvertedLandscapeOrientation"/> <value value="5" nick="InvertedPortraitOrientation"/> </enum> - <schema id="org.ayatana.indicator.display" path="/org/ayatana/indicator/display/"> + <schema id="org.ayatana.display" path="/org/ayatana/display/"> <key name="rotation-lock" type="b"> <default>false</default> <summary>Lock rotation</summary> @@ -15,7 +15,7 @@ Lock automatic display rotation. </description> </key> - <key name="orientation-lock" enum="org.ayatana.indicator.display.ScreenOrientation"> + <key name="orientation-lock" enum="org.ayatana.display.ScreenOrientation"> <default>"none"</default> <summary>Orientation lock</summary> <description>Locks orientation to a specific value.</description> 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; |