Mercurial > pidgin
changeset 28385:d5ff2cd6064a
merge of '0ff7fb50305f33b84a373ff00a085c25175515c1'
and 'af00ae634db8d99b296a90e1e0777bd23bd4df6a'
| author | Paul Aurich <paul@darkrain42.org> |
|---|---|
| date | Thu, 15 Oct 2009 16:13:57 +0000 |
| parents | ef513141e960 (diff) 29e96fb6cff3 (current diff) |
| children | 08ffa726aea2 3161c687d7bc e37f85160784 0db570ed5570 |
| files | |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/protocols/jabber/chat.c Thu Oct 15 09:21:18 2009 +0000 +++ b/libpurple/protocols/jabber/chat.c Thu Oct 15 16:13:57 2009 +0000 @@ -216,7 +216,8 @@ JabberChat *chat; char *jid; - g_return_val_if_fail(jabber_chat_find(js, room, server) == NULL, NULL); + if (jabber_chat_find(js, room, server) != NULL) + return NULL; chat = g_new0(JabberChat, 1); chat->js = js; @@ -264,7 +265,8 @@ char *jid; chat = jabber_chat_new(js, room, server, handle, password, data); - g_return_val_if_fail(chat != NULL, NULL); + if (chat == NULL) + return NULL; gc = js->gc; account = purple_connection_get_account(gc);