diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | src/com.ubuntu.touch.AccountsService.Sound.xml | 47 | ||||
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/snap.cpp | 2 |
4 files changed, 8 insertions, 55 deletions
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> |