NMConnection *
nma_ethernet_dialog_get_connection (GtkWidget *dialog)
{
NMConnection *connection, *tmp_connection;
WirelessSecurity *security;
NMSetting *s_8021x, *s_con;
g_return_val_if_fail (dialog != NULL, NULL);
connection = g_object_get_data (G_OBJECT (dialog), "connection");
security = g_object_get_data (G_OBJECT (dialog), "security");
/* Here's a nice hack to work around the fact that ws_802_1x_fill_connection()
* needs a wireless setting and a connection setting for various things.
*/
tmp_connection = nm_simple_connection_new ();
/* Add the fake connection setting (mainly for the UUID for cert ignore checking) */
s_con = nm_connection_get_setting (connection, NM_TYPE_SETTING_CONNECTION);
g_assert (s_con);
nm_connection_add_setting (tmp_connection, NM_SETTING (g_object_ref (s_con)));
/* And the fake wireless setting */
nm_connection_add_setting (tmp_connection, nm_setting_wireless_new ());
/* Fill up the 802.1x setting */
ws_802_1x_fill_connection (security, "wpa_eap_auth_combo", tmp_connection);
/* Grab it and add it to our original connection */
s_8021x = nm_connection_get_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
nm_connection_add_setting (connection, NM_SETTING (g_object_ref (s_8021x)));
/* Save new CA cert ignore values to GSettings */
eap_method_ca_cert_ignore_save (tmp_connection);
/* Remove the 8021x setting to prevent the clearing of secrets when the
* simple-connection is destroyed.
*/
nm_connection_remove_setting (tmp_connection, NM_TYPE_SETTING_802_1X);
g_object_unref (tmp_connection);
return connection;
}
static void
ok_button_clicked_save_connection (NMConnectionEditor *self)
{
/* Copy the modified connection to the original connection */
nm_connection_replace_settings_from_connection (self->orig_connection,
self->connection);
nm_connection_editor_set_busy (self, TRUE);
/* Save new CA cert ignore values to GSettings */
eap_method_ca_cert_ignore_save (self->connection);
if (self->is_new_connection) {
nm_client_add_connection_async (self->client,
self->orig_connection,
TRUE,
NULL,
added_connection_cb,
self);
} else {
nm_remote_connection_commit_changes_async (NM_REMOTE_CONNECTION (self->orig_connection),
TRUE, NULL, updated_connection_cb, self);
}
}
