2 files changed, 9 insertions, 9 deletions
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 37ce2bf5..40d56bbd 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -26,6 +26,7 @@
 #include "client.h"
 #include "channel.h"
 #include "channelmanager.h"
+#include "eventmanager.h"
 
 #include "gui/chat.h"
 
@@ -149,7 +150,7 @@ void ChatHandler::handleGameChatMessage(Net::MessageIn &msg)
 
     if (id == 0)
     {
-        localChatTab->chatLog(chatMsg, BY_SERVER);
+        SERVER_NOTICE(chatMsg)
         return;
     }
 
@@ -198,13 +199,13 @@ void ChatHandler::handleEnterChannelResponse(Net::MessageIn &msg)
     }
     else
     {
-        localChatTab->chatLog(_("Error joining channel."), BY_SERVER);
+        SERVER_NOTICE(_("Error joining channel."))
     }
 }
 
 void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
 {
-    localChatTab->chatLog(_("Listing channels."), BY_SERVER);
+    SERVER_NOTICE(_("Listing channels."))
     while (msg.getUnreadLength())
     {
         std::string channelName = msg.readString();
@@ -214,9 +215,9 @@ void ChatHandler::handleListChannelsResponse(Net::MessageIn &msg)
         numUsers << msg.readInt16();
         channelName += " - ";
         channelName += numUsers.str();
-        localChatTab->chatLog(channelName, BY_SERVER);
+        SERVER_NOTICE(channelName)
     }
-    localChatTab->chatLog(_("End of channel list."), BY_SERVER);
+    SERVER_NOTICE(_("End of channel list."))
 }
 
 void ChatHandler::handlePrivateMessage(Net::MessageIn &msg)
@@ -341,7 +342,7 @@ void ChatHandler::handleWhoResponse(Net::MessageIn &msg)
         {
             break;
         }
-        localChatTab->chatLog(userNick, BY_SERVER);
+        SERVER_NOTICE(userNick)
     }
 }
 
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index f147ef9b..09d83cbe 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -21,13 +21,12 @@
 
 #include "net/tmwa/specialhandler.h"
 
+#include "eventmanager.h"
 #include "log.h"
 #include "playerinfo.h"
 
 #include "gui/skilldialog.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/messagein.h"
 #include "net/messageout.h"
 
@@ -216,7 +215,7 @@ void SpecialHandler::handleMessage(Net::MessageIn &msg)
                 }
             }
 
-            localChatTab->chatLog(msg);
+            SERVER_NOTICE(msg)
             break;
     }
 }