summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorJonathan Rose <jrose@digium.com>2011-08-29 15:58:24 +0000
committerJonathan Rose <jrose@digium.com>2011-08-29 15:58:24 +0000
commitd836c88b4902df43547a4a51f1bcee84af5c1004 (patch)
treedb61bd2099ef4f3e0de4c844ae6bf97e08e7f28b /res
parentad02be1f2be75fa0fbd4ccccb49bbb08e3c4bd6f (diff)
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) ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@333571 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
-rw-r--r--res/res_jabber.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_jabber.c b/res/res_jabber.c
index 3d4d136f6..a4772b19c 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);
}