From 036076d373c37bd82bd446a0a0a1df912e28ee87 Mon Sep 17 00:00:00 2001
From: Badlop <badlop@process-one.net>
Date: Tue, 4 Mar 2014 17:06:30 +0100
Subject: [PATCH] Update mod_multicast to allow compile

---
 mod_multicast/src/ejabberd_c2s.erl              | 1 +
 mod_multicast/src/ejabberd_router_multicast.erl | 1 +
 mod_multicast/src/mod_muc_room.erl              | 3 ++-
 mod_multicast/src/mod_multicast.erl             | 4 +---
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mod_multicast/src/ejabberd_c2s.erl b/mod_multicast/src/ejabberd_c2s.erl
index 433b75b..d0daf36 100644
--- a/mod_multicast/src/ejabberd_c2s.erl
+++ b/mod_multicast/src/ejabberd_c2s.erl
@@ -37,6 +37,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -define(SETS, gb_sets).
 
diff --git a/mod_multicast/src/ejabberd_router_multicast.erl b/mod_multicast/src/ejabberd_router_multicast.erl
index 5f6d967..3ea9560 100644
--- a/mod_multicast/src/ejabberd_router_multicast.erl
+++ b/mod_multicast/src/ejabberd_router_multicast.erl
@@ -26,6 +26,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -record(route_multicast, {domain, pid}).
 -record(state, {}).
diff --git a/mod_multicast/src/mod_muc_room.erl b/mod_multicast/src/mod_muc_room.erl
index 1dab48c..c5bdae5 100644
--- a/mod_multicast/src/mod_muc_room.erl
+++ b/mod_multicast/src/mod_muc_room.erl
@@ -29,6 +29,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -define(MAX_USERS_DEFAULT, 200).
 -define(MAX_USERS_DEFAULT_LIST,
@@ -1199,7 +1200,7 @@ filter_presence({xmlelement, "presence", Attrs, Els}) ->
 			 {xmlelement, _Name1, Attrs1, _Els1} ->
 			     XMLNS = xml:get_attr_s("xmlns", Attrs1),
 			     case XMLNS of
-				 ?NS_MUC ++ _ ->
+				 "http://jabber.org/protocol/muc" ++ _ ->
 				     false;
 				 _ ->
 				     true
diff --git a/mod_multicast/src/mod_multicast.erl b/mod_multicast/src/mod_multicast.erl
index f51f8d7..dd610d8 100644
--- a/mod_multicast/src/mod_multicast.erl
+++ b/mod_multicast/src/mod_multicast.erl
@@ -30,6 +30,7 @@
 
 -include("ejabberd.hrl").
 -include("jlib.hrl").
+-include("logger.hrl").
 
 -record(state, {lserver, lservice, access, service_limits}).
 
@@ -70,9 +71,6 @@
 -define(VERSION_MULTICAST, "$Revision: 440 $ ").
 -define(PROCNAME, ejabberd_mod_multicast).
 
-%% TODO: move this line to jlib.hrl
--define(NS_ADDRESS, "http://jabber.org/protocol/address").
-
 -define(PURGE_PROCNAME, ejabberd_mod_multicast_purgeloop).
 
 %% TODO: allow configuration instead of hard-coding