changeset
merge of 'aacaa228480c4129f2a8b1ef2a70285027b542c0'
Sat, 20 Nov 2010 18:12:13 +0000
- author
- Paul Aurich <darkrain42@pidgin.im>
- date
- Sat, 20 Nov 2010 18:12:13 +0000
- changeset 31132
- bb0b787208f4
- parent 31129
- aacaa228480c (current diff)
- parent 31128
- 116e599c707f (diff)
- child 31133
- 9383e6398f7d
- child 31138
- 0ef538545fa6
- child 31139
- 11e15a737738
merge of 'aacaa228480c4129f2a8b1ef2a70285027b542c0'
and '116e599c707fc47729211140c6596a57a74d5101'
--- a/libpurple/protocols/jabber/jabber.c Sat Nov 20 09:21:29 2010 +0000 +++ b/libpurple/protocols/jabber/jabber.c Sat Nov 20 18:12:13 2010 +0000 @@ -477,7 +477,7 @@ char *text = NULL, *last_part = NULL, *tag_start = NULL; /* Because debug logs with plaintext passwords make me sad */ - if(js->state != JABBER_STREAM_CONNECTED && + if (!purple_debug_is_unsafe() && js->state != JABBER_STREAM_CONNECTED && /* Either <auth> or <query><password>... */ (((tag_start = strstr(data, "<auth ")) && strstr(data, "xmlns='" NS_XMPP_SASL "'")) ||
