Mercurial > pidgin
changeset 21372:b6b69faafbe3
merge of '37c3d8dfb803b6da542ca98ccd64739e1943072c'
and '59ae1baa5170a6a40f17cc5d213864be55009356'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Sun, 28 Oct 2007 11:04:04 +0000 |
| parents | a41ac7fd19ab (current diff) 0aa18e21a595 (diff) |
| children | cbf197042bad |
| files | |
| diffstat | 2 files changed, 6 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libpurple/account.c Sat Oct 27 17:46:04 2007 +0000 +++ b/libpurple/account.c Sun Oct 28 11:04:04 2007 +0000 @@ -2588,6 +2588,8 @@ purple_signal_connect(conn_handle, "signed-on", handle, PURPLE_CALLBACK(signed_on_cb), NULL); + purple_signal_connect(conn_handle, "connection-error", handle, + PURPLE_CALLBACK(connection_error_cb), NULL); load_accounts();
--- a/libpurple/core.c Sat Oct 27 17:46:04 2007 +0000 +++ b/libpurple/core.c Sun Oct 28 11:04:04 2007 +0000 @@ -138,15 +138,17 @@ /* The buddy icon code uses the imgstore, so init it early. */ purple_imgstore_init(); - /* Accounts use status and buddy icons, so initialize these before accounts */ + /* Accounts use status, buddy icons and connection signals, so + * initialize these before accounts + */ purple_status_init(); purple_buddy_icons_init(); + purple_connections_init(); purple_accounts_init(); purple_savedstatuses_init(); purple_notify_init(); purple_certificate_init(); - purple_connections_init(); purple_conversations_init(); purple_blist_init(); purple_log_init();