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

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);

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);