diff options
| author | Matthew Wild <mwild1@gmail.com> | 2009-04-29 02:08:55 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2009-04-29 02:08:55 +0100 |
| commit | 544704ff815efee4204636f302dfb5deed3463d7 (patch) | |
| tree | 55b6589f5ac43b656b4dfa2a10b9e0108bfc10a4 | |
| parent | 2e3907bc3e56c60f947ebda858c632e9a5110943 (diff) | |
| parent | e241b85a56b96bbda1719448a08e68cf5b8eed56 (diff) | |
| download | prosody-544704ff815efee4204636f302dfb5deed3463d7.tar.gz prosody-544704ff815efee4204636f302dfb5deed3463d7.zip | |
Merge with 0.4
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | core/componentmanager.lua | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -78,6 +78,10 @@ do PREFIX="$value" PREFIX_SET=yes ;; + --sysconfdir=*) + SYSCONFDIR="$value" + SYSCONFDIR_SET=yes + ;; --ostype=*) OSTYPE="$value" OSTYPE_SET=yes diff --git a/core/componentmanager.lua b/core/componentmanager.lua index 77d11f99..8b1cce3a 100644 --- a/core/componentmanager.lua +++ b/core/componentmanager.lua @@ -103,7 +103,7 @@ end function deregister_component(host) if components[host] then modulemanager.unload(host, "dialback"); - host.connected = nil; + hosts[host].connected = nil; local host_config = configmanager.getconfig()[host]; if host_config and ((host_config.core.enabled == nil or host_config.core.enabled) and type(host_config.core.component_module) == "string") then -- Set default handler |