kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-27 16:07:15 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 107718 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@107720 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jason Parker
2008-03-11 20:54:38 +00:00
parent 2ada3e4bba
commit 2b1b649a97
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_gtalk.c
+7
View File
@@ -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(&gtalk_list);
if (!gtalk_load_config()) {
ast_log(LOG_ERROR, "Unable to read config file %s. Not loading module.\n", GOOGLE_CONFIG);
channels/chan_jingle.c
+7
View File
@@ -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);