Mercurial > pidgin.yaz
changeset 27618:e574d1858b5a
merge of '03e0254c6871c4730755a200d34d4adacdf40c66'
and 'fe1b9e426c3f6f96ab00db928c3c9249746e5845'
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Tue, 14 Jul 2009 21:25:10 +0000 |
| parents | 32d2caa6a777 (diff) 0a0ece3477af (current diff) |
| children | 205267108d6e a756b4ed306e |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/qq/group_im.c Tue Jul 14 21:23:18 2009 +0000 +++ b/libpurple/protocols/qq/group_im.c Tue Jul 14 21:25:10 2009 +0000 @@ -52,6 +52,7 @@ gchar *topic_utf8; g_return_val_if_fail(rmd != NULL, NULL); + g_return_val_if_fail(rmd->title_utf8, NULL); qd = (qq_data *) gc->proto_data; conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_CHAT,
--- a/libpurple/server.c Tue Jul 14 21:23:18 2009 +0000 +++ b/libpurple/server.c Tue Jul 14 21:25:10 2009 +0000 @@ -862,7 +862,12 @@ account = purple_connection_get_account(gc); + g_return_val_if_fail(account != NULL, NULL); + g_return_val_if_fail(name != NULL, NULL); + conv = purple_conversation_new(PURPLE_CONV_TYPE_CHAT, account, name); + g_return_val_if_fail(conv != NULL, NULL); + chat = PURPLE_CONV_CHAT(conv); if (!g_slist_find(gc->buddy_chats, conv))