colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2007-09-13 Dan Williams <dcbw@redhat.com>

Browse Source 
* src/nm-device-802-3-ethernet.c
		- (real_bring_down, nm_device_802_3_ethernet_dispose): disconnect from
			netlink monitor carrier signals on dispose, not bring down.  The
			carrier signals should be handled over the entire lifetime of the
			device anyway, not created/destroyed on up or down.



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2802 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2007-09-13 18:09:28 +00:00
parent 9cda18eea2
commit fbb6eec43d
2 changed files with 29 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@@ -1,3 +1,11 @@
2007-09-13 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-3-ethernet.c
- (real_bring_down, nm_device_802_3_ethernet_dispose): disconnect from
netlink monitor carrier signals on dispose, not bring down. The
carrier signals should be handled over the entire lifetime of the
device anyway, not created/destroyed on up or down.
2007-09-13 Dan Williams <dcbw@redhat.com> 2007-09-13 Dan Williams <dcbw@redhat.com>
* libnm-glib/nm-device.c * libnm-glib/nm-device.c

33
src/nm-device-802-3-ethernet.c
View File

@@ -219,7 +219,6 @@ real_bring_down (NMDevice *dev)
{ {
NMDevice8023EthernetPrivate *priv = NM_DEVICE_802_3_ETHERNET_GET_PRIVATE (dev); NMDevice8023EthernetPrivate *priv = NM_DEVICE_802_3_ETHERNET_GET_PRIVATE (dev);
NMSupplicantManager *sup_mgr; NMSupplicantManager *sup_mgr;
NMNetlinkMonitor *monitor;
sup_mgr = nm_supplicant_manager_get (); sup_mgr = nm_supplicant_manager_get ();
if (priv->sup_iface) { if (priv->sup_iface) {
@@ -227,17 +226,6 @@ real_bring_down (NMDevice *dev)
priv->sup_iface = NULL; priv->sup_iface = NULL;
} }
g_object_unref (sup_mgr); g_object_unref (sup_mgr);
monitor = nm_netlink_monitor_get ();
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);
} }
@@ -435,6 +423,26 @@ real_get_best_connection (NMDevice *dev,
} }
static void
nm_device_802_3_ethernet_dispose (GObject *object)
{
NMDevice8023EthernetPrivate *priv = NM_DEVICE_802_3_ETHERNET_GET_PRIVATE (object);
NMNetlinkMonitor *monitor;
monitor = nm_netlink_monitor_get ();
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);
G_OBJECT_CLASS (nm_device_802_3_ethernet_parent_class)->dispose (object);
}
static void static void
nm_device_802_3_ethernet_finalize (GObject *object) nm_device_802_3_ethernet_finalize (GObject *object)
{ {
@@ -480,6 +488,7 @@ nm_device_802_3_ethernet_class_init (NMDevice8023EthernetClass *klass)
/* virtual methods */ /* virtual methods */
object_class->constructor = constructor; object_class->constructor = constructor;
object_class->dispose = nm_device_802_3_ethernet_dispose;
object_class->get_property = get_property; object_class->get_property = get_property;
object_class->finalize = nm_device_802_3_ethernet_finalize; object_class->finalize = nm_device_802_3_ethernet_finalize;