[network-manager-applet/rm-userset] editor: update for recent API changes



commit 18b06765090fad5bc4eb57faed590e3f7d9ac5c3
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jan 27 10:51:53 2011 -0600

    editor: update for recent API changes

 src/connection-editor/nm-connection-editor.c |    4 +---
 src/connection-editor/nm-connection-list.c   |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/src/connection-editor/nm-connection-editor.c b/src/connection-editor/nm-connection-editor.c
index 3cc271b..8b83905 100644
--- a/src/connection-editor/nm-connection-editor.c
+++ b/src/connection-editor/nm-connection-editor.c
@@ -440,7 +440,7 @@ nm_connection_editor_update_connection (NMConnectionEditor *editor, GError **err
 		return FALSE;
 
 	/* Copy the modified connection to the original connection */
-	settings = nm_connection_to_hash (editor->connection);
+	settings = nm_connection_to_hash (editor->connection, NM_SETTING_HASH_FLAG_ALL);
 	nm_connection_replace_settings (editor->orig_connection, settings, NULL);
 	g_hash_table_destroy (settings);
 
@@ -583,8 +583,6 @@ request_secrets (GetSecretsInfo *info)
 
 	nm_remote_connection_get_secrets (NM_REMOTE_CONNECTION (info->self->orig_connection),
 	                                  info->setting_name,
-	                                  NULL,
-	                                  FALSE,
 	                                  get_secrets_cb,
 	                                  info);
 }
diff --git a/src/connection-editor/nm-connection-list.c b/src/connection-editor/nm-connection-list.c
index db9858e..d742864 100644
--- a/src/connection-editor/nm-connection-list.c
+++ b/src/connection-editor/nm-connection-list.c
@@ -460,7 +460,7 @@ update_connection (NMConnectionList *list,
 	 * applet private values that we use to store the path to certificates
 	 * and private keys don't go through D-Bus; they are private of course!
 	 */
-	new_settings = nm_connection_to_hash (NM_CONNECTION (connection));
+	new_settings = nm_connection_to_hash (NM_CONNECTION (connection), NM_SETTING_HASH_FLAG_ALL);
 	if (!nm_connection_replace_settings (NM_CONNECTION (connection), new_settings, &error)) {
 		update_complete (info, error);
 		g_error_free (error);



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]