AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-15 21:20:09 +00:00
Code Issues Projects Releases Wiki Activity

SidebarRow: Unref CloudProvider on change/finalize

Browse Source 
It was never unref()d, either when replacing the existing GObject in
set_property(), cleaning up in finalize(), or becoming a placeholder.

Fix by using g_set_object() and g_clear_object() to unref as needed.

This also drops the check that the newly set object is a valid cloud
provider account, as we don’t do the equivalent for any of the other
object-typed properties, and Carlos didn’t think this was important.

https://bugzilla.gnome.org/show_bug.cgi?id=787600
This commit is contained in:
Daniel Boles 2017-09-12 21:56:46 +01:00
parent c477dad41d
commit bfe54d1185
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gtk/gtksidebarrow.c
View File

@ -267,15 +267,10 @@ gtk_sidebar_row_set_property (GObject *object,
break;
case PROP_CLOUD_PROVIDER:
{
#ifdef HAVE_CLOUDPROVIDERS
gpointer *object;
object = g_value_get_object (value);
if (IS_CLOUD_PROVIDER_ACCOUNT(object))
self->cloud_provider = g_object_ref (object);
g_set_object (&self->cloud_provider, g_value_get_object (value));
#endif
break;
}
break;
case PROP_PLACEHOLDER:
{
@ -297,6 +292,7 @@ gtk_sidebar_row_set_property (GObject *object,
g_clear_object (&self->drive);
g_clear_object (&self->volume);
g_clear_object (&self->mount);
g_clear_object (&self->cloud_provider);
gtk_container_foreach (GTK_CONTAINER (self),
(GtkCallback) gtk_widget_destroy,
@ -403,6 +399,7 @@ gtk_sidebar_row_finalize (GObject *object)
g_clear_object (&self->drive);
g_clear_object (&self->volume);
g_clear_object (&self->mount);
g_clear_object (&self->cloud_provider);
G_OBJECT_CLASS (gtk_sidebar_row_parent_class)->finalize (object);
}