summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2014-11-22 16:52:29 -0600
committerTimothy Pearson <[email protected]>2014-11-22 16:52:29 -0600
commitfb7b5f6d45bb29b629169fb7ecd9247435398af2 (patch)
treeec4ec010718d54c892f0460af70c7b28a5460ab0
parenta582c6e22dc2ca97d3589b2459aba83aaf95ed0d (diff)
parent5365a2380c9eb51e43fe50db4ea3130e6568e0b7 (diff)
downloadtdebase-fb7b5f6d45bb29b629169fb7ecd9247435398af2.tar.gz
tdebase-fb7b5f6d45bb29b629169fb7ecd9247435398af2.zip
Merge branch 'master' of https://scm.trinitydesktop.org/scm/git/tdebase
-rw-r--r--tdmlib/dmctl.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tdmlib/dmctl.cpp b/tdmlib/dmctl.cpp
index 6ee7722a2..6fea12b5a 100644
--- a/tdmlib/dmctl.cpp
+++ b/tdmlib/dmctl.cpp
@@ -401,7 +401,7 @@ DM::lockSwitchVT( int vt )
kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "lock()", data, replyType, replyData);
if (!switchVT( vt )) {
// Switching VT failed; unlock...
- kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "unlock()", data, replyType, replyData);
+ // kapp->dcopClient()->call("kdesktop", "KScreensaverIface", "unlock()", data, replyType, replyData);
}
}
}