mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

make module-hal and module-ck live together in peace

Browse source
This commit is contained in:
Lennart Poettering 2008-07-24 03:02:09 +02:00
parent 49f09d6d0e
commit e3fb086681
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/module-console-kit.c
View file

@ -178,6 +178,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
} }
add_session(u, path); add_session(u, path);
return DBUS_HANDLER_RESULT_HANDLED;
} else if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionRemoved")) { } else if (dbus_message_is_signal(message, "org.freedesktop.ConsoleKit.Seat", "SessionRemoved")) {
@ -192,12 +193,13 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
} }
remove_session(u, path); remove_session(u, path);
return DBUS_HANDLER_RESULT_HANDLED;
} }
finish: finish:
dbus_error_free(&error); dbus_error_free(&error);
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
static int get_session_list(struct userdata *u) { static int get_session_list(struct userdata *u) {

6
src/modules/module-hal-detect.c
View file

@ -615,6 +615,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
device_added_cb(u->context, udi); device_added_cb(u->context, udi);
} }
return DBUS_HANDLER_RESULT_HANDLED;
} else if (dbus_message_is_signal(message, "org.pulseaudio.Server", "DirtyGiveUpMessage")) { } else if (dbus_message_is_signal(message, "org.pulseaudio.Server", "DirtyGiveUpMessage")) {
/* We use this message to avoid a dirty race condition when we /* We use this message to avoid a dirty race condition when we
get an ACLAdded message before the previously owning PA get an ACLAdded message before the previously owning PA
@ -661,12 +663,14 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo
} else } else
/* Yes, we don't check the UDI for validity, but hopefully HAL will */ /* Yes, we don't check the UDI for validity, but hopefully HAL will */
device_added_cb(u->context, udi); device_added_cb(u->context, udi);
return DBUS_HANDLER_RESULT_HANDLED;
} }
finish: finish:
dbus_error_free(&error); dbus_error_free(&error);
return DBUS_HANDLER_RESULT_HANDLED; return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
} }
static void hal_context_free(LibHalContext* hal_context) { static void hal_context_free(LibHalContext* hal_context) {