X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fqssparser.cpp;h=56a76122b2b552647ec33a3c20493ce84b999daf;hp=ceac60baebbeccf04e254abdffee797d3910af9c;hb=86bd6b1ffb870e65af6d830a2ea16471c348ed5a;hpb=02ed3d0a95051e55ecaf66561f379041ae111cca

diff --git a/src/uisupport/qssparser.cpp b/src/uisupport/qssparser.cpp
index ceac60ba..56a76122 100644
--- a/src/uisupport/qssparser.cpp
+++ b/src/uisupport/qssparser.cpp
@@ -160,7 +160,7 @@ void QssParser::parsePaletteBlock(const QString &decl, const QString &contents)
 /******** Determine format types from a block declaration ********/
 
 quint64 QssParser::parseFormatType(const QString &decl) {
-  QRegExp rx("ChatLine(?:::(\\w+))?(?:#(\\w+))?(?:\\[([=-,\\\"\\w\\s]+)\\])?");
+  QRegExp rx("ChatLine(?:::(\\w+))?(?:#([\\w\\-]+))?(?:\\[([=-,\\\"\\w\\s]+)\\])?");
   // $1: subelement; $2: msgtype; $3: conditionals
   if(!rx.exactMatch(decl)) {
     qWarning() << Q_FUNC_INFO << tr("Invalid block declaration: %1").arg(decl);
@@ -226,9 +226,9 @@ quint64 QssParser::parseFormatType(const QString &decl) {
       fmtType |= UiStyle::DayChangeMsg;
     else if(msgType == "topic")
       fmtType |= UiStyle::TopicMsg;
-    else if(msgType == "netsplitJoin")
+    else if(msgType == "netsplit-join")
       fmtType |= UiStyle::NetsplitJoinMsg;
-    else if(msgType == "netsplitQuit")
+    else if(msgType == "netsplit-quit")
       fmtType |= UiStyle::NetsplitQuitMsg;
     else {
       qWarning() << Q_FUNC_INFO << tr("Invalid message type in %1").arg(decl);