summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock/main.cc
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-04-22 19:47:48 -0500
committerTimothy Pearson <[email protected]>2012-04-22 19:47:48 -0500
commit50739c9ba4737317108da68c148472c3da856c95 (patch)
tree0c4314a713458ef4274abc8c56db3e69679d1865 /kdesktop/lock/main.cc
parent06adb1823ef9222874fc459536a78d464a801be5 (diff)
downloadtdebase-50739c9ba4737317108da68c148472c3da856c95.tar.gz
tdebase-50739c9ba4737317108da68c148472c3da856c95.zip
Fix kdesktop_lock secure dialog
Minor whitespace cleanup and warning fixes
Diffstat (limited to 'kdesktop/lock/main.cc')
-rw-r--r--kdesktop/lock/main.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 93206951d..5853da17a 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -252,19 +252,21 @@ int main( int argc, char **argv )
}
}
- if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE))
+ if (args->isSet( "forcelock" ) || (signalled_forcelock == TRUE)) {
trinity_desktop_lock_forced = TRUE;
+ }
LockProcess process(child, (args->isSet( "blank" ) || (signalled_blank == TRUE)));
- if (!child)
+ if (!child) {
process.setChildren(child_sockets);
- else
+ }
+ else {
process.setParent(parent_connection);
+ }
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;
}