chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logind: rename "seat-master" tag to "master-of-seat"
[elogind.git]
/
src
/
login
/
logind.c
diff --git
a/src/login/logind.c
b/src/login/logind.c
index 6776229ee7b6643134e11c835753bf8de1c0e411..680bc1fcdff07905e88dd63c903468d0399345ee 100644
(file)
--- a/
src/login/logind.c
+++ b/
src/login/logind.c
@@
-187,6
+187,8
@@
void manager_free(Manager *m) {
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
strv_free(m->kill_only_users);
strv_free(m->kill_exclude_users);
+ free(m->action_job);
+
free(m->cgroup_path);
free(m);
}
free(m->cgroup_path);
free(m);
}
@@
-459,7
+461,7
@@
int manager_enumerate_devices(Manager *m) {
goto finish;
}
goto finish;
}
- r = udev_enumerate_add_match_tag(e, "
seat-master
");
+ r = udev_enumerate_add_match_tag(e, "
master-of-seat
");
if (r < 0)
goto finish;
if (r < 0)
goto finish;
@@
-1291,7
+1293,7
@@
static int manager_connect_udev(Manager *m) {
if (!m->udev_seat_monitor)
return -ENOMEM;
if (!m->udev_seat_monitor)
return -ENOMEM;
- r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "
seat-master
");
+ r = udev_monitor_filter_add_match_tag(m->udev_seat_monitor, "
master-of-seat
");
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1626,11
+1628,11
@@
int manager_run(Manager *m) {
manager_gc(m, true);
manager_gc(m, true);
- if (m->
delayed_unit
) {
+ if (m->
action_what != 0
) {
usec_t x, y;
x = now(CLOCK_MONOTONIC);
usec_t x, y;
x = now(CLOCK_MONOTONIC);
- y = m->
delayed
_timestamp + m->inhibit_delay_max;
+ y = m->
action
_timestamp + m->inhibit_delay_max;
msec = x >= y ? 0 : (int) ((y - x) / USEC_PER_MSEC);
}
msec = x >= y ? 0 : (int) ((y - x) / USEC_PER_MSEC);
}