From b876907e650eaf996aa3c2bcfac9a526cf900c5b Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 27 Dec 2013 19:29:38 -0600 Subject: Fix free space overlay not disappearing on unmount Fix devices disappearing on unmount Automatically close notification popup on associated media device removal --- kdesktop/lock/lockprocess.cc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kdesktop/lock') diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc index a90f15c09..812f2a6d6 100644 --- a/kdesktop/lock/lockprocess.cc +++ b/kdesktop/lock/lockprocess.cc @@ -2391,10 +2391,14 @@ static int run_vkbd = -1; void LockProcess::showVkbd() { if( run_vkbd == - 1 ) { +#ifdef WITH_HAL int status = system( "hal-find-by-property --key system.formfactor.subtype --string tabletpc" ); // status = 0; // enable for testing run_vkbd = ( WIFEXITED( status ) && WEXITSTATUS( status ) == 0 && !TDEStandardDirs::findExe( "xvkbd" ).isEmpty()) ? 1 : 0; +#else // WITH_HAL + run_vkbd = (!TDEStandardDirs::findExe( "xvkbd" ).isEmpty()); +#endif // WITH_HAL } if( run_vkbd ) { mVkbdWindows.clear(); -- cgit v1.2.3