Mercurial > pidgin.yaz
diff libpurple/account.c @ 28610:bc87a89e4401
merge of '9ce1a7ac92f523b7b5b9983746ae57ee1fac1a67'
and 'ebf771e2c74addf4821a643a9c9179f4adc67c3b'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Tue, 08 Sep 2009 02:23:49 +0000 |
parents | e8eaf57f42da caa94dfa37f1 |
children | 7686397d2282 |
line wrap: on
line diff
--- a/libpurple/account.c Tue Aug 18 00:00:22 2009 +0000 +++ b/libpurple/account.c Tue Sep 08 02:23:49 2009 +0000 @@ -1206,11 +1206,14 @@ purple_account_disconnect(PurpleAccount *account) { PurpleConnection *gc; + const char *username; g_return_if_fail(account != NULL); g_return_if_fail(!purple_account_is_disconnected(account)); - purple_debug_info("account", "Disconnecting account %p\n", account); + username = purple_account_get_username(account); + purple_debug_info("account", "Disconnecting account %s (%p)\n", + username ? username : "(null)", account); account->disconnecting = TRUE; @@ -2323,9 +2326,13 @@ purple_account_add_buddy(PurpleAccount *account, PurpleBuddy *buddy) { PurplePluginProtocolInfo *prpl_info = NULL; - PurpleConnection *gc = purple_account_get_connection(account); + PurpleConnection *gc; PurplePlugin *prpl = NULL; + g_return_if_fail(account != NULL); + g_return_if_fail(buddy != NULL); + + gc = purple_account_get_connection(account); if (gc != NULL) prpl = purple_connection_get_prpl(gc);