X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Flocale%2Flocaled.c;h=a1e0ab6fe876e72ec2926850eee48b8ea2d0be05;hb=6cebe83cfa656365348ff21f567d133c7e34a71d;hp=abb610d33259f87e7aa382512c75c17406e31e57;hpb=adacb9575a09981fcf11279f2f661e3fc21e58ff;p=elogind.git

diff --git a/src/locale/localed.c b/src/locale/localed.c
index abb610d33..a1e0ab6fe 100644
--- 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;
         }
 
-        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;
@@ -1137,6 +1137,8 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        sd_event_set_watchdog(event, true);
+
         r = connect_bus(&context, event, &bus);
         if (r < 0)
                 goto finish;
@@ -1147,14 +1149,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC);
+        r = bus_event_loop_with_idle(event, bus, "org.freedesktop.locale1", DEFAULT_EXIT_USEC, NULL, NULL);
         if (r < 0) {
                 log_error("Failed to run event loop: %s", strerror(-r));
                 goto finish;
         }
 
-        r = 0;
-
 finish:
         context_free(&context, bus);