[asterisk-commits] oej: branch 1.6.1 r242231 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: oej
Date: Fri Jan 22 03:41:57 2010
New Revision: 242231

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=242231
Log:
Merged revisions 242227 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
r242227 | oej | 2010-01-22 10:28:34 +0100 (Fre, 22 Jan 2010) | 11 lines

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

........
r242226 | oej | 2010-01-22 10:19:30 +0100 (Fre, 22 Jan 2010) | 3 lines

Initialize notify_types to NULL


........

................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

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

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=242231&r1=242230&r2=242231
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Fri Jan 22 03:41:57 2010
@@ -1879,7 +1879,7 @@
 static int ourport_tls;				/*!< The port used for TCP/TLS connections */
 static struct sockaddr_in debugaddr;
 
-static struct ast_config *notify_types;		/*!< The list of manual NOTIFY types we know how to send */
+static struct ast_config *notify_types = NULL;		/*!< The list of manual NOTIFY types we know how to send */
 
 /*! some list management macros. */