Browse Source

Update references of kscreensaver->tdescreensaver.

tags/r14.0.0
Darrell Anderson 5 years ago
parent
commit
0ba43923ad

+ 2
- 2
CMakeLists.txt View File

@@ -173,7 +173,7 @@ option( BUILD_KAPPFINDER "Build kappfinder" ${BUILD_ALL} )
173 173
 option( BUILD_KCHECKPASS "Build kcheckpass" ${BUILD_ALL} )
174 174
 option( BUILD_KHELPCENTER "Build khelpcenter" ${BUILD_ALL} )
175 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 177
 option( BUILD_KSTART "Build kstart" ${BUILD_ALL} )
178 178
 option( BUILD_KSYSTRAYCMD "Build ksystraycmd" ${BUILD_ALL} )
179 179
 option( BUILD_NSPLUGINS "Build nsplugins"  ${BUILD_ALL} )
@@ -252,7 +252,7 @@ tde_conditional_add_subdirectory( BUILD_KAPPFINDER kappfinder )
252 252
 tde_conditional_add_subdirectory( BUILD_KCHECKPASS kcheckpass )
253 253
 tde_conditional_add_subdirectory( BUILD_KHELPCENTER khelpcenter )
254 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 256
 tde_conditional_add_subdirectory( BUILD_KSTART kstart )
257 257
 tde_conditional_add_subdirectory( BUILD_KSYSTRAYCMD ksystraycmd )
258 258
 tde_conditional_add_subdirectory( BUILD_NSPLUGINS nsplugins )

+ 1
- 1
ConfigureChecks.cmake View File

@@ -169,7 +169,7 @@ endif( )
169 169
 
170 170
 
171 171
 # GL
172
-if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_KSCREENSAVER )
172
+if( BUILD_KDESKTOP OR BUILD_KCONTROL OR BUILD_TDESCREENSAVER )
173 173
 check_library_exists( GL glXChooseVisual "" HAVE_GLXCHOOSEVISUAL )
174 174
   if( HAVE_GLXCHOOSEVISUAL )
175 175
     set( GL_LIBRARY "GL" )

+ 1
- 1
config.h.cmake View File

@@ -123,7 +123,7 @@
123 123
 #cmakedefine KCHECKPASS_PAM_SERVICE "@KCHECKPASS_PAM_SERVICE@"
124 124
 
125 125
 // kdesktop
126
-#cmakedefine KSCREENSAVER_PAM_SERVICE "@KSCREENSAVER_PAM_SERVICE@"
126
+#cmakedefine TDESCREENSAVER_PAM_SERVICE "@TDESCREENSAVER_PAM_SERVICE@"
127 127
 #cmakedefine WITH_KDESKTOP_LOCK_BACKTRACE 1
128 128
 
129 129
 // tdm

+ 1
- 1
configure.in.in View File

@@ -7,7 +7,7 @@ KDE_PASSWDLIBS
7 7
 
8 8
 DEF_PAM_SERVICE(tdm, tdm, TDM)
9 9
 DEF_PAM_SERVICE(kcp, kcheckpass, KCHECKPASS)
10
-DEF_PAM_SERVICE(kss, tdescreensaver, KSCREENSAVER)
10
+DEF_PAM_SERVICE(kss, tdescreensaver, TDESCREENSAVER)
11 11
 
12 12
 dnl Checks for header files.
13 13
 AC_HEADER_DIRENT

+ 2
- 4
kdesktop/ConfigureChecks.cmake View File

@@ -9,10 +9,8 @@
9 9
 #
10 10
 #################################################
11 11
 
12
-# FIXME: KSCREENSAVER_PAM_SERVICE should be "kde" or "tdescreensaver"?
13
-
14
-if( WITH_PAM AND (NOT DEFINED KSCREENSAVER_PAM_SERVICE) )
15
-  set( KSCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
12
+if( WITH_PAM AND (NOT DEFINED TDESCREENSAVER_PAM_SERVICE) )
13
+  set( TDESCREENSAVER_PAM_SERVICE "kde" CACHE INTERNAL "" )
16 14
 endif( )
17 15
 
18 16
 if( WITH_KDESKTOP_LOCK_BACKTRACE )

+ 1
- 1
kdesktop/lock/Makefile.am View File

@@ -18,7 +18,7 @@ lockprocess.o: ../kdesktopsettings.h
18 18
 
19 19
 ####### Build rules
20 20
 
21
-PAM = @KSCREENSAVER_PAM_SERVICE@
21
+PAM = @TDESCREENSAVER_PAM_SERVICE@
22 22
 
23 23
 install-data-local:
24 24
 	-@test -n "$(DESTDIR)" || test -z "$(PAM)" || $(top_srcdir)/mkpamserv $(PAM)

+ 1
- 1
kdesktop/lock/lockdlg.cc View File

@@ -565,7 +565,7 @@ void PasswordDlg::gplugStart()
565 565
         sprintf(fdbuf, "%d", sfd[1]);
566 566
         execlp("kcheckpass", "kcheckpass",
567 567
 #ifdef HAVE_PAM
568
-               "-c", KSCREENSAVER_PAM_SERVICE,
568
+               "-c", TDESCREENSAVER_PAM_SERVICE,
569 569
 #endif
570 570
                "-m", mPlugin->info->method,
571 571
                "-S", fdbuf,

Loading…
Cancel
Save