[svn-commits] jrose: trunk r333571 - in /trunk: ./ res/res_jabber.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Aug 29 10:58:24 2011
New Revision: 333571

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333571
Log:
Merged revisions 333570 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r333570 | jrose | 2011-08-29 10:56:56 -0500 (Mon, 29 Aug 2011) | 11 lines
  
  Merged revisions 333569 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.8
  
  ........
    r333569 | jrose | 2011-08-29 10:55:34 -0500 (Mon, 29 Aug 2011) | 4 lines
    
    Accidental use of variable client->status instead of client->state in from ASTERISK-18078
    
    (issue ASTERISK-18078)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/res/res_jabber.c

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

Modified: trunk/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/trunk/res/res_jabber.c?view=diff&rev=333571&r1=333570&r2=333571
==============================================================================
--- trunk/res/res_jabber.c (original)
+++ trunk/res/res_jabber.c Mon Aug 29 10:58:24 2011
@@ -1511,7 +1511,7 @@
 #endif
 	/* If needed, data will be sent unencrypted, and logHook will
 	   be called inside iks_send_raw */
-	if((client->timeout != 0 && client->status == AJI_CONNECTED) || (client->status == AJI_CONNECTING))
+	if((client->timeout != 0 && client->state == AJI_CONNECTED) || (client->state == AJI_CONNECTING))
 	{
 	    ret = iks_send_raw(client->p, xmlstr);
 	}