aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-01 08:21:06 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-11-01 08:21:06 +0100
commit9facc9ae06c42ce822e78b605c58e1cb7d7db8dc (patch)
tree9cc353820f1fce07208424d71883d7d7019ea9a7
parentf814857699e7903c59a856aaafa4fedecceb8bc5 (diff)
parent2626734c7e1f8060dd8b55dc25480d47758e369d (diff)
downloadayatana-indicator-display-9facc9ae06c42ce822e78b605c58e1cb7d7db8dc.tar.gz
ayatana-indicator-display-9facc9ae06c42ce822e78b605c58e1cb7d7db8dc.tar.bz2
ayatana-indicator-display-9facc9ae06c42ce822e78b605c58e1cb7d7db8dc.zip
Merge branch 'tari01-pr/rename-com-ubuntu-touch-system'
Attributes GH PR #36: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/36
-rw-r--r--data/CMakeLists.txt2
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/rotation-lock.cpp4
-rw-r--r--tests/unit/CMakeLists.txt4
4 files changed, 7 insertions, 7 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index aea23cb..acc462f 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -4,7 +4,7 @@ find_package(GSettings)
## GSettings
##
-if(NOT EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.touch.system.gschema.xml)
+if(NOT EXISTS /usr/share/glib-2.0/schemas/com.lomiri.touch.system.gschema.xml)
add_schema ("org.ayatana.indicator.display.gschema.xml")
endif()
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eb736c8..5066cbd 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,7 +1,7 @@
add_definitions(-DG_LOG_DOMAIN="${CMAKE_PROJECT_NAME}")
-if(EXISTS "/usr/share/glib-2.0/schemas/com.ubuntu.sound.gschema.xml")
- add_definitions( -DHAS_UBUNTU_TOUCH_SCHEMA )
+if(EXISTS "/usr/share/glib-2.0/schemas/com.lomiri.touch.system.gschema.xml")
+ add_definitions( -DHAS_LOMIRI_TOUCH_SCHEMA )
endif()
add_compile_options(
diff --git a/src/rotation-lock.cpp b/src/rotation-lock.cpp
index f671c4c..a794dd2 100644
--- a/src/rotation-lock.cpp
+++ b/src/rotation-lock.cpp
@@ -195,8 +195,8 @@ private:
****
***/
-#ifdef HAS_UBUNTU_TOUCH_SCHEMA
- static constexpr char const * m_schema_name {"com.ubuntu.touch.system"};
+#ifdef HAS_LOMIRI_TOUCH_SCHEMA
+ static constexpr char const * m_schema_name {"com.lomiri.touch.system"};
#else
static constexpr char const * m_schema_name {"org.ayatana.indicator.display"};
#endif
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index 01592f3..5656bed 100644
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -12,8 +12,8 @@ set_source_files_properties (gschemas.compiled GENERATED)
# and help the tests to find that file by setting -DSCHEMA_DIR
set (XDG_DATA_DIRS "${CMAKE_CURRENT_BINARY_DIR}/gsettings-schemas")
set (SCHEMA_DIR "${XDG_DATA_DIRS}/glib-2.0/schemas")
-if (EXISTS /usr/share/glib-2.0/schemas/com.ubuntu.touch.system.gschema.xml)
- set (DISPLAY_SCHEMA /usr/share/glib-2.0/schemas/com.ubuntu.touch.system.gschema.xml)
+if (EXISTS /usr/share/glib-2.0/schemas/com.lomiri.touch.system.gschema.xml)
+ set (DISPLAY_SCHEMA /usr/share/glib-2.0/schemas/com.lomiri.touch.system.gschema.xml)
else()
set (DISPLAY_SCHEMA ${CMAKE_SOURCE_DIR}/data/org.ayatana.display.gschema.xml)
endif()