X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flogin%2Flogind-device.c;h=c5fe92bd6044974d55cb17ed41d3062a542a1500;hb=45a7c6b5d373170eda2fa7bdb8fa81b49865f316;hp=95c2307baf04cb02cd3aa2402af84d831c11c9f8;hpb=118ecf32425a590ea266b5c2b6de7962bb242356;p=elogind.git

diff --git a/src/login/logind-device.c b/src/login/logind-device.c
index 95c2307ba..c5fe92bd6 100644
--- a/src/login/logind-device.c
+++ b/src/login/logind-device.c
@@ -22,8 +22,8 @@
 #include <assert.h>
 #include <string.h>
 
-#include "logind-device.h"
 #include "util.h"
+#include "logind-device.h"
 
 Device* device_new(Manager *m, const char *sysfs, bool master) {
         Device *d;
@@ -68,6 +68,7 @@ void device_free(Device *d) {
 void device_detach(Device *d) {
         Seat *s;
         SessionDevice *sd;
+
         assert(d);
 
         if (!d->seat)
@@ -77,12 +78,12 @@ void device_detach(Device *d) {
                 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);
         }
 }
 
@@ -110,16 +111,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);
 }