From 26264729896d3d5408ee89ef4ebd0a607ebc949c Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Wed, 1 Sep 2021 15:43:06 +0200 Subject: Use legacy canonical names for now --- include/datetime/settings-shared.h | 6 +++--- tests/notification-fixture.h | 4 ++-- tests/test-eds-ics-non-selected-source.ics.in | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/datetime/settings-shared.h b/include/datetime/settings-shared.h index 7280c16..c59be14 100644 --- a/include/datetime/settings-shared.h +++ b/include/datetime/settings-shared.h @@ -51,10 +51,10 @@ TimeFormatMode; #define SETTINGS_ALARM_HAPTIC_S "alarm-haptic-feedback" #define SETTINGS_SNOOZE_DURATION_S "snooze-duration-minutes" -#define SETTINGS_NOTIFY_APPS_SCHEMA_ID "com.lomiri.notifications.settings.applications" +#define SETTINGS_NOTIFY_APPS_SCHEMA_ID "com.ubuntu.notifications.settings.applications" #define SETTINGS_VIBRATE_SILENT_KEY "vibrate-silent-mode" -#define SETTINGS_NOTIFY_SCHEMA_ID "com.lomiri.notifications.settings" -#define SETTINGS_NOTIFY_CALENDAR_PATH "/com/lomiri/NotificationSettings/com.lomiri.calendar/calendar/" +#define SETTINGS_NOTIFY_SCHEMA_ID "com.ubuntu.notifications.settings" +#define SETTINGS_NOTIFY_CALENDAR_PATH "/com/ubuntu/NotificationSettings/com.ubuntu.calendar/calendar/" #define SETTINGS_NOTIFY_ENABLED_KEY "enable-notifications" #define SETTINGS_NOTIFY_SOUNDS_KEY "use-sounds-notifications" #define SETTINGS_NOTIFY_VIBRATIONS_KEY "use-vibrations-notifications" diff --git a/tests/notification-fixture.h b/tests/notification-fixture.h index 23329aa..301c53c 100644 --- a/tests/notification-fixture.h +++ b/tests/notification-fixture.h @@ -78,7 +78,7 @@ protected: static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"}; static constexpr char const * AS_BUSNAME {"org.freedesktop.Accounts"}; - static constexpr char const * AS_INTERFACE {"com.lomiri.touch.AccountsService.Sound"}; + static constexpr char const * AS_INTERFACE {"com.ubuntu.touch.AccountsService.Sound"}; static constexpr char const * PROP_OTHER_VIBRATIONS {"OtherVibrate"}; static constexpr char const * PROP_SILENT_MODE {"SilentMode"}; @@ -112,7 +112,7 @@ protected: appt.end = christmas.end_of_day(); appt.alarms.push_back(ayatana::indicator::datetime::Alarm{"Ho Ho Ho!", CALENDAR_DEFAULT_SOUND, appt.begin}); - // init a Lomiri Alarm + // init an Ubuntu Alarm ualarm.color = "red"; ualarm.summary = "Wakeup"; ualarm.uid = "E4B57D50247291478ED31DED17FF0A9838DED403"; diff --git a/tests/test-eds-ics-non-selected-source.ics.in b/tests/test-eds-ics-non-selected-source.ics.in index 19f93d7..f7b028b 100644 --- a/tests/test-eds-ics-non-selected-source.ics.in +++ b/tests/test-eds-ics-non-selected-source.ics.in @@ -9,7 +9,7 @@ DTSTAMP:20150508T211449Z DTSTART:20150508T164000 RRULE:FREQ=WEEKLY;BYDAY=FR SUMMARY:Alarm -CATEGORIES:x-lomiri-alarm +CATEGORIES:x-canonical-alarm CREATED:20150507T211449Z LAST-MODIFIED:20150507T211449Z BEGIN:VALARM -- cgit v1.2.3