]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Revert "FS-9148: add new voicemail.conf.xml param `send-full-vm-header`"
authorMichael Jerris <mike@jerris.com>
Thu, 12 May 2016 19:05:56 +0000 (15:05 -0400)
committerMichael Jerris <mike@jerris.com>
Thu, 12 May 2016 19:05:56 +0000 (15:05 -0400)
This reverts commit 98cb363f187a8ba5ad21b5a722a4f6dcaac21243.

This commit does not compile

src/mod/applications/mod_voicemail/mod_voicemail.c

index bebcfde9cacf52a8d4a83c96c3c06030f286dc1a..43917d88e30493efaeb1d224baca3c4cab705db9 100644 (file)
@@ -28,7 +28,7 @@
  * John Wehle (john@feith.com)
  * Raymond Chandler <intralanman@gmail.com>
  * Kristin King <kristin.king@quentustech.com>
- * Emmanuel Schmidbauer <eschmidbauer@gmail.com>
+ * Emmanuel Schmidbauer <e.schmidbauer@gmail.com>
  *
  * 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);