diff --git a/UPGRADE.txt b/UPGRADE.txt
index b7bbf3b983..7e17b1057b 100644
--- a/UPGRADE.txt
+++ b/UPGRADE.txt
@@ -25,3 +25,6 @@
=== UPGRADE-16.txt -- Upgrade info for 15 to 16
===========================================================
+From 16 to 17:
+
+* The JabberStatus application, deprecated in Asterisk 12, has been removed.
diff --git a/res/res_xmpp.c b/res/res_xmpp.c
index b72581fa54..8366a8cbba 100644
--- a/res/res_xmpp.c
+++ b/res/res_xmpp.c
@@ -137,14 +137,31 @@
Retrieves the numeric status associated with the buddy identified
- by jid.
- If the buddy does not exist in the buddylist, returns 7.
- Status will be 1-7.
- 1=Online, 2=Chatty, 3=Away, 4=XAway, 5=DND, 6=Offline
- If not in roster variable will be set to 7.
- Example: ${JABBER_STATUS(asterisk,bob@domain.com)} returns 1 if
- bob@domain.com is online. asterisk is
- the associated XMPP account configured in xmpp.conf.
+ by jid. The return value will be one of the
+ following.
+
+
+ Online
+
+
+ Chatty
+
+
+ Away
+
+
+ Extended Away
+
+
+ Do Not Disturb
+
+
+ Offline
+
+
+ Not In Roster
+
+
[JABBER_RECEIVE]
@@ -213,50 +230,6 @@
Allows Asterisk to leave a chat room.
-
-
- Retrieve the status of a jabber list member
-
-
-
- Client or transport Asterisk users to connect to Jabber.
-
-
- XMPP/Jabber JID (Name) of recipient.
-
-
- Variable to store the status of requested user.
-
-
-
- This application is deprecated. Please use the JABBER_STATUS() function instead.
- Retrieves the numeric status associated with the specified buddy JID.
- The return value in the Variablewill be one of the following.
-
-
- Online.
-
-
- Chatty.
-
-
- Away.
-
-
- Extended Away.
-
-
- Do Not Disturb.
-
-
- Offline.
-
-
- Not In Roster.
-
-
-
-
Sends a message to a Jabber Client.
@@ -1679,64 +1652,6 @@ static int get_buddy_status(struct ast_xmpp_client_config *clientcfg, char *scre
return status;
}
-/*
- * \internal
- * \brief Dial plan function status(). puts the status of watched user
- * into a channel variable.
- * \param chan ast_channel
- * \param data
- * \retval 0 success
- * \retval -1 error
- */
-static int xmpp_status_exec(struct ast_channel *chan, const char *data)
-{
- RAII_VAR(struct xmpp_config *, cfg, ao2_global_obj_ref(globals), ao2_cleanup);
- RAII_VAR(struct ast_xmpp_client_config *, clientcfg, NULL, ao2_cleanup);
- char *s = NULL, status[2];
- static int deprecation_warning = 0;
- AST_DECLARE_APP_ARGS(args,
- AST_APP_ARG(sender);
- AST_APP_ARG(jid);
- AST_APP_ARG(variable);
- );
- AST_DECLARE_APP_ARGS(jid,
- AST_APP_ARG(screenname);
- AST_APP_ARG(resource);
- );
-
- if (deprecation_warning++ % 10 == 0) {
- ast_log(LOG_WARNING, "JabberStatus is deprecated. Please use the JABBER_STATUS dialplan function in the future.\n");
- }
-
- if (ast_strlen_zero(data)) {
- ast_log(LOG_ERROR, "Usage: JabberStatus(,[/],\n");
- return 0;
- }
- s = ast_strdupa(data);
- AST_STANDARD_APP_ARGS(args, s);
-
- if (args.argc != 3) {
- ast_log(LOG_ERROR, "JabberStatus() requires 3 arguments.\n");
- return -1;
- }
-
- AST_NONSTANDARD_APP_ARGS(jid, args.jid, '/');
- if (jid.argc < 1 || jid.argc > 2) {
- ast_log(LOG_WARNING, "Wrong JID %s, exiting\n", args.jid);
- return -1;
- }
-
- if (!cfg || !cfg->clients || !(clientcfg = xmpp_config_find(cfg->clients, args.sender))) {
- ast_log(LOG_WARNING, "Could not find sender connection: '%s'\n", args.sender);
- return -1;
- }
-
- snprintf(status, sizeof(status), "%d", get_buddy_status(clientcfg, jid.screenname, jid.resource));
- pbx_builtin_setvar_helper(chan, args.variable, status);
-
- return 0;
-}
-
/*!
* \internal
* \brief Dial plan funtcion to retrieve the status of a buddy.
@@ -4748,7 +4663,6 @@ static int load_module(void)
ast_register_application_xml(app_ajisend, xmpp_send_exec);
ast_register_application_xml(app_ajisendgroup, xmpp_sendgroup_exec);
- ast_register_application_xml(app_ajistatus, xmpp_status_exec);
ast_register_application_xml(app_ajijoin, xmpp_join_exec);
ast_register_application_xml(app_ajileave, xmpp_leave_exec);