[svn-commits] jpeeler: branch 1.6.0 r213837 - in /branches/1.6.0: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Mon Aug 24 12:07:29 2009
New Revision: 213837

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=213837
Log:
Merged revisions 213833 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r213833 | jpeeler | 2009-08-24 11:43:57 -0500 (Mon, 24 Aug 2009) | 14 lines
  
  Fix storage of greetings when using IMAP_STORAGE
  
  Fix checking if the imapgreetings option is turned on to store the greeting
  in IMAP.
  
  (closes issue #14950)
  Reported by: noahisaac
  Patches:
      14950.patch uploaded by mmichelson (license 60)
........

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

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

Modified: branches/1.6.0/apps/app_voicemail.c
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.0/apps/app_voicemail.c?view=diff&rev=213837&r1=213836&r2=213837
==============================================================================
--- branches/1.6.0/apps/app_voicemail.c (original)
+++ branches/1.6.0/apps/app_voicemail.c Mon Aug 24 12:07:29 2009
@@ -1397,6 +1397,11 @@
 	void *buf;
 	int tempcopy = 0;
 	STRING str;
+
+	/* Back out early if this is a greeting and we don't want to store greetings in IMAP */
+	if (msgnum < 0 && !imapgreetings) {
+		return 0;
+	}
 	
 	/* Attach only the first format */
 	fmt = ast_strdupa(fmt);