aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-10-25 20:14:15 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-10-26 11:14:58 +0200
commit0b17f2a57666f7811d1aa171a8e974e131c032a8 (patch)
treed1cffdd97880601128af81e578d84f1aff0ea547
parenta00f7b54717f31e4bef5ac260504052664be9094 (diff)
downloadayatana-indicator-datetime-0b17f2a57666f7811d1aa171a8e974e131c032a8.tar.gz
ayatana-indicator-datetime-0b17f2a57666f7811d1aa171a8e974e131c032a8.tar.bz2
ayatana-indicator-datetime-0b17f2a57666f7811d1aa171a8e974e131c032a8.zip
Renaname x-canonical properties to x-ayatana
-rw-r--r--include/notifications/notifications.h10
-rw-r--r--src/engine-eds.cpp4
-rw-r--r--src/notifications.cpp2
-rw-r--r--tests/notification-fixture.h2
-rw-r--r--tests/test-eds-ics-missing-trigger.ics.in4
-rw-r--r--tests/test-eds-ics-non-selected-source.ics.in2
-rw-r--r--tests/test-eds-ics-nonrepeating-events.ics.in2
-rw-r--r--tests/test-eds-ics-repeating-events.ics.in2
8 files changed, 14 insertions, 14 deletions
diff --git a/include/notifications/notifications.h b/include/notifications/notifications.h
index af6d21f..d35e38e 100644
--- a/include/notifications/notifications.h
+++ b/include/notifications/notifications.h
@@ -60,11 +60,11 @@ 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-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"};
- static constexpr char const * HINT_INTERACTIVE {"x-canonical-switch-to-application"};
+ 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_INTERACTIVE {"x-ayatana-switch-to-application"};
/* 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 4228258..af11f7f 100644
--- a/src/engine-eds.cpp
+++ b/src/engine-eds.cpp
@@ -37,8 +37,8 @@ namespace ayatana {
namespace indicator {
namespace datetime {
-static constexpr char const * TAG_ALARM {"x-canonical-alarm"};
-static constexpr char const * TAG_DISABLED {"x-canonical-disabled"};
+static constexpr char const * TAG_ALARM {"x-ayatana-alarm"};
+static constexpr char const * TAG_DISABLED {"x-ayatana-disabled"};
static constexpr char const * X_PROP_ACTIVATION_URL {"X-CANONICAL-ACTIVATION-URL"};
diff --git a/src/notifications.cpp b/src/notifications.cpp
index b36227b..bb9a2e1 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -511,7 +511,7 @@ private:
// as the name indicates, don't use this directly: use server_caps() instead
mutable std::set<std::string> m_lazy_caps;
- static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
+ static constexpr char const * HINT_TIMEOUT {"x-ayatana-snap-decisions-timeout"};
};
/***
diff --git a/tests/notification-fixture.h b/tests/notification-fixture.h
index 301c53c..739a1fc 100644
--- a/tests/notification-fixture.h
+++ b/tests/notification-fixture.h
@@ -75,7 +75,7 @@ protected:
static constexpr char const * SIGNAL_CLOSED {"NotificationClosed"};
- static constexpr char const * HINT_TIMEOUT {"x-canonical-snap-decisions-timeout"};
+ static constexpr char const * HINT_TIMEOUT {"x-ayatana-snap-decisions-timeout"};
static constexpr char const * AS_BUSNAME {"org.freedesktop.Accounts"};
static constexpr char const * AS_INTERFACE {"com.ubuntu.touch.AccountsService.Sound"};
diff --git a/tests/test-eds-ics-missing-trigger.ics.in b/tests/test-eds-ics-missing-trigger.ics.in
index 0b7881f..01a306c 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-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150617T211838Z
LAST-MODIFIED:20150617T211838Z
BEGIN:VALARM
@@ -28,7 +28,7 @@ DTSTAMP:20150617T211913Z
DTSTART:20150618T100100
RRULE:FREQ=DAILY
SUMMARY:Recurring Alarm
-CATEGORIES:x-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150617T211913Z
LAST-MODIFIED:20150617T211913Z
BEGIN:VALARM
diff --git a/tests/test-eds-ics-non-selected-source.ics.in b/tests/test-eds-ics-non-selected-source.ics.in
index f7b028b..3ae584f 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-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150507T211449Z
LAST-MODIFIED:20150507T211449Z
BEGIN:VALARM
diff --git a/tests/test-eds-ics-nonrepeating-events.ics.in b/tests/test-eds-ics-nonrepeating-events.ics.in
index be95ed1..6e45450 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-canonical-alarm
+CATEGORIES:x-ayatana-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 7c728c6..51679a3 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-canonical-alarm
+CATEGORIES:x-ayatana-alarm
CREATED:20150507T211449Z
LAST-MODIFIED:20150507T211449Z
BEGIN:VALARM