Mercurial > pidgin.yaz
diff libpurple/protocols/oscar/flap_connection.c @ 22167:ce5ced43cd93
Undo revision accb4afcd6bbf17cf99d9aac0b4b448293190647. This should
also not be necessary. If the gc doesn't exist but the FlapConnection
does then that's bad and is a sign of a serious bug that should be
fixed correctly. If you have a crash that you think this fixes, feel
free to show me a backtrace.
| author | Mark Doliner <mark@kingant.net> |
|---|---|
| date | Mon, 21 Jan 2008 07:32:49 +0000 |
| parents | 23d85a181575 |
| children | 6419554aadd9 |
line wrap: on
line diff
--- a/libpurple/protocols/oscar/flap_connection.c Mon Jan 21 07:00:02 2008 +0000 +++ b/libpurple/protocols/oscar/flap_connection.c Mon Jan 21 07:32:49 2008 +0000 @@ -360,7 +360,7 @@ conn = data; od = conn->od; - account = (PURPLE_CONNECTION_IS_VALID(od->gc) ? purple_connection_get_account(od->gc) : NULL); + account = purple_connection_get_account(od->gc); purple_debug_info("oscar", "Destroying oscar connection of " "type 0x%04hx. Disconnect reason is %d\n", @@ -375,8 +375,8 @@ * TODO: If we don't have a SNAC_FAMILY_LOCATE connection then * we should try to request one instead of disconnecting. */ - if (account && !account->disconnecting && - ((od->oscar_connections == NULL) || (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE)))) + if (!account->disconnecting && ((od->oscar_connections == NULL) + || (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE)))) { /* No more FLAP connections! Sign off this PurpleConnection! */ gchar *tmp;