comparison src/account.c @ 10384:b234ad7e0dfe

[gaim-migrate @ 11610] I think this is a better fix for the jabber problem. I think that gaim_account_get_connection should never return NULL when called inside a prpl from a function being called by the core. I think ChipX86 wrote the code that I'm changing that made account->gc = NULL. So if he has any objections, he should raise them. committer: Tailor Script <[e-mail]>

10383:f2035bdc4272

	g_return_if_fail(account != NULL);
	g_return_if_fail(gaim_account_is_connected(account));

	gaim_debug_info("account", "Disconnecting account %p\n", account);

	gc = gaim_account_get_connection(account);

	gaim_account_set_connection(account, NULL);

	gaim_connection_disconnect(gc);
}

void
gaim_account_notify_added(GaimAccount *account, const char *id,
						  const char *remote_user, const char *alias,

10384:b234ad7e0dfe

	g_return_if_fail(account != NULL);
	g_return_if_fail(gaim_account_is_connected(account));

	gaim_debug_info("account", "Disconnecting account %p\n", account);

	account->disconnecting = TRUE;
	gc = gaim_account_get_connection(account);

	gaim_connection_disconnect(gc);

	gaim_account_set_connection(account, NULL);
	account->disconnecting = FALSE;
}

void
gaim_account_notify_added(GaimAccount *account, const char *id,
						  const char *remote_user, const char *alias,