Mercurial Mercurial > prosody > prosody / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 0.4
authorMatthew Wild <mwild1@gmail.com>
Wed, 29 Apr 2009 02:08:55 +0100
changeset 1066 0cb325970a50
parent 1058 63b7a81d45eb (current diff)
parent 1065 3806173670f2 (diff)
child 1068 5a655479db72
Merge with 0.4
core/componentmanager.lua file | annotate | diff | comparison | revisions
plugins/mod_muc.lua file | annotate | diff | comparison | revisions
plugins/mod_posix.lua file | annotate | diff | comparison | revisions 
--- 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
prosody