im.pidgin.pidgin: 4ca258deda6a50b61f8431bb3a742805c180a583

[markdoliner at pidgin.im]

-----------------------------------------------------------------
Revision: 4ca258deda6a50b61f8431bb3a742805c180a583
Ancestor: 1d305db6072033c5dfbd003d4c695112aa844c72
Author: markdoliner at pidgin.im
Date: 2008-01-21T07:32:49
Branch: im.pidgin.pidgin

Modified files:
        libpurple/protocols/oscar/flap_connection.c

ChangeLog: 

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.

-------------- next part --------------
============================================================
--- libpurple/protocols/oscar/flap_connection.c	b3c9d505d8cd6772ff3d3ea77d62e0202cf0eb00
+++ libpurple/protocols/oscar/flap_connection.c	01cb4c3e541855a81434f60dfc1f232828be7ce7
@@ -360,7 +360,7 @@ flap_connection_destroy_cb(gpointer data
 
 	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 @@ flap_connection_destroy_cb(gpointer data
 	 * 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;