Chat channeling commit part 3. Is now linked with the connection handler to chat in a specific channel. Also made some fixes on the chat channeling.

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main.cpp b/src/main.cpp
index 6088654f..fef59d3d 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,7 @@
 #endif
 
 #include "accounthandler.h"
+#include "chatchannelmanager.h"
 #include "chathandler.h"
 #include "configuration.h"
 #include "connectionhandler.h"
@@ -94,6 +95,8 @@ AccountHandler *accountHandler;
 
 /** Communications (chat) message handler */
 ChatHandler *chatHandler;
+/** Chat Channels Manager */
+ChatChannelManager *chatChannelManager;
 
 /** Core game message handler */
 GameHandler *gameHandler;
@@ -175,8 +178,10 @@ void initialize()
     // Initialize the global handlers
     // FIXME: Make the global handlers global vars or part of a bigger
     // singleton or a local vatiable in the event-loop
-    accountHandler = new AccountHandler();
+    chatChannelManager = new ChatChannelManager();
+
     chatHandler = new ChatHandler();
+    accountHandler = new AccountHandler();
     gameHandler = new GameHandler();
     connectionHandler = new ConnectionHandler();
 
@@ -270,6 +275,8 @@ void deinitialize()
     delete gameHandler;
     delete connectionHandler;
 
+    delete chatChannelManager;
+
     // Get rid of persistent data storage
     tmwserv::Storage::destroy();