diff options
| author | Matthew Wild <mwild1@gmail.com> | 2013-05-14 09:39:32 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2013-05-14 09:39:32 +0100 |
| commit | e76f13c5d29bf4cac7a244eab77a354638f8823b (patch) | |
| tree | b86a1c45fbce3384d59838f15874809dfd441913 | |
| parent | bdbef6db88bb34e2041d60e57fa2fcec52e54401 (diff) | |
| parent | a9407043cf075c684494be34a5622ad06666a043 (diff) | |
| download | prosody-e76f13c5d29bf4cac7a244eab77a354638f8823b.tar.gz prosody-e76f13c5d29bf4cac7a244eab77a354638f8823b.zip | |
Merge 0.9->trunk
| -rw-r--r-- | plugins/muc/mod_muc.lua | 1 | ||||
| -rw-r--r-- | plugins/muc/muc.lib.lua | 1 | ||||
| -rw-r--r-- | util-src/hashes.c | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/plugins/muc/mod_muc.lua b/plugins/muc/mod_muc.lua index 7861092c..0f1beb0e 100644 --- a/plugins/muc/mod_muc.lua +++ b/plugins/muc/mod_muc.lua @@ -83,6 +83,7 @@ function create_room(jid) room.route_stanza = room_route_stanza; room.save = room_save; rooms[jid] = room; + module:fire_event("muc-room-created", { room = room }); return room; end diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index a5aba3c8..1ea231f3 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -767,6 +767,7 @@ function room_mt:destroy(newjid, reason, password) 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 diff --git a/util-src/hashes.c b/util-src/hashes.c index 8f7d7140..39737ae0 100644 --- a/util-src/hashes.c +++ b/util-src/hashes.c @@ -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" |