comparison libgaim/protocols/oscar/flap_connection.c @ 15355:00d0d4524377

[gaim-migrate @ 18148] Some safety which should avoid a post-disconnect crash I've seen reported committer: Tailor Script <[e-mail]>

15354:db11d9e416ac

	OscarData *od;
	GaimAccount *account;

	conn = data;
	od = conn->od;
	account = gaim_connection_get_account(od->gc);

	gaim_debug_info("oscar", "Destroying oscar connection of "
			"type 0x%04hx\n", conn->type);

	od->oscar_connections = g_slist_remove(od->oscar_connections, conn);

	/*
	 * TODO: If we don't have a SNAC_FAMILY_LOCATE connection then
	 * we should try to request one instead of disconnecting.
	 */
	if (!account->disconnecting && ((od->oscar_connections == NULL)
			|| (!flap_connection_getbytype(od, SNAC_FAMILY_LOCATE))))
	{
		/* No more FLAP connections!  Sign off this GaimConnection! */
		gchar *tmp;
		if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
			tmp = g_strdup(_("Server closed the connection."));

15355:00d0d4524377

	OscarData *od;
	GaimAccount *account;

	conn = data;
	od = conn->od;
	account = (GAIM_CONNECTION_IS_VALID(od->gc) ? gaim_connection_get_account(od->gc) : NULL);

	gaim_debug_info("oscar", "Destroying oscar connection of "
			"type 0x%04hx\n", conn->type);

	od->oscar_connections = g_slist_remove(od->oscar_connections, conn);

	/*
	 * 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))))
	{
		/* No more FLAP connections!  Sign off this GaimConnection! */
		gchar *tmp;
		if (conn->disconnect_reason == OSCAR_DISCONNECT_REMOTE_CLOSED)
			tmp = g_strdup(_("Server closed the connection."));