[Asterisk-cvs] asterisk/apps app_directory.c,1.18,1.19

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv16505/apps

Modified Files:
	app_directory.c 
Log Message:
Even better, let it be specified per-context


Index: app_directory.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_directory.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- app_directory.c	29 Apr 2004 13:50:29 -0000	1.18
+++ app_directory.c	29 Apr 2004 13:53:38 -0000	1.19
@@ -250,9 +250,6 @@
 	}
 	LOCAL_USER_ADD(u);
 top:
-	dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
-	if (!dirintro || !strlen(dirintro))
-		dirintro = "dir-intro";
 	context = ast_strdupa(data);
 	dialcontext = strchr(context, '|');
 	if (dialcontext) {
@@ -260,6 +257,11 @@
 		dialcontext++;
 	} else
 		dialcontext = context;
+	dirintro = ast_variable_retrieve(cfg, context, "directoryintro");
+	if (!dirintro || !strlen(dirintro))
+		dirintro = ast_variable_retrieve(cfg, "general", "directoryintro");
+	if (!dirintro || !strlen(dirintro))
+		dirintro = "dir-intro";
 	if (chan->_state != AST_STATE_UP) 
 		res = ast_answer(chan);
 	if (!res)