Mercurial > pidgin

comparison libpurple/protocols/myspace/myspace.c @ 20816:efa448405f3d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove explicit setting of wants_to_die from prpls.
author Will Thompson <will.thompson@collabora.co.uk>
date Tue, 09 Oct 2007 13:42:15 +0000
parents f3cfcbbac3d8
children bbcc9e206c43
comparison
equal deleted inserted replaced
20815:7a7b3a425666 20816:efa448405f3d
289 (int)strlen(acct->password)); 289 (int)strlen(acct->password));
290 290
291 /* Notify an error message also, because this is important! */ 291 /* Notify an error message also, because this is important! */
292 purple_notify_error(acct, _("MySpaceIM Error"), str, NULL); 292 purple_notify_error(acct, _("MySpaceIM Error"), str, NULL);
293 293
294 gc->wants_to_die = TRUE;
295 purple_connection_error_reason (gc, 294 purple_connection_error_reason (gc,
296 PURPLE_REASON_AUTHENTICATION_FAILED, str); 295 PURPLE_REASON_AUTHENTICATION_FAILED, str);
297 g_free(str); 296 g_free(str);
298 return; 297 return;
299 } 298 }
1557 purple_debug_info("msim_we_are_logged_on", "TODO: pick username\n"); 1556 purple_debug_info("msim_we_are_logged_on", "TODO: pick username\n");
1558 /* No username is set. */ 1557 /* No username is set. */
1559 purple_notify_error(session->account, 1558 purple_notify_error(session->account,
1560 _("No username set"), 1559 _("No username set"),
1561 _("Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."), NULL); 1560 _("Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."), NULL);
1562 session->gc->wants_to_die = TRUE;
1563 purple_connection_error_reason (session->gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("No username set")); 1561 purple_connection_error_reason (session->gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("No username set"));
1564 return FALSE; 1562 return FALSE;
1565 } 1563 }
1566 1564
1567 body = msim_msg_new( 1565 body = msim_msg_new(
1799 PurpleDisconnectReason reason = PURPLE_REASON_NETWORK_ERROR; 1797 PurpleDisconnectReason reason = PURPLE_REASON_NETWORK_ERROR;
1800 purple_debug_info("msim", "fatal error, closing\n"); 1798 purple_debug_info("msim", "fatal error, closing\n");
1801 switch (err) { 1799 switch (err) {
1802 case 260: /* Incorrect password */ 1800 case 260: /* Incorrect password */
1803 reason = PURPLE_REASON_AUTHENTICATION_FAILED; 1801 reason = PURPLE_REASON_AUTHENTICATION_FAILED;
1804 session->gc->wants_to_die = TRUE;
1805 if (!purple_account_get_remember_password(session->account)) 1802 if (!purple_account_get_remember_password(session->account))
1806 purple_account_set_password(session->account, NULL); 1803 purple_account_set_password(session->account, NULL);
1807 break; 1804 break;
1808 case 6: /* Logged in elsewhere */ 1805 case 6: /* Logged in elsewhere */
1809 reason = PURPLE_REASON_NAME_IN_USE; 1806 reason = PURPLE_REASON_NAME_IN_USE;
1810 session->gc->wants_to_die = TRUE;
1811 if (!purple_account_get_remember_password(session->account)) 1807 if (!purple_account_get_remember_password(session->account))
1812 purple_account_set_password(session->account, NULL); 1808 purple_account_set_password(session->account, NULL);
1813 break; 1809 break;
1814 } 1810 }
1815 purple_connection_error_reason (session->gc, reason, full_errmsg); 1811 purple_connection_error_reason (session->gc, reason, full_errmsg);