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

@@ -2388,7 +2388,7 @@ static void reload_queues(void)
int new;
char *general_val = NULL;
cfg = ast_load("queues.conf");
cfg = ast_config_load("queues.conf");
if (!cfg) {
ast_log(LOG_NOTICE, "No call queueing config file (queues.conf), so no call queues\n");
return;
@@ -2578,7 +2578,7 @@ static void reload_queues(void)
}
cat = ast_category_browse(cfg, cat);
}
ast_destroy(cfg);
ast_config_destroy(cfg);
q = queues;
ql = NULL;
while(q) {