From 11eb79674694ac071a460063814e3c88f8494da5 Mon Sep 17 00:00:00 2001 From: lifeifei Date: Thu, 1 Aug 2024 20:42:27 +0800 Subject: [PATCH] only-display-provider-s-name-when-country_code-is-none --- network-manager-applet.spec | 9 ++++++++- ...ider-s-name-when-country_code-is-none.patch | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 only-display-provider-s-name-when-country_code-is-none.patch diff --git a/network-manager-applet.spec b/network-manager-applet.spec index f5980dc..97c695f 100644 --- a/network-manager-applet.spec +++ b/network-manager-applet.spec @@ -7,7 +7,7 @@ Name: network-manager-applet Version: 1.8.22 -Release: 3 +Release: 4 Summary: NetworkManager GUI tools License: GPLv2+ URL: http://www.gnome.org/projects/NetworkManager @@ -15,6 +15,7 @@ Source0: https://download.gnome.org/sources/network-manager-applet/1.8/% Patch1: 0001-nm-applet-no-notifications.patch Patch6000: backport-po-RHEL-8.1-translations.patch +Patch6001: only-display-provider-s-name-when-country_code-is-none.patch Requires: NetworkManager libnotify Requires: libnma = %{version}-%{release} @@ -174,6 +175,12 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/nm-connection-edit %{_mandir}/man1/nm-connection-editor* %changelog +* Mon Jul 29 2024 lifeifei - 1.8.22-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC: only display provider's name when country_code is none + * Tue Nov 21 2023 zhouwenpei - 1.8.22-3 - Type:bugfix - Id:NA diff --git a/only-display-provider-s-name-when-country_code-is-none.patch b/only-display-provider-s-name-when-country_code-is-none.patch new file mode 100644 index 0000000..f55a29d --- /dev/null +++ b/only-display-provider-s-name-when-country_code-is-none.patch @@ -0,0 +1,18 @@ +diff -apurN network-manager-applet-1.8.22/src/libnma/nma-mobile-providers.c network-manager-applet-1.8.22-new/src/libnma/nma-mobile-providers.c +--- network-manager-applet-1.8.22/src/libnma/nma-mobile-providers.c 2019-05-24 17:49:21.000000000 +0800 ++++ network-manager-applet-1.8.22-new/src/libnma/nma-mobile-providers.c 2024-08-01 20:33:51.327005026 +0800 +@@ -738,9 +738,11 @@ parser_provider_end (MobileParser *parse + if (nma_country_info_get_country_code (parser->current_country)) { + parser->current_provider->name = parser->text_buffer; + } else { +- parser->current_provider->name = g_strdup_printf ("%s (%s)", +- parser->text_buffer, +- parser->country_code); ++ // kylin modify: only display provider's name when country_code is none ++ parser->current_provider->name = (parser->country_code && strlen(parser->country_code) > 0) ++ ? g_strdup_printf("%s (%s)", parser->text_buffer, parser->country_code) ++ : g_strdup(parser->text_buffer); ++ // kylin modify end + g_free (parser->text_buffer); + } + parser->text_buffer = NULL; -- Gitee