Revert changes to sorcery that accidentally got committed.

These changes were still up for review and have not been approved
yet. I must have had the changes in my working copy when making
a different change.
........

Merged revisions 410696 from http://svn.asterisk.org/svn/asterisk/branches/12


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@410699 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Michelson
2014-03-17 19:35:17 +00:00
parent d44aefeef4
commit eba91d2a98
9 changed files with 51 additions and 91 deletions

View File

@@ -163,8 +163,10 @@ static int mwi_sorcery_init(void)
}
/* Map the external MWI wizards. */
if (ast_sorcery_apply_default(mwi_sorcery, MWI_MAILBOX_TYPE, "astdb",
MWI_ASTDB_PREFIX) == AST_SORCERY_APPLY_FAIL) {
res = !!ast_sorcery_apply_config(mwi_sorcery, "res_mwi_external");
res &= !!ast_sorcery_apply_default(mwi_sorcery, MWI_MAILBOX_TYPE, "astdb",
MWI_ASTDB_PREFIX);
if (res) {
ast_log(LOG_ERROR, "MWI external: Sorcery could not setup wizards.\n");
return -1;
}