1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
diff -p -up hal-0.5.11/configure.in.ck03 hal-0.5.11/configure.in
--- hal-0.5.11/configure.in.ck03 2008-05-07 19:24:31.000000000 -0400
+++ configure.in 2008-08-11 06:18:07.000000000 -0400
diff -p -up hal-0.5.11/hald/ck-tracker.c.ck03 hal-0.5.11/hald/ck-tracker.c
--- hal-0.5.11/hald/ck-tracker.c.ck03 2008-05-07 19:23:48.000000000 -0400
+++ hald/ck-tracker.c 2008-08-12 12:34:47.000000000 -0400
@@ -256,7 +256,11 @@ ck_session_get_info (CKTracker *tracker,
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 (C
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 (C
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 (C
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 (C
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;
|
