From e341914d250ab715951cbdaa0aaf70d67077d544 Mon Sep 17 00:00:00 2001 From: Brian West Date: Mon, 21 Apr 2008 15:25:09 +0000 Subject: [PATCH] Add MODEVENT-21 and a small tweak to voicemail to not light up on saved message counts git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@8133 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/applications/mod_voicemail/mod_voicemail.c | 6 +++--- src/mod/event_handlers/mod_event_socket/mod_event_socket.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mod/applications/mod_voicemail/mod_voicemail.c b/src/mod/applications/mod_voicemail/mod_voicemail.c index a837a5c3b3..7ec269d3c7 100644 --- a/src/mod/applications/mod_voicemail/mod_voicemail.c +++ b/src/mod/applications/mod_voicemail/mod_voicemail.c @@ -1429,7 +1429,7 @@ default: 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 @@ greet: 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 @@ static void message_query_handler(switch_event_t *event) 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); diff --git a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c index 26b0ba84f5..adfe1734a6 100644 --- a/src/mod/event_handlers/mod_event_socket/mod_event_socket.c +++ b/src/mod/event_handlers/mod_event_socket/mod_event_socket.c @@ -1334,7 +1334,7 @@ SWITCH_MODULE_RUNTIME_FUNCTION(mod_event_socket_runtime) 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); }