Attachment 792 Details for Bug 1180 – Disable use of SAK if TSAK is not built

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.

[patch] Disable use of SAK if TSAK is not built

kdebase-3.5.13-disable_tsak_dialog_if_not_built.patch (text/plain), 1.87 KB, created by Francois Andriot on 2012-08-20 07:37:14 CDT

(hide)

Description:

Filename:

MIME Type:

Creator: Francois Andriot

Created: 2012-08-20 07:37:14 CDT

Size: 1.87 KB

patch

obsolete

>--- 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";

Actions: View | Diff

Attachments on bug 1180: 792