chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: properly handle empty messages
[elogind.git]
/
src
/
login
/
logind-inhibit.c
diff --git
a/src/login/logind-inhibit.c
b/src/login/logind-inhibit.c
index 26cce8d7fcdd3defe57729421a6aa7de340a78e3..ec6a722ce3e65ed7b1517c7d65098d249aaad7b6 100644
(file)
--- a/
src/login/logind-inhibit.c
+++ b/
src/login/logind-inhibit.c
@@
-45,7
+45,7
@@
Inhibitor* inhibitor_new(Manager *m, const char* id) {
return NULL;
}
return NULL;
}
- i->id =
path_get_file_
name(i->state_file);
+ i->id =
base
name(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
if (hashmap_put(m->inhibitors, i->id, i) < 0) {
free(i->state_file);
@@
-304,7
+304,7
@@
int inhibitor_create_fifo(Inhibitor *i) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_event_source_set_priority(i->event_source, SD_PRIORITY_IDLE);
+ r = sd_event_source_set_priority(i->event_source, SD_
EVENT_
PRIORITY_IDLE);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-372,7
+372,8
@@
bool manager_is_inhibited(
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
dual_timestamp *since,
bool ignore_inactive,
bool ignore_uid,
- uid_t uid) {
+ uid_t uid,
+ Inhibitor **offending) {
Inhibitor *i;
Iterator j;
Inhibitor *i;
Iterator j;
@@
-400,6
+401,9
@@
bool manager_is_inhibited(
ts = i->since;
inhibited = true;
ts = i->since;
inhibited = true;
+
+ if (offending)
+ *offending = i;
}
if (since)
}
if (since)