chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: spawn pager only for commands that generates long output
[elogind.git]
/
src
/
dbus.c
diff --git
a/src/dbus.c
b/src/dbus.c
index 4365bca7bf6de7253587046ddb46348c2662a600..48051f25fb76f79ebfa93def6153f371d0f346c7 100644
(file)
--- a/
src/dbus.c
+++ b/
src/dbus.c
@@
-864,7
+864,7
@@
static int bus_init_api(Manager *m) {
if (m->running_as == MANAGER_SYSTEM && m->system_bus)
m->api_bus = m->system_bus;
else {
if (m->running_as == MANAGER_SYSTEM && m->system_bus)
m->api_bus = m->system_bus;
else {
- if (!(m->api_bus = dbus_bus_get_private(m->running_as == MANAGER_
SESSION
? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error))) {
+ if (!(m->api_bus = dbus_bus_get_private(m->running_as == MANAGER_
USER
? DBUS_BUS_SESSION : DBUS_BUS_SYSTEM, &error))) {
log_debug("Failed to get API D-Bus connection, retrying later: %s", error.message);
r = 0;
goto fail;
log_debug("Failed to get API D-Bus connection, retrying later: %s", error.message);
r = 0;
goto fail;
@@
-998,7
+998,7
@@
int bus_init(Manager *m) {
}
if (m->subscribed_data_slot < 0)
}
if (m->subscribed_data_slot < 0)
- if (!dbus_
pending_call
_allocate_data_slot(&m->subscribed_data_slot)) {
+ if (!dbus_
connection
_allocate_data_slot(&m->subscribed_data_slot)) {
log_error("Not enough memory");
return -ENOMEM;
}
log_error("Not enough memory");
return -ENOMEM;
}
@@
-1110,7
+1110,7
@@
void bus_done(Manager *m) {
dbus_pending_call_free_data_slot(&m->name_data_slot);
if (m->subscribed_data_slot >= 0)
dbus_pending_call_free_data_slot(&m->name_data_slot);
if (m->subscribed_data_slot >= 0)
- dbus_
pending_call
_free_data_slot(&m->subscribed_data_slot);
+ dbus_
connection
_free_data_slot(&m->subscribed_data_slot);
}
static void query_pid_pending_cb(DBusPendingCall *pending, void *userdata) {
}
static void query_pid_pending_cb(DBusPendingCall *pending, void *userdata) {