Attachment #1423 for bug #1598

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 1598
Collapse All | Expand All

Lines 169-175 Link Here

(-)tdebase/ConfigureChecks.cmake (-1 / +1 lines)
169		169
170		170
171	# GL	171	# GL
172	if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )	172	if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_TDESCREENSAVER )
173	check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )	173	check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
174	if( HAVE_GLXCHOOSEVISUAL )	174	if( HAVE_GLXCHOOSEVISUAL )
175	set( GL_LIBRARY "GL" )	175	set( GL_LIBRARY "GL" )

Lines 123-129 Link Here

(-)tdebase/config.h.cmake (-1 / +1 lines)
123	#cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@"	123	#cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@"
124		124
125	// kdesktop	125	// kdesktop
126	#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"	126	#cmakedefine TDESCREENSAVER_PAM_SERVICE "@TDESCREENSAVER_PAM_SERVICE@"
127	#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1	127	#cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
128		128
129	// tdm	129	// tdm

Lines 7-13 Link Here

(-)tdebase/configure.in.in (-1 / +1 lines)
7		7
8	DEF_PAM_SERVICE(tdm, tdm, TDM)	8	DEF_PAM_SERVICE(tdm, tdm, TDM)
9	DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)	9	DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
10	DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER)	10	DEF_PAM_SERVICE(kss, tdescreensaver, TDESCREENSAVER)
11		11
12	dnl Checks for header files.	12	dnl Checks for header files.
13	AC_HEADER_DIRENT	13	AC_HEADER_DIRENT

Lines 9-18 Link Here

(-)tdebase/kdesktop/ConfigureChecks.cmake (-4 / +2 lines)
9	#	9	#
10	#################################################	10	#################################################
11		11
12	# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "tdescreensaver"?	12	if( WITH_PAM AND (NOT DEFINED TDESCREENSAVER_PAM_SERVICE) )
13		13	set( TDESCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
14	if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
15	set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
16	endif( )	14	endif( )
17		15
18	if( WITH_KDESKTOP_LOCK_BACKTRACE )	16	if( WITH_KDESKTOP_LOCK_BACKTRACE )

Lines 18-24 Link Here

(-)tdebase/kdesktop/lock/Makefile.am (-1 / +1 lines)
18		18
19	####### Build rules	19	####### Build rules
20		20
21	PAM = @KSCREENSAVER_PAM_SERVICE@	21	PAM = @TDESCREENSAVER_PAM_SERVICE@
22		22
23	install-data-local:	23	install-data-local:
24	-@test -n "$(DESTDIR)" \|\| test -z "$(PAM)" \|\| $(top_srcdir)/mkpamserv $(PAM)	24	-@test -n "$(DESTDIR)" \|\| test -z "$(PAM)" \|\| $(top_srcdir)/mkpamserv $(PAM)

Lines 565-571 Link Here

(-)tdebase/kdesktop/lock/lockdlg.cc (-1 / +1 lines)
565	sprintf(fdbuf, "%d", sfd[1]);	565	sprintf(fdbuf, "%d", sfd[1]);
566	execlp("kcheckpass", "kcheckpass",	566	execlp("kcheckpass", "kcheckpass",
567	#ifdef HAVE_PAM	567	#ifdef HAVE_PAM
568	"-c", KSCREENSAVER_PAM_SERVICE,	568	"-c", TDESCREENSAVER_PAM_SERVICE,
569	#endif	569	#endif
570	"-m", mPlugin->info->method,	570	"-m", mPlugin->info->method,
571	"-S", fdbuf,	571	"-S", fdbuf,

Return to bug 1598

Lines 173-179 Link Here

(-)tdebase/CMakeLists.txt (-2 / +2 lines)
173	option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )	173	option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
174	option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )	174	option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
175	option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )	175	option( BUILD_KHOTKEYS "Build khotkeys" ${BUILD_ALL} )
176	option( BUILD_KSCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )	176	option( BUILD_TDESCREENSAVER "Build tdescreensaver" ${BUILD_ALL} )
177	option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )	177	option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
178	option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )	178	option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
179	option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} )	179	option( BUILD_NSPLUGINS "Build nsplugins" ${BUILD_ALL} )
Lines 252-258 Link Here
252	tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )	252	tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
253	tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )	253	tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
254	tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )	254	tde_conditional_add_subdirectory( BUILD_KHOTKEYS khotkeys )
255	tde_conditional_add_subdirectory( BUILD_KSCREENSAVER tdescreensaver )	255	tde_conditional_add_subdirectory( BUILD_TDESCREENSAVER tdescreensaver )
256	tde_conditional_add_subdirectory( BUILD_KSTART kstart )	256	tde_conditional_add_subdirectory( BUILD_KSTART kstart )
257	tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )	257	tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
258	tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )	258	tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )