summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-09-08 11:26:39 +0200
committerSimon Rettberg2016-09-08 11:26:39 +0200
commitc524f6003caa90ea28e19b90f027302486903e24 (patch)
tree97ba9382c6781a7765ff4b0603b40d19f771f042
parentfix problem with ghost click. (diff)
downloadpvs2-c524f6003caa90ea28e19b90f027302486903e24.tar.gz
pvs2-c524f6003caa90ea28e19b90f027302486903e24.tar.xz
pvs2-c524f6003caa90ea28e19b90f027302486903e24.zip
Rename lock/unlock scripts to kb-lock and kb-unlock so you know it's for the keyboard
-rwxr-xr-xsample_configuration/kb-lock.sh (renamed from sample_configuration/lock.sh)0
-rwxr-xr-xsample_configuration/kb-unlock.sh (renamed from sample_configuration/unlock.sh)0
-rwxr-xr-xsrc/client/util/platform/blankscreen_X11.cpp6
3 files changed, 3 insertions, 3 deletions
diff --git a/sample_configuration/lock.sh b/sample_configuration/kb-lock.sh
index 68cbc40..68cbc40 100755
--- a/sample_configuration/lock.sh
+++ b/sample_configuration/kb-lock.sh
diff --git a/sample_configuration/unlock.sh b/sample_configuration/kb-unlock.sh
index f09a2fd..f09a2fd 100755
--- a/sample_configuration/unlock.sh
+++ b/sample_configuration/kb-unlock.sh
diff --git a/src/client/util/platform/blankscreen_X11.cpp b/src/client/util/platform/blankscreen_X11.cpp
index cee8f03..db8873b 100755
--- a/src/client/util/platform/blankscreen_X11.cpp
+++ b/src/client/util/platform/blankscreen_X11.cpp
@@ -56,7 +56,7 @@ bool BlankScreen::lock(const QString& message)
QProcess ungrabP;
- ungrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/lock.sh");
+ ungrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/kb-lock.sh");
ungrabP.waitForFinished();
_locked = true;
@@ -77,9 +77,9 @@ bool BlankScreen::unlock()
XFlush(_sysdep->dpy);
- /* start the unlock.sh script */
+ /* start the kb-unlock.sh script */
QProcess regrabP;
- regrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/unlock.sh");
+ regrabP.start("/bin/bash", QStringList() << "/opt/openslx/pvs2/kb-unlock.sh");
regrabP.waitForFinished();
_locked = false;