62 lines
2.9 KiB
Diff
62 lines
2.9 KiB
Diff
diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c
|
|
index 3adee99..3b7b57e 100644
|
|
--- a/src/modules/module-console-kit.c
|
|
+++ b/src/modules/module-console-kit.c
|
|
@@ -71,7 +71,7 @@ struct userdata {
|
|
static void add_session(struct userdata *u, const char *id) {
|
|
DBusError error;
|
|
DBusMessage *m = NULL, *reply = NULL;
|
|
- int32_t uid;
|
|
+ uid_t uid;
|
|
struct session *session;
|
|
char *t;
|
|
|
|
@@ -92,10 +92,12 @@ static void add_session(struct userdata *u, const char *id) {
|
|
goto fail;
|
|
}
|
|
|
|
- /* FIXME: Why is this in int32? and not an uint32? */
|
|
- if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) {
|
|
- pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message);
|
|
- goto fail;
|
|
+ /* CK 0.3 this changed from int32 to uint32 */
|
|
+ if (!dbus_message_get_args(reply, &error, DBUS_TYPE_UINT32, &uid, DBUS_TYPE_INVALID)) {
|
|
+ if (!dbus_message_get_args(reply, &error, DBUS_TYPE_INT32, &uid, DBUS_TYPE_INVALID)) {
|
|
+ pa_log("Failed to parse GetUnixUser() result: %s: %s", error.name, error.message);
|
|
+ goto fail;
|
|
+ }
|
|
}
|
|
|
|
/* We only care about our own sessions */
|
|
@@ -163,18 +165,24 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
|
|
|
|
if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionAdded")) {
|
|
|
|
- if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID) || dbus_error_is_set(&error)) {
|
|
- pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message);
|
|
- goto finish;
|
|
+ /* CK API changed to match spec in 0.3 */
|
|
+ if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
|
|
+ if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
|
|
+ pa_log_error("Failed to parse SessionAdded message: %s: %s", error.name, error.message);
|
|
+ goto finish;
|
|
+ }
|
|
}
|
|
|
|
add_session(u, path);
|
|
|
|
} else if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionRemoved")) {
|
|
|
|
- if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID) || dbus_error_is_set(&error)) {
|
|
- pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message);
|
|
- goto finish;
|
|
+ /* CK API changed to match spec in 0.3 */
|
|
+ if (!dbus_message_get_args(message, &error, DBUS_TYPE_OBJECT_PATH, &path, DBUS_TYPE_INVALID)) {
|
|
+ if (!dbus_message_get_args(message, &error, DBUS_TYPE_STRING, &path, DBUS_TYPE_INVALID)) {
|
|
+ pa_log_error("Failed to parse SessionRemoved message: %s: %s", error.name, error.message);
|
|
+ goto finish;
|
|
+ }
|
|
}
|
|
|
|
remove_session(u, path);
|