[asterisk-commits] qwell: branch 1.6.0 r107720 - in /branches/1.6.0: ./ channels/

[SVN commits to the Asterisk project]

Author: qwell
Date: Tue Mar 11 15:54:38 2008
New Revision: 107720

URL: http://svn.digium.com/view/asterisk?view=rev&rev=107720
Log:
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

........

................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_gtalk.c
    branches/1.6.0/channels/chan_jingle.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_gtalk.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_gtalk.c?view=diff&rev=107720&r1=107719&r2=107720
==============================================================================
--- branches/1.6.0/channels/chan_gtalk.c (original)
+++ branches/1.6.0/channels/chan_gtalk.c Tue Mar 11 15:54:38 2008
@@ -1869,6 +1869,13 @@
 /*! \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);

Modified: branches/1.6.0/channels/chan_jingle.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_jingle.c?view=diff&rev=107720&r1=107719&r2=107720
==============================================================================
--- branches/1.6.0/channels/chan_jingle.c (original)
+++ branches/1.6.0/channels/chan_jingle.c Tue Mar 11 15:54:38 2008
@@ -1786,6 +1786,13 @@
 /*! \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);