everything: use libgudev instead of HAL; merge NM and nm-system-settings

The only thing that doesn't work yet is the system-settings service's
"auto eth" connections for ethernet devices that don't have an existing
connection.  Might also have issues with unmanaged devices that can't
provide a MAC address until they are brought up, but we'll see.

1 files changed, 6 insertions, 6 deletions

diff --git a/src/ppp-manager/nm-ppp-manager.c b/src/ppp-manager/nm-ppp-manager.c
index 73fd1ed880..7fdf2ea808 100644
--- a/src/ppp-manager/nm-ppp-manager.c
+++ b/src/ppp-manager/nm-ppp-manager.c
@@ -408,12 +408,12 @@ impl_ppp_manager_need_secrets (NMPPPManager *manager,
 	 * servers (T-Mobile USA) appear to ask a few times when they actually don't
 	 * even care what you pass back.
 	 */
-	nm_act_request_request_connection_secrets (priv->act_req,
-	                                           setting_name,
-	                                           tries > 1 ? TRUE : FALSE,
-	                                           SECRETS_CALLER_PPP,
-	                                           hint1,
-	                                           hint2);
+	nm_act_request_get_secrets (priv->act_req,
+	                            setting_name,
+	                            tries > 1 ? TRUE : FALSE,
+	                            SECRETS_CALLER_PPP,
+	                            hint1,
+	                            hint2);
 	g_object_set_data (G_OBJECT (connection), PPP_MANAGER_SECRET_TRIES, GUINT_TO_POINTER (++tries));
 	priv->pending_secrets_context = context;