diff options
| author | Chris Coulson <chrisccoulson@ubuntu.com> | 2011-03-10 00:43:07 +0000 |
|---|---|---|
| committer | Chris Coulson <chrisccoulson@ubuntu.com> | 2011-03-10 00:43:07 +0000 |
| commit | ec307704b44db4f65f3534f23cfdf517c883a9e1 (patch) | |
| tree | 878c02659ae6060788a5a2d38e7fe558357bebf5 /libdbusmenu-gtk | |
| parent | da12001cce940316c26b8dc68da507f62ea689a7 (diff) | |
| download | libdbusmenu-ec307704b44db4f65f3534f23cfdf517c883a9e1.tar.gz libdbusmenu-ec307704b44db4f65f3534f23cfdf517c883a9e1.tar.bz2 libdbusmenu-ec307704b44db4f65f3534f23cfdf517c883a9e1.zip | |
Fix various memory leaks
Diffstat (limited to 'libdbusmenu-gtk')
| -rw-r--r-- | libdbusmenu-gtk/client.c | 4 | ||||
| -rw-r--r-- | libdbusmenu-gtk/menuitem.c | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/libdbusmenu-gtk/client.c b/libdbusmenu-gtk/client.c index 50978ff..b7b201d 100644 --- a/libdbusmenu-gtk/client.c +++ b/libdbusmenu-gtk/client.c @@ -697,6 +697,7 @@ new_item_normal (DbusmenuMenuitem * newitem, DbusmenuMenuitem * parent, Dbusmenu if (gmi != NULL) { dbusmenu_gtkclient_newitem_base(DBUSMENU_GTKCLIENT(client), newitem, gmi, parent); + g_object_unref(gmi); } else { return FALSE; } @@ -870,6 +871,9 @@ image_property_handle (DbusmenuMenuitem * item, const gchar * property, GVariant } else { gtk_image_set_from_pixbuf(GTK_IMAGE(gtkimage), image); } + if (image) { + g_object_unref(image); + } } } diff --git a/libdbusmenu-gtk/menuitem.c b/libdbusmenu-gtk/menuitem.c index 370dbf2..b3358fe 100644 --- a/libdbusmenu-gtk/menuitem.c +++ b/libdbusmenu-gtk/menuitem.c @@ -119,12 +119,7 @@ dbusmenu_menuitem_property_get_image (DbusmenuMenuitem * menuitem, const gchar * g_error_free(error); } - error = NULL; - g_input_stream_close(input, NULL, &error); - if (error != NULL) { - g_warning("Unable to close input stream: %s", error->message); - g_error_free(error); - } + g_object_unref(input); g_free(icondata); return icon; |