summaryrefslogtreecommitdiffstats
path: root/kdesktop/lock
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-01-22 01:17:21 -0600
committerSlávek Banko <slavek.banko@axis.cz>2012-06-03 03:26:50 +0200
commit9512f43dd8822bdcfd96e1f3ca9fa34193a32093 (patch)
treead1df45a02e9f217fbc92a0104bb96da3e039b73 /kdesktop/lock
parent26185aa1302a1563df5700cd0d812682d7973070 (diff)
downloadtdebase-9512f43dd8822bdcfd96e1f3ca9fa34193a32093.tar.gz
tdebase-9512f43dd8822bdcfd96e1f3ca9fa34193a32093.zip
Fix desktop lock
(cherry picked from commit 5f8d730703882e1335305a2c43a378f0c4b96e8e)
Diffstat (limited to 'kdesktop/lock')
-rw-r--r--kdesktop/lock/lockprocess.cc2
-rw-r--r--kdesktop/lock/main.cc4
2 files changed, 4 insertions, 2 deletions
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cc
index 6b39e64c8..f41f2537e 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cc
@@ -630,6 +630,8 @@ void LockProcess::startSecureDialog()
return;
}
+ setGeometry(0, 0, mRootWidth, mRootHeight);
+
int ret;
SecureDlg inDlg( this );
inDlg.setRetInt(&ret);
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cc
index 1d459a0d3..fb7e241ac 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cc
@@ -181,14 +181,14 @@ int main( int argc, char **argv )
rt = process.runSecureDialog();
}
else {
- return 1;
+ return 0;
}
}
else {
rt = process.defaultSave();
}
if (!rt) {
- return 1;
+ return 0;
}
if( sig )