Author: brian Date: Mon Apr 21 11:25:09 2008 New Revision: 8133 Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Log: Add MODEVENT-21 and a small tweak to voicemail to not light up on saved message counts Modified: freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c ============================================================================== --- freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c (original) +++ freeswitch/trunk/src/mod/applications/mod_voicemail/mod_voicemail.c Mon Apr 21 11:25:09 2008 @@ -1429,7 +1429,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { char *mwi_id; const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages ) { yn = "yes"; } mwi_id = switch_mprintf("%s@%s", myid, domain_name); @@ -1940,7 +1940,7 @@ if (switch_event_create(&event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages) { yn = "yes"; } mwi_id = switch_mprintf("%s@%s", id, domain_name); @@ -2187,7 +2187,7 @@ if (total_new_messages || total_saved_messages) { if (switch_event_create(&new_event, SWITCH_EVENT_MESSAGE_WAITING) == SWITCH_STATUS_SUCCESS) { const char *yn = "no"; - if (total_new_messages || total_saved_messages || total_new_urgent_messages || total_saved_urgent_messages) { + if (total_new_messages || total_new_urgent_messages ) { yn = "yes"; } switch_event_add_header(new_event, SWITCH_STACK_BOTTOM, "MWI-Messages-Waiting", "%s", yn); Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c ============================================================================== --- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (original) +++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c Mon Apr 21 11:25:09 2008 @@ -1334,7 +1334,7 @@ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Socket up listening on %s:%u\n", prefs.ip, prefs.port); break; sock_fail: - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n"); + switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error! Could not listen on %s:%u\n", prefs.ip, prefs.port); switch_yield(100000); }