X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fknotificationbackend.cpp;h=1dd9553116a65dfb127b18b6fee812a6b565f460;hb=5c6c9730bd840bcd51f32988dd4e224fed69c85d;hp=4c508ecd66ea1fd38a52c7576154a94f38c394ea;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a;p=quassel.git

diff --git a/src/qtui/knotificationbackend.cpp b/src/qtui/knotificationbackend.cpp
index 4c508ecd..1dd95531 100644
--- a/src/qtui/knotificationbackend.cpp
+++ b/src/qtui/knotificationbackend.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2014 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -56,8 +56,12 @@ void KNotificationBackend::notify(const Notification &n)
         type = "PrivMsgFocused"; break;
     }
 
+#if QT_VERSION < 0x050000
     QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, Qt::escape(n.message));
-    KNotification *notification = KNotification::event(type, message, DesktopIcon("dialog-information"), QtUi::mainWindow(),
+#else
+    QString message = QString("<b>&lt;%1&gt;</b> %2").arg(n.sender, n.message.toHtmlEscaped());
+#endif
+    KNotification *notification = KNotification::event(type, message, QIcon::fromTheme("dialog-information").pixmap(48), QtUi::mainWindow(),
         KNotification::RaiseWidgetOnActivation
         |KNotification::CloseWhenWidgetActivated
         |KNotification::CloseOnTimeout);