core: use G_SOURCE_REMOVE and G_SOURCE_CONTINUE in GSourceFuncs

35 files changed, 73 insertions, 73 deletions

diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c b/plugins/altair/mm-broadband-modem-altair-lte.c
index d58b6839a..53d516f8a 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 0135c8d9c..f0fa630f8 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 4af5aa4d8..6c64d4d0e 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 70d157c86..5a3187b54 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 22c03de29..85562836e 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 c4a40c22a..95e5722d7 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 eb4ebce1d..561fcca25 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 5627dee83..fa291d65d 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 a1e1a76ee..6949129f2 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 df9004631..f652a65bd 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 bd66ee1ff..461ed6170 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 499aafe7a..8fab1521a 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 5305d1245..4c39c7c73 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 f1c0445ee..275dff830 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 cf02ba307..583af5f91 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 65464569a..878806d76 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 c03074585..8616f1c95 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 e71209322..fe5695712 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 fd3355705..47c6b4f04 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 17658e003..3ea59b597 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
diff --git a/src/mm-base-bearer.c b/src/mm-base-bearer.c
index 1b1c7b311..a49ea4345 100644
--- a/src/mm-base-bearer.c
+++ b/src/mm-base-bearer.c
@@ -200,7 +200,7 @@ deferred_3gpp_unregistration_cb (MMBaseBearer *self)
 
     mm_dbg ("Forcing bearer disconnection, not registered in 3GPP network");
     mm_base_bearer_disconnect_force (self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -282,7 +282,7 @@ deferred_cdma_unregistration_cb (MMBaseBearer *self)
 
     mm_dbg ("Forcing bearer disconnection, not registered in CDMA network");
     mm_base_bearer_disconnect_force (self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-base-manager.c b/src/mm-base-manager.c
index f11070f53..57c3ca16e 100644
--- a/src/mm-base-manager.c
+++ b/src/mm-base-manager.c
@@ -453,7 +453,7 @@ start_device_added_idle (StartDeviceAdded *ctx)
     g_object_unref (ctx->self);
     g_object_unref (ctx->device);
     g_slice_free (StartDeviceAdded, ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
index 84ecf8d2e..3a56566cf 100644
--- a/src/mm-base-modem.c
+++ b/src/mm-base-modem.c
@@ -1357,7 +1357,7 @@ base_modem_invalid_idle (MMBaseModem *self)
      * cancelled */
     mm_base_modem_set_valid (self, FALSE);
     g_object_unref (self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-broadband-modem-mbim.c b/src/mm-broadband-modem-mbim.c
index 626d0d726..603809478 100644
--- a/src/mm-broadband-modem-mbim.c
+++ b/src/mm-broadband-modem-mbim.c
@@ -682,7 +682,7 @@ wait_for_sim_ready (LoadUnlockRequiredContext *ctx)
                          (GAsyncReadyCallback)unlock_required_subscriber_ready_state_ready,
                          ctx);
     mbim_message_unref (message);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-broadband-modem-qmi.c b/src/mm-broadband-modem-qmi.c
index 1b516c69b..0dd88519c 100644
--- a/src/mm-broadband-modem-qmi.c
+++ b/src/mm-broadband-modem-qmi.c
@@ -5495,7 +5495,7 @@ static gboolean
 retry_msisdn_check_cb (CdmaActivationContext *ctx)
 {
     cdma_activation_context_step (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-broadband-modem.c b/src/mm-broadband-modem.c
index 852664623..32a5eea27 100644
--- a/src/mm-broadband-modem.c
+++ b/src/mm-broadband-modem.c
@@ -7666,7 +7666,7 @@ run_cdma_registration_checks_again (RegisterInCdmaNetworkContext *ctx)
         MM_IFACE_MODEM_CDMA (ctx->self),
         (GAsyncReadyCallback)run_cdma_registration_checks_ready,
         ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -8304,7 +8304,7 @@ enabling_after_modem_init_timeout (EnablingStartedContext *ctx)
     ctx->self->priv->enabled_ports_ctx = ports_context_ref (ctx->ports);
     g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
     enabling_started_context_complete_and_free (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -8506,7 +8506,7 @@ schedule_initial_registration_checks_cb (MMBroadbandModem *self)
                                                      NULL);
     /* We got a full reference, so balance it out here */
     g_object_unref (self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-iface-modem-3gpp.c b/src/mm-iface-modem-3gpp.c
index 409c03f8b..baf743fb1 100644
--- a/src/mm-iface-modem-3gpp.c
+++ b/src/mm-iface-modem-3gpp.c
@@ -233,7 +233,7 @@ run_registration_checks_again (RegisterInNetworkContext *ctx)
         ctx->self,
         (GAsyncReadyCallback)run_registration_checks_ready,
         ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -1309,7 +1309,7 @@ periodic_registration_check (MMIfaceModem3gpp *self)
             (GAsyncReadyCallback)periodic_registration_checks_ready,
             NULL);
     }
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 static void
diff --git a/src/mm-iface-modem-cdma.c b/src/mm-iface-modem-cdma.c
index 67d360a10..771bffd71 100644
--- a/src/mm-iface-modem-cdma.c
+++ b/src/mm-iface-modem-cdma.c
@@ -1160,7 +1160,7 @@ periodic_registration_check (MMIfaceModemCdma *self)
             (GAsyncReadyCallback)periodic_registration_checks_ready,
             NULL);
     }
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 static void
diff --git a/src/mm-iface-modem-signal.c b/src/mm-iface-modem-signal.c
index d28c2ad94..dbf115156 100644
--- a/src/mm-iface-modem-signal.c
+++ b/src/mm-iface-modem-signal.c
@@ -157,7 +157,7 @@ refresh_context_cb (MMIfaceModemSignal *self)
         NULL,
         (GAsyncReadyCallback)load_values_ready,
         NULL);
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 static void
diff --git a/src/mm-iface-modem-time.c b/src/mm-iface-modem-time.c
index 1a6ab213a..91be855eb 100644
--- a/src/mm-iface-modem-time.c
+++ b/src/mm-iface-modem-time.c
@@ -270,7 +270,7 @@ timezone_poll_cb (UpdateNetworkTimezoneContext *ctx)
         (GAsyncReadyCallback)load_network_timezone_ready,
         ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-iface-modem.c b/src/mm-iface-modem.c
index 0de50e225..87dace2f0 100644
--- a/src/mm-iface-modem.c
+++ b/src/mm-iface-modem.c
@@ -131,7 +131,7 @@ state_changed_wait_expired (WaitForFinalStateContext *ctx)
         MM_CORE_ERROR_RETRY,
         "Too much time waiting to get to a final state");
     wait_for_final_state_context_complete_and_free (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -250,7 +250,7 @@ load_unlock_required_again (InternalLoadUnlockRequiredContext *ctx)
     ctx->pin_check_timeout_id = 0;
     /* Retry the step */
     internal_load_unlock_required_context_step (ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -961,7 +961,7 @@ periodic_access_technologies_check (MMIfaceModem *self)
             NULL);
     }
 
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 void
@@ -1111,7 +1111,7 @@ expire_signal_quality (MMIfaceModem *self)
     /* Remove source id */
     ctx = g_object_get_qdata (G_OBJECT (self), signal_quality_update_context_quark);
     ctx->recent_timeout_source = 0;
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -1261,7 +1261,7 @@ periodic_signal_quality_check (MMIfaceModem *self)
             NULL);
     }
 
-    return TRUE;
+    return G_SOURCE_CONTINUE;
 }
 
 static void
@@ -2775,7 +2775,7 @@ restart_initialize_idle (MMIfaceModem *self)
     mm_base_modem_initialize (MM_BASE_MODEM (self),
                               (GAsyncReadyCallback) reinitialize_ready,
                               NULL);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
diff --git a/src/mm-plugin-manager.c b/src/mm-plugin-manager.c
index 567555baf..734fbc124 100644
--- a/src/mm-plugin-manager.c
+++ b/src/mm-plugin-manager.c
@@ -334,7 +334,7 @@ deferred_support_check_idle (PortProbeContext *port_probe_ctx)
 {
     port_probe_ctx->defer_id = 0;
     port_probe_context_step (port_probe_ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -765,7 +765,7 @@ min_wait_timeout_cb (FindDeviceSupportContext *ctx)
     ctx->timeout_id = g_timeout_add (MIN_PROBING_TIME_MSECS - MIN_WAIT_TIME_MSECS,
                                      (GSourceFunc)min_probing_timeout_cb,
                                      ctx);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 void
diff --git a/src/mm-port-probe.c b/src/mm-port-probe.c
index 18adb38df..e58d18b71 100644
--- a/src/mm-port-probe.c
+++ b/src/mm-port-probe.c
@@ -563,7 +563,7 @@ wdm_probe (MMPortProbe *self)
         /* All done now */
         port_probe_run_task_complete (task, TRUE, NULL);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 /***************************************************************/
@@ -659,7 +659,7 @@ serial_probe_qcdm (MMPortProbe *self)
 
     /* If already cancelled, do nothing else */
     if (port_probe_run_is_cancelled (self))
-        return FALSE;
+        return G_SOURCE_REMOVE;
 
     mm_dbg ("(%s/%s) probing QCDM...",
             g_udev_device_get_subsystem (self->priv->port),
@@ -687,7 +687,7 @@ serial_probe_qcdm (MMPortProbe *self)
                          "(%s/%s) Couldn't create QCDM port",
                          g_udev_device_get_subsystem (self->priv->port),
                          g_udev_device_get_name (self->priv->port)));
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     /* Try to open the port */
@@ -702,7 +702,7 @@ serial_probe_qcdm (MMPortProbe *self)
                          g_udev_device_get_name (self->priv->port),
                          (error ? error->message : "unknown error")));
         g_clear_error (&error);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     /* Build up the probe command; 0x7E is the frame marker, so put one at the
@@ -723,7 +723,7 @@ serial_probe_qcdm (MMPortProbe *self)
                          "(%s/%s) Failed to create QCDM versin info command",
                          g_udev_device_get_subsystem (self->priv->port),
                          g_udev_device_get_name (self->priv->port)));
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
     verinfo->len = len + 1;
 
@@ -740,7 +740,7 @@ serial_probe_qcdm (MMPortProbe *self)
                                  self);
     g_byte_array_unref (verinfo);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 /***************************************************************/
@@ -955,7 +955,7 @@ serial_probe_at (MMPortProbe *self)
 
     /* If already cancelled, do nothing else */
     if (port_probe_run_is_cancelled (self))
-        return FALSE;
+        return G_SOURCE_REMOVE;
 
     /* If AT probing cancelled, end this partial probing */
     if (g_cancellable_is_cancelled (task->at_probing_cancellable)) {
@@ -964,7 +964,7 @@ serial_probe_at (MMPortProbe *self)
                 g_udev_device_get_name (self->priv->port));
         task->at_result_processor (self, NULL);
         serial_probe_schedule (self);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     mm_port_serial_at_command (
@@ -976,7 +976,7 @@ serial_probe_at (MMPortProbe *self)
         task->at_probing_cancellable,
         (GAsyncReadyCallback)serial_probe_at_parse_response,
         self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static const MMPortProbeAtCommand at_probing[] = {
@@ -1162,7 +1162,7 @@ serial_open_at (MMPortProbe *self)
 
     /* If already cancelled, do nothing else */
     if (port_probe_run_is_cancelled (self))
-        return FALSE;
+        return G_SOURCE_REMOVE;
 
     /* Create AT serial port if not done before */
     if (!task->serial) {
@@ -1183,7 +1183,7 @@ serial_open_at (MMPortProbe *self)
                              "(%s/%s) couldn't create AT port",
                              g_udev_device_get_subsystem (self->priv->port),
                              g_udev_device_get_name (self->priv->port)));
-            return FALSE;
+            return G_SOURCE_REMOVE;
         }
 
         g_object_set (task->serial,
@@ -1236,7 +1236,7 @@ serial_open_at (MMPortProbe *self)
         }
 
         g_clear_error (&error);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     /* success, start probing */
@@ -1250,7 +1250,7 @@ serial_open_at (MMPortProbe *self)
                           TRUE,
                           (GAsyncReadyCallback)serial_flash_ready,
                           self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 gboolean
diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c
index 7dd259334..d1baa1bde 100644
--- a/src/mm-port-serial.c
+++ b/src/mm-port-serial.c
@@ -762,7 +762,7 @@ port_serial_timed_out (gpointer data)
      * serial port */
     g_signal_emit (self, signals[TIMED_OUT], 0, self->priv->n_consecutive_timeouts);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static void
@@ -795,7 +795,7 @@ port_serial_queue_process (gpointer data)
 
     ctx = (CommandContext *) g_queue_peek_head (self->priv->queue);
     if (!ctx)
-        return FALSE;
+        return G_SOURCE_REMOVE;
 
     if (ctx->allow_cached) {
         const GByteArray *cached;
@@ -814,7 +814,7 @@ port_serial_queue_process (gpointer data)
 
             g_byte_array_append (self->priv->response, cached->data, cached->len);
             port_serial_got_response (self, NULL);
-            return FALSE;
+            return G_SOURCE_REMOVE;
         }
 
         /* Cached reply wasn't found, keep on */
@@ -824,7 +824,7 @@ port_serial_queue_process (gpointer data)
     if (!port_serial_process_command (self, ctx, &error)) {
         port_serial_got_response (self, error);
         g_error_free (error);
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     /* Schedule the next byte of the command to be sent */
@@ -833,7 +833,7 @@ port_serial_queue_process (gpointer data)
                                             (mm_port_get_subsys (MM_PORT (self)) == MM_PORT_SUBSYS_TTY ?
                                              self->priv->send_delay / 1000 :
                                              0));
-        return FALSE;
+        return G_SOURCE_REMOVE;
     }
 
     /* Setup the cancellable so that we can stop waiting for a response */
@@ -850,7 +850,7 @@ port_serial_queue_process (gpointer data)
                                  "Won't wait for the reply");
             port_serial_got_response (self, error);
             g_error_free (error);
-            return FALSE;
+            return G_SOURCE_REMOVE;
         }
     }
 
@@ -858,7 +858,7 @@ port_serial_queue_process (gpointer data)
     self->priv->timeout_id = g_timeout_add_seconds (ctx->timeout,
                                                     port_serial_timed_out,
                                                     self);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 static gboolean
@@ -1511,7 +1511,7 @@ reopen_do (MMPortSerial *self)
         g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
     reopen_context_complete_and_free (ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 void
@@ -1729,7 +1729,7 @@ flash_do (MMPortSerial *self)
         g_simple_async_result_set_op_res_gboolean (ctx->result, TRUE);
     flash_context_complete_and_free (ctx);
 
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 void
diff --git a/test/mmtty.c b/test/mmtty.c
index 677203ad5..7947f814d 100644
--- a/test/mmtty.c
+++ b/test/mmtty.c
@@ -250,7 +250,7 @@ start_cb (void)
                           FALSE,
                           (GAsyncReadyCallback) flash_ready,
                           NULL);
-    return FALSE;
+    return G_SOURCE_REMOVE;
 }
 
 int main (int argc, char **argv)