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

Port Workspace::clientShortcutUpdated away from KAction

Browse source 
Does no longer crash when setting a window shortcut.
This commit is contained in:
Martin Gräßlin 2013-08-19 13:51:29 +02:00
parent caae057649
commit 209666538e
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
useractions.cpp
View file

@ -1036,17 +1036,13 @@ void Workspace::clientShortcutUpdated(Client* c)
connect(action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated())); connect(action, SIGNAL(triggered(bool)), c, SLOT(shortcutActivated()));
} }
KAction *kaction = qobject_cast<KAction*>(action);
// no autoloading, since it's configured explicitly here and is not meant to be reused // no autoloading, since it's configured explicitly here and is not meant to be reused
// (the key is the window id anyway, which is kind of random) // (the key is the window id anyway, which is kind of random)
kaction->setGlobalShortcut( KGlobalAccel::self()->setShortcut(action, QList<QKeySequence>() << c->shortcut().primary(),
c->shortcut(), KAction::ActiveShortcut, KAction::NoAutoloading); KGlobalAccel::NoAutoloading);
kaction->setEnabled(true); action->setEnabled(true);
} else { } else {
KAction *kaction = qobject_cast<KAction*>(action); KGlobalAccel::self()->removeAllShortcuts(action);
if (kaction) {
kaction->forgetGlobalShortcut();
}
delete action; delete action;
} }
} }