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.

2 files changed, 4 insertions, 19 deletions

diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 1f6d12332..e18fd7afc 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -6759,18 +6759,6 @@ modem_signal_load_values (MMIfaceModemSignal  *self,
 
     task = g_task_new (self, NULL, callback, user_data);
 
-    if (mbim_device_check_ms_mbimex_version (device, 2, 0)) {
-        message = mbim_message_signal_state_query_new (NULL);
-        mbim_device_command (device,
-                             message,
-                             5,
-                             NULL,
-                             (GAsyncReadyCallback)signal_state_query_ready,
-                             task);
-        mbim_message_unref (message);
-        return;
-    }
-
     if (MM_BROADBAND_MODEM_MBIM (self)->priv->is_atds_signal_supported) {
         message = mbim_message_atds_signal_query_new (NULL);
         mbim_device_command (device,
diff --git a/src/mm-iface-modem-signal.c b/src/mm-iface-modem-signal.c
index fe7d0c7ad..9f9600011 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);
 }