Mercurial > pidgin
diff libpurple/protocols/myspace/myspace.c @ 21358:ba41f2a60253
Rename:
* PurpleDisconnectReason to PurpleConnectionError;
* elements of that enum from PURPLE_REASON_* to PURPLE_CONNECTION_ERROR_*;
* purple_connection_reason_is_fatal to purple_connection_error_is_fatal.
author | Will Thompson <will.thompson@collabora.co.uk> |
---|---|
date | Sun, 14 Oct 2007 21:08:42 +0000 |
parents | bbcc9e206c43 |
children | 38cc722159ff |
line wrap: on
line diff
--- a/libpurple/protocols/myspace/myspace.c Sun Oct 14 12:19:20 2007 +0000 +++ b/libpurple/protocols/myspace/myspace.c Sun Oct 14 21:08:42 2007 +0000 @@ -292,7 +292,7 @@ purple_notify_error(acct, _("MySpaceIM Error"), str, NULL); purple_connection_error_reason (gc, - PURPLE_REASON_AUTHENTICATION_FAILED, str); + PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, str); g_free(str); return; } @@ -315,7 +315,8 @@ if (!purple_proxy_connect(gc, acct, host, port, msim_connect_cb, gc)) { /* TODO: try other ports if in auto mode, then save * working port and try that first next time. */ - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Couldn't create socket")); return; } @@ -354,7 +355,8 @@ if (nc_len != MSIM_AUTH_CHALLENGE_LENGTH) { purple_debug_info("msim", "bad nc length: %x != 0x%x\n", nc_len, MSIM_AUTH_CHALLENGE_LENGTH); - purple_connection_error_reason (session->gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (session->gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unexpected challenge length from server")); return FALSE; } @@ -1292,7 +1294,7 @@ purple_debug_info("msim", "msim_check_alive: %s > interval of %d, presumed dead\n", errmsg, MSIM_KEEPALIVE_INTERVAL); purple_connection_error_reason (session->gc, - PURPLE_REASON_NETWORK_ERROR, errmsg); + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, errmsg); purple_notify_error(session->gc, NULL, errmsg, NULL); @@ -1558,7 +1560,8 @@ purple_notify_error(session->account, _("No username set"), _("Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."), NULL); - purple_connection_error_reason (session->gc, PURPLE_REASON_AUTHENTICATION_FAILED, _("No username set")); + purple_connection_error_reason (session->gc, + PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("No username set")); return FALSE; } @@ -1794,16 +1797,16 @@ /* Destroy session if fatal. */ if (msim_msg_get(msg, "fatal")) { - PurpleDisconnectReason reason = PURPLE_REASON_NETWORK_ERROR; + PurpleConnectionError reason = PURPLE_CONNECTION_ERROR_NETWORK_ERROR; purple_debug_info("msim", "fatal error, closing\n"); switch (err) { case 260: /* Incorrect password */ - reason = PURPLE_REASON_AUTHENTICATION_FAILED; + reason = PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED; if (!purple_account_get_remember_password(session->account)) purple_account_set_password(session->account, NULL); break; case 6: /* Logged in elsewhere */ - reason = PURPLE_REASON_NAME_IN_USE; + reason = PURPLE_CONNECTION_ERROR_NAME_IN_USE; if (!purple_account_get_remember_password(session->account)) purple_account_set_password(session->account, NULL); break; @@ -2319,7 +2322,8 @@ /* libpurple/eventloop.h only defines these two */ if (cond != PURPLE_INPUT_READ && cond != PURPLE_INPUT_WRITE) { purple_debug_info("msim_input_cb", "unknown condition=%d\n", cond); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Invalid input condition")); return; } @@ -2338,7 +2342,8 @@ purple_debug_error("msim", "msim_input_cb: %d-byte read buffer full! rxoff=%d\n", MSIM_READ_BUF_SIZE, session->rxoff); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Read buffer full")); return; } @@ -2358,12 +2363,14 @@ purple_debug_error("msim", "msim_input_cb: read error, ret=%d, " "error=%s, source=%d, fd=%d (%X))\n", n, strerror(errno), source, session->fd, session->fd); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Read error")); return; } else if (n == 0) { purple_debug_info("msim", "msim_input_cb: server disconnected\n"); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Server has disconnected")); return; } @@ -2372,7 +2379,8 @@ purple_debug_info("msim_input_cb", "received %d bytes, pushing rxoff to %d, over buffer size of %d\n", n, n + session->rxoff, MSIM_READ_BUF_SIZE); /* TODO: g_realloc like msn, yahoo, irc, jabber? */ - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Read buffer full")); } @@ -2388,7 +2396,8 @@ purple_debug_info("msim", "msim_input_cb: strlen=%d, but read %d bytes" "--null byte encountered?\n", strlen(session->rxbuf + session->rxoff), n); - /*purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + /*purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, "Invalid message - null byte on input"); */ return; } @@ -2412,7 +2421,8 @@ msg = msim_parse(g_strdup(session->rxbuf)); if (!msg) { purple_debug_info("msim", "msim_input_cb: couldn't parse rxbuf\n"); - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, _("Unparseable message")); } else { /* Process message and then free it (processing function should @@ -2480,7 +2490,8 @@ session = (MsimSession *)gc->proto_data; if (source < 0) { - purple_connection_error_reason (gc, PURPLE_REASON_NETWORK_ERROR, + purple_connection_error_reason (gc, + PURPLE_CONNECTION_ERROR_NETWORK_ERROR, g_strdup_printf(_("Couldn't connect to host: %s (%d)"), error_message ? error_message : "no message given", source));