Fix merge errors.

(bzr r3764.7.4)

2 files changed, 12 insertions, 12 deletions

diff --git a/lockscreen/LockScreenPanel.cpp b/lockscreen/LockScreenPanel.cpp
index 1985fdc34..89117419a 100644
--- a/lockscreen/LockScreenPanel.cpp
+++ b/lockscreen/LockScreenPanel.cpp
@@ -341,27 +341,27 @@ void Panel::OnKeyDown(unsigned long event,
 }
 else if (IsMatch(true, key_sym, state, volume_mute_))
 {
- Activate(indicator_sound_actions_, "mute");
+ ActivateSoundAction("mute");
 last_action_ = volume_mute_;
 }
 else if (IsMatch(true, key_sym, state, volume_down_))
 {
- Activate(indicator_sound_actions_, "scroll", g_variant_new_int32(-1));
+ ActivateSoundAction("scroll", g_variant_new_int32(-1));
 last_action_ = volume_down_;
 }
 else if (IsMatch(true, key_sym, state, volume_up_))
 {
- Activate(indicator_sound_actions_, "scroll", g_variant_new_int32(+1));
+ ActivateSoundAction("scroll", g_variant_new_int32(+1));
 last_action_ = volume_up_;
 }
 else if (IsMatch(true, key_sym, state, previous_source_))
 {
- Activate(indicator_keyboard_actions_, "locked_scroll", g_variant_new_int32(-1));
+ ActivateKeyboardAction("locked_scroll", g_variant_new_int32(-1));
 last_action_ = previous_source_;
 }
 else if (IsMatch(true, key_sym, state, next_source_))
 {
- Activate(indicator_keyboard_actions_, "locked_scroll", g_variant_new_int32(+1));
+ ActivateKeyboardAction("locked_scroll", g_variant_new_int32(+1));
 last_action_ = next_source_;
 }
 }
@@ -384,35 +384,35 @@ void Panel::OnKeyUp(unsigned int key_sym,
 else if (IsMatch(false, key_sym, state, volume_mute_))
 {
 if (last_action_ != volume_mute_)
- Activate(indicator_sound_actions_, "mute");
+ ActivateSoundAction("mute");
 
 last_action_ = std::make_pair(0, 0);
 }
 else if (IsMatch(false, key_sym, state, volume_down_))
 {
 if (last_action_ != volume_down_)
- Activate(indicator_sound_actions_, "scroll", g_variant_new_int32(-1));
+ ActivateSoundAction("scroll", g_variant_new_int32(-1));
 
 last_action_ = std::make_pair(0, 0);
 }
 else if (IsMatch(false, key_sym, state, volume_up_))
 {
 if (last_action_ != volume_up_)
- Activate(indicator_sound_actions_, "scroll", g_variant_new_int32(+1));
+ ActivateSoundAction("scroll", g_variant_new_int32(+1));
 
 last_action_ = std::make_pair(0, 0);
 }
 else if (IsMatch(false, key_sym, state, previous_source_))
 {
 if (last_action_ != previous_source_)
- Activate(indicator_keyboard_actions_, "locked_scroll", g_variant_new_int32(-1));
+ ActivateKeyboardAction("locked_scroll", g_variant_new_int32(-1));
 
 last_action_ = std::make_pair(0, 0);
 }
 else if (IsMatch(false, key_sym, state, next_source_))
 {
 if (last_action_ != next_source_)
- Activate(indicator_keyboard_actions_, "locked_scroll", g_variant_new_int32(+1));
+ ActivateKeyboardAction("locked_scroll", g_variant_new_int32(+1));
 
 last_action_ = std::make_pair(0, 0);
 }
@@ -421,7 +421,7 @@ void Panel::OnKeyUp(unsigned int key_sym,
 void Panel::ActivateIndicatorAction(std::string const& bus_name,
 std::string const& object_path,
 std::string const& action,
- glib::Variant const& parameter = glib::Variant()) const;
+ glib::Variant const& parameter) const
 {
 GVariantBuilder builder;
 
diff --git a/lockscreen/LockScreenShield.cpp b/lockscreen/LockScreenShield.cpp
index d8bafdc8f..b1f7191bb 100644
--- a/lockscreen/LockScreenShield.cpp
+++ b/lockscreen/LockScreenShield.cpp
@@ -175,7 +175,7 @@ nux::Area* Shield::FindKeyFocusArea(unsigned etype, unsigned long key_sym, unsig
 {
 if (primary)
 {
- grab_key.emit(modifiers, key_code);
+ grab_key.emit(modifiers, key_sym);
 
 if (panel_view_ && panel_view_->WillHandleKeyEvent(etype, key_sym, modifiers))
 return panel_view_;