[svn-commits] mmichelson: branch group/v14_colp r150200 - /team/group/v14_colp/apps/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Thu Oct 16 12:07:47 2008
New Revision: 150200

URL: http://svn.digium.com/view/asterisk?view=rev&rev=150200
Log:
app_directed_pickup change that didn't get merged
from the issue8824 branch.


Modified:
    team/group/v14_colp/apps/app_directed_pickup.c

Modified: team/group/v14_colp/apps/app_directed_pickup.c
URL: http://svn.digium.com/view/asterisk/team/group/v14_colp/apps/app_directed_pickup.c?view=diff&rev=150200&r1=150199&r2=150200
==============================================================================
--- team/group/v14_colp/apps/app_directed_pickup.c (original)
+++ team/group/v14_colp/apps/app_directed_pickup.c Thu Oct 16 12:07:47 2008
@@ -42,6 +42,7 @@
 #include "asterisk/lock.h"
 #include "asterisk/app.h"
 #include "asterisk/options.h"
+#include "asterisk/callerid.h"
 
 #define PICKUPMARK "PICKUPMARK"
 
@@ -58,10 +59,19 @@
 static int pickup_do(struct ast_channel *chan, struct ast_channel *target)
 {
 	int res = 0;
+	struct ast_party_connected_line connected_caller;
 
 	if (option_debug)
 		ast_log(LOG_DEBUG, "Call pickup on '%s' by '%s'\n", target->name, chan->name);
 
+	connected_caller = target->connected;
+	connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
+	ast_connected_line_update(chan, &connected_caller);
+
+	ast_party_connected_line_collect_caller(&connected_caller, &chan->cid);
+	connected_caller.source = AST_CONNECTED_LINE_UPDATE_SOURCE_ANSWER;
+	ast_queue_connected_line_update(chan, &connected_caller);
+	
 	if ((res = ast_answer(chan))) {
 		ast_log(LOG_WARNING, "Unable to answer '%s'\n", chan->name);
 		return -1;