[svn-commits] jpeeler: trunk r306963 - in /trunk: ./ apps/app_voicemail.c

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Feb  8 13:26:05 2011
New Revision: 306963

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

................
  r306962 | jpeeler | 2011-02-08 13:25:38 -0600 (Tue, 08 Feb 2011) | 22 lines
  
  Merged revisions 306961 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r306961 | jpeeler | 2011-02-08 13:25:10 -0600 (Tue, 08 Feb 2011) | 15 lines
    
    Merged revisions 306960 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r306960 | jpeeler | 2011-02-08 13:18:50 -0600 (Tue, 08 Feb 2011) | 9 lines
      
      Backup file storing message duration is not used with IMAP_STORAGE, remove code.
      
      The message duration is stored in the body of the email when using IMAP_STORAGE,
      so nothing needs to happen with the backup file.
      
      (closes issue #18718)
      Reported by: kerframil
    ........
  ................
................

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=306963&r1=306962&r2=306963
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Feb  8 13:26:05 2011
@@ -6767,14 +6767,16 @@
 			}
 			
 			/* Back up the original file, so we can retry the prepend and restore it after forward. */
+#ifndef IMAP_STORAGE
 			if (already_recorded) {
 				ast_filecopy(backup, msgfile, NULL);
 				copy(backup_textfile, textfile);
 			}
 			else {
 				ast_filecopy(msgfile, backup, NULL);
-				copy(textfile,backup_textfile);
-			}
+				copy(textfile, backup_textfile);
+			}
+#endif
 			already_recorded = 1;
 
 			if (record_gain)