Privacy updates, message waiting with new messages only

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@702 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_privacy.c b/apps/app_privacy.c
index 9b5e0c9d6f1a8786215ac180cac558282bd96631..8db778e0be38e7dd5ccb1ae36bb50f30714802eb 100755 (executable)
--- a/apps/app_privacy.c
+++ b/apps/app_privacy.c
@@ -83,7 +83,7 @@ privacy_exec (struct ast_channel *chan, void *data)
                
                
                /*Play unidentified call*/
-               res = ast_safe_sleep(1);
+               res = ast_safe_sleep(chan, 1000);
                if (!res)
                        res = ast_streamfile(chan, "privacy-unident", chan->language);
                if (!res)

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e26350a801b0c4129354b140f685d8c8a3a2c7cb..d7b73efdaa6fba003838379c5402efdb52c5ed68 100755 (executable)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -2035,7 +2035,7 @@ static int transmit_notify(struct sip_pvt *p, int newmsgs, int oldmsgs)
        add_header(&req, "Event", "message-summary");
        add_header(&req, "Content-Type", "application/simple-message-summary");
 
-       snprintf(tmp, sizeof(tmp), "Message-Waiting: %s\n", (newmsgs + oldmsgs) ? "yes" : "no");
+       snprintf(tmp, sizeof(tmp), "Message-Waiting: %s\n", newmsgs ? "yes" : "no");
        snprintf(tmp2, sizeof(tmp2), "Voicemail: %d/%d\n", newmsgs, oldmsgs);
        snprintf(clen, sizeof(clen), "%d", strlen(tmp) + strlen(tmp2));
        add_header(&req, "Content-Length", clen);