[Pkg-voip-commits] r5785 - /asterisk/trunk/debian/patches/bristuff/zapata-gsm

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun May 25 18:49:59 2008
New Revision: 5785

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5785
Log:
zapata merge of 0.4.0-RC1, part 4

Modified:
    asterisk/trunk/debian/patches/bristuff/zapata-gsm

Modified: asterisk/trunk/debian/patches/bristuff/zapata-gsm
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/zapata-gsm?rev=5785&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/zapata-gsm (original)
+++ asterisk/trunk/debian/patches/bristuff/zapata-gsm Sun May 25 18:49:59 2008
@@ -179,7 +179,7 @@
  			}
  #endif
 +#ifdef HAVE_GSMAT
-+		if (chan_conf.signalling == SIG_GSM) {
++		if (conf.chan.sig == SIG_GSM) {
 +		    struct zt_bufferinfo bi;
 +		    ast_mutex_init(&tmp->gsm.lock);
 +		    strncpy(tmp->gsm.pin, gsm_modem_pin, sizeof(tmp->gsm.pin) - 1);
@@ -285,7 +285,7 @@
 +		if (!ast_strlen_zero(e->ring.callingnum)) {
 +		    strncpy(gsm->pvt->cid_num, e->ring.callingnum, sizeof(gsm->pvt->cid_num) - 1);
 +		} else {
-+		    strncpy(gsm->pvt->cid_name, withheldcid, sizeof(gsm->pvt->cid_name));
++		    strncpy(gsm->pvt->cid_name, "CID withheld", sizeof(gsm->pvt->cid_name));
 +		}
 +		if (!ast_strlen_zero(gsm->exten)) {
 +		    strncpy(gsm->pvt->exten, gsm->exten, sizeof(gsm->pvt->exten) - 1);