From a007ddef3b530d1f58975a9e733ae2ec49fe9531 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 31 Oct 2021 22:16:13 +0100 Subject: debian/control: Depend on lomiri-common-schemas instead of accountsservice-ubuntu-schemas + update description --- debian/control | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/debian/control b/debian/control index 5c38318..9d39bf4 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Build-Depends: cmake, libecal2.0-dev (>= 3.16), libical-dev (>= 1.0), libedataserver1.2-dev (>= 3.5), - accountsservice-ubuntu-schemas | hello, + lomiri-common-schemas | hello, libproperties-cpp-dev, liblomiri-url-dispatcher-dev | hello, libmessaging-menu-dev, @@ -56,6 +56,5 @@ Description: Ayatana Indicator providing clock and calendar This Ayatana Indicator provides a combined calendar, clock, alarm and event management tool. . - On Ubuntu systems, this Indicator supports phone devices based on - Ubuntu. On non-Ubuntu systems, the phone support has been disabled at - build-time. + On Lomiri, this Indicator supports phone devices. On other systems, + the phone support has been disabled at build-time. -- cgit v1.2.3 From d8f10b3cf26b5e585db0f2b5d2e0a7e528c23160 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 31 Oct 2021 22:19:42 +0100 Subject: Rename com.ubuntu.touch.AccountsService.Sound to com.lomiri.touch.AccountsService.Sound --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 4 ++-- tests/notification-fixture.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4920c0..5497086 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,7 @@ if(URLDISPATCHER_FOUND) add_definitions( -DHAS_URLDISPATCHER ) endif() -if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml") +if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) add_definitions ( -DHAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ) else() diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 90b2a4b..595acd9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -49,8 +49,8 @@ add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.datetime.AlarmProperties.xml) if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound - com.ubuntu.touch - ${CMAKE_SOURCE_DIR}/src/com.ubuntu.touch.AccountsService.Sound.xml) + com.lomiri.touch + ${CMAKE_SOURCE_DIR}/src/com.lomiri.touch.AccountsService.Sound.xml) add_definitions (-DHAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) endif() diff --git a/tests/notification-fixture.h b/tests/notification-fixture.h index 5024792..6c26409 100644 --- a/tests/notification-fixture.h +++ b/tests/notification-fixture.h @@ -80,7 +80,7 @@ protected: static constexpr char const * HINT_TIMEOUT {"x-ayatana-snap-decisions-timeout"}; static constexpr char const * AS_BUSNAME {"org.freedesktop.Accounts"}; - static constexpr char const * AS_INTERFACE {"com.ubuntu.touch.AccountsService.Sound"}; + static constexpr char const * AS_INTERFACE {"com.lomiri.touch.AccountsService.Sound"}; static constexpr char const * PROP_OTHER_VIBRATIONS {"OtherVibrate"}; static constexpr char const * PROP_SILENT_MODE {"SilentMode"}; -- cgit v1.2.3 From b942e307658c4e4fa72bc1184c53ae09f7bc3a74 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 31 Oct 2021 22:22:08 +0100 Subject: Drop local file and generate code from /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml --- po/POTFILES.in | 1 - src/CMakeLists.txt | 2 +- src/com.ubuntu.touch.AccountsService.Sound.xml | 47 -------------------------- 3 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 src/com.ubuntu.touch.AccountsService.Sound.xml diff --git a/po/POTFILES.in b/po/POTFILES.in index 72daf17..fe5cde1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -33,4 +33,3 @@ src/timezone-timedated.cpp src/wakeup-timer-mainloop.cpp src/wakeup-timer-powerd.cpp src/utils.c -src/com.ubuntu.touch.AccountsService.Sound.xml diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 595acd9..118cee5 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -50,7 +50,7 @@ add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound com.lomiri.touch - ${CMAKE_SOURCE_DIR}/src/com.lomiri.touch.AccountsService.Sound.xml) + /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml) add_definitions (-DHAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) endif() diff --git a/src/com.ubuntu.touch.AccountsService.Sound.xml b/src/com.ubuntu.touch.AccountsService.Sound.xml deleted file mode 100644 index 781a52f..0000000 --- a/src/com.ubuntu.touch.AccountsService.Sound.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -- cgit v1.2.3 From ede945145e96ecb3bde0dce0fd104c53f059cdca Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sun, 31 Oct 2021 22:41:09 +0100 Subject: Rename HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS to HAS_LOMIRI_ACCTSERVICE_SOUND --- CMakeLists.txt | 5 ++--- src/CMakeLists.txt | 4 ++-- src/main.cpp | 6 +++--- src/snap.cpp | 2 +- tests/CMakeLists.txt | 4 ++-- 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5497086..22792d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,10 +81,9 @@ if(URLDISPATCHER_FOUND) endif() if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml") - set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON) - add_definitions ( -DHAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ) + set (HAS_LOMIRI_ACCTSERVICE_SOUND ON) else() - set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF) + set (HAS_LOMIRI_ACCTSERVICE_SOUND OFF) endif() ## diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 118cee5..6132dfc 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -47,11 +47,11 @@ set(SERVICE_GENERATED_SOURCES) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-alarm-properties org.ayatana.indicator ${CMAKE_SOURCE_DIR}/data/org.ayatana.indicator.datetime.AlarmProperties.xml) -if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) +if(HAS_LOMIRI_ACCTSERVICE_SOUND) add_gdbus_codegen(SERVICE_GENERATED_SOURCES dbus-accounts-sound com.lomiri.touch /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml) - add_definitions (-DHAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) + add_definitions (-DHAS_LOMIRI_ACCTSERVICE_SOUND) endif() # add warnings/coverage info on handwritten files diff --git a/src/main.cpp b/src/main.cpp index 279d7be..613f700 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -32,7 +32,7 @@ #include #include #include -#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND #include #endif #include @@ -95,7 +95,7 @@ namespace return state; } -#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND std::shared_ptr create_simple_alarm_queue(const std::shared_ptr& clock, const std::shared_ptr& snooze_planner, const std::shared_ptr& engine, @@ -149,7 +149,7 @@ main(int /*argc*/, char** /*argv*/) auto actions = std::make_shared(state); MenuFactory factory(actions, state); -#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND // set up the snap decisions auto snooze_planner = std::make_shared(state->settings, state->clock); auto notification_engine = std::make_shared("ayatana-indicator-datetime-service"); diff --git a/src/snap.cpp b/src/snap.cpp index eb82b37..37ce741 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -19,7 +19,7 @@ * Robert Tari */ -#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS +#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND #include "dbus-accounts-sound.h" #include diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 52f5d61..cba60fb 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -44,7 +44,7 @@ function(add_test_by_name name) target_link_libraries (${TEST_NAME} indicatordatetimeservice ${DBUSTEST_LIBRARIES} ${SERVICE_DEPS_LIBRARIES} ${GTEST_LIBRARIES} ${GMOCK_LIBRARIES} ${URLDISPATCHER_LIBRARIES}) endfunction() add_test_by_name(test-datetime) -if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) +if(HAS_LOMIRI_ACCTSERVICE_SOUND) add_test_by_name(test-sound) add_test_by_name(test-notification) add_test_by_name(test-notification-response) @@ -72,7 +72,7 @@ add_test_by_name(test-settings) add_test_by_name(test-timezone-timedated) add_test_by_name(test-utils) -if(HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS) +if(HAS_LOMIRI_ACCTSERVICE_SOUND) set (TEST_NAME manual-test-snap) set (COVERAGE_TEST_TARGETS ${COVERAGE_TEST_TARGETS} ${TEST_NAME}) add_executable (${TEST_NAME} ${TEST_NAME}.cpp) -- cgit v1.2.3