Mercurial > pidgin
comparison 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 |
comparison
equal
deleted
inserted
replaced
10489:8dffdd8861b5 | 10490:a3a540ed2518 |
---|---|
535 return; | 535 return; |
536 | 536 |
537 for (child = xmlnode_get_child(node, "account"); child != NULL; | 537 for (child = xmlnode_get_child(node, "account"); child != NULL; |
538 child = xmlnode_get_next_twin(child)) | 538 child = xmlnode_get_next_twin(child)) |
539 { | 539 { |
540 GaimAccount *new; | 540 GaimAccount *new_acct; |
541 new = parse_account(child); | 541 new_acct = parse_account(child); |
542 gaim_accounts_add(new); | 542 gaim_accounts_add(new_acct); |
543 } | 543 } |
544 } | 544 } |
545 | 545 |
546 | 546 |
547 static void | 547 static void |
1667 void | 1667 void |
1668 gaim_accounts_init(void) | 1668 gaim_accounts_init(void) |
1669 { | 1669 { |
1670 void *handle = gaim_accounts_get_handle(); | 1670 void *handle = gaim_accounts_get_handle(); |
1671 | 1671 |
1672 load_accounts(); | |
1673 | |
1674 gaim_signal_register(handle, "account-connecting", | 1672 gaim_signal_register(handle, "account-connecting", |
1675 gaim_marshal_VOID__POINTER, NULL, 1, | 1673 gaim_marshal_VOID__POINTER, NULL, 1, |
1676 gaim_value_new(GAIM_TYPE_SUBTYPE, | 1674 gaim_value_new(GAIM_TYPE_SUBTYPE, |
1677 GAIM_SUBTYPE_ACCOUNT)); | 1675 GAIM_SUBTYPE_ACCOUNT)); |
1678 | 1676 |
1707 gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); | 1705 gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); |
1708 | 1706 |
1709 gaim_signal_register(handle, "account-removed", | 1707 gaim_signal_register(handle, "account-removed", |
1710 gaim_marshal_VOID__POINTER, NULL, 1, | 1708 gaim_marshal_VOID__POINTER, NULL, 1, |
1711 gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); | 1709 gaim_value_new(GAIM_TYPE_SUBTYPE, GAIM_SUBTYPE_ACCOUNT)); |
1710 | |
1711 load_accounts(); | |
1712 | |
1712 } | 1713 } |
1713 | 1714 |
1714 void | 1715 void |
1715 gaim_accounts_uninit(void) | 1716 gaim_accounts_uninit(void) |
1716 { | 1717 { |