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

Merge remote branch 'origin/master' into zvm

Browse source
This commit is contained in:
Dan Williams 2010-07-28 08:59:47 -07:00
commit 3dcf858c04
2 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/nm-device-wifi.c
View file

@ -2593,6 +2593,11 @@ supplicant_iface_connection_state_cb_handler (gpointer user_data)
}
out:
/* Signal scanning state changes */
if ( task->new_state == NM_SUPPLICANT_INTERFACE_CON_STATE_SCANNING
|| task->old_state == NM_SUPPLICANT_INTERFACE_CON_STATE_SCANNING)
g_object_notify (G_OBJECT (self), "scanning");
finish_supplicant_task (task, FALSE);
return FALSE;
}

19
system-settings/plugins/keyfile/nm-keyfile-connection.c
View file

@ -78,22 +78,21 @@ update (NMSettingsConnectionInterface *connection,
NMKeyfileConnectionPrivate *priv = NM_KEYFILE_CONNECTION_GET_PRIVATE (connection);
char *filename = NULL;
GError *error = NULL;
gboolean success;
success = write_connection (NM_CONNECTION (connection), KEYFILE_DIR, 0, 0, &filename, &error);
if (success && filename && strcmp (priv->filename, filename)) {
if (!write_connection (NM_CONNECTION (connection), KEYFILE_DIR, 0, 0, &filename, &error)) {
callback (connection, error, user_data);
g_clear_error (&error);
return FALSE;
}
if (g_strcmp0 (priv->filename, filename)) {
/* Update the filename if it changed */
g_free (priv->filename);
priv->filename = filename;
success = parent_settings_connection_iface->update (connection, callback, user_data);
} else {
callback (connection, error, user_data);
if (error)
g_error_free (error);
} else
g_free (filename);
}
return success;
return parent_settings_connection_iface->update (connection, callback, user_data);
}
static gboolean