Merge waqas with Tobias. Eww.

1 files changed, 4 insertions, 10 deletions

diff --git a/core/componentmanager.lua b/core/componentmanager.lua
index 08868236..536d1633 100644
--- a/core/componentmanager.lua
+++ b/core/componentmanager.lua
@@ -6,8 +6,6 @@
 -- COPYING file in the source package for more information.
 --
 
-
-
 local prosody = prosody;
 local log = require "util.logger".init("componentmanager");
 local configmanager = require "core.configmanager";
@@ -25,14 +23,6 @@ local components = {};
 
 local disco_items = require "util.multitable".new();
 local NULL = {};
-require "core.discomanager".addDiscoItemsHandler("*host", function(reply, to, from, node)
-	if #node == 0 and hosts[to] then
-		for jid in pairs(disco_items:get(to) or NULL) do
-			reply:tag("item", {jid = jid}):up();
-		end
-		return true;
-	end
-end);
 
 prosody.events.add_handler("server-starting", function () core_route_stanza = _G.core_route_stanza; end);
 
@@ -138,4 +128,8 @@ function set_component_handler(host, handler)
 	components[host] = handler;
 end
 
+function get_children(host)
+	return disco_items:get(host) or NULL;
+end
+
 return _M;