From d7ce19907ff585e7fb6b950a40bd638d49c96a27 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Sun, 12 Apr 2009 15:11:53 +0000 Subject: Make udev_event a generic event The struct udev_event can be used as a generic event, so rename it struct event and move it from udev.h into a new file event.h. Also, rename the emums UDEV_ACTION_ADD and UDEV_ACTION_REMOVE to ACTION_UDEV_ADD and ACTION_UDEV_REMOVE. Signed-off-by: Geoff Levand Signed-off-by: Jeremy Kerr --- discover/parser-utils.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'discover/parser-utils.c') diff --git a/discover/parser-utils.c b/discover/parser-utils.c index a91c33a..47e30d8 100644 --- a/discover/parser-utils.c +++ b/discover/parser-utils.c @@ -5,6 +5,7 @@ #include #include "pb-protocol/pb-protocol.h" +#include "event.h" #include "udev.h" #include "device-handler.h" #include "parser-utils.h" @@ -42,13 +43,13 @@ const char *generic_icon_file(enum generic_icon_type type) enum generic_icon_type guess_device_type(struct discover_context *ctx) { - struct udev_event *event; + struct event *event; const char *type, *bus; event = ctx->event; - type = udev_event_param(event, "ID_TYPE"); - bus = udev_event_param(event, "ID_BUS"); + type = event_get_param(event, "ID_TYPE"); + bus = event_get_param(event, "ID_BUS"); if (type && streq(type, "cd")) return ICON_TYPE_OPTICAL; -- cgit v1.2.1