aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/config/udev.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-09-05 15:55:59 +0200
committermarha <marha@users.sourceforge.net>2012-09-05 15:55:59 +0200
commit046f1422921cf63104f394a430634d364a8fd35a (patch)
tree5d49eef25d6c128ea369383e8de2a0e5a5dcf1c3 /xorg-server/config/udev.c
parentf2c10b20ce3f657c1f2013057602bb439816940f (diff)
parent50fad5cd2be4cd105c99687e224da60233f81645 (diff)
downloadvcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.gz
vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.tar.bz2
vcxsrv-046f1422921cf63104f394a430634d364a8fd35a.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/dix/dispatch.c
Diffstat (limited to 'xorg-server/config/udev.c')
-rw-r--r--xorg-server/config/udev.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/xorg-server/config/udev.c b/xorg-server/config/udev.c
index 03aca2854..c2d00bbda 100644
--- a/xorg-server/config/udev.c
+++ b/xorg-server/config/udev.c
@@ -339,7 +339,7 @@ config_udev_pre_init(void)
#endif
#ifdef HAVE_UDEV_MONITOR_FILTER_ADD_MATCH_TAG
- if (SeatId && strcmp(SeatId, "seat0"))
+ if (ServerIsNotSeat0())
udev_monitor_filter_add_match_tag(udev_monitor, SeatId);
#endif
if (udev_monitor_enable_receiving(udev_monitor)) {
@@ -368,7 +368,7 @@ config_udev_init(void)
#endif
#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
- if (SeatId && strcmp(SeatId, "seat0"))
+ if (ServerIsNotSeat0())
udev_enumerate_add_match_tag(enumerate, SeatId);
#endif
@@ -454,6 +454,10 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback)
udev_enumerate_add_match_subsystem(enumerate, "drm");
udev_enumerate_add_match_sysname(enumerate, "card[0-9]*");
+#ifdef HAVE_UDEV_ENUMERATE_ADD_MATCH_TAG
+ if (ServerIsNotSeat0())
+ udev_enumerate_add_match_tag(enumerate, SeatId);
+#endif
udev_enumerate_scan_devices(enumerate);
devices = udev_enumerate_get_list_entry(enumerate);
udev_list_entry_foreach(device, devices) {