X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fnetworkmodel.cpp;h=ddc71dd4f4ab19c5579b07922f93d4e391ee5bfd;hp=2adbe08a9eb83f87deb61c99c03e9f08ffa80150;hb=d3dcda30c8cbee75c0c8f500f4ab552bde513036;hpb=52f0d47d0cb1932c9e86ebb75cdd4dd0d625dd6f

diff --git a/src/client/networkmodel.cpp b/src/client/networkmodel.cpp
index 2adbe08a..ddc71dd4 100644
--- a/src/client/networkmodel.cpp
+++ b/src/client/networkmodel.cpp
@@ -463,6 +463,12 @@ bool QueryBufferItem::setData(int column, const QVariant &value, int role)
     case Qt::EditRole:
     {
         QString newName = value.toString();
+
+        // Sanity check - buffer names must not contain newlines!
+        int nlpos = newName.indexOf('\n');
+        if (nlpos >= 0)
+            newName = newName.left(nlpos);
+
         if (!newName.isEmpty()) {
             Client::renameBuffer(bufferId(), newName);
             return true;
@@ -958,7 +964,7 @@ QString IrcUserItem::toolTip(int column) const
     }
     tooltip << "</p>";
 
-    auto addRow = [&](const QString& key, const QString& value, bool condition = true) {
+    auto addRow = [&](const QString& key, const QString& value, bool condition) {
         if (condition)
         {
             tooltip << "<tr><td class='bold' align='right'>" << key << "</td><td>" << value << "</td></tr>";
@@ -971,24 +977,24 @@ QString IrcUserItem::toolTip(int column) const
         if(!_ircUser->awayMessage().isEmpty()) {
             awayMessage = _ircUser->awayMessage();
         }
-        addRow(tr("Away&nbsp;Message"), awayMessage);
+        addRow(tr("Away&nbsp;Message"), awayMessage, true);
     }
     addRow(tr("Realname"), _ircUser->realName(), !_ircUser->realName().isEmpty());
     addRow(tr("Operator"), _ircUser->ircOperator(), !_ircUser->ircOperator().isEmpty());
     addRow(tr("Suser&nbsp;Host"), _ircUser->suserHost(),!_ircUser->suserHost().isEmpty());
     addRow(tr("Whois&nbsp;Service&nbsp;Reply"), _ircUser->whoisServiceReply(), !_ircUser->whoisServiceReply().isEmpty());
-    addRow(tr("Hostmask"), _ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1));
+    addRow(tr("Hostmask"), _ircUser->hostmask().remove(0, _ircUser->hostmask().indexOf("!")+1), true);
     addRow(tr("Operator"), _ircUser->ircOperator(), !_ircUser->ircOperator().isEmpty());
 
     if (_ircUser->idleTime().isValid()) {
         QDateTime now = QDateTime::currentDateTime();
         QDateTime idle = _ircUser->idleTime();
         int idleTime = idle.secsTo(now);
-        addRow(tr("Idling&nbsp;since"), secondsToString(idleTime));
+        addRow(tr("Idling&nbsp;since"), secondsToString(idleTime), true);
     }
 
     if (_ircUser->loginTime().isValid()) {
-        addRow(tr("Login&nbsp;time"), _ircUser->loginTime().toString());
+        addRow(tr("Login&nbsp;time"), _ircUser->loginTime().toString(), true);
     }
 
     addRow(tr("Server"), _ircUser->server(), !_ircUser->server().isEmpty());