prosody
b8101bc0630f

Find changesets by keywords by author, files, the commit message, revision number or hash, or revset expression.

Software / code / prosody

Changeset

5578:b8101bc0630f

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 14 May 2013 09:39:32 +0100
parents 5575:345593806e22 (current diff) 5577:8b09b0d068d4 (diff)
children 5579:e449e6342e36
files
diffstat 3 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/plugins/muc/mod_muc.lua	Sat May 11 13:55:36 2013 +0100
+++ b/plugins/muc/mod_muc.lua	Tue May 14 09:39:32 2013 +0100
@@ -83,6 +83,7 @@
 	room.route_stanza = room_route_stanza;
 	room.save = room_save;
 	rooms[jid] = room;
+	module:fire_event("muc-room-created", { room = room });
 	return room;
 end
 
--- a/plugins/muc/muc.lib.lua	Sat May 11 13:55:36 2013 +0100
+++ b/plugins/muc/muc.lib.lua	Tue May 14 09:39:32 2013 +0100
@@ -767,6 +767,7 @@
 		self._occupants[nick] = nil;
 	end
 	self:set_persistent(false);
+	module:fire_event("muc-room-destroyed", { room = self });
 end
 
 function room_mt:handle_to_room(origin, stanza) -- presence changes and groupchat messages, along with disco/etc
--- a/util-src/hashes.c	Sat May 11 13:55:36 2013 +0100
+++ b/util-src/hashes.c	Tue May 14 09:39:32 2013 +0100
@@ -15,7 +15,12 @@
 
 #include <string.h>
 #include <stdlib.h>
+
+#ifdef _MSC_VER
+typedef unsigned __int32 uint32_t;
+#else
 #include <inttypes.h>
+#endif
 
 #include "lua.h"
 #include "lauxlib.h"