Merge 0.10->trunk

2 files changed, 7 insertions, 7 deletions

diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua
index 4d8175ef..4984b908 100644
--- a/plugins/mod_carbons.lua
+++ b/plugins/mod_carbons.lua
@@ -100,11 +100,11 @@ local function c2s_message_handler(event)
 end
 
 -- Stanzas sent by local clients
-module:hook("pre-message/host", c2s_message_handler, 1);
-module:hook("pre-message/bare", c2s_message_handler, 1);
-module:hook("pre-message/full", c2s_message_handler, 1);
+module:hook("pre-message/host", c2s_message_handler, -0.5);
+module:hook("pre-message/bare", c2s_message_handler, -0.5);
+module:hook("pre-message/full", c2s_message_handler, -0.5);
 -- Stanzas to local clients
-module:hook("message/bare", message_handler, 1);
-module:hook("message/full", message_handler, 1);
+module:hook("message/bare", message_handler, -0.5);
+module:hook("message/full", message_handler, -0.5);
 
 module:add_feature(xmlns_carbons);
diff --git a/plugins/mod_message.lua b/plugins/mod_message.lua
index fc337db0..47da5f46 100644
--- a/plugins/mod_message.lua
+++ b/plugins/mod_message.lua
@@ -73,13 +73,13 @@ module:hook("message/full", function(data)
 	else -- resource not online
 		return process_to_bare(jid_bare(stanza.attr.to), origin, stanza);
 	end
-end);
+end, -1);
 
 module:hook("message/bare", function(data)
 	-- message to bare JID recieved
 	local origin, stanza = data.origin, data.stanza;
 
 	return process_to_bare(stanza.attr.to or (origin.username..'@'..origin.host), origin, stanza);
-end);
+end, -1);
 
 module:add_feature("msgoffline");