[asterisk-commits] russell: branch russell/ais r78345 - in /team/russell/ais: configs/ res/

[SVN commits to the Asterisk project]

Author: russell
Date: Tue Aug  7 11:07:08 2007
New Revision: 78345

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78345
Log:
* Don't say "type" is an invalid config option
* Make the sample config match the code

Modified:
    team/russell/ais/configs/ais.conf.sample
    team/russell/ais/res/res_ais.c

Modified: team/russell/ais/configs/ais.conf.sample
URL: http://svn.digium.com/view/asterisk/team/russell/ais/configs/ais.conf.sample?view=diff&rev=78345&r1=78344&r2=78345
==============================================================================
--- team/russell/ais/configs/ais.conf.sample (original)
+++ team/russell/ais/configs/ais.conf.sample Tue Aug  7 11:07:08 2007
@@ -16,6 +16,6 @@
 ;
 ;[mwi]
 ;type=event_channel
-;event_publish=mwi
-;event_subscribe=mwi
+;publish_event=mwi
+;subscribe_event=mwi
 ;

Modified: team/russell/ais/res/res_ais.c
URL: http://svn.digium.com/view/asterisk/team/russell/ais/res/res_ais.c?view=diff&rev=78345&r1=78344&r2=78345
==============================================================================
--- team/russell/ais/res/res_ais.c (original)
+++ team/russell/ais/res/res_ais.c Tue Aug  7 11:07:08 2007
@@ -535,7 +535,9 @@
 	}
 
 	for (var = ast_variable_browse(cfg, cat); var; var = var->next) {
-		if (!strcasecmp(var->name, "publish_event")) {
+		if (!strcasecmp(var->name, "type")) {
+			continue;
+		} else if (!strcasecmp(var->name, "publish_event")) {
 			add_publish_event(event_channel, var->value);
 		} else if (!strcasecmp(var->name, "subscribe_event")) {
 			add_subscribe_event(event_channel, var->value);