[svn-commits] twilson: trunk r352475 - /trunk/channels/chan_vpb.cc

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Jan 24 19:21:23 2012
New Revision: 352475

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=352475
Log:
Fix channel opaquification of stringfields for chan_vpb

Modified:
    trunk/channels/chan_vpb.cc

Modified: trunk/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_vpb.cc?view=diff&rev=352475&r1=352474&r2=352475
==============================================================================
--- trunk/channels/chan_vpb.cc (original)
+++ trunk/channels/chan_vpb.cc Tue Jan 24 19:21:23 2012
@@ -2475,7 +2475,7 @@
 		else
 			strcpy(tmp->exten, "s");
 		if (!ast_strlen_zero(me->language))
-			ast_string_field_set(tmp, language, me->language);
+			ast_channel_language_set(tmp, me->language);
 
 		me->owner = tmp;
 
@@ -2538,13 +2538,13 @@
 		if (group == -1) {
 			if (strncmp(s, p->dev + 4, sizeof p->dev) == 0) {
 				if (!p->owner) {
-					tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? requestor->linkedid : NULL);
+					tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? ast_channel_linkedid(requestor) : NULL);
 					break;
 				}
 			}
 		} else {
 			if ((p->group == group) && (!p->owner)) {
-				tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? requestor->linkedid : NULL);
+				tmp = vpb_new(p, AST_STATE_DOWN, p->context, requestor ? ast_channel_linkedid(requestor) : NULL);
 				break;
 			}
 		}