Partially revert fab51b4. Only rename those x-canonical attributes to x-ayatana if they are solely used by Ayatana Indicators.

4 files changed, 5 insertions, 5 deletions

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"};