about summary refs log tree commit diff
path: root/src/libnmc-base/nm-client-utils.c
diff options
context:
space:
mode:
authorJeremy Bicha <jeremy.bicha@canonical.com>2022-08-18 08:31:29 -0400
committerJeremy Bicha <jeremy.bicha@canonical.com>2022-08-18 08:31:29 -0400
commitb0887dd4d035acc0d84aa859748d36891548eaaf (patch)
treec4dc0dae50954f3c8fb600aa9e7cfaabeb80deb0 /src/libnmc-base/nm-client-utils.c
parent1a62dcfdc0470be37743914da69fe0b0677c6bfb (diff)
parent4741f1a52215c7ba466140912084d6906185bef3 (diff)
Merge branch 'debian/master' into ubuntu/master
Diffstat (limited to 'src/libnmc-base/nm-client-utils.c')
-rw-r--r--src/libnmc-base/nm-client-utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libnmc-base/nm-client-utils.c b/src/libnmc-base/nm-client-utils.c
index e2ed7fc2..4ce1ac6c 100644
--- a/src/libnmc-base/nm-client-utils.c
+++ b/src/libnmc-base/nm-client-utils.c
@@ -305,7 +305,7 @@ NM_UTILS_LOOKUP_STR_DEFINE(
     NM_UTILS_LOOKUP_ITEM(NM_DEVICE_STATE_UNKNOWN, N_("unknown")), );
 
 static NM_UTILS_LOOKUP_STR_DEFINE(
-    _device_state_to_string,
+    _device_state_externally_to_string,
     NMDeviceState,
     NM_UTILS_LOOKUP_DEFAULT(NULL),
     NM_UTILS_LOOKUP_ITEM(NM_DEVICE_STATE_PREPARE, N_("connecting (externally)")),
@@ -330,7 +330,7 @@ nmc_device_state_to_string_with_external(NMDevice *device)
 
     if ((ac = nm_device_get_active_connection(device))
         && NM_FLAGS_HAS(nm_active_connection_get_state_flags(ac), NM_ACTIVATION_STATE_FLAG_EXTERNAL)
-        && (s = _device_state_to_string(state)))
+        && (s = _device_state_externally_to_string(state)))
         return s;
 
     return nmc_device_state_to_string(state);