summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-03 19:25:16 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-09-03 19:25:16 +0000
commitcf01bd685d7fd110e54736bdf9ebf618b5ccef55 (patch)
tree9ce79a78fbed799f3cd1a21ecfcf689bdea7b19b
parent342b8e69aa5127eb25e57cd359371b2f0b44c142 (diff)
downloadtdebase-cf01bd685d7fd110e54736bdf9ebf618b5ccef55.tar.gz
tdebase-cf01bd685d7fd110e54736bdf9ebf618b5ccef55.zip
Fix kompmgr abort on TDE login
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1251224 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--kwin/kompmgr/kompmgr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c
index 870cf1b47..6044c8300 100644
--- a/kwin/kompmgr/kompmgr.c
+++ b/kwin/kompmgr/kompmgr.c
@@ -3106,7 +3106,8 @@ register_cm (void)
Xutf8SetWMProperties(dpy, w, "kcompmgr", "kcompmgr", NULL, 0, NULL, NULL,
NULL);
- XSetSelectionOwner (dpy, a, w, 0);
+ /* setting this causes kompmgr to abort on TDE login */
+ /* XSetSelectionOwner (dpy, a, w, 0); */
return True;
}
@@ -3305,7 +3306,6 @@ main (int argc, char **argv)
fprintf(stderr, "Started\n");
- register_cm();
if (!register_cm())
{
my_exit_code=2;