Author: dcbw
Date: Fri Jan 18 02:58:25 2008
New Revision: 3243
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3243&view=rev
Log:
2008-01-17 Dan Williams <[EMAIL PROTECTED]>
* src/nm-device-802-11-wireless.c
- (real_check_connection_conflicts): ignore connections that
aren't
wireless connections
Modified:
trunk/ChangeLog
trunk/src/nm-device-802-11-wireless.c
Modified: trunk/src/nm-device-802-11-wireless.c
==============================================================================
--- trunk/src/nm-device-802-11-wireless.c (original)
+++ trunk/src/nm-device-802-11-wireless.c Fri Jan 18 02:58:25 2008
@@ -814,10 +814,12 @@
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;
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
