# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1240517211 -3600
# Node ID 63b7a81d45eb9ad4d3b3ba36c188288f14ee525c
# Parent  2677f5a4e66ba42374a142219c7984e98e0ad2ba# Parent  084d265b37cfc3bd49b643e8a4cda1c0420e67be
Automated merge with http://waqas.ath.cx:8000/

diff -r 084d265b37cf -r 63b7a81d45eb plugins/mod_muc.lua
--- a/plugins/mod_muc.lua	Thu Apr 23 21:06:08 2009 +0100
+++ b/plugins/mod_muc.lua	Thu Apr 23 21:06:51 2009 +0100
@@ -23,7 +23,7 @@
 end
 
 local muc_domain = module:get_host();
-local muc_name = "MUCMUCMUC!!!";
+local muc_name = "Chatrooms";
 local history_length = 20;
 
 -- room_name -> room
@@ -276,6 +276,7 @@
 					log("debug", "%s joining as %s", from, to);
 					local data;
 					if not rooms:get(room) and not rooms_info:get(room) then -- new room
+						rooms_info:set(room, 'name', (jid_split(room)));
 						data = {affiliation='owner', role='moderator', jid=from, sessions={[from]=get_filtered_presence(stanza)}};
 					end
 					if not data then -- new occupant
diff -r 084d265b37cf -r 63b7a81d45eb plugins/mod_presence.lua
--- a/plugins/mod_presence.lua	Thu Apr 23 21:06:08 2009 +0100
+++ b/plugins/mod_presence.lua	Thu Apr 23 21:06:51 2009 +0100
@@ -65,7 +65,7 @@
 		end
 		local node, host = jid_split(stanza.attr.from);
 		for _, res in pairs(hosts[host].sessions[node].sessions) do -- broadcast to all resources
-			if res ~= origin and res.full_jid then -- to resource. FIXME is res.full_jid the correct check? Maybe it should be res.presence
+			if res ~= origin and res.presence then -- to resource
 				stanza.attr.to = res.full_jid;
 				core_route_stanza(origin, stanza);
 			end