diff options
| author | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 20:54:38 +0000 |
|---|---|---|
| committer | qwell <qwell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-03-11 20:54:38 +0000 |
| commit | d68e13d99e1796e5c327dda682518f9e8f78c2d2 (patch) | |
| tree | beaa0ac7cadb74f3a03b62ec2a81aaa975e07f37 /channels/chan_jingle.c | |
| parent | 7091bb222e24c739d26120b6bb04a6a112325743 (diff) | |
Merged revisions 107718 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r107718 | qwell | 2008-03-11 15:53:48 -0500 (Tue, 11 Mar 2008) | 13 lines
Merged revisions 107714 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r107714 | qwell | 2008-03-11 15:49:56 -0500 (Tue, 11 Mar 2008) | 5 lines
Copy voicemail dependency logic for res_adsi to chan_gtalk and chan_jingle (for jabber).
(closes issue #12014)
Reported by: junky
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@107720 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_jingle.c')
| -rw-r--r-- | channels/chan_jingle.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/channels/chan_jingle.c b/channels/chan_jingle.c index 8c2361ce8..52a4693e0 100644 --- a/channels/chan_jingle.c +++ b/channels/chan_jingle.c @@ -1786,6 +1786,13 @@ static int jingle_load_config(void) /*! \brief Load module into PBX, register channel */ static int load_module(void) { + char *jabber_loaded = ast_module_helper("", "res_jabber.so", 0, 0, 0, 0); + free(jabber_loaded); + if (!jabber_loaded) { + ast_log(LOG_ERROR, "chan_jingle.so depends upon res_jabber.so\n"); + return AST_MODULE_LOAD_DECLINE; + } + ASTOBJ_CONTAINER_INIT(&jingle_list); if (!jingle_load_config()) { ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", JINGLE_CONFIG); |