[network-manager-applet/rm-userset] applet: more fixes for recent API changes

[Dan Williams <dcbw src gnome org>]

commit ec68a999c69f081b77c38c9c4d322b2cb05d434a
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jan 27 11:01:43 2011 -0600

    applet: more fixes for recent API changes

 src/applet-device-wifi.c  |    5 ++---
 src/applet-device-wired.c |    2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/src/applet-device-wifi.c b/src/applet-device-wifi.c
index 449f02e..93cdedf 100644
--- a/src/applet-device-wifi.c
+++ b/src/applet-device-wifi.c
@@ -1211,11 +1211,10 @@ wireless_device_state_changed (NMDevice *device,
                                NMDeviceStateReason reason,
                                NMApplet *applet)
 {
-	NMAccessPoint *new = NULL;
 	char *msg;
 	char *esc_ssid = NULL;
 
-	new = update_active_ap (device, new_state, applet);
+	update_active_ap (device, new_state, applet);
 
 	if (new_state == NM_DEVICE_STATE_DISCONNECTED)
 		queue_avail_access_point_notification (device);
@@ -1489,7 +1488,7 @@ add_one_setting (GHashTable *settings,
 	g_return_val_if_fail (error != NULL, FALSE);
 	g_return_val_if_fail (*error == NULL, FALSE);
 
-	secrets = nm_setting_to_hash (setting);
+	secrets = nm_setting_to_hash (setting, NM_SETTING_HASH_FLAG_ALL);
 	if (secrets) {
 		g_hash_table_insert (settings, g_strdup (nm_setting_get_name (setting)), secrets);
 	} else {
diff --git a/src/applet-device-wired.c b/src/applet-device-wired.c
index 43ca50b..38c9899 100644
--- a/src/applet-device-wired.c
+++ b/src/applet-device-wired.c
@@ -426,7 +426,7 @@ get_pppoe_secrets_cb (GtkDialog *dialog, gint response, gpointer user_data)
 	setting = nm_connection_get_setting (req->connection, NM_TYPE_SETTING_PPPOE);
 	pppoe_update_setting (NM_SETTING_PPPOE (setting), info);
 
-	secrets = nm_setting_to_hash (setting);
+	secrets = nm_setting_to_hash (setting, NM_SETTING_HASH_FLAG_ONLY_SECRETS);
 	if (!secrets) {
 		g_set_error (&error,
 		             NM_SECRET_AGENT_ERROR,