# HG changeset patch
# User Paul Aurich <paul@darkrain42.org>
# Date 1260293073 0
# Node ID e2ba2a8814c1e742f646b66e1002b5fc63476ac2
# Parent  be02d04d2fee1b35145aaa56b70cc03f97df44fc# Parent  a299f96fb25c9df6ae4864b04d929fd8db1df6a1
merge of 'f31da20f593d64a906374f7963e178dcd1738ac3'
     and 'f39cd1fed08fe5f5e3165a087fcc36ed984a6eee'

diff -r be02d04d2fee -r e2ba2a8814c1 libpurple/protocols/oscar/oscar.c
--- a/libpurple/protocols/oscar/oscar.c	Tue Dec 08 12:13:08 2009 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Tue Dec 08 17:24:33 2009 +0000
@@ -3576,9 +3576,9 @@
 
 			purple_debug_misc("oscar",
 					"created room: %s %hu %hu %hu %u %hu %hu %hhu %hu %s %s\n",
-					fqcn, exchange, instance, flags, createtime,
+					fqcn ? fqcn : "(null)", exchange, instance, flags, createtime,
 					maxmsglen, maxoccupancy, createperms, unknown,
-					name, ck);
+					name ? name : "(null)", ck);
 			aim_chat_join(od, exchange, ck, instance);
 			}
 			break;