EBookClient: Avoid race between dispose() and signal handlers.
authorMatthew Barnes <mbarnes@redhat.com>
Mon, 4 Feb 2013 16:06:17 +0000 (11:06 -0500)
committerMatthew Barnes <mbarnes@redhat.com>
Mon, 4 Feb 2013 16:06:17 +0000 (11:06 -0500)
Use g_signal_connect_object() to ensure the GDBusProxy stays alive while
its signal handlers are running.

addressbook/libebook/e-book-client.c

index 87f92aa..85ba55c 100644 (file)
@@ -989,14 +989,16 @@ book_client_init_in_dbus_thread (GSimpleAsyncResult *simple,
                connection, "closed",
                G_CALLBACK (gdbus_book_client_closed_cb), client);
 
-       handler_id = g_signal_connect (
+       handler_id = g_signal_connect_object (
                priv->dbus_proxy, "error",
-               G_CALLBACK (book_client_dbus_proxy_error_cb), client);
+               G_CALLBACK (book_client_dbus_proxy_error_cb),
+               client, 0);
        priv->dbus_proxy_error_handler_id = handler_id;
 
-       handler_id = g_signal_connect (
+       handler_id = g_signal_connect_object (
                priv->dbus_proxy, "notify",
-               G_CALLBACK (book_client_dbus_proxy_notify_cb), client);
+               G_CALLBACK (book_client_dbus_proxy_notify_cb),
+               client, 0);
        priv->dbus_proxy_notify_handler_id = handler_id;
 
        /* Initialize our public-facing GObject properties. */