picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

logind: rename can_activate_sessions to can_multi_session

Browse source
This commit is contained in:
Lennart Poettering 2011-07-26 21:49:29 +02:00
parent 40cbb26f3b
commit 64559e8b4e
2 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/logind-dbus.c
View file

@ -577,7 +577,6 @@ static int trigger_device(Manager *m, struct udev_device *d) {
}
}
if (udev_enumerate_scan_devices(e) < 0) {
r = -EIO;
goto finish;

18
src/logind-seat-dbus.c
View file

@ -35,7 +35,7 @@
" </method>\n" \
" <property name=\"Id\" type=\"s\" access=\"read\"/>\n" \
" <property name=\"ActiveSession\" type=\"so\" access=\"read\"/>\n" \
" <property name=\"CanActivateSessions\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"CanMultiSession\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"Sessions\" type=\"a(so)\" access=\"read\"/>\n" \
" <property name=\"IdleHint\" type=\"b\" access=\"read\"/>\n" \
" <property name=\"IdleSinceHint\" type=\"t\" access=\"read\"/>\n" \
@ -133,7 +133,7 @@ static int bus_seat_append_sessions(DBusMessageIter *i, const char *property, vo
return 0;
}
static int bus_seat_append_can_activate(DBusMessageIter *i, const char *property, void *data) {
static int bus_seat_append_multi_session(DBusMessageIter *i, const char *property, void *data) {
Seat *s = data;
dbus_bool_t b;
@ -213,13 +213,13 @@ static DBusHandlerResult seat_message_dispatch(
DBusMessage *message) {
const BusProperty properties[] = {
{ "org.freedesktop.login1.Seat", "Id", bus_property_append_string, "s", s->id },
{ "org.freedesktop.login1.Seat", "ActiveSession", bus_seat_append_active, "(so)", s },
{ "org.freedesktop.login1.Seat", "CanActivateSessions", bus_seat_append_can_activate, "b", s },
{ "org.freedesktop.login1.Seat", "Sessions", bus_seat_append_sessions, "a(so)", s },
{ "org.freedesktop.login1.Seat", "IdleHint", bus_seat_append_idle_hint, "b", s },
{ "org.freedesktop.login1.Seat", "IdleSinceHint", bus_seat_append_idle_hint_since, "t", s },
{ "org.freedesktop.login1.Seat", "IdleSinceHintMonotonic", bus_seat_append_idle_hint_since, "t", s },
{ "org.freedesktop.login1.Seat", "Id", bus_property_append_string, "s", s->id },
{ "org.freedesktop.login1.Seat", "ActiveSession", bus_seat_append_active, "(so)", s },
{ "org.freedesktop.login1.Seat", "CanMultiSession", bus_seat_append_multi_session, "b", s },
{ "org.freedesktop.login1.Seat", "Sessions", bus_seat_append_sessions, "a(so)", s },
{ "org.freedesktop.login1.Seat", "IdleHint", bus_seat_append_idle_hint, "b", s },
{ "org.freedesktop.login1.Seat", "IdleSinceHint", bus_seat_append_idle_hint_since, "t", s },
{ "org.freedesktop.login1.Seat", "IdleSinceHintMonotonic", bus_seat_append_idle_hint_since, "t", s },
{ NULL, NULL, NULL, NULL, NULL }
};