diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-04-30 22:35:36 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-04-30 22:35:36 +0200 |
| commit | 197b5a23ee8aa4d85acba1b4ee156b810cddce8f (patch) | |
| tree | 5911f1fdfd6d18fdc8739dc00ef754c2cf4d691f /redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch | |
| parent | 9016533d378890aeefb6e8e27a8aafab5b1011d3 (diff) | |
| download | tde-packaging-197b5a23ee8aa4d85acba1b4ee156b810cddce8f.tar.gz tde-packaging-197b5a23ee8aa4d85acba1b4ee156b810cddce8f.zip | |
RHEL/Fedora: updates kdebase 3.5.13
Diffstat (limited to 'redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch')
| -rw-r--r-- | redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch b/redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch index 73220e70d..6cb257d9b 100644 --- a/redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch +++ b/redhat/kdebase/kdebase-3.5.13-fix_lock_failure.patch @@ -28,15 +28,15 @@ diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc index 5853da1..225d9c5 100644 --- a/kdesktop/lock/main.cc +++ b/kdesktop/lock/main.cc -@@ -168,7 +168,7 @@ int main( int argc, char **argv ) +@@ -260,7 +260,7 @@ int main( int argc, char **argv ) - bool rt; - bool sig = false; -- if( !child && args->isSet( "forcelock" )) -+ if( (!child) && (args->isSet( "forcelock" ))) - { - rt = process.lock(); - sig = true; + bool rt; + bool sig = false; +- if( !child && (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE))) ++ if( (((!child) && (args->isSet( "forcelock" ))) || (signalled_forcelock == TRUE))) + { + rt = process.lock(); + sig = true; diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cc index 9eb88e1..f24d02f 100644 --- a/kdesktop/lockeng.cc |