diff -Nru gnome-control-center-41.4/debian/changelog gnome-control-center-41.4/debian/changelog --- gnome-control-center-41.4/debian/changelog 2022-04-20 15:02:15.000000000 -0400 +++ gnome-control-center-41.4/debian/changelog 2022-05-10 22:01:31.000000000 -0400 @@ -1,3 +1,10 @@ +gnome-control-center (1:41.4-1ubuntu13.1) jammy-security; urgency=medium + + * Add patch to turn off RDP gsettings key when turning off RDP Sharing + (LP: #1971415) + + -- Jeremy Bicha Tue, 10 May 2022 22:01:31 -0400 + gnome-control-center (1:41.4-1ubuntu13) jammy; urgency=medium * Add patch to fix RDP Sharing on switch (LP: #1969619) diff -Nru gnome-control-center-41.4/debian/control gnome-control-center-41.4/debian/control --- gnome-control-center-41.4/debian/control 2022-04-20 15:02:15.000000000 -0400 +++ gnome-control-center-41.4/debian/control 2022-05-10 22:01:31.000000000 -0400 @@ -69,8 +69,8 @@ Rules-Requires-Root: no XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/master -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/jammy +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/jammy Package: gnome-control-center Architecture: any diff -Nru gnome-control-center-41.4/debian/control.in gnome-control-center-41.4/debian/control.in --- gnome-control-center-41.4/debian/control.in 2022-04-20 15:02:15.000000000 -0400 +++ gnome-control-center-41.4/debian/control.in 2022-05-10 22:01:31.000000000 -0400 @@ -65,8 +65,8 @@ Rules-Requires-Root: no XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center -Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/master -Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/master +Vcs-Git: https://salsa.debian.org/gnome-team/gnome-control-center.git -b ubuntu/jammy +Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-control-center/tree/ubuntu/jammy Package: gnome-control-center Architecture: any diff -Nru gnome-control-center-41.4/debian/gbp.conf gnome-control-center-41.4/debian/gbp.conf --- gnome-control-center-41.4/debian/gbp.conf 2022-04-20 15:02:15.000000000 -0400 +++ gnome-control-center-41.4/debian/gbp.conf 2022-05-10 22:01:31.000000000 -0400 @@ -1,6 +1,6 @@ [DEFAULT] pristine-tar = True -debian-branch=ubuntu/master +debian-branch=ubuntu/jammy upstream-branch = upstream/latest debian-tag=ubuntu/%(version)s diff -Nru gnome-control-center-41.4/debian/patches/series gnome-control-center-41.4/debian/patches/series --- gnome-control-center-41.4/debian/patches/series 2022-04-20 15:02:15.000000000 -0400 +++ gnome-control-center-41.4/debian/patches/series 2022-05-10 22:01:31.000000000 -0400 @@ -71,3 +71,4 @@ ubuntu/sharing-rdp/0013-sharing-Remove-leftover-remote_desktop_password_inse.patch ubuntu/sharing-rdp/0014-sharing-panel-Make-possible-to-control-and-configure.patch ubuntu/sharing-rdp/0015-sharing-fix-rdp-on-switch.patch +sharing-Turn-off-RDP-gsettings-key-when-turning-off-RDP.patch diff -Nru gnome-control-center-41.4/debian/patches/sharing-Turn-off-RDP-gsettings-key-when-turning-off-RDP.patch gnome-control-center-41.4/debian/patches/sharing-Turn-off-RDP-gsettings-key-when-turning-off-RDP.patch --- gnome-control-center-41.4/debian/patches/sharing-Turn-off-RDP-gsettings-key-when-turning-off-RDP.patch 1969-12-31 19:00:00.000000000 -0500 +++ gnome-control-center-41.4/debian/patches/sharing-Turn-off-RDP-gsettings-key-when-turning-off-RDP.patch 2022-05-10 22:01:31.000000000 -0400 @@ -0,0 +1,27 @@ +From: Jeremy Bicha +Date: Tue, 10 May 2022 16:06:02 -0400 +Subject: sharing: Turn off RDP gsettings key when turning off RDP + +Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1825 +Bug-Ubuntu: https://launchpad.net/bugs/1971415 +(cherry picked from commit f94c96577bf375a8f5d4c978577acf565512ccaf) +--- + panels/sharing/cc-sharing-panel.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/panels/sharing/cc-sharing-panel.c b/panels/sharing/cc-sharing-panel.c +index 6b2a099..6037271 100644 +--- a/panels/sharing/cc-sharing-panel.c ++++ b/panels/sharing/cc-sharing-panel.c +@@ -1045,6 +1045,11 @@ static void + disable_gnome_remote_desktop_service (CcSharingPanel *self) + { + g_autoptr(GError) error = NULL; ++ g_autoptr(GSettings) rdp_settings = NULL; ++ ++ rdp_settings = g_settings_new (GNOME_REMOTE_DESKTOP_RDP_SCHEMA_ID); ++ ++ g_settings_set_boolean (rdp_settings, "enable", FALSE); + + if (!cc_disable_service (REMOTE_DESKTOP_SERVICE, + G_BUS_TYPE_SESSION,