diff options
| author | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2015-11-24 00:06:46 +0100 |
| commit | 5916ab88146d04273e6a1895ba3eed7322f2625f (patch) | |
| tree | 54479065ceda124ef5ff84890de64c52717a5645 /libnm-core/nm-utils.c | |
| parent | 3f830f75cf071873c36e1365f80c31e2422e1f7c (diff) | |
| parent | a6ece1a2aa19a6268335c87d4fdef20123dd04a5 (diff) | |
Merge tag 'upstream/1.0.8'
Upstream version 1.0.8
Diffstat (limited to 'libnm-core/nm-utils.c')
| -rw-r--r-- | libnm-core/nm-utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libnm-core/nm-utils.c b/libnm-core/nm-utils.c index 66dd1c87..987cf731 100644 --- a/libnm-core/nm-utils.c +++ b/libnm-core/nm-utils.c @@ -3676,7 +3676,7 @@ char *nm_utils_enum_to_str (GType type, int value) break; if (!first) - g_string_append_c (str, ','); + g_string_append (str, ", "); g_string_append (str, flags_value->value_nick); value &= ~flags_value->value; @@ -3733,7 +3733,7 @@ gboolean nm_utils_enum_from_str (GType type, const char *str, gs_strfreev char **strv = NULL; int i; - strv = g_strsplit (stripped, ",", 0); + strv = g_strsplit_set (stripped, " \t,", 0); for (i = 0; strv[i]; i++) { if (!strv[i][0]) continue; |