From 49ea52e6a69d96bd3eb29ed26c6cb1de592d336f Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip.withnall@collabora.co.uk>
Date: Thu, 28 Nov 2013 20:41:49 +0000
Subject: [PATCH] =?utf8?q?gio:=20Replace=20g=5Fclear=5Fobject()=20with=20i?=
 =?utf8?q?f()=E2=80=A6g=5Fobject=5Funref()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

As per https://bugzilla.gnome.org/show_bug.cgi?id=113075#c39.
---
 gio/gcontenttype.c | 3 ++-
 gio/gdbusserver.c  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/gio/gcontenttype.c b/gio/gcontenttype.c
index 8734e7f..055df15 100644
--- a/gio/gcontenttype.c
+++ b/gio/gcontenttype.c
@@ -1330,7 +1330,8 @@ matchlet_match (TreeMatchlet *matchlet,
             result = FALSE;
         }
 
-      g_clear_object (&info);
+      if (info)
+        g_object_unref (info);
       g_object_unref (file);
     }
   while (!result);
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index 1016efb..e20f714 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -898,7 +898,8 @@ try_tcp (GDBusServer  *server,
 
  out:
   g_list_free_full (resolved_addresses, g_object_unref);
-  g_clear_object (&resolver);
+  if (resolver)
+    g_object_unref (resolver);
   return ret;
 }
 
-- 
2.7.4