[asterisk-commits] rmudgett: branch group/issue8824 r143603 - /team/group/issue8824/apps/

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Thu Sep 18 21:11:38 2008
New Revision: 143603

URL: http://svn.digium.com/view/asterisk?view=rev&rev=143603
Log:
*  Undid some apparent unintentional changes from the original
connected line patch.


Modified:
    team/group/issue8824/apps/app_dial.c
    team/group/issue8824/apps/app_queue.c

Modified: team/group/issue8824/apps/app_dial.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_dial.c?view=diff&rev=143603&r1=143602&r2=143603
==============================================================================
--- team/group/issue8824/apps/app_dial.c (original)
+++ team/group/issue8824/apps/app_dial.c Thu Sep 18 21:11:38 2008
@@ -1527,20 +1527,20 @@
 			connected.id.name = cid_name;
 			connected.id.number_presentation = AST_PRES_ALLOWED_USER_NUMBER_PASSED_SCREEN;
 			ast_set_connected_line(tc, &connected);
-		}
-		else {
-			S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
-			ast_party_redirecting_copy(&tc->redirecting, &chan->redirecting);
-
-			tc->cid.cid_tns = chan->cid.cid_tns;
-
+		} else {
 			ast_copy_caller_to_connected(&tc->connected, &chan->cid);
 		}
+
+		S_REPLACE(tc->cid.cid_rdnis, ast_strdup(chan->cid.cid_rdnis));
+		ast_party_redirecting_copy(&tc->redirecting, &chan->redirecting);
+
+		tc->cid.cid_tns = chan->cid.cid_tns;
 
 		ast_string_field_set(tc, accountcode, chan->accountcode);
 		tc->cdrflags = chan->cdrflags;
 		if (ast_strlen_zero(tc->musicclass))
 			ast_string_field_set(tc, musicclass, chan->musicclass);
+
 		/* Pass ADSI CPE and transfer capability */
 		tc->adsicpe = chan->adsicpe;
 		tc->transfercapability = chan->transfercapability;

Modified: team/group/issue8824/apps/app_queue.c
URL: http://svn.digium.com/view/asterisk/team/group/issue8824/apps/app_queue.c?view=diff&rev=143603&r1=143602&r2=143603
==============================================================================
--- team/group/issue8824/apps/app_queue.c (original)
+++ team/group/issue8824/apps/app_queue.c Thu Sep 18 21:11:38 2008
@@ -2497,6 +2497,9 @@
 					} else {
 						ast_channel_inherit_variables(in, o->chan);
 						ast_channel_datastore_inherit(in, o->chan);
+
+						ast_string_field_set(o->chan, accountcode, in->accountcode);
+						o->chan->cdrflags = in->cdrflags;
 
 						if (o->chan->cid.cid_rdnis)
 							ast_free(o->chan->cid.cid_rdnis);