[Pkg-voip-commits] r5778 - in /asterisk/trunk/debian: changelog patches/bristuff/ast-device-state-CID patches/bristuff/uniqueid-30-app-chanspy

[paravoid at alioth.debian.org]

Author: paravoid
Date: Sun May 25 17:42:36 2008
New Revision: 5778

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5778
Log:
Other minor and cosmetic fixes.

Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
    asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=5778&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun May 25 17:42:36 2008
@@ -21,8 +21,9 @@
     - Remove disabled chan-capi patch, obsoleted by upstream.
     - Remove uniqueid-01-use-pid-on-uniqueid-generation patch, dropped by
       upstream.
-
- -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 May 2008 18:50:46 +0300
+    - Other minor and cosmetic fixes.
+
+ -- Faidon Liambotis <paravoid at debian.org>  Sun, 25 May 2008 20:41:49 +0300
 
 asterisk (1:1.4.19.1~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/patches/bristuff/ast-device-state-CID
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/ast-device-state-CID?rev=5778&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/ast-device-state-CID (original)
+++ asterisk/trunk/debian/patches/bristuff/ast-device-state-CID Sun May 25 17:42:36 2008
@@ -127,7 +127,7 @@
 +extern ast_mutex_t uniquelock;			
 +
 +/*! \brief Change the state of a channel and the callerid of the calling channel*/
-+int ast_setstate_and_cid(struct ast_channel *chan, enum ast_channel_state state, char *cid_num, char *cid_name);
++int ast_setstate_and_callerid(struct ast_channel *chan, enum ast_channel_state state, char *cid_num, char *cid_name);
 +
  /*! \brief Change the state of a channel */
 -int ast_setstate(struct ast_channel *chan, enum ast_channel_state);
@@ -151,7 +151,7 @@
  }
  
 -int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
-+int ast_setstate_and_cid(struct ast_channel *chan, enum ast_channel_state state, char *cid_num, char *cid_name)
++int ast_setstate_and_callerid(struct ast_channel *chan, enum ast_channel_state state, char *cid_num, char *cid_name)
  {
  	int oldstate = chan->_state;
  
@@ -170,7 +170,7 @@
  
 +int ast_setstate(struct ast_channel *chan, enum ast_channel_state state)
 +{
-+    return ast_setstate_and_cid(chan, state, NULL, NULL);
++    return ast_setstate_and_callerid(chan, state, NULL, NULL);
 +}
 +
  /*! \brief Find bridged channel */

Modified: asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy?rev=5778&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy (original)
+++ asterisk/trunk/debian/patches/bristuff/uniqueid-30-app-chanspy Sun May 25 17:42:36 2008
@@ -36,13 +36,12 @@
  static const char *app_ext = "ExtenSpy";
  static const char *desc_ext = 
  "  ExtenSpy(exten[@context][|options]): This application is used to listen to the\n"
-@@ -457,7 +479,8 @@ static struct chanspy_ds *setup_chanspy_
+@@ -457,7 +479,7 @@ static struct chanspy_ds *setup_chanspy_
  
  static struct chanspy_ds *next_channel(struct ast_channel *chan,
  	const struct ast_channel *last, const char *spec,
 -	const char *exten, const char *context, struct chanspy_ds *chanspy_ds)
-+	const char *exten, const char *context, struct chanspy_ds *chanspy_ds,
-+	const char *uniqueid)
++	const char *exten, const char *context, struct chanspy_ds *chanspy_ds, const char *uniqueid)
  {
  	struct ast_channel *this;