Merged revisions 333570 via svnmerge from
authorJonathan Rose <jrose@digium.com>
Mon, 29 Aug 2011 15:58:24 +0000 (15:58 +0000)
committerJonathan Rose <jrose@digium.com>
Mon, 29 Aug 2011 15:58:24 +0000 (15:58 +0000)
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)
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333571 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_jabber.c

index 3d4d136..a4772b1 100644 (file)
@@ -1511,7 +1511,7 @@ static int aji_send_raw(struct aji_client *client, const char *xmlstr)
 #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);
        }