diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-03 18:27:58 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-09-03 18:27:58 +0000 |
| commit | 342b8e69aa5127eb25e57cd359371b2f0b44c142 (patch) | |
| tree | 0ae635bd8702df59125777bb6ca224526ac8967c /kwin | |
| parent | d27ff959d4d93f0693e517964bee939a961c5f87 (diff) | |
| download | tdebase-342b8e69aa5127eb25e57cd359371b2f0b44c142.tar.gz tdebase-342b8e69aa5127eb25e57cd359371b2f0b44c142.zip | |
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
Diffstat (limited to 'kwin')
| -rw-r--r-- | kwin/kompmgr/kompmgr.c | 1 | ||||
| -rw-r--r-- | kwin/workspace.cpp | 2 |
2 files changed, 2 insertions, 1 deletions
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(); |