Remove grabbed actions on destruction.

(bzr r3608.4.37)

2 files changed, 7 insertions, 0 deletions

diff --git a/unity-shared/GnomeKeyGrabber.cpp b/unity-shared/GnomeKeyGrabber.cpp
index 1469643ce..2de3a8b84 100644
--- a/unity-shared/GnomeKeyGrabber.cpp
+++ b/unity-shared/GnomeKeyGrabber.cpp
@@ -71,6 +71,12 @@ GnomeKeyGrabber::Impl::Impl(CompScreen* screen, bool test_mode)
 shell_object_->SetMethodsCallsHandler(sigc::mem_fun(this, &Impl::onShellMethodCall));
 }
 
+GnomeKeyGrabber::Impl::~Impl()
+{
+ for (auto& action : actions_)
+ screen_->removeAction(&action);
+}
+
 unsigned int GnomeKeyGrabber::Impl::addAction(CompAction const& action, bool addressable)
 {
 ++current_action_id_;
diff --git a/unity-shared/GnomeKeyGrabberImpl.h b/unity-shared/GnomeKeyGrabberImpl.h
index 2a434a84b..3367ce9b9 100644
--- a/unity-shared/GnomeKeyGrabberImpl.h
+++ b/unity-shared/GnomeKeyGrabberImpl.h
@@ -46,6 +46,7 @@ struct GnomeKeyGrabber::Impl
 std::unordered_map<unsigned int, CompAction const*> actions_by_action_id_;
 
 explicit Impl(CompScreen* screen, bool test_mode = false);
+ ~Impl();
 
 unsigned int addAction(CompAction const& action, bool addressable = true);
 bool removeAction(CompAction const& action);