Mercurial > pidgin
diff src/account.c @ 10490:a3a540ed2518
[gaim-migrate @ 11780]
some random jabber stuff, remove a duplicate #define, and shuffle account
loading so we're not emitting signals that haven't been registered yet
committer: Tailor Script <tailor@pidgin.im>
| author | Nathan Walp <nwalp@pidgin.im> |
|---|---|
| date | Sat, 08 Jan 2005 21:10:17 +0000 |
| parents | 6a20307ef8dc |
| children | 6a618db0a404 |
line wrap: on
line diff
--- a/src/account.c Sat Jan 08 20:51:16 2005 +0000 +++ b/src/account.c Sat Jan 08 21:10:17 2005 +0000 @@ -537,9 +537,9 @@ for (child = xmlnode_get_child(node, "account"); child != NULL; child = xmlnode_get_next_twin(child)) { - GaimAccount *new; - new = parse_account(child); - gaim_accounts_add(new); + GaimAccount *new_acct; + new_acct = parse_account(child); + gaim_accounts_add(new_acct); } } @@ -1669,8 +1669,6 @@ { void *handle = gaim_accounts_get_handle(); - load_accounts(); - gaim_signal_register(handle, "account-connecting", gaim_marshal_VOID__POINTER, NULL, 1, gaim_value_new(GAIM_TYPE_SUBTYPE, @@ -1709,6 +1707,9 @@ gaim_signal_register(handle, "account-removed", gaim_marshal_VOID__POINTER, NULL, 1, gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); + + load_accounts(); + } void