Software / code / prosody
Changeset
1066:0cb325970a50
Merge with 0.4
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Wed, 29 Apr 2009 02:08:55 +0100 |
| parents | 1058:63b7a81d45eb (current diff) 1065:3806173670f2 (diff) |
| children | 1068:5a655479db72 |
| files | core/componentmanager.lua plugins/mod_muc.lua plugins/mod_posix.lua |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Thu Apr 23 21:06:51 2009 +0100 +++ b/configure Wed Apr 29 02:08:55 2009 +0100 @@ -78,6 +78,10 @@ PREFIX="$value" PREFIX_SET=yes ;; + --sysconfdir=*) + SYSCONFDIR="$value" + SYSCONFDIR_SET=yes + ;; --ostype=*) OSTYPE="$value" OSTYPE_SET=yes
--- a/core/componentmanager.lua Thu Apr 23 21:06:51 2009 +0100 +++ b/core/componentmanager.lua Wed Apr 29 02:08:55 2009 +0100 @@ -103,7 +103,7 @@ 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
