aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-01-21 13:33:01 -0600
committerTed Gould <ted@gould.cx>2011-01-21 13:33:01 -0600
commit59b8be494e5fbccdbed59b49fa4f190fbbb55343 (patch)
tree2f86b7376e1e57aa9d4c1835ff30abc7b4731ceb /libdbusmenu-glib
parent48e68b4411e70f0526fca90d3d714f10aea566bb (diff)
downloadlibdbusmenu-59b8be494e5fbccdbed59b49fa4f190fbbb55343.tar.gz
libdbusmenu-59b8be494e5fbccdbed59b49fa4f190fbbb55343.tar.bz2
libdbusmenu-59b8be494e5fbccdbed59b49fa4f190fbbb55343.zip
Ensuring that all the errors are free'd correctly.
Diffstat (limited to 'libdbusmenu-glib')
-rw-r--r--libdbusmenu-glib/client.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libdbusmenu-glib/client.c b/libdbusmenu-glib/client.c
index 29ed4a0..86b023d 100644
--- a/libdbusmenu-glib/client.c
+++ b/libdbusmenu-glib/client.c
@@ -517,6 +517,7 @@ get_properties_callback (GObject *obj, GAsyncResult * res, gpointer user_data)
listener->callback(NULL, error, listener->user_data);
}
g_array_free(listeners, TRUE);
+ g_error_free(error);
return;
}
@@ -1140,7 +1141,6 @@ menuitem_get_properties_new_cb (GVariant * properties, GError * error, gpointer
if (error != NULL) {
g_warning("Error getting properties on a new menuitem: %s", error->message);
g_object_unref(propdata->item);
- g_free(data);
return;
}
@@ -1277,6 +1277,8 @@ about_to_show_cb (GObject * proxy, GAsyncResult * res, gpointer userdata)
g_warning("Unable to send about_to_show: %s", error->message);
/* Note: we're just ensuring only the callback gets called */
need_update = FALSE;
+ g_error_free(error);
+ error = NULL;
} else {
g_variant_get(params, "(b)", &need_update);
g_variant_unref(params);
@@ -1553,6 +1555,7 @@ update_layout_cb (GObject * proxy, GAsyncResult * res, gpointer data)
if (error != NULL) {
g_warning("Getting layout failed: %s", error->message);
+ g_error_free(error);
return;
}