Attachment #180814 for bug #257490

View | Details | Raw Unified | Return to bug 257490
Collapse All | Expand All




   AM_CONDITIONAL(HAVE_CONKIT, true)
   AC_DEFINE(HAVE_CONKIT, [], [Set if we use ConsoleKit])
   msg_conkit=yes
   # yes this is ugly, but there is no other way to get the version of CK 
   AC_MSG_CHECKING([if ConsoleKit version 0.3.0 or newer])
   if $PKG_CONFIG --atleast-version=0.3.0 ck-connector; then
     AC_MSG_RESULT([yes])
     AC_DEFINE(HAVE_CK_0_3, 1, [Define to 1 if ConsoleKit is v0.3.0 or newer])
   else 
     if $PKG_CONFIG --max-version=0.2.10 ck-connector; then
       AC_MSG_RESULT([no])
     else
       #assume we have the latest version
       AC_MSG_WARN([Couldn't detect ConsoleKit version, install the devel package, assume for now you use >= 0.3.0])
       AC_DEFINE(HAVE_CK_0_3, 1, [Define to 1 if ConsoleKit is v0.3.0 or newer])
     fi
   fi
fi

AC_PATH_PROG(GPERF, [gperf], [no])

Lines 256-262 ck_session_get_info (CKTracker *tracker, Link Here

(-)hal-0.5.11/hald/ck-tracker.c.ck03 (+20 lines)
256	goto error;	256	goto error;
257	}	257	}
258	if (!dbus_message_get_args (reply, NULL,	258	if (!dbus_message_get_args (reply, NULL,
		259	#ifdef HAVE_CK_0_3
		260	DBUS_TYPE_UINT32, &(session->user),
		261	#else
259	DBUS_TYPE_INT32, &(session->user),	262	DBUS_TYPE_INT32, &(session->user),
		263	#endif
260	DBUS_TYPE_INVALID)) {	264	DBUS_TYPE_INVALID)) {
261	HAL_ERROR (("Invalid GetUnixUser reply from CK"));	265	HAL_ERROR (("Invalid GetUnixUser reply from CK"));
262	goto error;	266	goto error;
Lines 531-537 ck_tracker_process_system_bus_message (C Link Here
531	seat_objpath = dbus_message_get_path (message);	535	seat_objpath = dbus_message_get_path (message);
532		536
533	if (!dbus_message_get_args (message, NULL,	537	if (!dbus_message_get_args (message, NULL,
		538	#ifdef HAVE_CK_0_3
		539	DBUS_TYPE_OBJECT_PATH, &seat_objpath,
		540	#else
534	DBUS_TYPE_STRING, &seat_objpath,	541	DBUS_TYPE_STRING, &seat_objpath,
		542	#endif
535	DBUS_TYPE_INVALID)) {	543	DBUS_TYPE_INVALID)) {
536	HAL_ERROR (("Invalid SeatAdded signal from CK"));	544	HAL_ERROR (("Invalid SeatAdded signal from CK"));
537	goto out;	545	goto out;
Lines 558-564 ck_tracker_process_system_bus_message (C Link Here
558	seat_objpath = dbus_message_get_path (message);	566	seat_objpath = dbus_message_get_path (message);
559		567
560	if (!dbus_message_get_args (message, NULL,	568	if (!dbus_message_get_args (message, NULL,
		569	#ifdef HAVE_CK_0_3
		570	DBUS_TYPE_OBJECT_PATH, &seat_objpath,
		571	#else
561	DBUS_TYPE_STRING, &seat_objpath,	572	DBUS_TYPE_STRING, &seat_objpath,
		573	#endif
562	DBUS_TYPE_INVALID)) {	574	DBUS_TYPE_INVALID)) {
563	HAL_ERROR (("Invalid SeatRemoved signal from CK"));	575	HAL_ERROR (("Invalid SeatRemoved signal from CK"));
564	goto out;	576	goto out;
Lines 588-594 ck_tracker_process_system_bus_message (C Link Here
588	seat_objpath = dbus_message_get_path (message);	600	seat_objpath = dbus_message_get_path (message);
589		601
590	if (!dbus_message_get_args (message, NULL,	602	if (!dbus_message_get_args (message, NULL,
		603	#ifdef HAVE_CK_0_3
		604	DBUS_TYPE_OBJECT_PATH, &session_objpath,
		605	#else
591	DBUS_TYPE_STRING, &session_objpath,	606	DBUS_TYPE_STRING, &session_objpath,
		607	#endif
592	DBUS_TYPE_INVALID)) {	608	DBUS_TYPE_INVALID)) {
593	HAL_ERROR (("Invalid SessionAdded signal from CK"));	609	HAL_ERROR (("Invalid SessionAdded signal from CK"));
594	goto out;	610	goto out;
Lines 624-630 ck_tracker_process_system_bus_message (C Link Here
624	seat_objpath = dbus_message_get_path (message);	640	seat_objpath = dbus_message_get_path (message);
625		641
626	if (!dbus_message_get_args (message, NULL,	642	if (!dbus_message_get_args (message, NULL,
		643	#ifdef HAVE_CK_0_3
		644	DBUS_TYPE_OBJECT_PATH, &session_objpath,
		645	#else
627	DBUS_TYPE_STRING, &session_objpath,	646	DBUS_TYPE_STRING, &session_objpath,
		647	#endif
628	DBUS_TYPE_INVALID)) {	648	DBUS_TYPE_INVALID)) {
629	HAL_ERROR (("Invalid SessionRemoved signal from CK"));	649	HAL_ERROR (("Invalid SessionRemoved signal from CK"));
630	goto out;	650	goto out;

Return to bug 257490

Lines 485-490 if test "x$enable_console_kit" != "xno"; Link Here

(-)hal-0.5.11/configure.in.ck03 (+14 lines)
485	AM_CONDITIONAL(HAVE_CONKIT, true)	485	AM_CONDITIONAL(HAVE_CONKIT, true)
486	AC_DEFINE(HAVE_CONKIT, [], [Set if we use ConsoleKit])	486	AC_DEFINE(HAVE_CONKIT, [], [Set if we use ConsoleKit])
487	msg_conkit=yes	487	msg_conkit=yes
		488	# yes this is ugly, but there is no other way to get the version of CK
		489	AC_MSG_CHECKING([if ConsoleKit version 0.3.0 or newer])
		490	if $PKG_CONFIG --atleast-version=0.3.0 ck-connector; then
		491	AC_MSG_RESULT([yes])
		492	AC_DEFINE(HAVE_CK_0_3, 1, [Define to 1 if ConsoleKit is v0.3.0 or newer])
		493	else
		494	if $PKG_CONFIG --max-version=0.2.10 ck-connector; then
		495	AC_MSG_RESULT([no])
		496	else
		497	#assume we have the latest version
		498	AC_MSG_WARN([Couldn't detect ConsoleKit version, install the devel package, assume for now you use >= 0.3.0])
		499	AC_DEFINE(HAVE_CK_0_3, 1, [Define to 1 if ConsoleKit is v0.3.0 or newer])
		500	fi
		501	fi
488	fi	502	fi
489		503
490	AC_PATH_PROG(GPERF, [gperf], [no])	504	AC_PATH_PROG(GPERF, [gperf], [no])