comparison core/componentmanager.lua @ 1013:943f2cd7e480

Merging stable into unstable
author Matthew Wild <mwild1@gmail.com>
date Mon, 20 Apr 2009 03:03:07 +0100
parents 0c3ea09d6d6e
children 07835534d996 3e945c3938ad
comparison
equal deleted inserted replaced
1012:d53108635407 1013:943f2cd7e480
102 end 102 end
103 103
104 function deregister_component(host) 104 function deregister_component(host)
105 if components[host] then 105 if components[host] then
106 modulemanager.unload(host, "dialback"); 106 modulemanager.unload(host, "dialback");
107 host.connected = nil;
107 local host_config = configmanager.getconfig()[host]; 108 local host_config = configmanager.getconfig()[host];
108 if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then 109 if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then
109 -- Set default handler 110 -- Set default handler
110 components[host] = default_component_handler; 111 components[host] = default_component_handler;
111 else 112 else