From 342b8e69aa5127eb25e57cd359371b2f0b44c142 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 3 Sep 2011 18:27:58 +0000
Subject: Fix shutdown dialog fading when compositing is enabled Add a bit of
 logging to kompmgr Fix a broken signal/slot disconnect in kwin

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1251223 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kwin/kompmgr/kompmgr.c | 1 +
 kwin/workspace.cpp     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'kwin')

diff --git a/kwin/kompmgr/kompmgr.c b/kwin/kompmgr/kompmgr.c
index b1c5b841d..870cf1b47 100644
--- a/kwin/kompmgr/kompmgr.c
+++ b/kwin/kompmgr/kompmgr.c
@@ -385,6 +385,7 @@ void delete_pid_file()
 
 #if WORK_AROUND_FGLRX
     if (my_exit_code == 3) {
+        printf("kompmgr lost connection to X server, restarting...\n\r"); fflush(stdout);
         sleep(1);
         char me[2048];
         readlink("/proc/self/exe", me, sizeof(me));
diff --git a/kwin/workspace.cpp b/kwin/workspace.cpp
index 77e22af6f..66b8780ec 100644
--- a/kwin/workspace.cpp
+++ b/kwin/workspace.cpp
@@ -2739,7 +2739,7 @@ void Workspace::stopKompmgr()
     }
     delete kompmgr_selection;
     kompmgr_selection = NULL;
-    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr()));
+    kompmgr->disconnect(this, TQT_SLOT(restartKompmgr(KProcess*)));
     options->useTranslucency = FALSE;
     if (popup){ delete popup; popup = 0L; } // to add/remove opacity slider
     kompmgr->kill();
-- 
cgit v1.2.3