[Asterisk-cvs] asterisk/apps app_voicemail.c,1.160,1.161

[markster at lists.digium.com]

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

Modified Files:
	app_voicemail.c 
Log Message:
Handle a few more cases of realtime and voicemail (bug #2648)


Index: app_voicemail.c
===================================================================
RCS file: /usr/cvsroot/asterisk/apps/app_voicemail.c,v
retrieving revision 1.160
retrieving revision 1.161
diff -u -d -r1.160 -r1.161
--- app_voicemail.c	10 Oct 2004 06:28:46 -0000	1.160
+++ app_voicemail.c	16 Oct 2004 20:01:57 -0000	1.161
@@ -396,16 +396,12 @@
 		memset(retval, 0, sizeof(struct ast_vm_user));
 		if (!ivm)
 			retval->alloced=1;
-		if (mailbox) {
+		if (mailbox) 
 			strncpy(retval->mailbox, mailbox, sizeof(retval->mailbox) - 1);
-		}
-		if (context) {
+		if (context) 
 			strncpy(retval->context, context, sizeof(retval->context) - 1);
-		}
 		else
-		{
 			strncpy(retval->context, "default", sizeof(retval->context) - 1);
-		}
 		populate_defaults(retval);
 		var = ast_load_realtime("voicemail", "mailbox", mailbox, "context", retval->context, NULL);
 		if (var) {
@@ -416,6 +412,12 @@
 					strncpy(retval->password, tmp->value, sizeof(retval->password) - 1);
 				} else if (!strcasecmp(tmp->name, "uniqueid")) {
 					strncpy(retval->uniqueid, tmp->value, sizeof(retval->uniqueid) - 1);
+				} else if (!strcasecmp(tmp->name, "pager")) {
+					strncpy(retval->pager, tmp->value, sizeof(retval->pager) - 1);
+				} else if (!strcasecmp(tmp->name, "email")) {
+					strncpy(retval->email, tmp->value, sizeof(retval->email) - 1);
+				} else if (!strcasecmp(tmp->name, "fullname")) {
+					strncpy(retval->fullname, tmp->value, sizeof(retval->fullname) - 1);
 				} else
 					apply_option(retval, tmp->name, tmp->value);
 				tmp = tmp->next;