[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [konversation] src: Fix < and > in OSD notifications
From:       Peter Simonsson <peter.simonsson () gmail ! com>
Date:       2016-09-11 9:01:39
Message-ID: E1bj0dv-0006WB-PB () code ! kde ! org
[Download RAW message or body]

Git commit 26801f3d7248a059d38e92d969326a35ac90c57a by Peter Simonsson.
Committed on 11/09/2016 at 09:00.
Pushed by psn into branch 'master'.

Fix < and > in OSD notifications

BUG:361993

M  +5    -5    src/notificationhandler.cpp

http://commits.kde.org/konversation/26801f3d7248a059d38e92d969326a35ac90c57a

diff --git a/src/notificationhandler.cpp b/src/notificationhandler.cpp
index c858c14..d9aaa01 100644
--- a/src/notificationhandler.cpp
+++ b/src/notificationhandler.cpp
@@ -106,7 +106,7 @@ namespace Konversation
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[HighLight] (%1) &lt;%2&gt;", \
chatWin->getName(), fromNick)); +                konvApp->osd->show(i18n("[HighLight] \
(%1) <%2>", chatWin->getName(), fromNick));  }
         }
         else
@@ -120,7 +120,7 @@ namespace Konversation
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[HighLight] (%1) &lt;%2&gt; %3", \
chatWin->getName(), fromNick, cleanedMessage)); +                \
konvApp->osd->show(i18n("[HighLight] (%1) <%2> %3", chatWin->getName(), fromNick, \
cleanedMessage));  }
         }
 
@@ -149,7 +149,7 @@ namespace Konversation
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[Query] &lt;%1&gt;", fromNick));
+                konvApp->osd->show(i18n("[Query] <%1>", fromNick));
             }
         }
         else
@@ -163,7 +163,7 @@ namespace Konversation
             {
                 Application* konvApp = Application::instance();
 
-                konvApp->osd->show(i18n("[Query] &lt;%1&gt; %2", fromNick, \
cleanedMessage)); +                konvApp->osd->show(i18n("[Query] <%1> %2", \
fromNick, cleanedMessage));  }
         }
 
@@ -406,7 +406,7 @@ namespace Konversation
                 konvApp->osd->show(i18n("[HighLight] (%1) *** \
%2",chatWin->getName(),cleanedMessage));  // normal highlight message
             else
-                konvApp->osd->show(i18n("[HighLight] (%1) &lt;%2&gt; \
%3",chatWin->getName(),fromNick,cleanedMessage)); +                \
konvApp->osd->show(i18n("[HighLight] (%1) <%2> \
%3",chatWin->getName(),fromNick,cleanedMessage));  }
     }
 


[prev in list] [next in list] [prev in thread] [next in thread]