[asterisk-commits] tilghman: branch 1.6.0 r114710 - in /branches/1.6.0: ./ channels/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Sun Apr 27 23:54:13 2008
New Revision: 114710

URL: http://svn.digium.com/view/asterisk?view=rev&rev=114710
Log:
Merged revisions 114709 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r114709 | tilghman | 2008-04-27 23:53:20 -0500 (Sun, 27 Apr 2008) | 13 lines

Merged revisions 114708 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r114708 | tilghman | 2008-04-27 23:47:39 -0500 (Sun, 27 Apr 2008) | 5 lines

When modules are embedded, they take on a different name, without the ".so"
extension.  Specifically check for this name, when we're checking if a module
is loaded.
(Closes issue #12534)

........

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

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=114710&r1=114709&r2=114710
==============================================================================
--- branches/1.6.0/channels/chan_gtalk.c (original)
+++ branches/1.6.0/channels/chan_gtalk.c Sun Apr 27 23:54:13 2008
@@ -1952,8 +1952,13 @@
 	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;
+		/* If embedded, check for a different module name */
+		jabber_loaded = ast_module_helper("", "res_jabber", 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);

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=114710&r1=114709&r2=114710
==============================================================================
--- branches/1.6.0/channels/chan_jingle.c (original)
+++ branches/1.6.0/channels/chan_jingle.c Sun Apr 27 23:54:13 2008
@@ -1789,8 +1789,13 @@
 	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;
+		/* Dependency module has a different name, if embedded */
+		jabber_loaded = ast_module_helper("", "res_jabber", 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);