mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-04 03:38:05 +02:00
2008-10-03 Alexander Sack <asac@ubuntu.com>
* system-settings/src/main.c: - (add_default_dhcp_connection, device_removed_cb): ensure the UDI is always used as the hash key; fixes a crash when removing wired devices git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@4147 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
parent
7511ca75aa
commit
e28b126389
2 changed files with 9 additions and 7 deletions
|
|
@ -1,3 +1,10 @@
|
|||
2008-10-03 Alexander Sack <asac@ubuntu.com>
|
||||
|
||||
* system-settings/src/main.c:
|
||||
- (add_default_dhcp_connection, device_removed_cb): ensure the UDI is
|
||||
always used as the hash key; fixes a crash when removing wired
|
||||
devices
|
||||
|
||||
2008-10-02 Dan Williams <dcbw@redhat.com>
|
||||
|
||||
* src/nm-gsm-device.c
|
||||
|
|
|
|||
|
|
@ -382,7 +382,7 @@ add_default_dhcp_connection (gpointer user_data)
|
|||
return FALSE;
|
||||
|
||||
ignore:
|
||||
g_hash_table_remove (info->app->wired_devices, info);
|
||||
g_hash_table_remove (info->app->wired_devices, info->udi);
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
|
|
@ -407,13 +407,8 @@ static void
|
|||
device_removed_cb (DBusGProxy *proxy, const char *udi, NMDeviceType devtype, gpointer user_data)
|
||||
{
|
||||
Application *app = (Application *) user_data;
|
||||
WiredDeviceInfo *info;
|
||||
|
||||
info = g_hash_table_lookup (app->wired_devices, udi);
|
||||
if (!info)
|
||||
return;
|
||||
|
||||
g_hash_table_remove (app->wired_devices, info);
|
||||
g_hash_table_remove (app->wired_devices, udi);
|
||||
}
|
||||
|
||||
/******************************************************************/
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue