[Asterisk-cvs] asterisk/apps app_voicemail.c,1.116,1.117

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/apps
In directory mongoose.digium.com:/tmp/cvs-serv12843/apps

Modified Files:
	app_voicemail.c 
Log Message:
Merge voicemail internationalization (bug #1485)


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- app_voicemail.c	23 Jun 2004 18:00:50 -0000	1.116
+++ app_voicemail.c	25 Jun 2004 21:25:44 -0000	1.117
@@ -27,6 +27,7 @@
 #include <asterisk/dsp.h>
 #include <asterisk/localtime.h>
 #include <asterisk/cli.h>
+#include <asterisk/utils.h>
 #include <stdlib.h>
 #include <errno.h>
 #include <unistd.h>
@@ -85,6 +86,35 @@
 #define MAX_DATETIME_FORMAT	512
 #define MAX_NUM_CID_CONTEXTS 10
 
[...998 lines suppressed...]
+							if (!ast_strlen_zero(vmu->dialout)) {
 								if (!res)
 									res = play_and_wait(chan, "vm-calldiffnum");
 							}
 						} else  {
 							res = play_and_wait(chan, "vm-nonumber");
-							if (strlen(vmu->dialout)) {
+							if (!ast_strlen_zero(vmu->dialout)) {
 								if (!res)
 									res = play_and_wait(chan, "vm-toenternumber");
 							}
@@ -4261,7 +4656,7 @@
 	}
 	else if (option == 1) { /* Reply */
               		/* Send reply directly to sender */
-		if (strlen(cid)) {
+		if (!ast_strlen_zero(cid)) {
 			ast_callerid_parse(cid, &name, &num);
 			if (!num) {
 				ast_verbose(VERBOSE_PREFIX_3 "No CID number available, no reply sent\n");