diff options
Diffstat (limited to 'hal-0.5.11-patches/0019-adapt-new-CK-library-version-v0.3.1-to-HAL.patch')
| -rw-r--r-- | hal-0.5.11-patches/0019-adapt-new-CK-library-version-v0.3.1-to-HAL.patch | 79 |
1 files changed, 79 insertions, 0 deletions
diff --git a/hal-0.5.11-patches/0019-adapt-new-CK-library-version-v0.3.1-to-HAL.patch b/hal-0.5.11-patches/0019-adapt-new-CK-library-version-v0.3.1-to-HAL.patch new file mode 100644 index 00000000..3e74e418 --- /dev/null +++ b/hal-0.5.11-patches/0019-adapt-new-CK-library-version-v0.3.1-to-HAL.patch @@ -0,0 +1,79 @@ +From 21b640b8182d9532d1a33d4a093395320085378f Mon Sep 17 00:00:00 2001 +From: Frederic Crozat <fcrozat@mandriva.com> +Date: Mon, 25 Aug 2008 13:02:19 +0200 +Subject: [PATCH 19/48] adapt new CK library version (>= v0.3.1) to HAL + +Adapted new CK library version (>= v0.3.1) to HAL. Adopted +patch from Ben Gamari <bgamari@gmail.com> to work with old +and new ConsoleKit versions. +--- + hald/ck-tracker.c | 20 ++++++++++++++++++++ + 1 files changed, 20 insertions(+), 0 deletions(-) + +diff --git a/hald/ck-tracker.c b/hald/ck-tracker.c +index 34aa640..eb76dbb 100644 +--- a/hald/ck-tracker.c ++++ b/hald/ck-tracker.c +@@ -256,7 +256,11 @@ ck_session_get_info (CKTracker *tracker, CKSession *session) + goto error; + } + if (!dbus_message_get_args (reply, NULL, ++#ifdef HAVE_CK_0_3 ++ DBUS_TYPE_UINT32, &(session->user), ++#else + DBUS_TYPE_INT32, &(session->user), ++#endif + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid GetUnixUser reply from CK")); + goto error; +@@ -531,7 +535,11 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, ++#ifdef HAVE_CK_0_3 ++ DBUS_TYPE_OBJECT_PATH, &seat_objpath, ++#else + DBUS_TYPE_STRING, &seat_objpath, ++#endif + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SeatAdded signal from CK")); + goto out; +@@ -558,7 +566,11 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, ++#ifdef HAVE_CK_0_3 ++ DBUS_TYPE_OBJECT_PATH, &seat_objpath, ++#else + DBUS_TYPE_STRING, &seat_objpath, ++#endif + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SeatRemoved signal from CK")); + goto out; +@@ -588,7 +600,11 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, ++#ifdef HAVE_CK_0_3 ++ DBUS_TYPE_OBJECT_PATH, &session_objpath, ++#else + DBUS_TYPE_STRING, &session_objpath, ++#endif + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SessionAdded signal from CK")); + goto out; +@@ -624,7 +640,11 @@ ck_tracker_process_system_bus_message (CKTracker *tracker, DBusMessage *message) + seat_objpath = dbus_message_get_path (message); + + if (!dbus_message_get_args (message, NULL, ++#ifdef HAVE_CK_0_3 ++ DBUS_TYPE_OBJECT_PATH, &session_objpath, ++#else + DBUS_TYPE_STRING, &session_objpath, ++#endif + DBUS_TYPE_INVALID)) { + HAL_ERROR (("Invalid SessionRemoved signal from CK")); + goto out; +-- +1.6.1.2 + |