Catch up with latest gdbus and gdbus-codegen(1)

Signed-off-by: David Zeuthen <davidz@redhat.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index 5c42653..7b12fb6 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -22,7 +22,7 @@ INCLUDES = \
        $(NULL)
 
 generated-bindings.stamp : Makefile.am $(top_srcdir)/data/org.freedesktop.UDisks.xml $(top_srcdir)/data/org.freedesktop.UDisks.Device.xml
-       gdbus-binding-tool                                                      \
+       gdbus-codegen                                                           \
                --strip-prefix org.freedesktop.UDisks.                          \
                --output-prefix generated                                       \
                $(top_srcdir)/data/org.freedesktop.UDisks.xml                   \

diff --git a/src/linuxdaemon.c b/src/linuxdaemon.c
index 685673d..822e415 100644 (file)
--- a/src/linuxdaemon.c
+++ b/src/linuxdaemon.c
@@ -202,6 +202,7 @@ maybe_export_unexport_object (LinuxDaemon *daemon,
             }
           g_object_set_data (G_OBJECT (device), "daemon-export-id", GUINT_TO_POINTER (id));
           ret = TRUE;
+          g_print ("registered object path `%s'\n", linux_device_get_object_path (device));
         }
       else
         {
@@ -212,9 +213,10 @@ maybe_export_unexport_object (LinuxDaemon *daemon,
     {
       if (daemon_export_id > 0)
         {
-          g_dbus_connection_unregister_object (daemon->priv->connection, daemon_export_id);
+          g_warn_if_fail (g_dbus_connection_unregister_object (daemon->priv->connection, daemon_export_id));
           g_object_set_data (G_OBJECT (device), "daemon-export-id", GUINT_TO_POINTER (0));
           ret = TRUE;
+          g_print ("unregistered object path `%s'\n", linux_device_get_object_path (device));
         }
       else
         {