diff --git a/pam/pam_fprintd.c b/pam/pam_fprintd.c index beb5671..2056780 100644 --- a/pam/pam_fprintd.c +++ b/pam/pam_fprintd.c @@ -324,7 +324,7 @@ static gboolean verify_timeout_cb (gpointer user_data) return FALSE; } -static int do_verify(DBusGConnection *connection, GMainLoop *loop, pam_handle_t *pamh, DBusGProxy *dev) +static int do_verify(GMainLoop *loop, pam_handle_t *pamh, DBusGProxy *dev) { GError *error = NULL; GHashTable *props; @@ -338,9 +338,7 @@ static int do_verify(DBusGConnection *connection, GMainLoop *loop, pam_handle_t data->loop = loop; /* Get some properties for the device */ - p = dbus_g_proxy_new_for_name(connection, - "net.reactivated.Fprint", dbus_g_proxy_get_path (dev), - "org.freedesktop.DBus.Properties"); + p = dbus_g_proxy_new_from_proxy (dev, "org.freedesktop.DBus.Properties", NULL); if (dbus_g_proxy_call (p, "GetAll", NULL, G_TYPE_STRING, "net.reactivated.Fprint.Device", G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) { @@ -451,7 +449,7 @@ static int do_auth(pam_handle_t *pamh, const char *username) g_object_unref (manager); if (!dev) return PAM_AUTHINFO_UNAVAIL; - ret = do_verify(connection, loop, pamh, dev); + ret = do_verify(loop, pamh, dev); g_main_loop_unref (loop); release_device(pamh, dev); g_object_unref (dev); diff --git a/tests/list.c b/tests/list.c index 1e9fac5..9eda402 100644 --- a/tests/list.c +++ b/tests/list.c @@ -55,9 +55,7 @@ static void list_fingerprints(DBusGProxy *dev, const char *username) return; } - p = dbus_g_proxy_new_for_name(connection, - "net.reactivated.Fprint", dbus_g_proxy_get_path (dev), - "org.freedesktop.DBus.Properties"); + p = dbus_g_proxy_new_from_proxy(dev, "org.freedesktop.DBus.Properties", NULL); if (!dbus_g_proxy_call (p, "GetAll", &error, G_TYPE_STRING, "net.reactivated.Fprint.Device", G_TYPE_INVALID, dbus_g_type_get_map ("GHashTable", G_TYPE_STRING, G_TYPE_VALUE), &props, G_TYPE_INVALID)) g_error("GetAll on the Properties interface failed: %s", error->message);