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: introduce concept of a "default" event loop per-thread and make use of it everywhere
[elogind.git]
/
src
/
locale
/
localed.c
diff --git
a/src/locale/localed.c
b/src/locale/localed.c
index 61a3015ead1d543842308dd25d03bc8c5a5da3c9..32d52a90a20a0addba53a87afcd0a5f90c446356 100644
(file)
--- a/
src/locale/localed.c
+++ b/
src/locale/localed.c
@@
-382,7
+382,7
@@
static int locale_update_system_manager(Context *c, sd_bus *bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_bus_
send_with_reply_and_block
(bus, m, 0, &error, NULL);
+ r = sd_bus_
call
(bus, m, 0, &error, NULL);
if (r < 0)
log_error("Failed to update the manager environment: %s", strerror(-r));
if (r < 0)
log_error("Failed to update the manager environment: %s", strerror(-r));
@@
-908,7
+908,7
@@
static int method_set_vc_keyboard(sd_bus *bus, sd_bus_message *m, void *userdata
Context *c = userdata;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
const char *keymap, *keymap_toggle;
Context *c = userdata;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
const char *keymap, *keymap_toggle;
-
unsigned
convert, interactive;
+
int
convert, interactive;
int r;
r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive);
int r;
r = sd_bus_message_read(m, "ssbb", &keymap, &keymap_toggle, &convert, &interactive);
@@
-971,7
+971,7
@@
static int method_set_x11_keyboard(sd_bus *bus, sd_bus_message *m, void *userdat
Context *c = userdata;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
const char *layout, *model, *variant, *options;
Context *c = userdata;
_cleanup_bus_error_free_ sd_bus_error error = SD_BUS_ERROR_NULL;
const char *layout, *model, *variant, *options;
-
unsigned
convert, interactive;
+
int
convert, interactive;
int r;
r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive);
int r;
r = sd_bus_message_read(m, "ssssbb", &layout, &model, &variant, &options, &convert, &interactive);
@@
-1115,7
+1115,7
@@
int main(int argc, char *argv[]) {
goto finish;
}
goto finish;
}
- r = sd_event_
new
(&event);
+ r = sd_event_
default
(&event);
if (r < 0) {
log_error("Failed to allocate event loop: %s", strerror(-r));
goto finish;
if (r < 0) {
log_error("Failed to allocate event loop: %s", strerror(-r));
goto finish;