# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1290276733 0
# Node ID 1d035209559df6541f59ca41d0d1397277abf046
# Parent  250a16f2548f8d2679b8f2c870ac112ec08855dd# Parent  b07841f6cd152a93c7536343bdad915f3977f2f2
merge of '6f879669a6513a5c40335bbaefe842389a92b39e'
     and '7827ad5ca971c169586552a79a046a84a28b60ba'

diff -r 250a16f2548f -r 1d035209559d libpurple/protocols/jabber/jabber.c
--- 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 "'")) ||