diff --git a/res/res_jabber.c b/res/res_jabber.c
index 010d669c8f..1cd650a694 100644
--- a/res/res_jabber.c
+++ b/res/res_jabber.c
@@ -59,6 +59,115 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/astdb.h"
#include "asterisk/manager.h"
+/*** DOCUMENTATION
+
+
+ Send a Jabber Message
+
+
+
+ Client or transport Asterisk uses to connect to Jabber.
+
+
+ XMPP/Jabber JID (Name) of recipient.
+
+
+ Message to be sent to the buddy.
+
+
+
+ Allows user to send a message to a receipent via XMPP.
+
+
+
+
+ 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.
+
+
+
+
+
+
+ Retrieve the status of a jabber list member
+
+
+
+ XMPP/Jabber ID (Name) of sender.
+
+
+ XMPP/Jabber JID (Name) of recipient.
+
+
+ Client or transport Asterisk users to connect to Jabber.
+
+
+
+ Retrieves the numeric status associated with the specified buddy JID.
+ The return value will be one of the following.
+
+
+ Online.
+
+
+ Chatty.
+
+
+ Away.
+
+
+ Extended Away.
+
+
+ Do Not Disturb.
+
+
+ Offline.
+
+
+ Not In Roster.
+
+
+
+
+ ***/
+
/*! \todo This should really be renamed to xmpp.conf. For backwards compatibility, we
need to read both files */
#define JABBER_CONFIG "jabber.conf"
@@ -132,27 +241,8 @@ static struct ast_cli_entry aji_cli[] = {
static char *app_ajisend = "JabberSend";
-static char *ajisend_synopsis = "JabberSend(Jabber,JID,Message)";
-
-static char *ajisend_descrip =
-"JabberSend(Jabber,JID,Message)\n"
-" Jabber - Client or transport Asterisk uses to connect to Jabber\n"
-" JID - XMPP/Jabber JID (Name) of recipient\n"
-" Message - Message to be sent to the buddy\n";
-
static char *app_ajistatus = "JabberStatus";
-static char *ajistatus_synopsis = "JabberStatus(Jabber,JID,Variable)";
-
-static char *ajistatus_descrip =
-"JabberStatus(Jabber,JID,Variable)\n"
-" Jabber - Client or transport Asterisk uses to connect to Jabber\n"
-" JID - User Name to retrieve status from.\n"
-" Variable - Variable to store presence in will be 1-6.\n"
-" In order, 1=Online, 2=Chatty, 3=Away, 4=XAway, 5=DND, 6=Offline\n"
-" If not in roster variable will be set to 7\n\n"
-"Note: This application is deprecated. Please use the JABBER_STATUS() function instead.\n";
-
struct aji_client_container clients;
struct aji_capabilities *capabilities = NULL;
@@ -446,15 +536,7 @@ static int acf_jabberstatus_read(struct ast_channel *chan, const char *name, cha
static struct ast_custom_function jabberstatus_function = {
.name = "JABBER_STATUS",
- .synopsis = "Retrieve buddy status",
- .syntax = "JABBER_STATUS(,[/])",
.read = acf_jabberstatus_read,
- .desc =
-"Retrieves the numeric status associated with the specified buddy (jid). If the\n"
-"buddy does not exist in the buddylist, returns 7.\n"
-"Status will be 1-7.\n"
-" 1=Online, 2=Chatty, 3=Away, 4=XAway, 5=DND, 6=Offline\n"
-" If not in roster variable will be set to 7\n\n",
};
/*!
@@ -3001,8 +3083,8 @@ static int load_module(void)
return AST_MODULE_LOAD_DECLINE;
ast_manager_register2("JabberSend", EVENT_FLAG_SYSTEM, manager_jabber_send,
"Sends a message to a Jabber Client", mandescr_jabber_send);
- ast_register_application(app_ajisend, aji_send_exec, ajisend_synopsis, ajisend_descrip);
- ast_register_application(app_ajistatus, aji_status_exec, ajistatus_synopsis, ajistatus_descrip);
+ ast_register_application_xml(app_ajisend, aji_send_exec);
+ ast_register_application_xml(app_ajistatus, aji_status_exec);
ast_cli_register_multiple(aji_cli, ARRAY_LEN(aji_cli));
ast_custom_function_register(&jabberstatus_function);