X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritem.cpp;h=ff397034c454d15190b4e7c76e983073aafb93e0;hb=dbebdc3d0ce67549cb72f4632c93ef6571bfcb51;hp=2a58db864fbd213432d18610715ef6f16630c6ee;hpb=9d7f1397e43aec23ab7d701e573c47ec01a8d99b;p=quassel.git diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp index 2a58db86..ff397034 100644 --- a/src/qtui/statusnotifieritem.cpp +++ b/src/qtui/statusnotifieritem.cpp @@ -105,6 +105,7 @@ void StatusNotifierItem::init() { if(_notificationsClient->isValid()) { QStringList desktopCapabilities = _notificationsClient->GetCapabilities(); _notificationsClientSupportsMarkup = desktopCapabilities.contains("body-markup"); + _notificationsClientSupportsActions = desktopCapabilities.contains("actions"); } StatusNotifierItemParent::init(); @@ -221,14 +222,14 @@ QString StatusNotifierItem::title() const { QString StatusNotifierItem::iconName() const { if(state() == Passive) - return QString("quassel_inactive"); + return QString("quassel-inactive"); else return QString("quassel"); } QString StatusNotifierItem::attentionIconName() const { if(animationEnabled()) - return QString("quassel_message"); + return QString("quassel-message"); else return QString("quassel"); } @@ -274,7 +275,9 @@ void StatusNotifierItem::showMessage(const QString &title, const QString &messag if(_notificationsClientSupportsMarkup) message = Qt::escape(message); - QStringList actions = QStringList() << "activate" << "View"; + QStringList actions; + if(_notificationsClientSupportsActions) + actions << "activate" << "View"; // we always queue notifications right now QDBusReply reply = _notificationsClient->Notify(title, 0, "quassel", title, message, actions, QVariantMap(), timeout);