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

[SVN commits to the Digium repositories]

Author: jpeeler
Date: Tue Nov 30 18:28:54 2010
New Revision: 296871

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

................
  r296870 | jpeeler | 2010-11-30 18:28:16 -0600 (Tue, 30 Nov 2010) | 18 lines
  
  Merged revisions 296869 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ................
    r296869 | jpeeler | 2010-11-30 18:24:58 -0600 (Tue, 30 Nov 2010) | 11 lines
    
    Merged revisions 296868 via svnmerge from 
    https://origsvn.digium.com/svn/asterisk/branches/1.4
    
    ........
      r296868 | jpeeler | 2010-11-30 18:23:19 -0600 (Tue, 30 Nov 2010) | 4 lines
      
      Properly restore backup information file when hanging up during message prepending.
      
      ABE-2654
    ........
  ................
................

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=296871&r1=296870&r2=296871
==============================================================================
--- trunk/apps/app_voicemail.c (original)
+++ trunk/apps/app_voicemail.c Tue Nov 30 18:28:54 2010
@@ -7229,6 +7229,16 @@
 #endif
 		}
 		DISPOSE(dir, curmsg);
+#ifndef IMAP_STORAGE
+		if (cmd) { /* assuming hangup, cleanup backup file */
+			make_file(msgfile, sizeof(msgfile), dir, curmsg);
+			strcpy(textfile, msgfile);
+			strcpy(backup_textfile, msgfile);
+			strncat(textfile, ".txt", sizeof(textfile) - strlen(textfile) - 1);
+			strncat(backup_textfile, "-bak.txt", sizeof(backup_textfile) - strlen(backup_textfile) - 1);
+			rename(backup_textfile, textfile);
+		}
+#endif
 	}
 
 	/* If anything failed above, we still have this list to free */