From kde-commits  Fri Dec 31 23:58:24 2004
From: Peter Simonsson <psn () linux ! se>
Date: Fri, 31 Dec 2004 23:58:24 +0000
To: kde-commits
Subject: kdeextragear-2/konversation/konversation
Message-Id: <20041231235824.7FD071C087 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=110453755315411

CVS commit by psn: 

Make the backlog work correctly with the new log format


  M +1 -5      chatwindow.cpp   1.110
  M +9 -13     ircview.cpp   1.197


--- kdeextragear-2/konversation/konversation/chatwindow.cpp  #1.109:1.110
@@ -335,8 +335,4 @@ void ChatWindow::setLogfileName(const QS
         if(backlogLine.find('\t')!=-1)
         {
-          // extract timestamp from log
-          QString backlogTime=backlogLine.left(backlogLine.find(' '));
-          // cut timestamp from line
-          backlogLine=backlogLine.mid(backlogLine.find(' ')+1);
           // extract first column from log
           QString backlogFirst=backlogLine.left(backlogLine.find('\t'));
@@ -345,5 +341,5 @@ void ChatWindow::setLogfileName(const QS
           // Logfile is in utf8 so we don't need to do encoding stuff here
           // append backlog with time and first column to text view
-          appendBacklogMessage(backlogFirst,backlogTime+' '+backlogLine);
+          appendBacklogMessage(backlogFirst, backlogLine);
         }
       } // while

--- kdeextragear-2/konversation/konversation/ircview.cpp  #1.196:1.197
@@ -597,21 +597,17 @@ void IRCView::appendBacklogMessage(const
   QString time;
   QString message(rawMessage);
-  QString first(firstColumn);
+  QString nick(firstColumn);
   QString backlogColor=KonversationApplication::preferences.getColor("BacklogMessage");
 
-  if(!first.isEmpty() && !first.startsWith("<") && !first.startsWith("*")) {
-    first = "|" + first + "|";
+  time = nick.section(' ', 0, 4);
+  nick = nick.section(' ', 5);
+
+  if(!nick.isEmpty() && !nick.startsWith("<") && !nick.startsWith("*")) {
+    nick = "|" + nick + "|";
   }
 
   // Nicks are in "<nick>" format so replace the "<>"
-  first.replace("<","&lt;");
-  first.replace(">","&gt;");
-
-  // extract timestamp from message string
-  if(message.startsWith("["))
-  {
-    time=message.section(' ',0,0);
-    message=message.section(' ',1);
-  }
+  nick.replace("<","&lt;");
+  nick.replace(">","&gt;");
 
   QString line;
@@ -623,5 +619,5 @@ void IRCView::appendBacklogMessage(const
   }
 
-  line = line.arg(time, first, filter(message, backlogColor, NULL, false));
+  line = line.arg(time, nick, filter(message, backlogColor, NULL, false));
 
   doAppend(line);