aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCharles Kerr <charles.kerr@canonical.com>2014-09-19 14:35:07 +0000
committerCI bot <ps-jenkins@lists.canonical.com>2014-09-19 14:35:07 +0000
commita35f8ed3418b853dfa582d56adde520911144b45 (patch)
tree0efc1e963fb167ec29861a1c0681aa5cb1afec65
parent16a4e034c30f2bc6b151b04707d3ec1a490dba44 (diff)
parentd18944bcfb58d7e0515e8745053349219c4ba281 (diff)
downloadayatana-indicator-datetime-a35f8ed3418b853dfa582d56adde520911144b45.tar.gz
ayatana-indicator-datetime-a35f8ed3418b853dfa582d56adde520911144b45.tar.bz2
ayatana-indicator-datetime-a35f8ed3418b853dfa582d56adde520911144b45.zip
Make alarm notifications icons and button color match Design's specs. Fixes: 1370594
Approved by: Ted Gould, PS Jenkins bot, Nekhelesh Ramananthan
-rw-r--r--include/notifications/notifications.h5
-rw-r--r--src/notifications.cpp2
-rw-r--r--src/snap.cpp4
3 files changed, 6 insertions, 5 deletions
diff --git a/include/notifications/notifications.h b/include/notifications/notifications.h
index eb14c07..fd41edf 100644
--- a/include/notifications/notifications.h
+++ b/include/notifications/notifications.h
@@ -59,8 +59,9 @@ public:
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_TINT {"x-canonical-private-button-tint"};
- static constexpr char const * HINT_NONSHAPEDICON {"x-canonical-non-shaped-icon"};
+ 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/notifications.cpp b/src/notifications.cpp
index 18f15d9..58a6e83 100644
--- a/src/notifications.cpp
+++ b/src/notifications.cpp
@@ -198,7 +198,7 @@ public:
{
notify_notification_set_hint (nn.get(),
hint.c_str(),
- g_variant_new_boolean(true));
+ g_variant_new_string("true"));
}
for (const auto& action : info.m_actions)
diff --git a/src/snap.cpp b/src/snap.cpp
index c2cbc0a..f84d9b3 100644
--- a/src/snap.cpp
+++ b/src/snap.cpp
@@ -91,8 +91,8 @@ public:
b.set_body (appointment.summary);
b.set_icon_name ("alarm-clock");
b.add_hint (uin::Builder::HINT_SNAP);
- b.add_hint (uin::Builder::HINT_TINT);
- b.add_hint (uin::Builder::HINT_NONSHAPEDICON);
+ b.add_hint (uin::Builder::HINT_AFFIRMATIVE_HINT);
+ b.add_hint (uin::Builder::HINT_NONSHAPED_ICON);
const char * timefmt;
if (is_locale_12h()) {