From 2626734c7e1f8060dd8b55dc25480d47758e369d Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Thu, 28 Oct 2021 17:50:08 +0200 Subject: Rename com.ubuntu.touch.system to com.lomiri.touch.system --- data/CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- src/rotation-lock.cpp | 4 ++-- tests/unit/CMakeLists.txt | 4 ++-- 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() -- cgit v1.2.3