From cf01bd685d7fd110e54736bdf9ebf618b5ccef55 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 3 Sep 2011 19:25:16 +0000
Subject: Fix kompmgr abort on TDE login

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1251224 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kwin/kompmgr/kompmgr.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kwin')

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;
-- 
cgit v1.2.3