From 9daf358122e20c881264f022b607b70b5ff3640a Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Sat, 17 Dec 2011 13:23:26 -0500 Subject: [PATCH] action muxer: drop direct GDBusActionGroup use We now have GRemoteActionGroup interface with the needed API, implemented by GDBusActionGroup. With the new API we could theoretically turn GActionMuxer itself into a GRemoteActionGroup and expose the _full API to the shell so that the timestamps could be passed from there. --- src/gactionmuxer.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/gactionmuxer.c b/src/gactionmuxer.c index 0c10a52b4..7b49a38d1 100644 --- a/src/gactionmuxer.c +++ b/src/gactionmuxer.c @@ -272,11 +272,11 @@ g_action_muxer_activate_action (GActionGroup *action_group, if (group) { - if (G_IS_DBUS_ACTION_GROUP (group->group)) - g_dbus_action_group_activate_action_full (G_DBUS_ACTION_GROUP (group->group), - action_name, - parameter, - get_platform_data ()); + if (G_IS_REMOTE_ACTION_GROUP (group->group)) + g_remote_action_group_activate_action_full (G_REMOTE_ACTION_GROUP (group->group), + action_name, + parameter, + get_platform_data ()); else g_action_group_activate_action (group->group, action_name, parameter); } @@ -294,11 +294,11 @@ g_action_muxer_change_action_state (GActionGroup *action_group, if (group) { - if (G_IS_DBUS_ACTION_GROUP (group->group)) - g_dbus_action_group_change_action_state_full (G_DBUS_ACTION_GROUP (group->group), - action_name, - state, - get_platform_data ()); + if (G_IS_REMOTE_ACTION_GROUP (group->group)) + g_remote_action_group_change_action_state_full (G_REMOTE_ACTION_GROUP (group->group), + action_name, + state, + get_platform_data ()); else g_action_group_change_action_state (group->group, action_name, state); }