projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use null QVariant instead of "ALL" for select limit on psql
[quassel.git]
/
src
/
qtui
/
statusnotifieritem.cpp
diff --git
a/src/qtui/statusnotifieritem.cpp
b/src/qtui/statusnotifieritem.cpp
index
1b6cb4a
..
df04252
100644
(file)
--- a/
src/qtui/statusnotifieritem.cpp
+++ b/
src/qtui/statusnotifieritem.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
2
by the Quassel Project *
+ * Copyright (C) 2005-201
4
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This contains code from KStatusNotifierItem, part of the KDE libs *
* devel@quassel-irc.org *
* *
* This contains code from KStatusNotifierItem, part of the KDE libs *
@@
-314,7
+314,11
@@
void StatusNotifierItem::showMessage(const QString &title, const QString &messag
QString message = message_;
if (_notificationsClient->isValid()) {
if (_notificationsClientSupportsMarkup)
QString message = message_;
if (_notificationsClient->isValid()) {
if (_notificationsClientSupportsMarkup)
+#if QT_VERSION < 0x050000
message = Qt::escape(message);
message = Qt::escape(message);
+#else
+ message = message.toHtmlEscaped();
+#endif
QStringList actions;
if (_notificationsClientSupportsActions)
QStringList actions;
if (_notificationsClientSupportsActions)