summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomasz Sterna <tomek@xiaoka.com>2016-01-07 15:38:02 +0100
committerTomasz Sterna <tomek@xiaoka.com>2016-01-07 15:38:02 +0100
commit0feca31a4482bc47b6b69c6ee4b23fe6805a9346 (patch)
tree9ba27e120e74ef01b514483ee2816d0361005df6
parentff59748338d98332838d03a45a57c9b8a96118b4 (diff)
parent617f81b19c0986c7a71a40ae9daaf18679606b96 (diff)
Merge pull request #106 from abranson/master
Don't forward any transient notifications to the watch.
-rw-r--r--daemon/notificationmanager.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/daemon/notificationmanager.cpp b/daemon/notificationmanager.cpp
index e485703..26c44e4 100644
--- a/daemon/notificationmanager.cpp
+++ b/daemon/notificationmanager.cpp
@@ -112,14 +112,15 @@ uint NotificationManager::Notify(const QString &app_name, uint replaces_id, cons
Q_UNUSED(actions);
Q_UNUSED(expire_timeout);
- // Ignore notifcations from myself
- if (app_name == "pebbled") {
+ // new place to check notification owner in Sailfish 1.1.6
+ QString owner = hints.value("x-nemo-owner", "none").toString();
+
+ // Ignore transient notifcations
+ if (hints.value("transient", false).toBool()) {
+ qCDebug(l) << "Ignoring transient notification from " << owner;
return 0;
}
- // new place to check notification owner in Sailfish 1.1.6
- QString owner = hints.value("x-nemo-owner").toString();
-
qCDebug(l) << Q_FUNC_INFO << "Got notification via dbus from" << this->getCleanAppName(app_name) << " Owner: " << owner;
qCDebug(l) << hints;