/pidgin/main: 3ead1b62bc55: irc: Use new purple_connection_take_...

Mike Ruprecht <[email protected]> Sun, 28 Aug 2016 23:58:01 -0400
Newsgroups gmane.comp.gnome.gaim.cvs
Message-ID <[email protected]>
Changeset: 3ead1b62bc550cf7351002171a3804ea85516579
Author:	 Mike Ruprecht <[email protected]>
Date:	 2016-08-26 03:36 -0500
Branch:	 default
URL: https://hg.pidgin.im/pidgin/main/rev/3ead1b62bc55

Description:

irc: Use new purple_connection_take_error()

This patch uses the new purple_connection_take_error() function in
places where it used the purple_connection_g_error() function. This
simplifies the code slightly.

diffstat:

 libpurple/protocols/irc/irc.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (33 lines):

diff --git a/libpurple/protocols/irc/irc.c b/libpurple/protocols/irc/irc.c
--- a/libpurple/protocols/irc/irc.c
+++ b/libpurple/protocols/irc/irc.c
@@ -108,8 +108,7 @@ irc_flush_cb(GObject *source, GAsyncResu
 
 	if (!result) {
 		g_prefix_error(&error, _("Lost connection with server: "));
-		purple_connection_g_error(gc, error);
-		g_clear_error(&error);
+		purple_connection_take_error(gc, error);
 		return;
 	}
 }
@@ -428,8 +427,7 @@ irc_login_cb(GObject *source, GAsyncResu
 
 	if (conn == NULL) {
 		g_prefix_error(&error, _("Unable to connect: "));
-		purple_connection_g_error(gc, error);
-		g_clear_error(&error);
+		purple_connection_take_error(gc, error);
 		return;
 	}
 
@@ -599,8 +597,7 @@ irc_read_input_cb(GObject *source, GAsyn
 
 	if (line == NULL && error != NULL) {
 		g_prefix_error(&error, _("Lost connection with server: "));
-		purple_connection_g_error(gc, error);
-		g_clear_error(&error);
+		purple_connection_take_error(gc, error);
 		return;
 	} else if (line == NULL) {
 		purple_connection_error (gc,

_______________________________________________
Commits mailing list
[email protected]
https://pidgin.im/cgi-bin/mailman/listinfo/commits