From: Aleksander Morgado <aleksander@lanedo.com>
Date: Thu, 27 Oct 2011 14:54:02 +0000 (+0200)
Subject: gdbus: avoid warning when finalizing a GDBusObjectManagerClient
X-Git-Tag: 2.31.2~160
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9782598b81ffe35f892bb510c27bc0d1afffaeee;p=platform%2Fupstream%2Fglib.git

gdbus: avoid warning when finalizing a GDBusObjectManagerClient

If the GDBusObjectManagerClient doesn't get a name owner during its lifetime,
`on_control_proxy_g_signal' will never be connected to any signal, so we
shouldn't dump any warning in that case.

Fixes https://bugzilla.gnome.org/show_bug.cgi?id=662858
---

diff --git a/gio/gdbusobjectmanagerclient.c b/gio/gdbusobjectmanagerclient.c
index e9a3c93..e6f18bf 100644
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -201,9 +201,9 @@ g_dbus_object_manager_client_finalize (GObject *object)
 
   if (manager->priv->control_proxy != NULL)
     {
-      g_warn_if_fail (g_signal_handlers_disconnect_by_func (manager->priv->control_proxy,
-                                                            on_control_proxy_g_signal,
-                                                            manager) == 1);
+      g_signal_handlers_disconnect_by_func (manager->priv->control_proxy,
+                                            on_control_proxy_g_signal,
+                                            manager);
       g_object_unref (manager->priv->control_proxy);
     }
   g_object_unref (manager->priv->connection);