[asterisk-commits] bweschke: branch bweschke/originate_w_jabber r99597 - in /team/bweschke/origi...

[SVN commits to the Asterisk project]

Author: bweschke
Date: Tue Jan 22 11:51:27 2008
New Revision: 99597

URL: http://svn.digium.com/view/asterisk?view=rev&rev=99597
Log:
 Resolve, reset, automerge again.


Modified:
    team/bweschke/originate_w_jabber/   (props changed)
    team/bweschke/originate_w_jabber/main/channel.c

Change Statistics:
 0 files changed

Propchange: team/bweschke/originate_w_jabber/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/bweschke/originate_w_jabber/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 22 11:51:27 2008
@@ -1,1 +1,1 @@
-/branches/1.4:1-98272
+/branches/1.4:1-98317

Modified: team/bweschke/originate_w_jabber/main/channel.c
URL: http://svn.digium.com/view/asterisk/team/bweschke/originate_w_jabber/main/channel.c?view=diff&rev=99597&r1=99596&r2=99597
==============================================================================
--- team/bweschke/originate_w_jabber/main/channel.c (original)
+++ team/bweschke/originate_w_jabber/main/channel.c Tue Jan 22 11:51:27 2008
@@ -3131,6 +3131,7 @@
 	int cause = 0;
 	struct ast_channel *chan;
 	int res = 0;
+	int last_subclass = 0;
 	int xmppsignaling = 0;
 	const char *origjid;
 	const char *xmppcid;
@@ -3259,6 +3260,7 @@
 				default:
 					ast_log(LOG_NOTICE, "Don't know what to do with control frame %d\n", f->subclass);
 				}
+				last_subclass = f->subclass;
 			}
 			ast_frfree(f);
 		}
@@ -3277,6 +3279,8 @@
 		*outstate = AST_CONTROL_ANSWER;
 
 	if (res <= 0) {
+		if ( AST_CONTROL_RINGING == last_subclass ) 
+			chan->hangupcause = AST_CAUSE_NO_ANSWER;
 		if (!chan->cdr && (chan->cdr = ast_cdr_alloc()))
 			ast_cdr_init(chan->cdr, chan);
 		if (chan->cdr) {