{
NMObjectPrivate *priv = NM_OBJECT_GET_PRIVATE (object);
- if (priv->notify_id) {
- g_source_remove (priv->notify_id);
- priv->notify_id = 0;
- }
+ nm_clear_g_source (&priv->notify_id);
g_slist_free_full (priv->notify_items, (GDestroyNotify) notify_item_free);
priv->notify_items = NULL;
context->sdp_session = NULL;
}
- if (context->sdp_watch_id) {
- g_source_remove (context->sdp_watch_id);
- context->sdp_watch_id = 0;
- }
+ nm_clear_g_source (&context->sdp_watch_id);
}
static void
g_free (base);
/* Got the modem */
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
/* Can only accept the modem in stage2, but since the interface matched
* what we were expecting, don't let anything else claim the modem either.
dun ? "DUN" : (pan ? "PAN" : "unknown"));
/* Kill the connect timeout since we're connected now */
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
if (pan) {
/* Bluez says we're connected now. Start IP config. */
if (priv->bt_type != NM_BT_CAPABILITY_NONE)
nm_bluez_device_disconnect (priv->bt_device);
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
priv->bt_type = NM_BT_CAPABILITY_NONE;
{
NMDeviceBtPrivate *priv = NM_DEVICE_BT_GET_PRIVATE (object);
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
g_signal_handlers_disconnect_matched (priv->bt_device, G_SIGNAL_MATCH_DATA, 0, 0, NULL, NULL, object);
{
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
- if (priv->supplicant.con_timeout_id) {
- g_source_remove (priv->supplicant.con_timeout_id);
- priv->supplicant.con_timeout_id = 0;
- }
-
- if (priv->supplicant_timeout_id) {
- g_source_remove (priv->supplicant_timeout_id);
- priv->supplicant_timeout_id = 0;
- }
+ nm_clear_g_source (&priv->supplicant.con_timeout_id);
+ nm_clear_g_source (&priv->supplicant_timeout_id);
}
static void
{
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (device);
- if (priv->dcb_timeout_id) {
- g_source_remove (priv->dcb_timeout_id);
- priv->dcb_timeout_id = 0;
- }
+ nm_clear_g_source (&priv->dcb_timeout_id);
}
static void
/* Clear wired secrets tries when deactivating */
clear_secrets_tries (device);
- if (priv->pppoe_wait_id) {
- g_source_remove (priv->pppoe_wait_id);
- priv->pppoe_wait_id = 0;
- }
+ nm_clear_g_source (&priv->pppoe_wait_id);
if (priv->pending_ip4_config) {
g_object_unref (priv->pending_ip4_config);
NMDeviceEthernet *self = NM_DEVICE_ETHERNET (object);
NMDeviceEthernetPrivate *priv = NM_DEVICE_ETHERNET_GET_PRIVATE (self);
- if (priv->pppoe_wait_id) {
- g_source_remove (priv->pppoe_wait_id);
- priv->pppoe_wait_id = 0;
- }
+ nm_clear_g_source (&priv->pppoe_wait_id);
dcb_timeout_cleanup (NM_DEVICE (self));
dcb_carrier_cleanup (NM_DEVICE (self));
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
- if (priv->linklocal6_timeout_id) {
- g_source_remove (priv->linklocal6_timeout_id);
- priv->linklocal6_timeout_id = 0;
- }
+ nm_clear_g_source (&priv->linklocal6_timeout_id);
}
static void
{
NMDevicePrivate *priv = NM_DEVICE_GET_PRIVATE (self);
- if (priv->arp_round2_id) {
- g_source_remove (priv->arp_round2_id);
- priv->arp_round2_id = 0;
- }
+ nm_clear_g_source (&priv->arp_round2_id);
}
static void
g_hash_table_remove_all (priv->ip6_saved_properties);
- if (priv->recheck_assume_id) {
- g_source_remove (priv->recheck_assume_id);
- priv->recheck_assume_id = 0;
- }
-
- if (priv->recheck_available.call_id) {
- g_source_remove (priv->recheck_available.call_id);
- priv->recheck_available.call_id = 0;
- }
+ nm_clear_g_source (&priv->recheck_assume_id);
+ nm_clear_g_source (&priv->recheck_available.call_id);
link_disconnect_action_cancel (self);
{
NMDeviceTeamPrivate *priv = NM_DEVICE_TEAM_GET_PRIVATE (device);
- if (priv->teamd_process_watch) {
- g_source_remove (priv->teamd_process_watch);
- priv->teamd_process_watch = 0;
- }
-
- if (priv->teamd_timeout) {
- g_source_remove (priv->teamd_timeout);
- priv->teamd_timeout = 0;
- }
+ nm_clear_g_source (&priv->teamd_process_watch);
+ nm_clear_g_source (&priv->teamd_timeout);
if (priv->teamd_pid > 0) {
nm_utils_kill_child_async (priv->teamd_pid, SIGTERM, LOGD_TEAM, "teamd", 2000, NULL, NULL);
int ifindex = nm_device_get_ifindex (device);
NM80211Mode old_mode = priv->mode;
- if (priv->periodic_source_id) {
- g_source_remove (priv->periodic_source_id);
- priv->periodic_source_id = 0;
- }
+ nm_clear_g_source (&priv->periodic_source_id);
cleanup_association_attempt (self, TRUE);
{
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
- if (priv->pending_scan_id) {
- g_source_remove (priv->pending_scan_id);
- priv->pending_scan_id = 0;
- }
+ nm_clear_g_source (&priv->pending_scan_id);
}
static void
{
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
- if (priv->sup_timeout_id) {
- g_source_remove (priv->sup_timeout_id);
- priv->sup_timeout_id = 0;
- }
-
- if (priv->link_timeout_id) {
- g_source_remove (priv->link_timeout_id);
- priv->link_timeout_id = 0;
- }
+ nm_clear_g_source (&priv->sup_timeout_id);
+ nm_clear_g_source (&priv->link_timeout_id);
}
static void
if (priv->sup_iface)
supplicant_interface_release (self);
- if (priv->periodic_source_id) {
- g_source_remove (priv->periodic_source_id);
- priv->periodic_source_id = 0;
- }
+ nm_clear_g_source (&priv->periodic_source_id);
cleanup_association_attempt (self, TRUE);
cleanup_supplicant_failures (self);
NMDeviceWifi *self = NM_DEVICE_WIFI (object);
NMDeviceWifiPrivate *priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
- if (priv->periodic_source_id) {
- g_source_remove (priv->periodic_source_id);
- priv->periodic_source_id = 0;
- }
+ nm_clear_g_source (&priv->periodic_source_id);
cleanup_association_attempt (self, TRUE);
supplicant_interface_release (self);
gchar *name_owner;
/* Quit poking, if any */
- if (self->priv->mm_launch_id) {
- g_source_remove (self->priv->mm_launch_id);
- self->priv->mm_launch_id = 0;
- }
+ nm_clear_g_source (&self->priv->mm_launch_id);
name_owner = g_dbus_object_manager_client_get_name_owner (G_DBUS_OBJECT_MANAGER_CLIENT (modem_manager));
if (!name_owner) {
{
NMModemManager *self = NM_MODEM_MANAGER (object);
- if (self->priv->mm_launch_id) {
- g_source_remove (self->priv->mm_launch_id);
- self->priv->mm_launch_id = 0;
- }
+ nm_clear_g_source (&self->priv->mm_launch_id);
modem_manager_clear_signals (self);
g_clear_object (&self->priv->modem_manager);
{
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
}
static void
{
NMDhcpClientPrivate *priv = NM_DHCP_CLIENT_GET_PRIVATE (self);
- if (priv->watch_id) {
- g_source_remove (priv->watch_id);
- priv->watch_id = 0;
- }
+ nm_clear_g_source (&priv->watch_id);
}
void
{
NMDnsPluginPrivate *priv = NM_DNS_PLUGIN_GET_PRIVATE (self);
- if (priv->watch_id) {
- g_source_remove (priv->watch_id);
- priv->watch_id = 0;
- }
+ nm_clear_g_source (&priv->watch_id);
if (priv->pid) {
nm_utils_kill_child_sync (priv->pid, SIGTERM, LOGD_DNS, priv->progname, NULL, 1000, 0);
priv = NM_DNSMASQ_MANAGER_GET_PRIVATE (manager);
- if (priv->dm_watch_id) {
- g_source_remove (priv->dm_watch_id);
- priv->dm_watch_id = 0;
- }
+ nm_clear_g_source (&priv->dm_watch_id);
if (priv->pid) {
nm_utils_kill_child_async (priv->pid, SIGTERM, LOGD_SHARING, "dnsmasq", 2000, NULL, NULL);
priv->initial_check_obsoleted = FALSE;
}
} else {
- if (priv->check_id) {
- g_source_remove (priv->check_id);
- priv->check_id = 0;
- }
+ nm_clear_g_source (&priv->check_id);
}
if (priv->check_id)
return;
g_assert (priv->devices == NULL);
- if (priv->ac_cleanup_id) {
- g_source_remove (priv->ac_cleanup_id);
- priv->ac_cleanup_id = 0;
- }
+ nm_clear_g_source (&priv->ac_cleanup_id);
while (priv->active_connections)
active_connection_remove (manager, NM_ACTIVE_CONNECTION (priv->active_connections->data));
if (priv->fw_monitor) {
g_signal_handlers_disconnect_by_func (priv->fw_monitor, firmware_dir_changed, manager);
- if (priv->fw_changed_id) {
- g_source_remove (priv->fw_changed_id);
- priv->fw_changed_id = 0;
- }
+ nm_clear_g_source (&priv->fw_changed_id);
g_file_monitor_cancel (priv->fw_monitor);
g_clear_object (&priv->fw_monitor);
nm_device_factory_manager_for_each_factory (_deinit_device_factory, manager);
- if (priv->timestamp_update_id) {
- g_source_remove (priv->timestamp_update_id);
- priv->timestamp_update_id = 0;
- }
+ nm_clear_g_source (&priv->timestamp_update_id);
G_OBJECT_CLASS (nm_manager_parent_class)->dispose (object);
}
connections = nm_manager_get_active_connections (priv->manager);
g_assert (connections == NULL);
- if (priv->reset_retries_id) {
- g_source_remove (priv->reset_retries_id);
- priv->reset_retries_id = 0;
- }
+ nm_clear_g_source (&priv->reset_retries_id);
g_clear_pointer (&priv->orig_hostname, g_free);
g_clear_pointer (&priv->cur_hostname, g_free);
{
NMPPPManagerPrivate *priv = NM_PPP_MANAGER_GET_PRIVATE (manager);
- if (priv->ppp_timeout_handler) {
- g_source_remove (priv->ppp_timeout_handler);
- priv->ppp_timeout_handler = 0;
- }
+ nm_clear_g_source (&priv->ppp_timeout_handler);
}
static void
cancel_get_secrets (manager);
- if (priv->monitor_id) {
- g_source_remove (priv->monitor_id);
- priv->monitor_id = 0;
- }
+ nm_clear_g_source (&priv->monitor_id);
if (priv->monitor_fd >= 0) {
/* Get the stats one last time */
priv->monitor_fd = -1;
}
- if (priv->ppp_timeout_handler) {
- g_source_remove (priv->ppp_timeout_handler);
- priv->ppp_timeout_handler = 0;
- }
-
- if (priv->ppp_watch_id) {
- g_source_remove (priv->ppp_watch_id);
- priv->ppp_watch_id = 0;
- }
+ nm_clear_g_source (&priv->ppp_timeout_handler);
+ nm_clear_g_source (&priv->ppp_watch_id);
}
/***********************************************************/
{
NMFakeRDiscPrivate *priv = NM_FAKE_RDISC_GET_PRIVATE (object);
- if (priv->receive_ra_id) {
- g_source_remove (priv->receive_ra_id);
- priv->receive_ra_id = 0;
- }
+ nm_clear_g_source (&priv->receive_ra_id);
g_slist_free_full (priv->ras, fake_ra_free);
priv->ras = NULL;
NMLNDPRDisc *rdisc = NM_LNDP_RDISC (object);
NMLNDPRDiscPrivate *priv = NM_LNDP_RDISC_GET_PRIVATE (rdisc);
- if (priv->event_id) {
- g_source_remove (priv->event_id);
- priv->event_id = 0;
- }
+ nm_clear_g_source (&priv->event_id);
g_clear_pointer (&priv->event_channel, g_io_channel_unref);
if (priv->ndp) {
guint32 never = G_MAXINT32;
guint32 nextevent = never;
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
clean_gateways (rdisc, now, &changed, &nextevent);
clean_addresses (rdisc, now, &changed, &nextevent);
nm_clear_g_source (&priv->send_rs_id);
g_clear_pointer (&priv->last_send_rs_error, g_free);
- if (priv->timeout_id) {
- g_source_remove (priv->timeout_id);
- priv->timeout_id = 0;
- }
+ nm_clear_g_source (&priv->timeout_id);
G_OBJECT_CLASS (nm_rdisc_parent_class)->dispose (object);
}
}
}
- if (priv->updated_idle_id) {
- g_source_remove (priv->updated_idle_id);
- priv->updated_idle_id = 0;
- }
+ nm_clear_g_source (&priv->updated_idle_id);
/* Disconnect handlers.
* changed_cb() has to be disconnected *before* nm_connection_clear_secrets(),
priv->devtimeout_link_changed_handler);
priv->devtimeout_link_changed_handler = 0;
}
- if (priv->devtimeout_timeout_id) {
- g_source_remove (priv->devtimeout_timeout_id);
- priv->devtimeout_timeout_id = 0;
- }
+ nm_clear_g_source (&priv->devtimeout_timeout_id);
g_clear_object (&priv->inotify_helper);
{
NMSupplicantManagerPrivate *priv = NM_SUPPLICANT_MANAGER_GET_PRIVATE (object);
- if (priv->die_count_reset_id) {
- g_source_remove (priv->die_count_reset_id);
- priv->die_count_reset_id = 0;
- }
+ nm_clear_g_source (&priv->die_count_reset_id);
if (priv->cancellable) {
g_cancellable_cancel (priv->cancellable);
}
}
- if (priv->connect_timeout) {
- g_source_remove (priv->connect_timeout);
- priv->connect_timeout = 0;
- }
+ nm_clear_g_source (&priv->connect_timeout);
if (success) {
print_vpn_config (self);
g_clear_pointer (&priv->connect_hash, g_variant_unref);
- if (priv->connect_timeout) {
- g_source_remove (priv->connect_timeout);
- priv->connect_timeout = 0;
- }
+ nm_clear_g_source (&priv->connect_timeout);
dispatcher_cleanup (self);