[svn-commits] jrose: branch 10 r333570 - in /branches/10: ./ res/res_jabber.c

[SVN commits to the Digium repositories]

Author: jrose
Date: Mon Aug 29 10:56:56 2011
New Revision: 333570

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=333570
Log:
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:
    branches/10/   (props changed)
    branches/10/res/res_jabber.c

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

Modified: branches/10/res/res_jabber.c
URL: http://svnview.digium.com/svn/asterisk/branches/10/res/res_jabber.c?view=diff&rev=333570&r1=333569&r2=333570
==============================================================================
--- branches/10/res/res_jabber.c (original)
+++ branches/10/res/res_jabber.c Mon Aug 29 10:56:56 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);
 	}