Mercurial > lxmppd-hg-xmllex / changeset

--- a/net/xmppcomponent_listener.lua	Wed Nov 10 20:51:23 2010 +0500
+++ b/net/xmppcomponent_listener.lua	Wed Nov 10 20:59:16 2010 +0500
@@ -15,8 +15,6 @@
 local logger = require "util.logger";
 local config = require "core.configmanager";
 local connlisteners = require "net.connlisteners";
-local cm_register_component = require "core.componentmanager".register_component;
-local cm_deregister_component = require "core.componentmanager".deregister_component;
 local uuid_gen = require "util.uuid".generate;
 local jid_split = require "util.jid".split;
 local sha1 = require "util.hashes".sha1;

--- a/plugins/mod_component.lua	Wed Nov 10 20:51:23 2010 +0500
+++ b/plugins/mod_component.lua	Wed Nov 10 20:59:16 2010 +0500
@@ -15,8 +15,6 @@
 local t_concat = table.concat;
 
 local config = require "core.configmanager";
-local cm_register_component = require "core.componentmanager".register_component;
-local cm_deregister_component = require "core.componentmanager".deregister_component;
 local sha1 = require "util.hashes".sha1;
 local st = require "util.stanza";
 
@@ -55,8 +53,6 @@
 module:hook("message/host", handle_stanza);
 module:hook("presence/host", handle_stanza);
 
-cm_register_component(module.host, function() end);
-
 --- Handle authentication attempts by components
 function handle_component_auth(event)
 	local session, stanza = event.origin, event.stanza;

--- a/plugins/mod_proxy65.lua	Wed Nov 10 20:51:23 2010 +0500
+++ b/plugins/mod_proxy65.lua	Wed Nov 10 20:59:16 2010 +0500
@@ -16,7 +16,6 @@
 
 local jid_split, jid_join, jid_compare = require "util.jid".split, require "util.jid".join, require "util.jid".compare;
 local st = require "util.stanza";
-local componentmanager = require "core.componentmanager";
 local config_get = require "core.configmanager".get;
 local connlisteners = require "net.connlisteners";
 local sha1 = require "util.hashes".sha1;
@@ -185,7 +184,6 @@
 end
 
 module.unload = function()
-	componentmanager.deregister_component(host);
 	connlisteners.deregister(module.host .. ':proxy65');
 end
 
@@ -260,4 +258,3 @@
 end
 
 connlisteners.start(module.host .. ':proxy65');
-component = componentmanager.register_component(host, function() end);

--- a/plugins/muc/mod_muc.lua	Wed Nov 10 20:51:23 2010 +0500
+++ b/plugins/muc/mod_muc.lua	Wed Nov 10 20:59:16 2010 +0500
@@ -23,8 +23,6 @@
 	end
 end
 local muc_new_room = module:require "muc".new_room;
-local register_component = require "core.componentmanager".register_component;
-local deregister_component = require "core.componentmanager".deregister_component;
 local jid_split = require "util.jid".split;
 local jid_bare = require "util.jid".bare;
 local st = require "util.stanza";
@@ -163,8 +161,7 @@
 module:hook("message/host", stanza_handler);
 module:hook("presence/host", stanza_handler);
 
-component = register_component(muc_host, function() end);
-function component.send(stanza) -- FIXME do a generic fix
+hosts[module.host].send = function(stanza) -- FIXME do a generic fix
 	if stanza.attr.type == "result" or stanza.attr.type == "error" then
 		core_post_stanza(component, stanza);
 	else error("component.send only supports result and error stanzas at the moment"); end
@@ -172,9 +169,6 @@
 
 prosody.hosts[module:get_host()].muc = { rooms = rooms };
 
-module.unload = function()
-	deregister_component(muc_host);
-end
 module.save = function()
 	return {rooms = rooms};
 end

--- a/prosody	Wed Nov 10 20:51:23 2010 +0500
+++ b/prosody	Wed Nov 10 20:59:16 2010 +0500
@@ -309,7 +309,6 @@
 	require "core.modulemanager"
 	require "core.usermanager"
 	require "core.sessionmanager"
-	require "core.componentmanager"
 	require "core.stanza_router"
 
 	require "net.http"