From 8ec14e26e24b823f6be26ff36b428781a75c6bdf Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Sat, 11 Feb 2023 01:27:40 +0100 Subject: Handle state changes for flashlight switch fixes https://gitlab.com/ubports/development/core/packaging/ayatana-indicators/ayatana-indicator-power/-/issues/5 --- src/flashlight.c | 4 +++- src/service.c | 4 ++-- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/flashlight.c b/src/flashlight.c index 064bd31..0a68af2 100644 --- a/src/flashlight.c +++ b/src/flashlight.c @@ -1,5 +1,6 @@ /* * Copyright 2017 The UBports project + * Copyright 2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -15,6 +16,7 @@ * * Authors: * Marius Gripsgard + * Robert Tari */ #include "flashlight.h" @@ -145,7 +147,7 @@ toggle_flashlight_action(GAction *action, toggled = toggle_flashlight_action_simple(); if (toggled) - g_action_change_state(action, g_variant_new_boolean(!activated)); + g_simple_action_set_state (G_SIMPLE_ACTION (action), g_variant_new_boolean(!activated)); } int diff --git a/src/service.c b/src/service.c index 2731508..293a983 100644 --- a/src/service.c +++ b/src/service.c @@ -1,6 +1,6 @@ /* * Copyright 2013-2016 Canonical Ltd. - * Copyright 2021-2022 Robert Tari + * Copyright 2021-2023 Robert Tari * * This program is free software: you can redistribute it and/or modify it * under the terms of the GNU General Public License version 3, as published @@ -931,7 +931,7 @@ init_gactions (IndicatorPowerService * self) a = g_simple_action_new_stateful ("flashlight", pType, g_variant_new_boolean (FALSE)); g_variant_type_free (pType); g_action_map_add_action (G_ACTION_MAP(p->actions), G_ACTION(a)); - g_signal_connect(a, "activate", G_CALLBACK(toggle_flashlight_action), self); + g_signal_connect(a, "change-state", G_CALLBACK(toggle_flashlight_action), self); /* add the brightness action */ a = g_simple_action_new_stateful ("brightness", NULL, action_state_for_brightness (self)); -- cgit v1.2.3