about summary refs log tree commit diff
path: root/clients/cli/devices.c
diff options
context:
space:
mode:
authorMichael Biebl <biebl@debian.org>2018-04-23 18:01:04 +0200
committerMichael Biebl <biebl@debian.org>2018-04-23 18:01:04 +0200
commitd00e17d14b5df5f7fcba1a17f91edbb3180fbf64 (patch)
tree2b16542fff332a3c38fb2191f7ae4d4795f66451 /clients/cli/devices.c
parent2e03b565aa24225ca4992797a5d563542b0b2bdd (diff)
parentf60117b41d5433be1b4a96d82cd11d0c3dce9b63 (diff)
Update upstream source from tag 'upstream/1.11.3'
Update to upstream version '1.11.3'
with Debian dir a3a34e6c602cb81e76dc3c255c617e7f7ecfc11c
Diffstat (limited to 'clients/cli/devices.c')
-rw-r--r--clients/cli/devices.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/clients/cli/devices.c b/clients/cli/devices.c
index da969fbe..a43861fa 100644
--- a/clients/cli/devices.c
+++ b/clients/cli/devices.c
@@ -451,11 +451,8 @@ usage_device_lldp (void)
 static void
 quit (void)
 {
-	if (progress_id) {
-		g_source_remove (progress_id);
+	if (nm_clear_g_source (&progress_id))
 		nmc_terminal_erase_line ();
-	}
-
 	g_main_loop_quit (loop);
 }
 
@@ -834,7 +831,7 @@ fill_output_access_point (gpointer data, gpointer user_data)
 	strength_str = g_strdup_printf ("%u", strength);
 	wpa_flags_str = ap_wpa_rsn_flags_to_string (wpa_flags);
 	rsn_flags_str = ap_wpa_rsn_flags_to_string (rsn_flags);
-	sig_bars = nm_utils_wifi_strength_bars (strength);
+	sig_bars = nmc_wifi_strength_bars (strength);
 
 	security_str = g_string_new (NULL);