Mercurial > pidgin
changeset 28776:e2ba2a8814c1
merge of 'f31da20f593d64a906374f7963e178dcd1738ac3'
and 'f39cd1fed08fe5f5e3165a087fcc36ed984a6eee'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Tue, 08 Dec 2009 17:24:33 +0000 |
| parents | be02d04d2fee (current diff) a299f96fb25c (diff) |
| children | e111f3a2f664 c38f6e6bf4ce |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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;