# HG changeset patch # User Etan Reisner <pidgin@unreliablesource.net> # Date 1242781744 0 # Node ID 3e83f63b16b482daa0e54ddfda070645a4de1330 # Parent a6a4b440e5aed27dbb98c0ab4f8c63edbf706adf# Parent 108455a3c019b0e2da13d7d86465a03beed3ed42 merge of '1696adf9dd410d4b67f782058165fbf61cb53c61' and '690c7c4a76e71e487456cfb56e90f63a76e5d1c7' diff -r a6a4b440e5ae -r 3e83f63b16b4 doc/notify-signals.dox --- a/doc/notify-signals.dox Wed May 20 00:39:12 2009 +0000 +++ b/doc/notify-signals.dox Wed May 20 01:09:04 2009 +0000 @@ -30,7 +30,7 @@ const char *url); @endsignalproto @signaldesc - Emitted before email notification is handed to the UI to display. + Emitted before notification of a single email is handed to the UI to display. @param subject Subject of email being notified of. @param from Who the email is from. @param to Who the email is to. diff -r a6a4b440e5ae -r 3e83f63b16b4 libpurple/account.c --- a/libpurple/account.c Wed May 20 00:39:12 2009 +0000 +++ b/libpurple/account.c Wed May 20 01:09:04 2009 +0000 @@ -1132,29 +1132,32 @@ purple_account_connect(PurpleAccount *account) { PurplePlugin *prpl; + const char *password, *username; PurplePluginProtocolInfo *prpl_info; - const char *password; g_return_if_fail(account != NULL); - purple_debug_info("account", "Connecting to account %s\n", - purple_account_get_username(account)); - - if (!purple_account_get_enabled(account, purple_core_get_ui())) + username = purple_account_get_username(account); + + if (!purple_account_get_enabled(account, purple_core_get_ui())) { + purple_debug_info("account", + "Account %s not enabled, not connecting.\n", + username); return; + } prpl = purple_find_prpl(purple_account_get_protocol_id(account)); - if (prpl == NULL) - { + if (prpl == NULL) { gchar *message; - message = g_strdup_printf(_("Missing protocol plugin for %s"), - purple_account_get_username(account)); + message = g_strdup_printf(_("Missing protocol plugin for %s"), username); purple_notify_error(account, _("Connection Error"), message, NULL); g_free(message); return; } + purple_debug_info("account", "Connecting to account %s.\n", username); + prpl_info = PURPLE_PLUGIN_PROTOCOL_INFO(prpl); password = purple_account_get_password(account); if ((password == NULL) && diff -r a6a4b440e5ae -r 3e83f63b16b4 libpurple/buddyicon.h --- a/libpurple/buddyicon.h Wed May 20 00:39:12 2009 +0000 +++ b/libpurple/buddyicon.h Wed May 20 01:09:04 2009 +0000 @@ -189,8 +189,6 @@ * takes ownership of and will free. * @param icon_len The length of the icon data. * @param checksum A protocol checksum from the prpl or @c NULL. - * - * @return The buddy icon set, or NULL if no icon was set. */ void purple_buddy_icons_set_for_user(PurpleAccount *account, const char *username,