X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-device.c;h=ee4c45fb8dd9125d76d0bc0d366981a67c31f5c4;hb=6f5035f2db6ab7b4beae46c44b95e6a8b6d956b5;hp=2bcd6a10c5432cdbd2eaee4d92373e82664bf4b8;hpb=718d006a63f773c42106494e823250c48942cf08;p=elogind.git
diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 2bcd6a10c..ee4c45fb8 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -19,11 +19,10 @@
along with systemd; If not, see .
***/
-#include
#include
-#include "logind-device.h"
#include "util.h"
+#include "logind-device.h"
Device* device_new(Manager *m, const char *sysfs, bool master) {
Device *d;
@@ -54,34 +53,39 @@ Device* device_new(Manager *m, const char *sysfs, bool master) {
return d;
}
-void device_free(Device *d) {
- assert(d);
-
- device_detach(d);
-
- hashmap_remove(d->manager->devices, d->sysfs);
-
- free(d->sysfs);
- free(d);
-}
-
-void device_detach(Device *d) {
+static void device_detach(Device *d) {
Seat *s;
+ SessionDevice *sd;
+
assert(d);
if (!d->seat)
return;
+ while ((sd = d->session_devices))
+ session_device_free(sd);
+
s = d->seat;
- LIST_REMOVE(Device, devices, d->seat->devices, d);
+ LIST_REMOVE(devices, d->seat->devices, d);
d->seat = NULL;
if (!seat_has_master_device(s)) {
seat_add_to_gc_queue(s);
- seat_send_changed(s, "CanGraphical\0");
+ seat_send_changed(s, "CanGraphical", NULL);
}
}
+void device_free(Device *d) {
+ assert(d);
+
+ device_detach(d);
+
+ hashmap_remove(d->manager->devices, d->sysfs);
+
+ free(d->sysfs);
+ free(d);
+}
+
void device_attach(Device *d, Seat *s) {
Device *i;
bool had_master;
@@ -106,16 +110,16 @@ void device_attach(Device *d, Seat *s) {
* per seat, so we iterate only a few times. */
if (d->master || !s->devices)
- LIST_PREPEND(Device, devices, s->devices, d);
+ LIST_PREPEND(devices, s->devices, d);
else {
LIST_FOREACH(devices, i, s->devices) {
if (!i->devices_next || !i->master) {
- LIST_INSERT_AFTER(Device, devices, s->devices, i, d);
+ LIST_INSERT_AFTER(devices, s->devices, i, d);
break;
}
}
}
if (!had_master && d->master)
- seat_send_changed(s, "CanGraphical\0");
+ seat_send_changed(s, "CanGraphical", NULL);
}