# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1344183679 -3600
# Node ID 1ffc788c56960142661f6762133ee058bcf3b9ee
# Parent  c0c060e450be170b31778a89137ed497def2b353# Parent  52767b1f057b3f34b49b7c6cd9c88a3c165d2363
Merge 0.9->trunk (who has been pushing to trunk?)

diff -r 52767b1f057b -r 1ffc788c5696 core/hostmanager.lua
--- a/core/hostmanager.lua	Sat Aug 04 23:55:52 2012 +0500
+++ b/core/hostmanager.lua	Sun Aug 05 17:21:19 2012 +0100
@@ -84,7 +84,7 @@
 	end
 	hosts[host] = host_session;
 	if not host:match("[@/]") then
-		disco_items:set(host:match("%.(.*)") or "*", host, true);
+		disco_items:set(host:match("%.(.*)") or "*", host, host_config.core.name or true);
 	end
 	for option_name in pairs(host_config.core) do
 		if option_name:match("_ports$") or option_name:match("_interface$") then
diff -r 52767b1f057b -r 1ffc788c5696 plugins/mod_disco.lua
--- a/plugins/mod_disco.lua	Sat Aug 04 23:55:52 2012 +0500
+++ b/plugins/mod_disco.lua	Sun Aug 05 17:21:19 2012 +0100
@@ -111,8 +111,8 @@
 	if node and node ~= "" then return; end -- TODO fire event?
 
 	local reply = st.reply(stanza):query("http://jabber.org/protocol/disco#items");
-	for jid in pairs(get_children(module.host)) do
-		reply:tag("item", {jid = jid}):up();
+	for jid, name in pairs(get_children(module.host)) do
+		reply:tag("item", {jid = jid, name = name~=true and name or nil}):up();
 	end
 	for _, item in ipairs(disco_items) do
 		reply:tag("item", {jid=item[1], name=item[2]}):up();