Merge with 0.5

Tue, 21 Jul 2009 13:22:48 +0100

author
Matthew Wild <mwild1@gmail.com>
date
Tue, 21 Jul 2009 13:22:48 +0100
changeset 1566
9edeef1ad4f1
parent 1562
2b8674e87a24 (current diff)
parent 1565
f1eeb049a0a5 (diff)
child 1567
e052a3bdb8b5

Merge with 0.5

--- a/.hgtags	Mon Jul 20 05:27:59 2009 +0100
+++ b/.hgtags	Tue Jul 21 13:22:48 2009 +0100
@@ -25,3 +25,4 @@
 b2e548344d61ebbfd1474baedc5aa187f874948a 0.4.1
 b1b42ce4f0f6a8f587c2925724694c0e8b437dce 0.4.2
 6b91a2b39680f0f7195fec561a3ce3d660ea0c20 0.4.2
+06030af44faddd7d3c20e7d380bb55b92b079c5f 0.5.0
--- a/util-src/pposix.c	Mon Jul 20 05:27:59 2009 +0100
+++ b/util-src/pposix.c	Tue Jul 21 13:22:48 2009 +0100
@@ -173,7 +173,7 @@
 				LOG_INFO,
 				LOG_NOTICE,
 				LOG_WARNING,
-				LOG_EMERG,
+				LOG_CRIT,
 				-1
 			};
 int lc_syslog_log(lua_State* L)
--- a/util/muc.lua	Mon Jul 20 05:27:59 2009 +0100
+++ b/util/muc.lua	Tue Jul 21 13:22:48 2009 +0100
@@ -159,7 +159,7 @@
 		end
 	end
 	if room._data['subject'] then
-		room:route_stanza(st.message({type='groupchat', from=room, to=to}):tag("subject"):text(room._data['subject']));
+		room:route_stanza(st.message({type='groupchat', from=room.jid, to=to}):tag("subject"):text(room._data['subject']));
 	end
 end
 

mercurial