Merge tag 'debian/1.34.0-2' into ubuntu/master

network-manager Debian release 1.34.0-2

1 files changed, 9 insertions, 9 deletions

diff --git a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
index e8ae1814..aa36ee8f 100644
--- a/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
+++ b/src/core/settings/plugins/keyfile/nms-keyfile-plugin.c
@@ -101,27 +101,27 @@ _extra_flags_to_string(char *   str,
     const char *str0 = str;
 
     if (!is_nm_generated && !is_volatile && !is_external)
-        nm_utils_strbuf_append_str(&str, &str_len, "");
+        nm_strbuf_append_str(&str, &str_len, "");
     else {
         char ch = '(';
 
-        nm_utils_strbuf_append_c(&str, &str_len, ' ');
+        nm_strbuf_append_c(&str, &str_len, ' ');
         if (is_nm_generated) {
-            nm_utils_strbuf_append_c(&str, &str_len, ch);
-            nm_utils_strbuf_append_str(&str, &str_len, "nm-generated");
+            nm_strbuf_append_c(&str, &str_len, ch);
+            nm_strbuf_append_str(&str, &str_len, "nm-generated");
             ch = ',';
         }
         if (is_volatile) {
-            nm_utils_strbuf_append_c(&str, &str_len, ch);
-            nm_utils_strbuf_append_str(&str, &str_len, "volatile");
+            nm_strbuf_append_c(&str, &str_len, ch);
+            nm_strbuf_append_str(&str, &str_len, "volatile");
             ch = ',';
         }
         if (is_external) {
-            nm_utils_strbuf_append_c(&str, &str_len, ch);
-            nm_utils_strbuf_append_str(&str, &str_len, "external");
+            nm_strbuf_append_c(&str, &str_len, ch);
+            nm_strbuf_append_str(&str, &str_len, "external");
             ch = ',';
         }
-        nm_utils_strbuf_append_c(&str, &str_len, ')');
+        nm_strbuf_append_c(&str, &str_len, ')');
     }
 
     return str0;