yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

r866294

Browse source 
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=/branches/KDE/4.1/kdebase/workspace/; revision=866296
This commit is contained in:
Luboš Luňák 2008-09-30 12:06:25 +00:00
parent 5cfa0330bd
commit 5e19cbbc0f
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

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

12
useractions.cpp
View file

@ -1264,6 +1264,18 @@ void Client::setShortcutInternal( const KShortcut& cut )
return; return;
_shortcut = cut; _shortcut = cut;
updateCaption(); 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 ); workspace()->clientShortcutUpdated( this );
} }