trunk

changeset 4927:13d18cc6527d

find changesets by author, revision, files, or words in the commit message
Merge with trunk
author Matthew Wild <mwild1@gmail.com>
date Tue, 12 Jun 2012 13:55:56 +0100
parents 55f6e0673e33 58714123f600
children 15c1b8aa123d
files
diffstat 3 files changed, 16 insertions(+), 15 deletions(-) [+]
line diff
     1.1 --- a/plugins/adhoc/mod_adhoc.lua	Tue Jun 12 17:02:35 2012 +0500
     1.2 +++ b/plugins/adhoc/mod_adhoc.lua	Tue Jun 12 13:55:56 2012 +0100
     1.3 @@ -100,3 +100,4 @@
     1.4  end
     1.5  
     1.6  module:handle_items("adhoc", adhoc_added, adhoc_removed);
     1.7 +module:handle_items("adhoc-provider", adhoc_added, adhoc_removed);

     2.1 --- a/plugins/mod_admin_adhoc.lua	Tue Jun 12 17:02:35 2012 +0500
     2.2 +++ b/plugins/mod_admin_adhoc.lua	Tue Jun 12 13:55:56 2012 +0100
     2.3 @@ -605,17 +605,17 @@
     2.4  local shut_down_service_desc = adhoc_new("Shut Down Service", "http://jabber.org/protocol/admin#shutdown", shut_down_service_handler, "global_admin");
     2.5  local unload_modules_desc = adhoc_new("Unload modules", "http://prosody.im/protocol/modules#unload", unload_modules_handler, "admin");
     2.6  
     2.7 -module:add_item("adhoc", add_user_desc);
     2.8 -module:add_item("adhoc", change_user_password_desc);
     2.9 -module:add_item("adhoc", config_reload_desc);
    2.10 -module:add_item("adhoc", delete_user_desc);
    2.11 -module:add_item("adhoc", end_user_session_desc);
    2.12 -module:add_item("adhoc", get_user_password_desc);
    2.13 -module:add_item("adhoc", get_user_roster_desc);
    2.14 -module:add_item("adhoc", get_user_stats_desc);
    2.15 -module:add_item("adhoc", get_online_users_desc);
    2.16 -module:add_item("adhoc", list_modules_desc);
    2.17 -module:add_item("adhoc", load_module_desc);
    2.18 -module:add_item("adhoc", reload_modules_desc);
    2.19 -module:add_item("adhoc", shut_down_service_desc);
    2.20 -module:add_item("adhoc", unload_modules_desc);
    2.21 +module:provides("adhoc", add_user_desc);
    2.22 +module:provides("adhoc", change_user_password_desc);
    2.23 +module:provides("adhoc", config_reload_desc);
    2.24 +module:provides("adhoc", delete_user_desc);
    2.25 +module:provides("adhoc", end_user_session_desc);
    2.26 +module:provides("adhoc", get_user_password_desc);
    2.27 +module:provides("adhoc", get_user_roster_desc);
    2.28 +module:provides("adhoc", get_user_stats_desc);
    2.29 +module:provides("adhoc", get_online_users_desc);
    2.30 +module:provides("adhoc", list_modules_desc);
    2.31 +module:provides("adhoc", load_module_desc);
    2.32 +module:provides("adhoc", reload_modules_desc);
    2.33 +module:provides("adhoc", shut_down_service_desc);
    2.34 +module:provides("adhoc", unload_modules_desc);

     3.1 --- a/plugins/mod_announce.lua	Tue Jun 12 17:02:35 2012 +0500
     3.2 +++ b/plugins/mod_announce.lua	Tue Jun 12 13:55:56 2012 +0100
     3.3 @@ -96,5 +96,5 @@
     3.4  
     3.5  local adhoc_new = module:require "adhoc".new;
     3.6  local announce_desc = adhoc_new("Send Announcement to Online Users", "http://jabber.org/protocol/admin#announce", announce_handler, "admin");
     3.7 -module:add_item("adhoc", announce_desc);
     3.8 +module:provides("adhoc", announce_desc);
     3.9