1
0
forked from drath/libratbag

Adjust for new libratbag 0.4 API

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
This commit is contained in:
Peter Hutterer
2016-03-15 10:18:23 +10:00
parent 917308d24d
commit 7c622ecc58
2 changed files with 7 additions and 4 deletions

View File

@@ -118,7 +118,7 @@ AC_SUBST([OUR_LDFLAGS], "$with_ldflags")
PKG_CHECK_MODULES([LIBUDEV], [libudev])
PKG_CHECK_MODULES([LIBSYSTEMD], [libsystemd >= 227])
PKG_CHECK_MODULES([LIBRATBAG], [libratbag >= 0.2])
PKG_CHECK_MODULES([LIBRATBAG], [libratbag >= 0.4])
PKG_CHECK_VAR([libratbag_data_dir], [libratbag], [pkgdatadir],
[AC_DEFINE_UNQUOTED([LIBRATBAG_DATA_DIR], ["$libratbag_data_dir"], [Directory for libratbag's SVG files])])

View File

@@ -212,10 +212,13 @@ static void ratbagd_process_device(struct ratbagd *ctx,
} else if (device) {
/* device already known, refresh our view of the device */
} else {
enum ratbag_error_code error;
/* device unknown, create new one and link it */
lib_device = ratbag_device_new_from_udev_device(ctx->lib_ctx,
udevice);
if (!lib_device)
error = ratbag_device_new_from_udev_device(ctx->lib_ctx,
udevice,
&lib_device);
if (error != RATBAG_SUCCESS)
return; /* unsupported device */
r = ratbagd_device_new(&device, ctx, name, lib_device);