[svn-commits] tilghman: branch 1.6.1 r162372 - in /branches/1.6.1: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: tilghman
Date: Tue Dec  9 16:02:40 2008
New Revision: 162372

URL: http://svn.digium.com/view/asterisk?view=rev&rev=162372
Log:
Merged revisions 162355 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r162355 | tilghman | 2008-12-09 15:57:09 -0600 (Tue, 09 Dec 2008) | 11 lines
  
  Merged revisions 162348 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r162348 | tilghman | 2008-12-09 15:53:25 -0600 (Tue, 09 Dec 2008) | 4 lines
    
    We appear to have documented tz= in the [general] section of voicemail.conf,
    without actually having implemented it.  Oops.
    (Reported by Olivier on the -users list)
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/apps/app_voicemail.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/apps/app_voicemail.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/apps/app_voicemail.c?view=diff&rev=162372&r1=162371&r2=162372
==============================================================================
--- branches/1.6.1/apps/app_voicemail.c (original)
+++ branches/1.6.1/apps/app_voicemail.c Tue Dec  9 16:02:40 2008
@@ -577,6 +577,7 @@
 
 static AST_LIST_HEAD_STATIC(users, ast_vm_user);
 static AST_LIST_HEAD_STATIC(zones, vm_zone);
+static char zonetag[80];
 static int maxsilence;
 static int maxmsg;
 static int maxdeletedmsg;
@@ -734,6 +735,7 @@
 	ast_copy_string(vmu->callback, callcontext, sizeof(vmu->callback));
 	ast_copy_string(vmu->dialout, dialcontext, sizeof(vmu->dialout));
 	ast_copy_string(vmu->exit, exitcontext, sizeof(vmu->exit));
+	ast_copy_string(vmu->zonetag, zonetag, sizeof(vmu->zonetag));
 	if (vmmaxsecs)
 		vmu->maxsecs = vmmaxsecs;
 	if (maxmsg)
@@ -10727,6 +10729,9 @@
 				adsiver = atoi(val);
 			}
 		}
+		if ((val = ast_variable_retrieve(cfg, "general", "zonetag"))) {
+			ast_copy_string(zonetag, val, sizeof(zonetag));
+		}
 		if ((val = ast_variable_retrieve(cfg, "general", "emailsubject"))) {
 			emailsubject = ast_strdup(val);
 		}