From 21b2c77cb8fb866a946b5f1e004316d2cb7199a9 Mon Sep 17 00:00:00 2001
From: shagu <ericmauser@googlemail.com>
Date: Wed, 21 Dec 2016 21:19:41 +0100
Subject: [PATCH] chat: use more common way to join default channels

---
 modules/chat.lua | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/modules/chat.lua b/modules/chat.lua
index ed69ec50..0eb11d4f 100644
--- a/modules/chat.lua
+++ b/modules/chat.lua
@@ -358,9 +358,6 @@ pfUI:RegisterModule("chat", function ()
     FCF_SetWindowColor(ChatFrame2, 0, 0, 0)
     FCF_SetWindowAlpha(ChatFrame2, 0)
     FCF_SetChatWindowFontSize(ChatFrame2, 12)
-    ChatFrame_RemoveAllChannels(ChatFrame2)
-    ChatFrame_RemoveAllMessageGroups(ChatFrame2)
-    ChatFrame_ActivateCombatMessages(ChatFrame2)
 
     -- set position of Loot & Spam
     if not ChatFrame3:IsShown() then
@@ -385,8 +382,13 @@ pfUI:RegisterModule("chat", function ()
 
   function pfUI.chat.SetupChannels()
     ChatFrame_RemoveAllMessageGroups(ChatFrame1)
+    ChatFrame_RemoveAllMessageGroups(ChatFrame2)
     ChatFrame_RemoveAllMessageGroups(ChatFrame3)
 
+    ChatFrame_RemoveAllChannels(ChatFrame1)
+    ChatFrame_RemoveAllChannels(ChatFrame2)
+    ChatFrame_RemoveAllChannels(ChatFrame3)
+
     local normalg = {"SAY", "EMOTE", "YELL", "GUILD", "OFFICER", "GUILD_ACHIEVEMENT", "WHISPER",
       "MONSTER_SAY", "MONSTER_EMOTE", "MONSTER_YELL", "MONSTER_WHISPER", "MONSTER_BOSS_EMOTE", "MONSTER_BOSS_WHISPER",
       "PARTY", "PARTY_LEADER", "RAID", "RAID_LEADER", "RAID_WARNING", "BATTLEGROUND", "BATTLEGROUND_LEADER",
@@ -395,16 +397,16 @@ pfUI:RegisterModule("chat", function ()
       ChatFrame_AddMessageGroup(ChatFrame1, group)
     end
 
+    ChatFrame_ActivateCombatMessages(ChatFrame2)
+
     local spamg = { "COMBAT_XP_GAIN", "COMBAT_HONOR_GAIN", "COMBAT_FACTION_CHANGE", "SKILL", "LOOT", "MONEY" }
     for _,group in pairs(spamg) do
       ChatFrame_AddMessageGroup(ChatFrame3, group)
     end
 
-    local spamc = { "Trade", "General", "LocalDefense", "GuildRecruitment", "LookingForGroup",
-      "Handel", "Allgemein", "LokaleVerteidigung", "Gildenrekrutierung", "SucheNachGruppe", "World" }
-    for _,channel in pairs(spamc) do
-      ChatFrame_RemoveChannel(ChatFrame1, channel)
-      ChatFrame_AddChannel(ChatFrame3, channel)
+    for _, chan in pairs({EnumerateServerChannels()}) do
+      ChatFrame_AddChannel(ChatFrame3, chan)
+      ChatFrame_RemoveChannel(ChatFrame1, chan)
     end
 
     JoinChannelByName("World")