diff options
author | Robert Tari <robert@tari.in> | 2021-09-02 20:05:04 +0200 |
---|---|---|
committer | Robert Tari <robert@tari.in> | 2021-09-02 20:05:04 +0200 |
commit | 941de24ca680e6844d874dc49288dd05340a6b60 (patch) | |
tree | 6085a76de8f3c22341872feef28537df9d083684 /src | |
parent | 2748fa58a285684b2c51aee1db543f585d57abd0 (diff) | |
parent | 458218b1920bd92638d324a239dfc486013c0ddc (diff) | |
download | ayatana-indicator-datetime-941de24ca680e6844d874dc49288dd05340a6b60.tar.gz ayatana-indicator-datetime-941de24ca680e6844d874dc49288dd05340a6b60.tar.bz2 ayatana-indicator-datetime-941de24ca680e6844d874dc49288dd05340a6b60.zip |
Merge branch 'pr/fix-unit-tests'
Attributes GH PR #53: https://github.com/AyatanaIndicators/ayatana-indicator-datetime/pull/53
Diffstat (limited to 'src')
-rw-r--r-- | src/settings-live.cpp | 10 | ||||
-rw-r--r-- | src/snap.cpp | 2 |
2 files changed, 5 insertions, 7 deletions
diff --git a/src/settings-live.cpp b/src/settings-live.cpp index dc90d0e..cf18739 100644 --- a/src/settings-live.cpp +++ b/src/settings-live.cpp @@ -19,11 +19,6 @@ #include <datetime/settings-live.h> -extern "C" -{ - #include <ayatana/common/utils.h> -} - namespace ayatana { namespace indicator { namespace datetime { @@ -65,7 +60,10 @@ LiveSettings::LiveSettings(): update_alarm_haptic(); update_snooze_duration(); - if (ayatana_common_utils_is_lomiri()) + GSettingsSchemaSource *pSource = g_settings_schema_source_get_default(); + GSettingsSchema *pSchema = g_settings_schema_source_lookup(pSource, SETTINGS_NOTIFY_SCHEMA_ID, TRUE); + + if (pSchema != NULL) { m_settings_cal_notification = g_settings_new_with_path(SETTINGS_NOTIFY_SCHEMA_ID, SETTINGS_NOTIFY_CALENDAR_PATH); m_settings_general_notification = g_settings_new(SETTINGS_NOTIFY_APPS_SCHEMA_ID); diff --git a/src/snap.cpp b/src/snap.cpp index 0ef6a94..0507cc7 100644 --- a/src/snap.cpp +++ b/src/snap.cpp @@ -116,7 +116,7 @@ public: const auto uri = get_alarm_uri(appointment, alarm, m_settings); const auto volume = m_settings->alarm_volume.get(); const bool loop = interactive; - sound = std::make_shared<ain::Sound>(role, uri, volume, loop); + sound = m_sound_builder->create(role, uri, volume, loop); } // create the haptic feedback... |