Merge config updates (bug #3406)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4889 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-25 06:10:20 +00:00
parent a611ce04f1
commit 5f726ad8c7
49 changed files with 881 additions and 856 deletions

View File

@@ -1024,7 +1024,7 @@ static void adsi_load(void)
struct ast_variable *v;
char *name, *sname;
init_state();
conf = ast_load("adsi.conf");
conf = ast_config_load("adsi.conf");
if (conf) {
x=0;
v = ast_variable_browse(conf, "intro");
@@ -1067,7 +1067,7 @@ static void adsi_load(void)
}
if (x)
speeds = x;
ast_destroy(conf);
ast_config_destroy(conf);
}
}