[svn-commits] mmichelson: trunk r196893 - in /trunk: apps/ channels/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Tue May 26 14:50:07 2009
New Revision: 196893

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=196893
Log:
Remove some redundant or unnecessary connected line-related function calls.


Modified:
    trunk/apps/app_directed_pickup.c
    trunk/channels/chan_sip.c

Modified: trunk/apps/app_directed_pickup.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/apps/app_directed_pickup.c?view=diff&rev=196893&r1=196892&r2=196893
==============================================================================
--- trunk/apps/app_directed_pickup.c (original)
+++ trunk/apps/app_directed_pickup.c Tue May 26 14:50:07 2009
@@ -97,7 +97,6 @@
 	ast_debug(1, "Call pickup on '%s' by '%s'\n", target->name, chan->name);
 
 	connected_caller = target->connected;
-	ast_party_connected_line_init(&target->connected);
 	connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
 	ast_channel_update_connected_line(chan, &connected_caller);
 

Modified: trunk/channels/chan_sip.c
URL: http://svn.asterisk.org/svn-view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=196893&r1=196892&r2=196893
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Tue May 26 14:50:07 2009
@@ -20471,7 +20471,6 @@
 				ast_channel_lock(target.chan1);
 				ast_party_connected_line_copy(&connected_caller, &target.chan1->connected);
 				ast_channel_unlock(target.chan1);
-				connected_caller = target.chan1->connected;
 				connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_TRANSFER;
 				ast_channel_update_connected_line(current->chan2, &connected_caller);
 				ast_party_connected_line_free(&connected_caller);