diff --git a/src/notificationhandler.cpp b/src/notificationhandler.cpp index 9f913ca..1e0cdb7 100644 --- a/src/notificationhandler.cpp +++ b/src/notificationhandler.cpp @@ -37,6 +37,12 @@ namespace Konversation { } + QString cleanMessage(QString message) + { + QString cleanedMessage = Qt::escape(Konversation::removeIrcMarkup(message)); + return cleanedMessage.toAscii(); + } + void NotificationHandler::message(ChatWindow* chatWin, const QString& fromNick, const QString& message) { if (!chatWin || !chatWin->notificationsEnabled()) @@ -45,7 +51,7 @@ namespace Konversation if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - QString cleanedMessage = Qt::escape(Konversation::removeIrcMarkup(message)); + QString cleanedMessage = cleanMessage(message); QString cutup = addLineBreaks(cleanedMessage); KNotification::event(QString::fromLatin1("message"), QString("<%1> %2").arg(fromNick).arg(cutup), QPixmap(), m_mainWindow); @@ -73,7 +79,7 @@ namespace Konversation if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - QString cleanedMessage = Qt::escape(Konversation::removeIrcMarkup(message)); + QString cleanedMessage = cleanMessage(message); QString cutup = addLineBreaks(cleanedMessage); KNotification::event(QString::fromLatin1("nick"), QString("<%1> %2").arg(fromNick).arg(cutup), QPixmap(), m_mainWindow); @@ -99,7 +105,7 @@ namespace Konversation if (Preferences::self()->disableNotifyWhileAway() && chatWin->getServer() && chatWin->getServer()->isAway()) return; - QString cleanedMessage = Qt::escape(Konversation::removeIrcMarkup(message)); + QString cleanedMessage = cleanMessage(message); QString cutup = addLineBreaks(cleanedMessage); KNotification::event(QString::fromLatin1("queryMessage"), QString("<%1> %2").arg(fromNick).arg(cutup), QPixmap(), m_mainWindow); @@ -314,7 +320,7 @@ namespace Konversation startTrayNotification(chatWin); - QString cleanedMessage = Qt::escape(Konversation::removeIrcMarkup(message)); + QString cleanedMessage = cleanMessage(message); QString cutup = addLineBreaks(cleanedMessage); if(fromNick.isEmpty())