From: Daniel Boles <dboles@src.gnome.org>
Date: Tue, 12 Sep 2017 20:56:46 +0000 (+0100)
Subject: SidebarRow: Unref CloudProvider on change/finalize
X-Git-Tag: archive/raspbian/3.24.39-1+rpi1~1^2~65^2~39^2~165
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=bfe54d1185e218cef1424ba1c561784f6a04e7a5;p=gtk%2B3.0.git

SidebarRow: Unref CloudProvider on change/finalize

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
---

diff --git a/gtk/gtksidebarrow.c b/gtk/gtksidebarrow.c
index cfa28b580f..20ef9a5729 100644
--- a/gtk/gtksidebarrow.c
+++ b/gtk/gtksidebarrow.c
@@ -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);
 }