Mercurial > pidgin
diff libpurple/protocols/myspace/myspace.c @ 19657:9cc67c3d145e
merge of 'cce02af7eb2fb114cb0f640979554b7de3a80e96'
and 'db5ad5300e844751f9abf8702f4e4a8369dfef8e'
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 06 Sep 2007 06:26:32 +0000 |
parents | 9968fff36e20 941965d6fd88 |
children | 3617681a2694 |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c Wed Sep 05 04:52:33 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Thu Sep 06 06:26:32 2007 +0000 @@ -932,7 +932,7 @@ username = msim_msg_get_string(msg, "user"); if (!username) { - purple_debug_info("msim", "msim_get_info_cb: no 'user' in msg"); + purple_debug_info("msim", "msim_get_info_cb: no 'user' in msg\n"); return; } @@ -1120,7 +1120,7 @@ "locstring", MSIM_TYPE_STRING, g_strdup(""), NULL)) { - purple_debug_info("msim", "msim_set_status: failed to set status"); + purple_debug_info("msim", "msim_set_status: failed to set status\n"); } } @@ -1182,7 +1182,7 @@ if (!buddies) { - purple_debug_info("msim", "msim_uid2username_from_blist: no buddies?"); + purple_debug_info("msim", "msim_uid2username_from_blist: no buddies?\n"); return NULL; } @@ -1542,7 +1542,7 @@ if (msim_msg_get_integer(msg, "uniquenick") == session->userid) { - purple_debug_info("msim_we_are_logged_on", "TODO: pick username"); + purple_debug_info("msim_we_are_logged_on", "TODO: pick username\n"); /* No username is set. */ purple_notify_error(session->account, _("No username set"), @@ -1781,15 +1781,23 @@ purple_debug_info("msim", "msim_error (sesskey=%d): %s\n", session->sesskey, full_errmsg); - purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), - full_errmsg, NULL); - /* Destroy session if fatal. */ if (msim_msg_get(msg, "fatal")) { purple_debug_info("msim", "fatal error, closing\n"); + if (err == 260) { + /* Incorrect password */ + session->gc->wants_to_die = TRUE; + if (!purple_account_get_remember_password(session->account)) + purple_account_set_password(session->account, NULL); + } purple_connection_error(session->gc, full_errmsg); + } else { + purple_notify_error(session->account, g_strdup(_("MySpaceIM Error")), + full_errmsg, NULL); } + g_free(full_errmsg); + return TRUE; }