From: Jonathan Rose Date: Mon, 29 Aug 2011 15:56:56 +0000 (+0000) Subject: Merged revisions 333569 via svnmerge from X-Git-Tag: 10.0.0-beta2~97 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f650edb2b08c453077d8d2e17fe6372e35fe6ff;p=thirdparty%2Fasterisk.git 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/branches/10@333570 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/res/res_jabber.c b/res/res_jabber.c index 3d4d136f69..a4772b19c2 100644 --- a/res/res_jabber.c +++ b/res/res_jabber.c @@ -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); }