2 files changed, 6 insertions, 6 deletions
diff --git a/unity-shared/GnomeKeyGrabber.cpp b/unity-shared/GnomeKeyGrabber.cpp
index 563390b46..0d0cdd5d7 100644
--- a/unity-shared/GnomeKeyGrabber.cpp
+++ b/unity-shared/GnomeKeyGrabber.cpp
@@ -52,6 +52,7 @@ R"(<node>
 <signal name='AcceleratorActivated'>
 <arg type='u' name='action'/>
 <arg type='u' name='device'/>
+ <arg type='u' name='timestamp'/>
 </signal>
 </interface>
 </node>)";
@@ -216,7 +217,7 @@ unsigned int GnomeGrabber::Impl::grabAccelerator(char const* accelerator, unsign
 action.setState(CompAction::StateInitKey);
 action.setInitiate([this](CompAction* action, CompAction::State state, CompOption::Vector& options) {
 LOG_DEBUG(logger) << "pressed \"" << action->keyToString() << "\"";
- activateAction(action, 0);
+ activateAction(action, 0, options[7].value().i());
 return true;
 });
 }
@@ -231,7 +232,7 @@ unsigned int GnomeGrabber::Impl::grabAccelerator(char const* accelerator, unsign
 if (state & CompAction::StateTermTapped)
 {
 LOG_DEBUG(logger) << "tapped \"" << key << "\"";
- activateAction(action, 0);
+ activateAction(action, 0, options[7].value().i());
 return true;
 }
 
@@ -242,16 +243,15 @@ unsigned int GnomeGrabber::Impl::grabAccelerator(char const* accelerator, unsign
 return addAction(action, false);
 }
 
-void GnomeGrabber::Impl::activateAction(CompAction const* action, unsigned int device) const
+void GnomeGrabber::Impl::activateAction(CompAction const* action, unsigned device, unsigned timestamp) const
 {
 ptrdiff_t i = action - &actions_.front();
 
 if (0 <= i && i < static_cast<ptrdiff_t>(action_ids_.size()))
 {
 auto action_id = action_ids_[i];
-
 LOG_DEBUG(logger) << "activateAction (" << action_id << " \"" << action->keyToString() << "\")";
- shell_object_->EmitSignal("AcceleratorActivated", g_variant_new("(uu)", action_id, device));
+ shell_object_->EmitSignal("AcceleratorActivated", g_variant_new("(uuu)", action_id, device, timestamp));
 }
 }
 
diff --git a/unity-shared/GnomeKeyGrabberImpl.h b/unity-shared/GnomeKeyGrabberImpl.h
index 6c65c91fe..585d761fa 100644
--- a/unity-shared/GnomeKeyGrabberImpl.h
+++ b/unity-shared/GnomeKeyGrabberImpl.h
@@ -53,7 +53,7 @@ struct GnomeGrabber::Impl
 
 GVariant* onShellMethodCall(std::string const& method, GVariant* parameters);
 unsigned int grabAccelerator(char const* accelerator, unsigned int flags);
- void activateAction(CompAction const* action, unsigned int device) const;
+ void activateAction(CompAction const* action, unsigned device, unsigned timestamp) const;
 
 bool isActionPostponed(CompAction const& action) const;
 };