# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1339505756 -3600
# Node ID 13d18cc6527da339159e4360e7d827ab959ba994
# Parent  55f6e0673e33ae005c389c91d6d564f2a6892fa4# Parent  58714123f6005c941a9c35fc2ad3fd08f1c38b8f
Merge with trunk

diff -r 55f6e0673e33 -r 13d18cc6527d plugins/adhoc/mod_adhoc.lua
--- a/plugins/adhoc/mod_adhoc.lua	Tue Jun 12 17:02:35 2012 +0500
+++ b/plugins/adhoc/mod_adhoc.lua	Tue Jun 12 13:55:56 2012 +0100
@@ -100,3 +100,4 @@
 end
 
 module:handle_items("adhoc", adhoc_added, adhoc_removed);
+module:handle_items("adhoc-provider", adhoc_added, adhoc_removed);
diff -r 55f6e0673e33 -r 13d18cc6527d plugins/mod_admin_adhoc.lua
--- a/plugins/mod_admin_adhoc.lua	Tue Jun 12 17:02:35 2012 +0500
+++ b/plugins/mod_admin_adhoc.lua	Tue Jun 12 13:55:56 2012 +0100
@@ -605,17 +605,17 @@
 local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "global_admin");
 local unload_modules_desc = adhoc_new("Unload modules", "http://prosody.im/protocol/modules#unload", unload_modules_handler, "admin");
 
-module:add_item("adhoc", add_user_desc);
-module:add_item("adhoc", change_user_password_desc);
-module:add_item("adhoc", config_reload_desc);
-module:add_item("adhoc", delete_user_desc);
-module:add_item("adhoc", end_user_session_desc);
-module:add_item("adhoc", get_user_password_desc);
-module:add_item("adhoc", get_user_roster_desc);
-module:add_item("adhoc", get_user_stats_desc);
-module:add_item("adhoc", get_online_users_desc);
-module:add_item("adhoc", list_modules_desc);
-module:add_item("adhoc", load_module_desc);
-module:add_item("adhoc", reload_modules_desc);
-module:add_item("adhoc", shut_down_service_desc);
-module:add_item("adhoc", unload_modules_desc);
+module:provides("adhoc", add_user_desc);
+module:provides("adhoc", change_user_password_desc);
+module:provides("adhoc", config_reload_desc);
+module:provides("adhoc", delete_user_desc);
+module:provides("adhoc", end_user_session_desc);
+module:provides("adhoc", get_user_password_desc);
+module:provides("adhoc", get_user_roster_desc);
+module:provides("adhoc", get_user_stats_desc);
+module:provides("adhoc", get_online_users_desc);
+module:provides("adhoc", list_modules_desc);
+module:provides("adhoc", load_module_desc);
+module:provides("adhoc", reload_modules_desc);
+module:provides("adhoc", shut_down_service_desc);
+module:provides("adhoc", unload_modules_desc);
diff -r 55f6e0673e33 -r 13d18cc6527d plugins/mod_announce.lua
--- a/plugins/mod_announce.lua	Tue Jun 12 17:02:35 2012 +0500
+++ b/plugins/mod_announce.lua	Tue Jun 12 13:55:56 2012 +0100
@@ -96,5 +96,5 @@
 
 local adhoc_new = module:require "adhoc".new;
 local announce_desc = adhoc_new("Send Announcement to Online Users", "http://jabber.org/protocol/admin#announce", announce_handler, "admin");
-module:add_item("adhoc", announce_desc);
+module:provides("adhoc", announce_desc);