/pidgin/main: c8a9082d50d1: Apply libpurple3 changes to recently...

[Daniel Atallah]

Changeset: c8a9082d50d161188d507cc5bb4297c9ab6c7b8f
Author:	 Daniel Atallah <datallah at pidgin.im>
Date:	 2013-02-26 21:59 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/c8a9082d50d1

Description:

Apply libpurple3 changes to recently merged code.

diffstat:

 libpurple/protocols/bonjour/jabber.c |   4 ++--
 libpurple/protocols/irc/msgs.c       |  20 ++++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diffs (114 lines):

diff --git a/libpurple/protocols/bonjour/jabber.c b/libpurple/protocols/bonjour/jabber.c
--- a/libpurple/protocols/bonjour/jabber.c
+++ b/libpurple/protocols/bonjour/jabber.c
@@ -181,7 +181,7 @@ static void
 			/* Types of messages sent by iChat */
 			if (html_body_font_node != NULL) {
 				gchar *html_body;
-				const char *font_face, *font_size,
+				const char *font_face, *font_size, *font_color,
 					*ichat_balloon_color, *ichat_text_color;
 
 				font_face = xmlnode_get_attrib(html_body_font_node, "face");
@@ -189,7 +189,7 @@ static void
 				font_size = xmlnode_get_attrib(html_body_font_node, "ABSZ");
 				if (font_size != NULL)
 					font_size = _font_size_ichat_to_purple(atoi(font_size));
-				/*font_color = xmlnode_get_attrib(html_body_font_node, "color");*/
+				font_color = xmlnode_get_attrib(html_body_font_node, "color");
 				ichat_balloon_color = xmlnode_get_attrib(html_body_node, "ichatballooncolor");
 				ichat_text_color = xmlnode_get_attrib(html_body_node, "ichattextcolor");
 
diff --git a/libpurple/protocols/irc/msgs.c b/libpurple/protocols/irc/msgs.c
--- a/libpurple/protocols/irc/msgs.c
+++ b/libpurple/protocols/irc/msgs.c
@@ -1560,7 +1560,7 @@ irc_auth_start_cyrus(struct irc_conn *ir
 			purple_debug_error("irc", "sasl_client_new failed: %d\n", ret);
 			tmp = g_strdup_printf(_("Failed to initialize SASL authentication: %s"),
 				sasl_errdetail(irc->sasl_conn));
-			purple_connection_error_reason (gc,
+			purple_connection_error (gc,
 				PURPLE_CONNECTION_ERROR_OTHER_ERROR, tmp);
 			g_free(tmp);
 			return;
@@ -1577,7 +1577,7 @@ irc_auth_start_cyrus(struct irc_conn *ir
 				irc->mech_works = FALSE;
 				break;
 			case SASL_NOMECH:
-				purple_connection_error_reason (gc,
+				purple_connection_error (gc,
 					PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
 					_("SASL authentication failed: No worthy authentication mechanisms found."));
 
@@ -1586,7 +1586,7 @@ irc_auth_start_cyrus(struct irc_conn *ir
 			case SASL_BADPARAM:
 			case SASL_NOMEM:
 				tmp = g_strdup_printf(_("SASL authentication failed: %s"), sasl_errdetail(irc->sasl_conn));
-				purple_connection_error_reason (gc,
+				purple_connection_error (gc,
 					PURPLE_CONNECTION_ERROR_OTHER_ERROR, tmp);
 				g_free(tmp);
 
@@ -1633,7 +1633,7 @@ irc_msg_cap(struct irc_conn *irc, const 
 		return;
 	if (strncmp(args[1], "ACK", 4)) {
 		const char *tmp = _("SASL authentication failed: Server does not support SASL authentication.");
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, tmp);
 
 		irc_sasl_finish(irc);
@@ -1642,7 +1642,7 @@ irc_msg_cap(struct irc_conn *irc, const 
 
 	if ((ret = sasl_client_init(NULL)) != SASL_OK) {
 		const char *tmp = _("SASL authentication failed: Initializing SASL failed.");
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_OTHER_ERROR, tmp);
 		return;
 	}
@@ -1683,7 +1683,7 @@ irc_msg_cap(struct irc_conn *irc, const 
 		purple_debug_error("irc", "sasl_client_new failed: %d\n", ret);
 		tmp = g_strdup_printf(_("Failed to initialize SASL authentication: %s"),
 			sasl_errdetail(irc->sasl_conn));
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_OTHER_ERROR, tmp);
 		g_free(tmp);
 
@@ -1723,7 +1723,7 @@ irc_msg_auth(struct irc_conn *irc, char 
 
 		gchar *tmp = g_strdup_printf(_("SASL authentication failed: %s"),
 			sasl_errdetail(irc->sasl_conn));
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE, tmp);
 		g_free(tmp);
 
@@ -1767,7 +1767,7 @@ irc_msg_authtryagain(struct irc_conn *ir
 	 * aren't told the server supports no worthy mechanisms.
 	 */
 	if (irc->mech_works) {
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Incorrect Password"));
 
 		irc_sasl_finish(irc);
@@ -1793,7 +1793,7 @@ irc_msg_authtryagain(struct irc_conn *ir
 		purple_debug_info("irc", "Now trying with %s\n", irc->sasl_mechs->str);
 		irc_auth_start_cyrus(irc);
 	} else {
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_IMPOSSIBLE,
 			_("SASL authentication failed: No worthy mechanisms found"));
 
@@ -1810,7 +1810,7 @@ irc_msg_authfail(struct irc_conn *irc, c
 	if (irc->sasl_conn) {
 		purple_debug_info("irc", "SASL authentication failed: %s", sasl_errdetail(irc->sasl_conn));
 
-		purple_connection_error_reason (gc,
+		purple_connection_error (gc,
 			PURPLE_CONNECTION_ERROR_AUTHENTICATION_FAILED, _("Incorrect Password"));
 	}