From: Jason Parker <jparker@digium.com>
Date: Tue, 11 Mar 2008 20:53:48 +0000 (+0000)
Subject: Merged revisions 107714 via svnmerge from
X-Git-Tag: 1.6.0-beta7~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c0bc928d13f1f177cc13ab7442965db4bdb593d;p=thirdparty%2Fasterisk.git

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/trunk@107718 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_gtalk.c b/channels/chan_gtalk.c
index b21201cc04..4eaf87fb54 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(&gtalk_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 8c2361ce85..52a4693e07 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);