Merge 0.7->trunk

Thu, 20 May 2010 09:41:27 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Thu, 20 May 2010 09:41:27 +0100
changeset 3055
6405d899764e
parent 3053
8bd3857a75ee (current diff)
parent 3054
05b45b1281aa (diff)
child 3056
c585678b3ecb

Merge 0.7->trunk

--- a/plugins/mod_groups.lua	Wed May 19 10:49:27 2010 +0500
+++ b/plugins/mod_groups.lua	Thu May 20 09:41:27 2010 +0100
@@ -18,7 +18,7 @@
 local module_host = module:get_host();
 
 function inject_roster_contacts(username, host, roster)
-	module:log("warn", "Injecting group members to roster");
+	--module:log("debug", "Injecting group members to roster");
 	local bare_jid = username.."@"..host;
 	if not members[bare_jid] and not members[false] then return; end -- Not a member of any groups
 	
@@ -41,7 +41,7 @@
 	-- Find groups this JID is a member of
 	if members[bare_jid] then
 		for _, group_name in ipairs(members[bare_jid]) do
-			module:log("debug", "Importing group %s", group_name);
+			--module:log("debug", "Importing group %s", group_name);
 			import_jids_to_roster(group_name);
 		end
 	end
@@ -49,7 +49,7 @@
 	-- Import public groups
 	if members[false] then
 		for _, group_name in ipairs(members[false]) do
-			module:log("debug", "Importing group %s", group_name);
+			--module:log("debug", "Importing group %s", group_name);
 			import_jids_to_roster(group_name);
 		end
 	end

mercurial