[svn-commits] russell: trunk r54104 - in /trunk: ./ include/asterisk/dial.h main/dial.c

[svn-commits at lists.digium.com]

Author: russell
Date: Mon Feb 12 13:18:33 2007
New Revision: 54104

URL: http://svn.digium.com/view/asterisk?view=rev&rev=54104
Log:
Merged revisions 54103 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r54103 | russell | 2007-02-12 13:17:08 -0600 (Mon, 12 Feb 2007) | 2 lines

Change ast_set_state_callback() to ast_dial_set_state_callback()

........

Modified:
    trunk/   (props changed)
    trunk/include/asterisk/dial.h
    trunk/main/dial.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/include/asterisk/dial.h
URL: http://svn.digium.com/view/asterisk/trunk/include/asterisk/dial.h?view=diff&rev=54104&r1=54103&r2=54104
==============================================================================
--- trunk/include/asterisk/dial.h (original)
+++ trunk/include/asterisk/dial.h Mon Feb 12 13:18:33 2007
@@ -142,7 +142,7 @@
  * \param callback the callback
  * \return nothing
  */
-void ast_set_state_callback(struct ast_dial *dial, ast_dial_state_callback callback);
+void ast_dial_set_state_callback(struct ast_dial *dial, ast_dial_state_callback callback);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }

Modified: trunk/main/dial.c
URL: http://svn.digium.com/view/asterisk/trunk/main/dial.c?view=diff&rev=54104&r1=54103&r2=54104
==============================================================================
--- trunk/main/dial.c (original)
+++ trunk/main/dial.c Mon Feb 12 13:18:33 2007
@@ -818,7 +818,7 @@
 	return 0;
 }
 
-void ast_set_state_callback(struct ast_dial *dial, ast_dial_state_callback callback)
+void ast_dial_set_state_callback(struct ast_dial *dial, ast_dial_state_callback callback)
 {
 	dial->state_callback = callback;
 }