Index: channel.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channel.c,v
retrieving revision 1.33
diff -u -2 -r1.33 channel.c
--- channel.c	11 Aug 2003 22:17:46 -0000	1.33
+++ channel.c	12 Aug 2003 22:58:22 -0000
@@ -1553,5 +1553,6 @@
 			if (chan->requester)
 				c = chan->requester(type, capabilities, data);
-			if (c) {
+			/* ast_setstate should generate this when appropriate*/
+/*			if (c) {
 //				ast_device_state_changed(c->name);
 				manager_event(EVENT_FLAG_CALL, "Newchannel",
@@ -1561,5 +1562,5 @@
 				"Uniqueid: %s\r\n",
 				c->name, ast_state2str(c->_state), c->callerid ? c->callerid : "<unknown>", c->uniqueid);
-			}
+			}*/
 			return c;
 		}
Index: channels/chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.77
diff -u -2 -r1.77 chan_zap.c
--- channels/chan_zap.c	8 Aug 2003 04:20:54 -0000	1.77
+++ channels/chan_zap.c	12 Aug 2003 22:58:26 -0000
@@ -3741,4 +3741,5 @@
 	if (p->dsp)
 		ast_dsp_digitreset(p->dsp);
+	ast_setstate(chan,AST_STATE_OFFHOOK); /* FIXME:  Put back onhook for errors */
 	switch(p->sig) {
 	case SIG_FEATD: