aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--CMakeLists.txt7
-rw-r--r--debian/control7
-rw-r--r--po/POTFILES.in1
-rw-r--r--src/CMakeLists.txt8
-rw-r--r--src/com.ubuntu.touch.AccountsService.Sound.xml47
-rw-r--r--src/main.cpp6
-rw-r--r--src/snap.cpp2
-rw-r--r--tests/CMakeLists.txt4
-rw-r--r--tests/notification-fixture.h2
9 files changed, 17 insertions, 67 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a4920c0..22792d8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,11 +80,10 @@ if(URLDISPATCHER_FOUND)
add_definitions( -DHAS_URLDISPATCHER )
endif()
-if(EXISTS "/usr/share/accountsservice/interfaces/com.ubuntu.touch.AccountsService.Sound.xml")
- set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS ON)
- add_definitions ( -DHAS_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS )
+if(EXISTS "/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml")
+ set (HAS_LOMIRI_ACCTSERVICE_SOUND ON)
else()
- set (HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS OFF)
+ set (HAS_LOMIRI_ACCTSERVICE_SOUND OFF)
endif()
##
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.
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 90b2a4b..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.ubuntu.touch
- ${CMAKE_SOURCE_DIR}/src/com.ubuntu.touch.AccountsService.Sound.xml)
- add_definitions (-DHAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS)
+ com.lomiri.touch
+ /usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml)
+ add_definitions (-DHAS_LOMIRI_ACCTSERVICE_SOUND)
endif()
# add warnings/coverage info on handwritten files
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 @@
-<node>
- <interface name="com.ubuntu.touch.AccountsService.Sound">
-
- <annotation name="org.freedesktop.Accounts.VendorExtension" value="true"/>
-
- <!-- Muted is all sound, SilentMode is only non-user-initiated sounds -->
- <property name="SilentMode" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="false"/>
- </property>
-
- <property name="IncomingCallSound" type="s" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue.String"
- value="/usr/share/sounds/ubuntu/ringtones/Ubuntu.ogg"/>
- </property>
-
- <property name="IncomingMessageSound" type="s" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue.String"
- value="/usr/share/sounds/ubuntu/notifications/Xylo.ogg"/>
- </property>
-
- <property name="IncomingCallVibrate" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
- </property>
-
- <property name="IncomingCallVibrateSilentMode" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
- </property>
-
- <property name="IncomingMessageVibrate" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
- </property>
-
- <property name="IncomingMessageVibrateSilentMode" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
- </property>
-
- <!-- "Other vibrations" should cover all vibrations except for those relating to phone calls and messages -->
- <property name="OtherVibrate" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
- </property>
-
- <property name="DialpadSoundsEnabled" type="b" access="readwrite">
- <annotation name="org.freedesktop.Accounts.DefaultValue" value="true"/>
- </property>
-
- </interface>
-</node>
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 <datetime/planner-snooze.h>
#include <datetime/planner-range.h>
#include <datetime/settings-live.h>
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
#include <datetime/snap.h>
#endif
#include <datetime/state.h>
@@ -95,7 +95,7 @@ namespace
return state;
}
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
std::shared_ptr<AlarmQueue> create_simple_alarm_queue(const std::shared_ptr<Clock>& clock,
const std::shared_ptr<Planner>& snooze_planner,
const std::shared_ptr<Engine>& engine,
@@ -149,7 +149,7 @@ main(int /*argc*/, char** /*argv*/)
auto actions = std::make_shared<LiveActions>(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<SnoozePlanner>(state->settings, state->clock);
auto notification_engine = std::make_shared<ain::Engine>("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 <robert@tari.in>
*/
-#ifdef HAVE_UT_ACCTSERVICE_SYSTEMSOUND_SETTINGS
+#ifdef HAS_LOMIRI_ACCTSERVICE_SOUND
#include "dbus-accounts-sound.h"
#include <datetime/snap.h>
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)
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"};
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 09:08:42 +0000