chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
event: rework sd-event exit logic
[elogind.git]
/
src
/
locale
/
localed.c
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index abb610d33259f87e7aa382512c75c17406e31e57..2c901801737c4eb47cde7da7a5f4fc7c9442e3a4 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-1094,7
+1094,7
@@
static int connect_bus(Context *c, sd_event *event, sd_bus **_bus) {
return r;
}
return r;
}
- r = sd_bus_request_name(bus, "org.freedesktop.locale1",
SD_BUS_NAME_REPLACE_EXISTING|SD_BUS_NAME_DO_NOT_QUEUE
);
+ r = sd_bus_request_name(bus, "org.freedesktop.locale1",
0
);
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;
if (r < 0) {
log_error("Failed to register name: %s", strerror(-r));
return r;
@@
-1137,6
+1137,8
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
+ sd_event_set_watchdog(event, true);
+
r = connect_bus(&context, event, &bus);
if (r < 0)
goto finish;
r = connect_bus(&context, event, &bus);
if (r < 0)
goto finish;
@@
-1153,8
+1155,6
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- r = 0;
-
finish:
context_free(&context, bus);
finish:
context_free(&context, bus);