[svn-commits] russell: branch russell/messaging r309492 - in /team/russell/messaging: ./ ch...

[SVN commits to the Digium repositories]

Author: russell
Date: Fri Mar  4 11:41:07 2011
New Revision: 309492

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=309492
Log:
sync with trunk

Modified:
    team/russell/messaging/   (props changed)
    team/russell/messaging/channels/chan_nbs.c

Propchange: team/russell/messaging/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Mar  4 11:41:07 2011
@@ -1,1 +1,1 @@
-/trunk:1-309485
+/trunk:1-309491

Modified: team/russell/messaging/channels/chan_nbs.c
URL: http://svnview.digium.com/svn/asterisk/team/russell/messaging/channels/chan_nbs.c?view=diff&rev=309492&r1=309491&r2=309492
==============================================================================
--- team/russell/messaging/channels/chan_nbs.c (original)
+++ team/russell/messaging/channels/chan_nbs.c Fri Mar  4 11:41:07 2011
@@ -280,16 +280,16 @@
 static int load_module(void)
 {
 	ast_format_set(&prefformat, AST_FORMAT_SLINEAR, 0);
-	if (!(nbs_tech.capabilities == ast_format_cap_alloc())) {
-		return -1;
+	if (!(nbs_tech.capabilities = ast_format_cap_alloc())) {
+		return AST_MODULE_LOAD_FAILURE;
 	}
 	ast_format_cap_add(nbs_tech.capabilities, &prefformat);
 	/* Make sure we can register our channel type */
 	if (ast_channel_register(&nbs_tech)) {
 		ast_log(LOG_ERROR, "Unable to register channel class %s\n", type);
-		return -1;
-	}
-	return 0;
+		return AST_MODULE_LOAD_DECLINE;
+	}
+	return AST_MODULE_LOAD_SUCCESS;
 }
 
 AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Network Broadcast Sound Support");