diff options
| author | Matthew Wild <mwild1@gmail.com> | 2012-06-12 13:55:56 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2012-06-12 13:55:56 +0100 |
| commit | d786589002d3626b31dcf95f929854db29d0b433 (patch) | |
| tree | ad5ef4f0eb8f1738a908ee17ac3301935cca7c43 | |
| parent | 93f062ef641152f54cc25fa2f1e71111cdba6aaf (diff) | |
| parent | f76c2aa90b3cc7ba714571448865fcb30d63ef78 (diff) | |
| download | prosody-d786589002d3626b31dcf95f929854db29d0b433.tar.gz prosody-d786589002d3626b31dcf95f929854db29d0b433.zip | |
Merge with trunk
| -rw-r--r-- | plugins/adhoc/mod_adhoc.lua | 1 | ||||
| -rw-r--r-- | plugins/mod_admin_adhoc.lua | 28 | ||||
| -rw-r--r-- | plugins/mod_announce.lua | 2 |
3 files changed, 16 insertions, 15 deletions
diff --git a/plugins/adhoc/mod_adhoc.lua b/plugins/adhoc/mod_adhoc.lua index 49d07103..69b2c8da 100644 --- a/plugins/adhoc/mod_adhoc.lua +++ b/plugins/adhoc/mod_adhoc.lua @@ -100,3 +100,4 @@ local function adhoc_removed(event) end module:handle_items("adhoc", adhoc_added, adhoc_removed); +module:handle_items("adhoc-provider", adhoc_added, adhoc_removed); diff --git a/plugins/mod_admin_adhoc.lua b/plugins/mod_admin_adhoc.lua index 4d2c60d7..b8cb0637 100644 --- a/plugins/mod_admin_adhoc.lua +++ b/plugins/mod_admin_adhoc.lua @@ -605,17 +605,17 @@ local reload_modules_desc = adhoc_new("Reload modules", "http://prosody.im/proto 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 --git a/plugins/mod_announce.lua b/plugins/mod_announce.lua index 77555bec..99fbae50 100644 --- a/plugins/mod_announce.lua +++ b/plugins/mod_announce.lua @@ -96,5 +96,5 @@ end 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); |