core: use G_SOURCE_REMOVE and G_SOURCE_CONTINUE in GSourceFuncs

20 files changed, 28 insertions, 28 deletions

diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c b/plugins/altair/mm-broadband-modem-altair-lte.c
index d58b6839..53d516f8 100644
--- a/plugins/altair/mm-broadband-modem-altair-lte.c
+++ b/plugins/altair/mm-broadband-modem-altair-lte.c
@@ -684,7 +684,7 @@ altair_sim_refresh_timer_expired (MMBroadbandModemAltairLte *self)
         self);
     self->priv->sim_refresh_timer_id = 0;
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/plugins/cinterion/mm-broadband-modem-cinterion.c
index 0135c8d9..f0fa630f 100644
--- a/plugins/cinterion/mm-broadband-modem-cinterion.c
+++ b/plugins/cinterion/mm-broadband-modem-cinterion.c
@@ -553,7 +553,7 @@ power_off_timeout_cb (PowerOffContext *ctx)
                                      "Power off operation timed out");
     power_off_context_complete_and_free (ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -1588,7 +1588,7 @@ simstatus_timeout_cb (AfterSimUnlockContext *ctx)
 {
     ctx->timeout_id = 0;
     after_sim_unlock_context_step (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/plugins/huawei/mm-broadband-bearer-huawei.c
index 4af5aa4d..6c64d4d0 100644
--- a/plugins/huawei/mm-broadband-bearer-huawei.c
+++ b/plugins/huawei/mm-broadband-bearer-huawei.c
@@ -126,7 +126,7 @@ connect_retry_ndisstatqry_check_cb (MMBroadbandBearerHuawei *self)
     /* Retry same step */
     connect_3gpp_context_step (ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -505,7 +505,7 @@ disconnect_retry_ndisstatqry_check_cb (MMBroadbandBearerHuawei *self)
 
     /* Retry same step */
     disconnect_3gpp_context_step (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -705,7 +705,7 @@ network_disconnect_3gpp_delayed (MMBroadbandBearerHuawei *self)
     self->priv->network_disconnect_pending_id = 0;
     mm_base_bearer_report_connection_status (MM_BASE_BEARER (self),
                                              MM_BEARER_CONNECTION_STATUS_DISCONNECTED);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/plugins/huawei/mm-broadband-modem-huawei.c
index 70d157c8..5a3187b5 100644
--- a/plugins/huawei/mm-broadband-modem-huawei.c
+++ b/plugins/huawei/mm-broadband-modem-huawei.c
@@ -712,7 +712,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/huawei/mm-plugin-huawei.c b/plugins/huawei/mm-plugin-huawei.c
index 22c03de2..85562836 100644
--- a/plugins/huawei/mm-plugin-huawei.c
+++ b/plugins/huawei/mm-plugin-huawei.c
@@ -328,7 +328,7 @@ first_interface_missing_timeout_cb (MMDevice *device)
 
     /* Reload the timeout, just in case we end up not having the next interface to probe...
      * which is anyway very unlikely as we got it by looking at the real probe list, but anyway... */
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 static void
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/plugins/icera/mm-broadband-bearer-icera.c
index c4a40c22..95e5722d 100644
--- a/plugins/icera/mm-broadband-bearer-icera.c
+++ b/plugins/icera/mm-broadband-bearer-icera.c
@@ -288,7 +288,7 @@ disconnect_3gpp_timed_out_cb (MMBroadbandBearerIcera *self)
                                      "Disconnection attempt timed out");
 
     disconnect_3gpp_context_complete_and_free (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -547,7 +547,7 @@ connect_timed_out_cb (MMBroadbandBearerIcera *self)
     /* It's probably pointless to try to reset this here, but anyway... */
     connect_reset (ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -795,7 +795,7 @@ static gboolean
 retry_authentication_cb (Dial3gppContext *ctx)
 {
     authenticate (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/plugins/mbm/mm-broadband-bearer-mbm.c
index eb4ebce1..561fcca2 100644
--- a/plugins/mbm/mm-broadband-bearer-mbm.c
+++ b/plugins/mbm/mm-broadband-bearer-mbm.c
@@ -272,7 +272,7 @@ poll_timeout_cb (MMBroadbandBearerMbm *self)
                                          MM_MOBILE_EQUIPMENT_ERROR_NETWORK_TIMEOUT,
                                          "Connection attempt timed out");
         dial_3gpp_context_complete_and_free (ctx);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     ctx->poll_count++;
@@ -286,7 +286,7 @@ poll_timeout_cb (MMBroadbandBearerMbm *self)
                                    (GAsyncReadyCallback)poll_ready,
                                    g_object_ref (ctx->self)); /* we pass the bearer object! */
     self->priv->connect_pending_id = 0;
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/mbm/mm-broadband-modem-mbm.c b/plugins/mbm/mm-broadband-modem-mbm.c
index 5627dee8..fa291d65 100644
--- a/plugins/mbm/mm-broadband-modem-mbm.c
+++ b/plugins/mbm/mm-broadband-modem-mbm.c
@@ -181,7 +181,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/mbm/mm-sim-mbm.c b/plugins/mbm/mm-sim-mbm.c
index a1e1a76e..6949129f 100644
--- a/plugins/mbm/mm-sim-mbm.c
+++ b/plugins/mbm/mm-sim-mbm.c
@@ -90,7 +90,7 @@ cpin_query_cb (SendPinPukContext *ctx)
                               FALSE,
                               (GAsyncReadyCallback)cpin_query_ready,
                               ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/plugins/mtk/mm-broadband-modem-mtk.c
index df900463..f652a65b 100644
--- a/plugins/mtk/mm-broadband-modem-mtk.c
+++ b/plugins/mtk/mm-broadband-modem-mtk.c
@@ -168,7 +168,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
index bd66ee1f..461ed617 100644
--- a/plugins/novatel/mm-broadband-bearer-novatel-lte.c
+++ b/plugins/novatel/mm-broadband-bearer-novatel-lte.c
@@ -161,7 +161,7 @@ poll_connection (MMBroadbandBearerNovatelLte *bearer)
         bearer);
     g_object_unref (modem);
 
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 static void
@@ -248,7 +248,7 @@ connect_3gpp_qmistatus (DetailedConnectContext *ctx)
         (GAsyncReadyCallback)connect_3gpp_qmistatus_ready, /* callback */
         ctx); /* user_data */
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -463,7 +463,7 @@ disconnect_3gpp_qmistatus (DetailedDisconnectContext *ctx)
         NULL, /* cancellable */
         (GAsyncReadyCallback)disconnect_3gpp_status_ready,
         ctx); /* user_data */
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.c b/plugins/novatel/mm-broadband-modem-novatel-lte.c
index 499aafe7..8fab1521 100644
--- a/plugins/novatel/mm-broadband-modem-novatel-lte.c
+++ b/plugins/novatel/mm-broadband-modem-novatel-lte.c
@@ -164,7 +164,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/novatel/mm-common-novatel.c b/plugins/novatel/mm-common-novatel.c
index 5305d124..4c39c7c7 100644
--- a/plugins/novatel/mm-common-novatel.c
+++ b/plugins/novatel/mm-common-novatel.c
@@ -84,7 +84,7 @@ static gboolean
 custom_init_wait_cb (CustomInitContext *ctx)
 {
     custom_init_step (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/plugins/option/mm-broadband-bearer-hso.c
index f1c0445e..275dff83 100644
--- a/plugins/option/mm-broadband-bearer-hso.c
+++ b/plugins/option/mm-broadband-bearer-hso.c
@@ -438,7 +438,7 @@ connect_timed_out_cb (MMBroadbandBearerHso *self)
     /* It's probably pointless to try to reset this here, but anyway... */
     connect_reset (ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/option/mm-broadband-modem-option.c b/plugins/option/mm-broadband-modem-option.c
index cf02ba30..583af5f9 100644
--- a/plugins/option/mm-broadband-modem-option.c
+++ b/plugins/option/mm-broadband-modem-option.c
@@ -675,7 +675,7 @@ after_power_up_wait_cb (GSimpleAsyncResult *result)
     option->priv->after_power_up_wait_id = 0;
     g_object_unref (option);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/pantech/mm-broadband-modem-pantech.c b/plugins/pantech/mm-broadband-modem-pantech.c
index 65464569..878806d7 100644
--- a/plugins/pantech/mm-broadband-modem-pantech.c
+++ b/plugins/pantech/mm-broadband-modem-pantech.c
@@ -122,7 +122,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/plugins/sierra/mm-broadband-modem-sierra.c
index c0307458..8616f1c9 100644
--- a/plugins/sierra/mm-broadband-modem-sierra.c
+++ b/plugins/sierra/mm-broadband-modem-sierra.c
@@ -937,7 +937,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/sierra/mm-common-sierra.c b/plugins/sierra/mm-common-sierra.c
index e7120932..fe569571 100644
--- a/plugins/sierra/mm-common-sierra.c
+++ b/plugins/sierra/mm-common-sierra.c
@@ -257,7 +257,7 @@ sierra_power_up_wait_cb (GSimpleAsyncResult *result)
     g_simple_async_result_set_op_res_gboolean (result, TRUE);
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/plugins/wavecom/mm-broadband-modem-wavecom.c
index fd335570..47c6b4f0 100644
--- a/plugins/wavecom/mm-broadband-modem-wavecom.c
+++ b/plugins/wavecom/mm-broadband-modem-wavecom.c
@@ -1220,7 +1220,7 @@ after_sim_unlock_wait_cb (GSimpleAsyncResult *result)
 {
     g_simple_async_result_complete (result);
     g_object_unref (result);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/plugins/zte/mm-broadband-modem-zte.c b/plugins/zte/mm-broadband-modem-zte.c
index 17658e00..3ea59b59 100644
--- a/plugins/zte/mm-broadband-modem-zte.c
+++ b/plugins/zte/mm-broadband-modem-zte.c
@@ -150,7 +150,7 @@ cpms_timeout_cb (ModemAfterSimUnlockContext *ctx)
 {
     ctx->retries--;
     modem_after_sim_unlock_context_step (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void