[gnome-control-center/wip/davidk/vpn-titles] network: Fix VPN with unescaped ampersand




commit b8bdf770af234f6d64248a8de9b3bb3997db9574
Author: David King <amigadave amigadave com>
Date:   Thu Jul 14 14:21:11 2022 +0100

    network: Fix VPN with unescaped ampersand
    
    Much like in commit 47c586a82e4a4d27db2b68473d7fb370d45ef90b for the
    wifi panel, fix escaping of titles for VPNs.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=2090996

 panels/network/net-vpn.c | 5 ++++-
 subprojects/gvc          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/panels/network/net-vpn.c b/panels/network/net-vpn.c
index fad5e2019..74009d52d 100644
--- a/panels/network/net-vpn.c
+++ b/panels/network/net-vpn.c
@@ -49,14 +49,17 @@ G_DEFINE_TYPE (NetVpn, net_vpn, ADW_TYPE_ACTION_ROW)
 static void
 nm_device_refresh_vpn_ui (NetVpn *self)
 {
+        g_autofree char *title_escaped = NULL;
         const GPtrArray *acs;
         NMActiveConnection *a;
         gint i;
         NMVpnConnectionState state;
 
         /* update title */
+        title_escaped = g_markup_escape_text (nm_connection_get_id (self->connection),
+                                              -1);
         adw_preferences_row_set_title (ADW_PREFERENCES_ROW (self),
-                                       nm_connection_get_id (self->connection));
+                                       title_escaped);
 
         if (self->active_connection) {
                 g_signal_handlers_disconnect_by_func (self->active_connection,
diff --git a/subprojects/gvc b/subprojects/gvc
index 8e7a5a4c3..7a621180b 160000
--- a/subprojects/gvc
+++ b/subprojects/gvc
@@ -1 +1 @@
-Subproject commit 8e7a5a4c3e51007ce6579292642517e3d3eb9c50
+Subproject commit 7a621180b46421e356b33972e3446775a504139c


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]