diff options
| author | Mark Michelson <mmichelson@digium.com> | 2014-03-17 19:35:17 +0000 |
|---|---|---|
| committer | Mark Michelson <mmichelson@digium.com> | 2014-03-17 19:35:17 +0000 |
| commit | eba91d2a98ac5a6558513549670162ab20ab6d68 (patch) | |
| tree | 82010a695584ef98e0ea29d87cec74b61c1c8956 /res/res_mwi_external.c | |
| parent | d44aefeef476d744f2915d47c3fdc9b138cdd584 (diff) | |
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
Diffstat (limited to 'res/res_mwi_external.c')
| -rw-r--r-- | res/res_mwi_external.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/res/res_mwi_external.c b/res/res_mwi_external.c index 875f32773..c3fc0eaf4 100644 --- a/res/res_mwi_external.c +++ b/res/res_mwi_external.c @@ -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; } |