From 4f5732f721d11545bfd2ad3a971a44b76bfa7273 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 12 Dec 2011 01:44:41 -0500 Subject: [PATCH] GApplication: fix a copy-paste error Activating an action must not turn into a change-state request. --- gio/gapplication.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gio/gapplication.c b/gio/gapplication.c index e1925398a..17398e057 100644 --- a/gio/gapplication.c +++ b/gio/gapplication.c @@ -1631,7 +1631,8 @@ g_application_change_action_state (GActionGroup *action_group, g_return_if_fail (application->priv->is_registered); if (application->priv->remote_actions) - return g_action_group_change_action_state (application->priv->remote_actions, action_name, value); + return g_action_group_change_action_state (application->priv->remote_actions, + action_name, value); else g_action_group_change_action_state (application->priv->actions, @@ -1650,7 +1651,8 @@ g_application_activate_action (GActionGroup *action_group, g_return_if_fail (application->priv->is_registered); if (application->priv->remote_actions) - return g_action_group_change_action_state (application->priv->remote_actions, action_name, parameter); + return g_action_group_activate_action (application->priv->remote_actions, + action_name, parameter); else g_action_group_activate_action (application->priv->actions,