Mercurial > pidgin
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 <tailor@pidgin.im>
author | Tim Ringenbach <marv@pidgin.im> |
---|---|
date | Wed, 15 Dec 2004 22:25:55 +0000 |
parents | 19974fd2d61d |
children | aab0c9508318 |
comparison
equal
deleted
inserted
replaced
10383:f2035bdc4272 | 10384:b234ad7e0dfe |
---|---|
254 g_return_if_fail(account != NULL); | 254 g_return_if_fail(account != NULL); |
255 g_return_if_fail(gaim_account_is_connected(account)); | 255 g_return_if_fail(gaim_account_is_connected(account)); |
256 | 256 |
257 gaim_debug_info("account", "Disconnecting account %p\n", account); | 257 gaim_debug_info("account", "Disconnecting account %p\n", account); |
258 | 258 |
259 account->disconnecting = TRUE; | |
259 gc = gaim_account_get_connection(account); | 260 gc = gaim_account_get_connection(account); |
260 | 261 |
262 gaim_connection_disconnect(gc); | |
263 | |
261 gaim_account_set_connection(account, NULL); | 264 gaim_account_set_connection(account, NULL); |
262 | 265 account->disconnecting = FALSE; |
263 gaim_connection_disconnect(gc); | |
264 } | 266 } |
265 | 267 |
266 void | 268 void |
267 gaim_account_notify_added(GaimAccount *account, const char *id, | 269 gaim_account_notify_added(GaimAccount *account, const char *id, |
268 const char *remote_user, const char *alias, | 270 const char *remote_user, const char *alias, |