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

2008-10-03 Alexander Sack <asac@ubuntu.com>

Browse Source 
* 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:
Alexander Sack
2008-10-06 16:03:57 +00:00
committed by Dan Williams
parent 7511ca75aa
commit e28b126389
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@@ -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> 2008-10-02 Dan Williams <dcbw@redhat.com>
* src/nm-gsm-device.c * src/nm-gsm-device.c

9
system-settings/src/main.c
View File

@@ -382,7 +382,7 @@ add_default_dhcp_connection (gpointer user_data)
return FALSE; return FALSE;
ignore: ignore:
g_hash_table_remove (info->app->wired_devices, info); g_hash_table_remove (info->app->wired_devices, info->udi);
return FALSE; return FALSE;
} }
@@ -407,13 +407,8 @@ static void
device_removed_cb (DBusGProxy *proxy, const char *udi, NMDeviceType devtype, gpointer user_data) device_removed_cb (DBusGProxy *proxy, const char *udi, NMDeviceType devtype, gpointer user_data)
{ {
Application *app = (Application *) user_data; Application *app = (Application *) user_data;
WiredDeviceInfo *info;
info = g_hash_table_lookup (app->wired_devices, udi); g_hash_table_remove (app->wired_devices, udi);
if (!info)
return;
g_hash_table_remove (app->wired_devices, info);
} }
/******************************************************************/ /******************************************************************/