X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=08190ed1a0cca73a24e84aee972536108e1aa94c;hb=1c0eb65f8545bb444f5fb9e792b8d9587ce8cefa;hp=627ba5e863ff4a9077c4c16ac4ba30c683a5734c;hpb=f45fafc6d8ec122a7244cef1fdae1cdf16c6a0c7;p=quassel.git

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 627ba5e8..08190ed1 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -19,13 +19,13 @@
  ***************************************************************************/
 #include <QApplication>
 
+#include "quassel.h"
 #include "uistyle.h"
 #include "uisettings.h"
 #include "util.h"
 
 // FIXME remove with migration code
 #include <QSettings>
-#include "global.h"
 
 UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // register FormatList if that hasn't happened yet
@@ -39,9 +39,9 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // FIXME remove migration at some point
   // We remove old settings if we find them, since they conflict
 #ifdef Q_WS_MAC
-  QSettings mys(QCoreApplication::organizationDomain(), Global::clientApplicationName);
+  QSettings mys(QCoreApplication::organizationDomain(), Quassel::buildInfo().clientApplicationName);
 #else
-  QSettings mys(QCoreApplication::organizationName(), Global::clientApplicationName);
+  QSettings mys(QCoreApplication::organizationName(), Quassel::buildInfo().clientApplicationName);
 #endif
   mys.beginGroup("QtUi");
   if(mys.childGroups().contains("Colors")) {
@@ -317,6 +317,7 @@ UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
   QString nick = nickFromMask(msg.sender());
   QString txt = mircToInternal(msg.contents());
   QString bufferName = msg.bufferInfo().bufferName();
+  bufferName.replace('%', "%%"); // well, you _can_ have a % in a buffername apparently... -_-
 
   StyledMessage result;
 
@@ -339,7 +340,7 @@ UiStyle::StyledMessage UiStyle::styleMessage(const Message &msg) {
       if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
       break;
     case Message::Quit:
-      s = tr("%Dq<--"); t = tr("%Dq%DN%DU%1%DU%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
+      s = tr("%Dq<--"); t = tr("%Dq%DN%1%DN %DH(%2@%3)%DH has quit").arg(nick, user, host);
       if(!txt.isEmpty()) t = QString("%1 (%2)").arg(t).arg(txt);
       break;
     case Message::Kick: