From 90cd1b58cfa5881de4d72de575335c6f7512082a Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Tue, 11 Aug 2020 16:58:55 +0200 Subject: Partially revert fab51b4. Only rename those x-canonical attributes to x-ayatana if they are solely used by Ayatana Indicators. --- include/notifications/notifications.h | 8 ++++---- src/engine-eds.cpp | 4 ++-- src/notifications.cpp | 2 +- tests/test-eds-ics-missing-trigger.ics.in | 4 ++-- tests/test-eds-ics-nonrepeating-events.ics.in | 2 +- tests/test-eds-ics-repeating-events.ics.in | 2 +- tests/test-snap.cpp | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/notifications/notifications.h b/include/notifications/notifications.h index e3c4389..0de1e23 100644 --- a/include/notifications/notifications.h +++ b/include/notifications/notifications.h @@ -58,10 +58,10 @@ public: /* Add a notification hint. These keys may be dependent on the notification server. */ void add_hint (const std::string& name); - static constexpr char const * HINT_SNAP {"x-ayatana-snap-decisions"}; - static constexpr char const * HINT_NONSHAPED_ICON {"x-ayatana-non-shaped-icon"}; - static constexpr char const * HINT_AFFIRMATIVE_HINT {"x-ayatana-private-affirmative-tint"}; - static constexpr char const * HINT_REJECTION_TINT {"x-ayatana-private-rejection-tint"}; + static constexpr char const * HINT_SNAP {"x-canonical-snap-decisions"}; + static constexpr char const * HINT_NONSHAPED_ICON {"x-canonical-non-shaped-icon"}; + static constexpr char const * HINT_AFFIRMATIVE_HINT {"x-canonical-private-affirmative-tint"}; + static constexpr char const * HINT_REJECTION_TINT {"x-canonical-private-rejection-tint"}; /* Add an action button. This may fail if the Engine doesn't support actions. diff --git a/src/engine-eds.cpp b/src/engine-eds.cpp index 3120b3f..f8a4ce8 100644 --- a/src/engine-eds.cpp +++ b/src/engine-eds.cpp @@ -35,8 +35,8 @@ namespace ayatana { namespace indicator { namespace datetime { -static constexpr char const * TAG_ALARM {"x-ayatana-alarm"}; -static constexpr char const * TAG_DISABLED {"x-ayatana-disabled"}; +static constexpr char const * TAG_ALARM {"x-canonical-alarm"}; +static constexpr char const * TAG_DISABLED {"x-canonical-disabled"}; static constexpr char const * X_PROP_ACTIVATION_URL {"X-CANONICAL-ACTIVATION-URL"}; diff --git a/src/notifications.cpp b/src/notifications.cpp index f8782de..051653d 100644 --- a/src/notifications.cpp +++ b/src/notifications.cpp @@ -314,7 +314,7 @@ private: // as the name indicates, don't use this directly: use server_caps() instead mutable std::set m_lazy_caps; - static constexpr char const * HINT_TIMEOUT {"x-ayatana-snap-decisions-timeout"}; + static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"}; }; /*** diff --git a/tests/test-eds-ics-missing-trigger.ics.in b/tests/test-eds-ics-missing-trigger.ics.in index 01a306c..0b7881f 100644 --- a/tests/test-eds-ics-missing-trigger.ics.in +++ b/tests/test-eds-ics-missing-trigger.ics.in @@ -8,7 +8,7 @@ UID:20150617T211838Z-6217-32011-2036-1@ubuntu-phablet DTSTAMP:20150617T211838Z DTSTART:20150618T100000 SUMMARY:One Time Alarm -CATEGORIES:x-ayatana-alarm +CATEGORIES:x-canonical-alarm CREATED:20150617T211838Z LAST-MODIFIED:20150617T211838Z BEGIN:VALARM @@ -28,7 +28,7 @@ DTSTAMP:20150617T211913Z DTSTART:20150618T100100 RRULE:FREQ=DAILY SUMMARY:Recurring Alarm -CATEGORIES:x-ayatana-alarm +CATEGORIES:x-canonical-alarm CREATED:20150617T211913Z LAST-MODIFIED:20150617T211913Z BEGIN:VALARM diff --git a/tests/test-eds-ics-nonrepeating-events.ics.in b/tests/test-eds-ics-nonrepeating-events.ics.in index 6e45450..be95ed1 100644 --- a/tests/test-eds-ics-nonrepeating-events.ics.in +++ b/tests/test-eds-ics-nonrepeating-events.ics.in @@ -8,7 +8,7 @@ UID:20150520T000726Z-3878-32011-1770-81@ubuntu-phablet DTSTAMP:20150520T223932Z DTSTART:20150520T200000 SUMMARY:Alarm -CATEGORIES:x-ayatana-alarm +CATEGORIES:x-canonical-alarm SEQUENCE:1 LAST-MODIFIED:20150520T223932Z BEGIN:VALARM diff --git a/tests/test-eds-ics-repeating-events.ics.in b/tests/test-eds-ics-repeating-events.ics.in index 51679a3..7c728c6 100644 --- a/tests/test-eds-ics-repeating-events.ics.in +++ b/tests/test-eds-ics-repeating-events.ics.in @@ -9,7 +9,7 @@ DTSTAMP:20150508T211449Z DTSTART:20150508T164000 RRULE:FREQ=WEEKLY;BYDAY=FR SUMMARY:Alarm -CATEGORIES:x-ayatana-alarm +CATEGORIES:x-canonical-alarm CREATED:20150507T211449Z LAST-MODIFIED:20150507T211449Z BEGIN:VALARM diff --git a/tests/test-snap.cpp b/tests/test-snap.cpp index 8a310e4..1904bef 100644 --- a/tests/test-snap.cpp +++ b/tests/test-snap.cpp @@ -84,7 +84,7 @@ protected: static constexpr char const * SIGNAL_CLOSED {"NotificationClosed"}; - static constexpr char const * HINT_TIMEOUT {"x-ayatana-snap-decisions-timeout"}; + 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.ubuntu.touch.AccountsService.Sound"}; -- cgit v1.2.3