summaryrefslogtreecommitdiffstats
path: root/redhat/tdebase/kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch
blob: 4c0a822cdded91ffea7f8eebd31ad6980d30814a (plain)
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
--- kdebase/config.h.cmake.ORI	2012-08-20 11:19:03.411461759 +0200
+++ kdebase/config.h.cmake	2012-08-20 11:19:40.587461736 +0200
@@ -174,3 +174,6 @@
 
 // kdm, kcontrol
 #cmakedefine WITH_XRANDR "@WITH_XRANDR@"
+
+// tsak
+#cmakedefine BUILD_TSAK "@BUILD_TSAK@"
--- kdebase/kdesktop/lock/main.cc.tsak	2012-08-20 13:55:47.265335687 +0200
+++ kdebase/kdesktop/lock/main.cc	2012-08-20 13:56:31.594856008 +0200
@@ -207,8 +207,11 @@
         struct stat st;
         KSimpleConfig* tdmconfig;
         OPEN_TDMCONFIG_AND_SET_GROUP
+#ifdef BUILD_TSAK
         trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
-
+#else
+        trinity_desktop_lock_use_sak = false;
+#endif
         LockProcess process;
 
         // Start loading core functions, such as the desktop wallpaper interface
@@ -272,7 +275,11 @@
         trinity_desktop_lock_use_system_modal_dialogs = !KDesktopSettings::useUnmanagedLockWindows();
         trinity_desktop_lock_delay_screensaver_start = KDesktopSettings::delaySaverStart();
         if (trinity_desktop_lock_use_system_modal_dialogs) {
+#ifdef BUILD_TSAK
             trinity_desktop_lock_use_sak = tdmconfig->readBoolEntry("UseSAK", true);
+#else
+            trinity_desktop_lock_use_sak = false;
+#endif
         }
         else {
             trinity_desktop_lock_use_sak = false;			// If SAK is enabled with unmanaged windows, the SAK dialog will never close and will "burn in" the screen
--- kdebase/kdm/kfrontend/kgapp.cpp.tsak	2012-08-20 14:00:44.387336567 +0200
+++ kdebase/kdm/kfrontend/kgapp.cpp	2012-08-20 14:01:26.280461134 +0200
@@ -195,7 +195,11 @@
 	KProcess *dcop = 0;
 	KProcess *kwin = 0;
 
+#ifdef BUILD_TSAK
 	trinity_desktop_lock_use_sak = _useSAK;
+#else
+	trinity_desktop_lock_use_sak = false;
+#endif
 	if (trinity_desktop_lock_use_sak) {
 		tsak = new KProcess;
 		*tsak << TQCString( argv0, strrchr( argv0, '/' ) - argv0 + 2 ) + "tsak";