[svn-commits] qwell: trunk r309257 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: qwell
Date: Wed Mar  2 13:54:43 2011
New Revision: 309257

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

................
  r309256 | qwell | 2011-03-02 13:54:20 -0600 (Wed, 02 Mar 2011) | 15 lines
  
  Merged revisions 309255 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r309255 | qwell | 2011-03-02 13:53:47 -0600 (Wed, 02 Mar 2011) | 8 lines
    
    Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP.
    
    Since it's a duplicate, nothing is going to be done, so delme doesn't need to
    be set at all.  Strangely, when this was added, this was being set to 1 in 1.6,
    and 0 in trunk.
    
    (issue AST-439)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

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

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=309257&r1=309256&r2=309257
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Mar  2 13:54:43 2011
@@ -26154,7 +26154,6 @@
 		AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) {
 			if (!strcmp(mailbox->mailbox, mbox) && !strcmp(S_OR(mailbox->context, ""), S_OR(context, ""))) {
 				duplicate = 1;
-				mailbox->delme = 0;
 				break;
 			}
 		}