From 45c7ad1e566b7465ea5e78a34762eab3867b803c Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Wed, 10 May 2023 19:58:07 +0000 Subject: Revert "iface-modem-signal: send a query after threshold set up" This reverts commit 17ed63637fea7ab7238880ec5eb75df910355dd2. We were reusing the signal_state_query_ready() callback in the wrong way. --- src/mm-iface-modem-signal.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'src/mm-iface-modem-signal.c') diff --git a/src/mm-iface-modem-signal.c b/src/mm-iface-modem-signal.c index fe7d0c7a..9f960001 100644 --- a/src/mm-iface-modem-signal.c +++ b/src/mm-iface-modem-signal.c @@ -249,7 +249,7 @@ load_values_ready (MMIfaceModemSignal *self, } static gboolean -query_signal_values (MMIfaceModemSignal *self) +polling_context_cb (MMIfaceModemSignal *self) { MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->load_values ( self, @@ -285,10 +285,10 @@ polling_restart (MMIfaceModemSignal *self) /* Start/restart polling */ if (priv->timeout_source) g_source_remove (priv->timeout_source); - priv->timeout_source = g_timeout_add_seconds (priv->rate, (GSourceFunc) query_signal_values, self); + priv->timeout_source = g_timeout_add_seconds (priv->rate, (GSourceFunc) polling_context_cb, self); /* Also launch right away */ - query_signal_values (self); + polling_context_cb (self); } /*****************************************************************************/ @@ -311,11 +311,8 @@ setup_thresholds_ready (MMIfaceModemSignal *self, if (!MM_IFACE_MODEM_SIGNAL_GET_INTERFACE (self)->setup_thresholds_finish (self, res, &error)) g_task_return_error (task, error); - else { - /* launch a query right away */ - query_signal_values (self); + else g_task_return_boolean (task, TRUE); - } g_object_unref (task); } -- cgit v1.2.3-70-g09d2