summaryrefslogtreecommitdiff
path: root/libpurple/protocols
diff options
context:
space:
mode:
Diffstat (limited to 'libpurple/protocols')
-rw-r--r--libpurple/protocols/demo/purpledemocontacts.c2
-rw-r--r--libpurple/protocols/jabber/oob.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libpurple/protocols/demo/purpledemocontacts.c b/libpurple/protocols/demo/purpledemocontacts.c
index 03a3f9cf7c..05ae20e538 100644
--- a/libpurple/protocols/demo/purpledemocontacts.c
+++ b/libpurple/protocols/demo/purpledemocontacts.c
@@ -242,6 +242,8 @@ purple_demo_contacts_load(PurpleAccount *account) {
if(!json_parser_load_from_stream(parser, istream, NULL, &error)) {
g_critical("%s", error->message);
+ g_clear_error(&error);
+ return;
}
/* Load our data */
diff --git a/libpurple/protocols/jabber/oob.c b/libpurple/protocols/jabber/oob.c
index 459c08d23b..d86d9869f6 100644
--- a/libpurple/protocols/jabber/oob.c
+++ b/libpurple/protocols/jabber/oob.c
@@ -87,6 +87,7 @@ jabber_oob_xfer_writer(GObject *source, GAsyncResult *result, gpointer data) {
purple_xfer_end(xfer);
g_clear_pointer(&bytes, g_bytes_unref);
g_clear_object(&input);
+ g_clear_error(&error);
jox->msg = NULL;
return;
}
@@ -137,6 +138,7 @@ jabber_oob_xfer_send_cb(GObject *source, GAsyncResult *result, gpointer data) {
purple_xfer_set_status(xfer, PURPLE_XFER_STATUS_CANCEL_REMOTE);
purple_xfer_end(xfer);
g_clear_object(&input);
+ g_clear_error(&error);
jox->msg = NULL;
return;
}