diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-07-24 03:02:09 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-07-24 03:02:09 +0200 |
| commit | e3fb086681bf743310f2af19bf9a01957fd34782 (patch) | |
| tree | 29309a5ee089be8e034eea0ec8d4cec13feef754 | |
| parent | 49f09d6d0eadd67d75190a9001fe715dc486cd36 (diff) | |
make module-hal and module-ck live together in peacev0.9.11
| -rw-r--r-- | src/modules/module-console-kit.c | 4 | ||||
| -rw-r--r-- | src/modules/module-hal-detect.c | 6 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/modules/module-console-kit.c b/src/modules/module-console-kit.c index 3578212e..e1933c28 100644 --- a/src/modules/module-console-kit.c +++ b/src/modules/module-console-kit.c @@ -178,6 +178,7 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo } add_session(u, path); + return DBUS_HANDLER_RESULT_HANDLED; } 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); + return DBUS_HANDLER_RESULT_HANDLED; } finish: dbus_error_free(&error); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } static int get_session_list(struct userdata *u) { diff --git a/src/modules/module-hal-detect.c b/src/modules/module-hal-detect.c index ec064961..ab5b206f 100644 --- a/src/modules/module-hal-detect.c +++ b/src/modules/module-hal-detect.c @@ -615,6 +615,8 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo device_added_cb(u->context, udi); } + return DBUS_HANDLER_RESULT_HANDLED; + } else if (dbus_message_is_signal(message, "org.pulseaudio.Server", "DirtyGiveUpMessage")) { /* We use this message to avoid a dirty race condition when we get an ACLAdded message before the previously owning PA @@ -661,12 +663,14 @@ static DBusHandlerResult filter_cb(DBusConnection *bus, DBusMessage *message, vo } else /* Yes, we don't check the UDI for validity, but hopefully HAL will */ device_added_cb(u->context, udi); + + return DBUS_HANDLER_RESULT_HANDLED; } finish: dbus_error_free(&error); - return DBUS_HANDLER_RESULT_HANDLED; + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; } static void hal_context_free(LibHalContext* hal_context) { |