* src/NetworkManagerDbus.c: Fix comment.
* src/NetworkManagerPolicy.c: Fix crasher. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1664 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
@@ -287,11 +287,9 @@ void nm_dbus_schedule_device_status_change_signal (NMData *data, NMDevice *dev,
|
|||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* nm_dbus_network_status_from_data
|
* nm_get_app_state_from_data
|
||||||
*
|
*
|
||||||
* Return a network status string based on our network data
|
* Return the state of the network connection
|
||||||
*
|
|
||||||
* Caller MUST free returned value
|
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
NMState nm_get_app_state_from_data (NMData *data)
|
NMState nm_get_app_state_from_data (NMData *data)
|
||||||
|
@@ -390,7 +390,7 @@ nm_policy_device_change_check (NMData *data)
|
|||||||
* link to the old access point. We don't switch away
|
* link to the old access point. We don't switch away
|
||||||
* from Ad-Hoc APs either.
|
* from Ad-Hoc APs either.
|
||||||
*/
|
*/
|
||||||
gboolean same_essid = (strcmp (old_essid, new_essid) == 0);
|
gboolean same_essid = (nm_null_safe_strcmp (old_essid, new_essid) == 0);
|
||||||
if ((!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
|
if ((!same_essid || !old_has_link) && (old_mode != IW_MODE_ADHOC))
|
||||||
{
|
{
|
||||||
nm_info ("SWITCH: found better connection '%s/%s'"
|
nm_info ("SWITCH: found better connection '%s/%s'"
|
||||||
|
Reference in New Issue
Block a user