Mercurial > pidgin
changeset 30930:1d035209559d
merge of '6f879669a6513a5c40335bbaefe842389a92b39e'
and '7827ad5ca971c169586552a79a046a84a28b60ba'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Sat, 20 Nov 2010 18:12:13 +0000 |
| parents | 250a16f2548f (current diff) b07841f6cd15 (diff) |
| children | 9a21a5e259f7 dec85cefc758 d8784469072e |
| files | |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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 "'")) ||