From 8a4ad0da035d8a551eea743b05004ee030bf73e0 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 12 May 2016 15:05:56 -0400 Subject: [PATCH] Revert "FS-9148: add new voicemail.conf.xml param `send-full-vm-header`" This reverts commit 98cb363f187a8ba5ad21b5a722a4f6dcaac21243. This commit does not compile --- .../applications/mod_voicemail/mod_voicemail.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c index bebcfde9ca..43917d88e3 100644 --- a/src/mod/applications/mod_voicemail/mod_voicemail.c +++ b/src/mod/applications/mod_voicemail/mod_voicemail.c @@ -28,7 +28,7 @@ * John Wehle (john@feith.com) * Raymond Chandler * Kristin King - * Emmanuel Schmidbauer + * Emmanuel Schmidbauer * * mod_voicemail.c -- Voicemail Module * @@ -689,7 +689,6 @@ vm_profile_t *profile_set_config(vm_profile_t *profile) SWITCH_CONFIG_SET_ITEM(profile->config[i++], "allow-empty-password-auth", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &profile->allow_empty_password_auth, SWITCH_TRUE, NULL, NULL, NULL); SWITCH_CONFIG_SET_ITEM(profile->config[i++], "auto-playback-recordings", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &profile->auto_playback_recordings, SWITCH_FALSE, NULL, NULL, NULL); - SWITCH_CONFIG_SET_ITEM(profile->config[i++], "send-full-vm-header", SWITCH_CONFIG_BOOL, CONFIG_RELOADABLE, &profile->send_full_vm_header, SWITCH_FALSE, NULL, NULL, NULL); switch_assert(i < VM_PROFILE_CONFIGITEM_COUNT); @@ -1936,13 +1935,11 @@ static void update_mwi(vm_profile_t *profile, const char *id, const char *domain switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", yn); switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Update-Reason", update_reason); switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Message-Account", "%s@%s", id, domain_name); - - if (profile->send_full_vm_header) { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, - total_new_urgent_messages, total_saved_urgent_messages); - } else { - switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d", total_new_messages, total_saved_messages); - } + /* + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d (%d/%d)", total_new_messages, total_saved_messages, + total_new_urgent_messages, total_saved_urgent_messages); + */ + switch_event_add_header(event, SWITCH_STACK_BOTTOM, "MWI-Voice-Message", "%d/%d", total_new_messages, total_saved_messages); switch_event_fire(&event);