summaryrefslogtreecommitdiff
diff options
authorsmspillaz <sam.spilsbury@canonical.com>2012-03-02 12:35:46 +0800
committersmspillaz <sam.spilsbury@canonical.com>2012-03-02 12:35:46 +0800
commitfeb4eb2ce64daa2ae0cfbb4a8f6af3b7fbec6d07 (patch)
treea2da28fa8c5cbe393f24c2bf3433a9c32f14e739
parenta2a989c8ad39f266933aee1efba65f37362a5b8b (diff)
Always return true whenever an action was handled
Fixes LP: #943456 (bzr r2044.3.1)
-rw-r--r--plugins/unityshell/src/unityshell.cpp38
1 files changed, 19 insertions, 19 deletions
diff --git a/plugins/unityshell/src/unityshell.cpp b/plugins/unityshell/src/unityshell.cpp
index 93f9395fe..2b5661927 100644
--- a/plugins/unityshell/src/unityshell.cpp
+++ b/plugins/unityshell/src/unityshell.cpp
@@ -1502,7 +1502,7 @@ bool UnityScreen::showLauncherKeyInitiate(CompAction* action,
shortcut_controller_->Show();
}
- return false;
+ return true;
}
bool UnityScreen::showLauncherKeyTerminate(CompAction* action,
@@ -1522,7 +1522,7 @@ bool UnityScreen::showLauncherKeyTerminate(CompAction* action,
shortcut_controller_->SetEnabled(enable_shortcut_overlay_);
shortcut_controller_->Hide();
action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
- return false;
+ return true;
}
bool UnityScreen::showPanelFirstMenuKeyInitiate(CompAction* action,
@@ -1533,7 +1533,7 @@ bool UnityScreen::showPanelFirstMenuKeyInitiate(CompAction* action,
// to receive the Terminate event
action->setState(action->state() | CompAction::StateTermKey);
panel_controller_->StartFirstMenuShow();
- return false;
+ return true;
}
bool UnityScreen::showPanelFirstMenuKeyTerminate(CompAction* action,
@@ -1543,7 +1543,7 @@ bool UnityScreen::showPanelFirstMenuKeyTerminate(CompAction* action,
screen->removeGrab(grab_index_, NULL);
action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
panel_controller_->EndFirstMenuShow();
- return false;
+ return true;
}
void UnityScreen::SendExecuteCommand()
@@ -1557,7 +1557,7 @@ bool UnityScreen::executeCommand(CompAction* action,
CompOption::Vector& options)
{
SendExecuteCommand();
- return false;
+ return true;
}
void UnityScreen::startLauncherKeyNav()
@@ -1586,7 +1586,7 @@ bool UnityScreen::setKeyboardFocusKeyInitiate(CompAction* action,
CompOption::Vector& options)
{
_key_nav_mode_requested = true;
- return false;
+ return true;
}
bool UnityScreen::altTabInitiateCommon(switcher::ShowMode show_mode)
@@ -1660,7 +1660,7 @@ bool UnityScreen::altTabForwardInitiate(CompAction* action,
altTabInitiateCommon(switcher::ShowMode::CURRENT_VIEWPORT);
action->setState(action->state() | CompAction::StateTermKey);
- return false;
+ return true;
}
bool UnityScreen::altTabForwardAllInitiate(CompAction* action,
@@ -1673,7 +1673,7 @@ bool UnityScreen::altTabForwardAllInitiate(CompAction* action,
altTabInitiateCommon(switcher::ShowMode::ALL);
action->setState(action->state() | CompAction::StateTermKey);
- return false;
+ return true;
}
bool UnityScreen::altTabPrevAllInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1681,7 +1681,7 @@ bool UnityScreen::altTabPrevAllInitiate(CompAction* action, CompAction::State st
if (switcher_controller_->Visible())
switcher_controller_->Prev();
- return false;
+ return true;
}
bool UnityScreen::altTabPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1689,7 +1689,7 @@ bool UnityScreen::altTabPrevInitiate(CompAction* action, CompAction::State state
if (switcher_controller_->Visible())
switcher_controller_->Prev();
- return false;
+ return true;
}
bool UnityScreen::altTabDetailStartInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1697,7 +1697,7 @@ bool UnityScreen::altTabDetailStartInitiate(CompAction* action, CompAction::Stat
if (switcher_controller_->Visible())
switcher_controller_->SetDetail(true);
- return false;
+ return true;
}
bool UnityScreen::altTabDetailStopInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1705,7 +1705,7 @@ bool UnityScreen::altTabDetailStopInitiate(CompAction* action, CompAction::State
if (switcher_controller_->Visible())
switcher_controller_->SetDetail(false);
- return false;
+ return true;
}
bool UnityScreen::altTabNextWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1719,7 +1719,7 @@ bool UnityScreen::altTabNextWindowInitiate(CompAction* action, CompAction::State
switcher_controller_->NextDetail();
action->setState(action->state() | CompAction::StateTermKey);
- return false;
+ return true;
}
bool UnityScreen::altTabPrevWindowInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1727,7 +1727,7 @@ bool UnityScreen::altTabPrevWindowInitiate(CompAction* action, CompAction::State
if (switcher_controller_->Visible())
switcher_controller_->PrevDetail();
- return false;
+ return true;
}
bool UnityScreen::launcherSwitcherForwardInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
@@ -1743,13 +1743,13 @@ bool UnityScreen::launcherSwitcherForwardInitiate(CompAction* action, CompAction
}
action->setState(action->state() | CompAction::StateTermKey);
- return false;
+ return true;
}
bool UnityScreen::launcherSwitcherPrevInitiate(CompAction* action, CompAction::State state, CompOption::Vector& options)
{
launcher_controller_->KeyNavPrevious();
- return false;
+ return true;
}
bool UnityScreen::launcherSwitcherTerminate(CompAction* action, CompAction::State state, CompOption::Vector& options)
{
@@ -1758,7 +1758,7 @@ bool UnityScreen::launcherSwitcherTerminate(CompAction* action, CompAction::Stat
EnableCancelAction(false);
action->setState (action->state() & (unsigned)~(CompAction::StateTermKey));
- return false;
+ return true;
}
void UnityScreen::OnLauncherStartKeyNav(GVariant* data)
@@ -1790,7 +1790,7 @@ bool UnityScreen::ShowHudInitiate(CompAction* action,
action->setState(action->state() | CompAction::StateTermKey);
last_hud_show_time_ = g_get_monotonic_time();
- return false;
+ return true;
}
bool UnityScreen::ShowHudTerminate(CompAction* action,
@@ -1830,7 +1830,7 @@ bool UnityScreen::ShowHudTerminate(CompAction* action,
hud_controller_->ShowHud();
}
- return false;
+ return true;
}
gboolean UnityScreen::initPluginActions(gpointer data)