2007-08-17 Dan Williams <dcbw@redhat.com>

* src/nm-device-802-3-ethernet.c
		- (real_bring_down): don't try to dispose of stuff that might not
			exist



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2712 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2007-08-17 21:31:59 +00:00
parent 4f402876fe
commit d6ce97e677
2 changed files with 18 additions and 6 deletions

View file

@ -1,3 +1,9 @@
2007-08-17 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-3-ethernet.c
- (real_bring_down): don't try to dispose of stuff that might not
exist
2007-08-17 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAP.c

View file

@ -216,15 +216,21 @@ real_bring_down (NMDevice *dev)
NMNetlinkMonitor *monitor;
sup_mgr = nm_supplicant_manager_get ();
nm_supplicant_manager_release_iface (sup_mgr, priv->sup_iface);
priv->sup_iface = NULL;
if (priv->sup_iface) {
nm_supplicant_manager_release_iface (sup_mgr, priv->sup_iface);
priv->sup_iface = NULL;
}
g_object_unref (sup_mgr);
monitor = nm_netlink_monitor_get ();
g_signal_handler_disconnect (monitor, priv->link_connected_id);
priv->link_connected_id = 0;
g_signal_handler_disconnect (monitor, priv->link_disconnected_id);
priv->link_disconnected_id = 0;
if (priv->link_connected_id) {
g_signal_handler_disconnect (monitor, priv->link_connected_id);
priv->link_connected_id = 0;
}
if (priv->link_disconnected_id) {
g_signal_handler_disconnect (monitor, priv->link_disconnected_id);
priv->link_disconnected_id = 0;
}
g_object_unref (monitor);
}