fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2025-12-25 20:00:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-01-17 Dan Williams <dcbw@redhat.com>

Browse source 
* src/nm-device-802-11-wireless.c
		- (real_check_connection_conflicts): ignore connections that aren't
			wireless connections



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3243 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-01-18 02:58:25 +00:00
parent 2013215c4c
commit dc92660e6c
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-01-17 Dan Williams <dcbw@redhat.com>
* src/nm-device-802-11-wireless.c
- (real_check_connection_conflicts): ignore connections that aren't
wireless connections
2008-01-17 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerPolicy.c

6
src/nm-device-802-11-wireless.c
View file

@ -814,10 +814,12 @@ real_check_connection_conflicts (NMDevice *device,
g_assert (system_s_con);
s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (connection, NM_TYPE_SETTING_WIRELESS));
g_assert (s_wireless);
if (!s_wireless)
return FALSE;
system_s_wireless = NM_SETTING_WIRELESS (nm_connection_get_setting (system_connection, NM_TYPE_SETTING_WIRELESS));
g_assert (system_s_wireless);
if (!system_s_wireless)
return FALSE;
if (!system_s_con->lockdown)
return FALSE;