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

@@ -1026,7 +1026,7 @@ int load_module()
}
for (x=0;x<sizeof(myclis)/sizeof(struct ast_cli_entry); x++)
ast_cli_register(myclis + x);
if ((cfg = ast_load(config))) {
if ((cfg = ast_config_load(config))) {
v = ast_variable_browse(cfg, "general");
while(v) {
if (!strcasecmp(v->name, "autoanswer"))
@@ -1045,7 +1045,7 @@ int load_module()
playbackonly = ast_true(v->value);
v=v->next;
}
ast_destroy(cfg);
ast_config_destroy(cfg);
}
ast_pthread_create(&sthread, NULL, sound_thread, NULL);
return 0;