vitalif
/
kwin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Workaround for kwin<->kglobalaccel deadlock, when KWin has X grab and the kded 

kglobalaccel module tries to create the key grab. KWin should preferably grab
they keys itself anyway :(.


svn path=/trunk/KDE/kdebase/workspace/; revision=866294
icc-effect-5.14.5
Luboš Luňák 2008-09-30 12:03:20 +00:00
parent 1c1c1bb6cc
commit 27182e3800
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client.h
View File

@ -336,6 +336,7 @@ class Client
void processKillerExited();
void demandAttentionKNotify();
void syncTimeout();
void delayedSetShortcut();
private:
void exportMappingState( int s ); // ICCCM 4.1.3.1, 4.1.4 , NETWM 2.5.1

12
useractions.cpp
View File

@ -1265,6 +1265,18 @@ void Client::setShortcutInternal( const KShortcut& cut )
return;
_shortcut = cut;
updateCaption();
#if 0
workspace()->clientShortcutUpdated( this );
#else
// Workaround for kwin<->kglobalaccel deadlock, when KWin has X grab and the kded
// kglobalaccel module tries to create the key grab. KWin should preferably grab
// they keys itself anyway :(.
QTimer::singleShot( 0, this, SLOT( delayedSetShortcut()));
#endif
}
void Client::delayedSetShortcut()
{
workspace()->clientShortcutUpdated( this );
}