From: David Zeuthen <davidz@redhat.com>
Date: Fri, 27 Aug 2010 22:50:12 +0000 (-0400)
Subject: Catch up with latest gdbus-codegen(1)
X-Git-Tag: upstream/2.1.2~480^2~235
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=56a1a1f784a7683e616ab9d562d53d7a9bedd78c;p=platform%2Fupstream%2Fudisks2.git

Catch up with latest gdbus-codegen(1)

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

diff --git a/configure.ac b/configure.ac
index 14c40cb..80659e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -139,7 +139,7 @@ PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.6.0])
 AC_SUBST(GLIB_CFLAGS)
 AC_SUBST(GLIB_LIBS)
 
-PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.25.7])
+PKG_CHECK_MODULES(GIO, [gio-unix-2.0 >= 2.25.7 gdbus-codegen])
 AC_SUBST(GIO_CFLAGS)
 AC_SUBST(GIO_LIBS)
 
diff --git a/src/linuxdaemon.c b/src/linuxdaemon.c
index ffa4db8..a0ba24b 100644
--- a/src/linuxdaemon.c
+++ b/src/linuxdaemon.c
@@ -190,10 +190,10 @@ maybe_export_unexport_object (LinuxDaemon *daemon,
           GError *error;
           guint id;
           error = NULL;
-          id = device_register_object (DEVICE (device),
-                                       daemon->priv->connection,
-                                       linux_device_get_object_path (device),
-                                       &error);
+          id = g_dbus_interface_register_object (G_DBUS_INTERFACE (device),
+                                                 daemon->priv->connection,
+                                                 linux_device_get_object_path (device),
+                                                 &error);
           if (id == 0)
             {
               g_printerr ("Error registering object: %s\n",
@@ -236,7 +236,7 @@ emit_added (LinuxDaemon  *daemon,
   g_variant_builder_add (&builder,
                          "{s@a{sv}}",
                          device_interface_info ()->name,
-                         device_properties (DEVICE (device)));
+                         g_dbus_interface_get_properties (G_DBUS_INTERFACE (device)));
   daemon_emit_device_added (DAEMON (daemon),
                             linux_device_get_object_path (device),
                             g_variant_builder_end (&builder));
diff --git a/src/main.c b/src/main.c
index e40c560..42c3a6e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -57,10 +57,10 @@ on_bus_acquired (GDBusConnection *connection,
                              NULL);
 
   error = NULL;
-  daemon_register_object (the_daemon,
-                          connection,
-                          "/org/freedesktop/UDisks",
-                          &error);
+  g_dbus_interface_register_object (G_DBUS_INTERFACE (the_daemon),
+                                    connection,
+                                    "/org/freedesktop/UDisks",
+                                    &error);
   if (error != NULL)
     {
       g_printerr ("Error registering object at /org/freedesktop/UDisks: %s", error->message);