[network-manager-applet/rm-userset] applet: fix up WiMAX for recent API changes post-merge

[Dan Williams <dcbw src gnome org>]

commit 15bc8669730b24c823c8f62f6fa85f480e5f33b5
Author: Dan Williams <dcbw redhat com>
Date:   Thu Jan 27 11:07:18 2011 -0600

    applet: fix up WiMAX for recent API changes post-merge

 src/applet-device-wimax.c |   16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)
---
diff --git a/src/applet-device-wimax.c b/src/applet-device-wimax.c
index 7773410..f10d1ec 100644
--- a/src/applet-device-wimax.c
+++ b/src/applet-device-wimax.c
@@ -345,7 +345,7 @@ active_nsp_changed_cb (NMDeviceWimax *device,
                        GParamSpec *pspec,
                        NMApplet *applet)
 {
-	NMSettingsConnectionInterface *connection;
+	NMRemoteConnection *connection;
 	NMSettingWimax *s_wimax;
 	NMWimaxNsp *new;
 	NMDeviceState state;
@@ -489,19 +489,11 @@ wimax_get_icon (NMDevice *device,
 }
 
 static gboolean
-wimax_get_secrets (NMDevice *device,
-                   NMSettingsConnectionInterface *connection,
-                   NMActiveConnection *active_connection,
-                   const char *setting_name,
-                   const char **hints,
-                   NMANewSecretsRequestedFunc callback,
-                   gpointer callback_data,
-                   NMApplet *applet,
-                   GError **error)
+wimax_get_secrets (SecretsRequest *req, GError **error)
 {
 	g_set_error (error,
-	             NM_SETTINGS_INTERFACE_ERROR,
-	             NM_SETTINGS_INTERFACE_ERROR_INTERNAL_ERROR,
+	             NM_SECRET_AGENT_ERROR,
+	             NM_SECRET_AGENT_ERROR_NO_SECRETS,
 	             "%s.%d (%s): no WiMAX secrets available.",
 	             __FILE__, __LINE__, __func__);
 	return FALSE;