From d68e13d99e1796e5c327dda682518f9e8f78c2d2 Mon Sep 17 00:00:00 2001 From: qwell Date: Tue, 11 Mar 2008 20:54:38 +0000 Subject: 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 --- channels/chan_gtalk.c | 7 +++++++ channels/chan_jingle.c | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c index b21201cc0..4eaf87fb5 100644 --- a/channels/chan_gtalk.c +++ b/channels/chan_gtalk.c @@ -1869,6 +1869,13 @@ static int gtalk_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_gtalk.so depends upon res_jabber.so\n"); + return AST_MODULE_LOAD_DECLINE; + } + ASTOBJ_CONTAINER_INIT(>alk_list); if (!gtalk_load_config()) { ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG); 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); -- cgit v1.2.3