Mercurial > pidgin.yaz
changeset 32225:257b01353334
merge of '56ec802a4201a596a1bf852cae8f08819ca6bedc'
and 'f1442997e656d73d0aad5c9daf3de27983b7cc1b'
author | Mark Doliner <mark@kingant.net> |
---|---|
date | Thu, 11 Aug 2011 06:36:47 +0000 |
parents | 4151dad5bd00 (diff) c164dcad5e28 (current diff) |
children | c563769843b2 |
files | |
diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/sametime/sametime.c Mon Aug 08 21:49:06 2011 +0000 +++ b/libpurple/protocols/sametime/sametime.c Thu Aug 11 06:36:47 2011 +0000 @@ -924,7 +924,7 @@ if (!name) { DEBUG_WARN("Can't ensure a null group\n"); - return; + return NULL; } DEBUG_INFO("attempting to ensure group %s, called %s\n",