X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fstatusnotifieritem.cpp;h=841f0cf540254a025df7691030ec1cc85fb3408e;hb=dd8d82a90c136fa1e56d7f72781881cd5099574f;hp=2a58db864fbd213432d18610715ef6f16630c6ee;hpb=0ec85b3e2ce83908af510a25d40eb2b9a0f0ffed;p=quassel.git

diff --git a/src/qtui/statusnotifieritem.cpp b/src/qtui/statusnotifieritem.cpp
index 2a58db86..841f0cf5 100644
--- a/src/qtui/statusnotifieritem.cpp
+++ b/src/qtui/statusnotifieritem.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2010 by the Quassel Project                        *
+ *   Copyright (C) 2005-2012 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This contains code from KStatusNotifierItem, part of the KDE libs     *
@@ -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<uint> reply = _notificationsClient->Notify(title, 0, "quassel", title, message, actions, QVariantMap(), timeout);