New upstream version 1.4.2 upstream/1.4.2

1 files changed, 8 insertions, 31 deletions

diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index afa769f6..550f0c2e 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -1860,8 +1860,12 @@ do_device_connect (NmCli *nmc, int argc, char **argv)
 
 	/* Create secret agent */
 	nmc->secret_agent = nm_secret_agent_simple_new ("nmcli-connect");
-	if (nmc->secret_agent)
-		g_signal_connect (nmc->secret_agent, "request-secrets", G_CALLBACK (nmc_secrets_requested), nmc);
+	if (nmc->secret_agent) {
+		g_signal_connect (nmc->secret_agent,
+		                  NM_SECRET_AGENT_SIMPLE_REQUEST_SECRETS,
+		                  G_CALLBACK (nmc_secrets_requested),
+		                  nmc);
+	}
 
 	info = g_malloc0 (sizeof (AddAndActivateInfo));
 	info->nmc = nmc;
@@ -3809,33 +3813,6 @@ is_single_word (const char* line)
 		return FALSE;
 }
 
-static char *
-gen_func_ifnames (const char *text, int state)
-{
-	int i;
-	const GPtrArray *devices;
-	const char **ifnames;
-	char *ret;
-
-	nm_cli.get_client (&nm_cli);
-	devices = nm_client_get_devices (nm_cli.client);
-	if (devices->len == 0)
-		return NULL;
-
-	ifnames = g_new (const char *, devices->len + 1);
-	for (i = 0; i < devices->len; i++) {
-		NMDevice *dev = g_ptr_array_index (devices, i);
-		const char *ifname = nm_device_get_iface (dev);
-		ifnames[i] = ifname;
-	}
-	ifnames[i] = NULL;
-
-	ret = nmc_rl_gen_func_basic (text, state, ifnames);
-
-	g_free (ifnames);
-	return ret;
-}
-
 static char **
 nmcli_device_tab_completion (const char *text, int start, int end)
 {
@@ -3852,9 +3829,9 @@ nmcli_device_tab_completion (const char *text, int start, int end)
 		if (!is_single_word (rl_line_buffer))
 			return NULL;
 
-		generator_func = gen_func_ifnames;
+		generator_func = nmc_rl_gen_func_ifnames;
 	} else if (g_strcmp0 (rl_prompt, PROMPT_INTERFACES) == 0) {
-		generator_func = gen_func_ifnames;
+		generator_func = nmc_rl_gen_func_ifnames;
 	}
 
 	if (generator_func)