summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-07-26 21:49:29 +0200
committerLennart Poettering <lennart@poettering.net>2011-07-26 21:49:29 +0200
commit64559e8b4e81897bab3659aea27791467a579566 (patch)
tree9f431f823e69e91d4c1335ee9f3c9a6ee35b73d0 /src
parent40cbb26f3b53eba37b55e0795e0fdfb2ad8cae06 (diff)
logind: rename can_activate_sessions to can_multi_session
Diffstat (limited to 'src')
-rw-r--r--src/logind-dbus.c1
-rw-r--r--src/logind-seat-dbus.c18
2 files changed, 9 insertions, 10 deletions
diff --git a/src/logind-dbus.c b/src/logind-dbus.c
index f39941c9d2..035847c622 100644
--- a/src/logind-dbus.c
+++ b/src/logind-dbus.c
@@ -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;
diff --git a/src/logind-seat-dbus.c b/src/logind-seat-dbus.c
index 669e83e82d..3a916eef78 100644
--- a/src/logind-seat-dbus.c
+++ b/src/logind-seat-dbus.c
@@ -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 }
};