Merged revisions 293004 via svnmerge from

Merged revisions 293004 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r293004 | jpeeler | 2010-10-25 17:55:28 -0500 (Mon, 25 Oct 2010) | 29 lines

  Fix inprocess_container in voicemail to correctly restrict max messages.

  The comparison function logic was off, so the number of sessions for a given
  mailbox were not being incremented properly. This problem caused the maximum
  number of messages per folder to not be respected when simultaneously leaving
  multiple voicemails just below the threshold.

  These problems should be fixed by the above, but just in case:
  Fixed resequence_mailbox to rely on the actual number of detected number of
  files in a directory rather than just assuming only 10 messages more than the
  maximum had been left. Also if more messages than the maximum are deleted they
  are actually removed now.

  The second purpose of this commit should have been separated out probably, but
  is related to the above. Again, if the number of messages in a given voicemail
  folder exceeds the maximum set limit make sure to allocate enough space for the
  deleted and heard index tracking array.

  A few random fixes:
  There was a forgotten decrement of the inprocess count in imap_store_file.

  When using IMAP storage, do not look in the directory where file based storage
  messages may still reside and influence the message count.

  Ensure to use only the first format in sendmail.

  ABE-2516
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@293118 65c4cc65-6c06-0410-ace0-fbb531ad65f3