comparison src/account.c @ 5926:6c22d37c6a3c

[gaim-migrate @ 6366] Another "should fix" commit! If calling gaim_connection_disconnect() instead of gaim_account_disconnect() (which was happening at times), the account's connection would never be set to NULL. Now we ensure that if the account's connection is non-NULL, gaim_account_disconnect() is called first instead of gaim_connection_disconnect(). committer: Tailor Script <tailor@pidgin.im>
author Christian Hammond <chipx86@chipx86.com>
date Fri, 20 Jun 2003 03:55:56 +0000
parents d58406d31a1a
children 03f1d6cd784c
comparison
equal deleted inserted replaced
5925:6690934e5ea6 5926:6c22d37c6a3c
174 } 174 }
175 175
176 void 176 void
177 gaim_account_disconnect(GaimAccount *account) 177 gaim_account_disconnect(GaimAccount *account)
178 { 178 {
179 GaimConnection *gc;
180
179 g_return_if_fail(account != NULL); 181 g_return_if_fail(account != NULL);
180 g_return_if_fail(gaim_account_is_connected(account)); 182 g_return_if_fail(gaim_account_is_connected(account));
181 183
182 gaim_connection_disconnect(account->gc); 184 gc = gaim_account_get_connection(account);
183 185
184 account->gc = NULL; 186 gaim_account_set_connection(account, NULL);
187
188 gaim_connection_disconnect(gc);
185 } 189 }
186 190
187 void 191 void
188 gaim_account_set_username(GaimAccount *account, const char *username) 192 gaim_account_set_username(GaimAccount *account, const char *username)
189 { 193 {