diff options
| author | Kinsey Moore <kmoore@digium.com> | 2012-09-10 19:49:30 +0000 |
|---|---|---|
| committer | Kinsey Moore <kmoore@digium.com> | 2012-09-10 19:49:30 +0000 |
| commit | d96b832787e621d5654a21704a7bb03b17775dbf (patch) | |
| tree | e8ae5943c6cbc4291396823df8c56b32d7d162b3 | |
| parent | 1f0f8694d8434ff38f8469f126dcc0ab8fedc9a0 (diff) | |
Deprecate chan_gtalk, chan_jingle, and res_jabber
chan_gtalk, chan_jingle, and res_jabber are now deprecated in favor of
using chan_motif and res_xmpp. They are a feature-equivalent
replacement and are written to be more easily maintainable.
(closes issue ASTERISK-20298)
Review: https://reviewboard.asterisk.org/r/2082/
Reported-by: Leif Madsen
........
Merged revisions 372795 from http://svn.asterisk.org/svn/asterisk/branches/11
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@372796 65c4cc65-6c06-0410-ace0-fbb531ad65f3
| -rw-r--r-- | channels/chan_gtalk.c | 3 | ||||
| -rw-r--r-- | channels/chan_jingle.c | 3 | ||||
| -rw-r--r-- | include/asterisk/doxygen/architecture.h | 2 | ||||
| -rw-r--r-- | main/devicestate.c | 2 | ||||
| -rw-r--r-- | res/res_jabber.c | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index 9864f7884..f30a3413b 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -36,7 +36,8 @@ <depend>iksemel</depend> <depend>res_jabber</depend> <use type="external">openssl</use> - <support_level>extended</support_level> + <support_level>deprecated</support_level> + <replacement>chan_motif</replacement> ***/ #include "asterisk.h" diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index a3adb653a..29329c6c6 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -32,7 +32,8 @@ <depend>res_jabber</depend> <use type="external">openssl</use> <defaultenabled>no</defaultenabled> - <support_level>extended</support_level> + <support_level>deprecated</support_level> + <replacement>chan_motif</replacement> ***/ #include "asterisk.h" diff --git a/include/asterisk/doxygen/architecture.h b/include/asterisk/doxygen/architecture.h index 27b8d2a5a..c157697ee 100644 --- a/include/asterisk/doxygen/architecture.h +++ b/include/asterisk/doxygen/architecture.h @@ -185,7 +185,7 @@ Some examples of modules that provide C APIs (potentially among other things) ar - res_ael_share.c - res_crypto.c - res_curl.c - - res_jabber.c + - res_xmpp.c - res_monitor.c - res_smdi.c - res_speech.c diff --git a/main/devicestate.c b/main/devicestate.c index 779668259..3256a7b4f 100644 --- a/main/devicestate.c +++ b/main/devicestate.c @@ -70,7 +70,7 @@ * The CLI command "show hints" show last known state * * \note None of these handle user states, like an IM presence - * system. res_jabber.c can subscribe and watch such states + * system. res_xmpp.c can subscribe and watch such states * in jabber/xmpp based systems. * * \section AstDevStateArch Architecture for devicestates diff --git a/res/res_jabber.c b/res/res_jabber.c index ee55df99a..fde8a452b 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -34,7 +34,8 @@ <defaultenabled>no</defaultenabled> <depend>iksemel</depend> <use type="external">openssl</use> - <support_level>extended</support_level> + <support_level>deprecated</support_level> + <replacement>res_xmpp</replacement> ***/ #include "asterisk.h" |