diff options
| author | Etan Reisner <deryni@pidgin.im> | 2009-05-18 02:47:21 +0000 |
|---|---|---|
| committer | Etan Reisner <deryni@pidgin.im> | 2009-05-18 02:47:21 +0000 |
| commit | e03e1047afb57dfdeaea7c8ffed7e95373f1f8ec (patch) | |
| tree | cf00cc79819bd7b7ad1ec67bd184d3c9652ca1b4 /libpurple/account.c | |
| parent | b71c75bb1f7a3b31f7a8b1317db9c6c79f671e78 (diff) | |
| parent | 2f1427614385225a9aab9ce6d8a2be904f5600ca (diff) | |
| download | pidgin-e03e1047afb57dfdeaea7c8ffed7e95373f1f8ec.tar.gz | |
merge of '206581aed04f194adfdcba63099be15198cf8d71'
and 'de06818ed80f27b716740a3a6b74c38ff539f778'
Diffstat (limited to 'libpurple/account.c')
| -rw-r--r-- | libpurple/account.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/libpurple/account.c b/libpurple/account.c index f0a33b6db4..e60d31f8d1 100644 --- a/libpurple/account.c +++ b/libpurple/account.c @@ -1132,29 +1132,32 @@ void 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)); + username = purple_account_get_username(account); - if (!purple_account_get_enabled(account, purple_core_get_ui())) + 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) && |