diff options
| author | Timothy Pearson <[email protected]> | 2013-12-27 19:29:38 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-12-27 19:29:38 -0600 |
| commit | b876907e650eaf996aa3c2bcfac9a526cf900c5b (patch) | |
| tree | 513671ea3db58c11b28de8ee74f51ff35be6b9c8 /kdesktop/lock/lockprocess.cc | |
| parent | ee68bc1fd3d2e5edc1527bdfcacfb330b7670a86 (diff) | |
| download | tdebase-b876907e650eaf996aa3c2bcfac9a526cf900c5b.tar.gz tdebase-b876907e650eaf996aa3c2bcfac9a526cf900c5b.zip | |
Fix free space overlay not disappearing on unmount
Fix devices disappearing on unmount
Automatically close notification popup on associated media device removal
Diffstat (limited to 'kdesktop/lock/lockprocess.cc')
| -rw-r--r-- | kdesktop/lock/lockprocess.cc | 4 |
1 files changed, 4 insertions, 0 deletions
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(); |