[svn-commits] seanbright: trunk r302835 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Jan 19 17:49:54 2011
New Revision: 302835

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302835
Log:
Merged revisions 302834 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302834 | seanbright | 2011-01-19 18:49:00 -0500 (Wed, 19 Jan 2011) | 14 lines
  
  Merged revisions 302833 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r302833 | seanbright | 2011-01-19 18:47:22 -0500 (Wed, 19 Jan 2011) | 7 lines
    
    Support greetingsfolder as documented in voicemail.conf.sample.
    
    (closes issue #17870)
    Reported by: edhorton
    Patches:
          __20100816-app_voicemail-greetingsfolder-support.txt uploaded by lmadsen (license 10)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/apps/app_voicemail.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/apps/app_voicemail.c
URL: http://svnview.digium.com/svn/asterisk/trunk/apps/app_voicemail.c?view=diff&rev=302835&r1=302834&r2=302835
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Wed Jan 19 17:49:54 2011
@@ -11698,6 +11698,9 @@
 		}
 		if ((val = ast_variable_retrieve(cfg, "general", "greetingfolder"))) {
 			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
+		} else if ((val = ast_variable_retrieve(cfg, "general", "greetingsfolder"))) {
+			/* Also support greetingsfolder as documented in voicemail.conf.sample */
+			ast_copy_string(greetingfolder, val, sizeof(greetingfolder));
 		} else {
 			ast_copy_string(greetingfolder, imapfolder, sizeof(greetingfolder));
 		}