From ea224c4045993fac4f1da0a93c430796324d1f57 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Fri, 1 Dec 2023 14:32:18 +0100
Subject: [PATCH 1/2] system: Replace dynamic System row subtitles with static
 text

Row subtitles in Settings are typically a description of the main label or setting.
You can see this in Mouse & Touchpad, Privacy, Sharing, and Wi-Fi.
For the System panel we did something a bit different and used the subtitle to show
the status of each panel.

Given the standard use of subtitles elsewhere, this feels a bit surprising which,
as a result, makes the panel harder to read. I think that a standard description
would probably also be more useful than the current labels.

Mockups https://gitlab.gnome.org/Teams/Design/settings-mockups/-/blob/master/system/system-panel.png?ref_type=heads

This also removes the thin CcSystemPage abstract class because it was
only introduced to add the support for dynamic System row subtitle. Now
this abstraction is no longer necessary.

Fixes #2776
---
 panels/system/about/cc-about-page.c           |   5 +-
 panels/system/about/cc-about-page.h           |   5 +-
 panels/system/about/cc-about-page.ui          |   2 +-
 panels/system/cc-system-page.c                | 118 ------------------
 panels/system/cc-system-page.h                |  46 -------
 panels/system/cc-system-panel.ui              |   8 +-
 panels/system/datetime/cc-datetime-page.c     |  18 +--
 panels/system/datetime/cc-datetime-page.h     |   4 +-
 panels/system/datetime/cc-datetime-page.ui    |   3 +-
 panels/system/meson.build                     |   1 -
 panels/system/region/cc-region-page.c         |   6 +-
 panels/system/region/cc-region-page.h         |   5 +-
 panels/system/region/cc-region-page.ui        |   2 +-
 .../remote-desktop/cc-remote-desktop-page.c   |  16 +--
 .../remote-desktop/cc-remote-desktop-page.h   |   4 +-
 .../remote-desktop/cc-remote-desktop-page.ui  |   3 +-
 16 files changed, 24 insertions(+), 222 deletions(-)
 delete mode 100644 panels/system/cc-system-page.c
 delete mode 100644 panels/system/cc-system-page.h

diff --git a/panels/system/about/cc-about-page.c b/panels/system/about/cc-about-page.c
index 34a7cac8e2..80969f0bfa 100644
--- a/panels/system/about/cc-about-page.c
+++ b/panels/system/about/cc-about-page.c
@@ -30,7 +30,7 @@
 
 struct _CcAboutPage
 {
-  CcSystemPage parent_instance;
+  AdwNavigationPage parent_instance;
 
   CcListRow       *disk_row;
   CcListRow       *hardware_model_row;
@@ -43,7 +43,7 @@ struct _CcAboutPage
   GtkWindow       *system_details_window;
 };
 
-G_DEFINE_TYPE (CcAboutPage, cc_about_page, CC_TYPE_SYSTEM_PAGE)
+G_DEFINE_TYPE (CcAboutPage, cc_about_page, ADW_TYPE_NAVIGATION_PAGE)
 
 static void
 about_page_setup_overview (CcAboutPage *self)
@@ -76,7 +76,6 @@ about_page_setup_overview (CcAboutPage *self)
 
   os_name_text = get_os_name ();
   cc_list_row_set_secondary_label (self->os_name_row, os_name_text);
-  cc_system_page_set_summary (CC_SYSTEM_PAGE (self), os_name_text);
 
   self->system_details_window = GTK_WINDOW (cc_system_details_window_new ());
   parent = (GtkWindow *) gtk_widget_get_native (GTK_WIDGET (self));
diff --git a/panels/system/about/cc-about-page.h b/panels/system/about/cc-about-page.h
index 496f9bafeb..254d6b47bb 100644
--- a/panels/system/about/cc-about-page.h
+++ b/panels/system/about/cc-about-page.h
@@ -19,12 +19,11 @@
 
 #pragma once
 
-#include <shell/cc-panel.h>
-#include "cc-system-page.h"
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_ABOUT_PAGE (cc_about_page_get_type ())
-G_DECLARE_FINAL_TYPE (CcAboutPage, cc_about_page, CC, ABOUT_PAGE, CcSystemPage)
+G_DECLARE_FINAL_TYPE (CcAboutPage, cc_about_page, CC, ABOUT_PAGE, AdwNavigationPage)
 
 G_END_DECLS
diff --git a/panels/system/about/cc-about-page.ui b/panels/system/about/cc-about-page.ui
index 5d9e04f81b..93189ce6e4 100644
--- a/panels/system/about/cc-about-page.ui
+++ b/panels/system/about/cc-about-page.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="CcAboutPage" parent="CcSystemPage">
+  <template class="CcAboutPage" parent="AdwNavigationPage">
     <property name="title" translatable="yes">About</property>
     <property name="tag">system-about-page</property>
     <property name="child">
diff --git a/panels/system/cc-system-page.c b/panels/system/cc-system-page.c
deleted file mode 100644
index e9f1d93e57..0000000000
--- a/panels/system/cc-system-page.c
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * cc-system-page.c
- *
- * Copyright 2023 Red Hat Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * Authors:
- *  Felipe Borges <felipeborges@gnome.org>
- */
-
-#include "cc-system-page.h"
-
-typedef struct
-{
-  const gchar *summary;
-} CcSystemPagePrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_CODE (CcSystemPage, cc_system_page, ADW_TYPE_NAVIGATION_PAGE,
-                         G_ADD_PRIVATE (CcSystemPage))
-
-enum {
-  PROP_0,
-  PROP_SUMMARY,
-  LAST_PROP,
-};
-
-static GParamSpec *props[LAST_PROP];
-
-static void
-cc_system_page_get_property (GObject    *object,
-                             guint       prop_id,
-                             GValue     *value,
-                             GParamSpec *pspec)
-{
-  CcSystemPage *self = CC_SYSTEM_PAGE (object);
-
-  switch (prop_id) {
-  case PROP_SUMMARY:
-    g_value_set_string (value, cc_system_page_get_summary (self));
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-  }
-}
-
-static void
-cc_system_page_set_property (GObject      *object,
-                             guint         prop_id,
-                             const GValue *value,
-                             GParamSpec   *pspec)
-{
-  CcSystemPage *self = CC_SYSTEM_PAGE (object);
-
-  switch (prop_id) {
-  case PROP_SUMMARY:
-    cc_system_page_set_summary (self, g_value_get_string (value));
-    break;
-  default:
-    G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-  }
-}
-
-static void
-cc_system_page_class_init (CcSystemPageClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->get_property = cc_system_page_get_property;
-  object_class->set_property = cc_system_page_set_property;
-
-  props[PROP_SUMMARY] =
-    g_param_spec_string ("summary", NULL, NULL, "",
-                         G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY);
-
-  g_object_class_install_properties (object_class, LAST_PROP, props);
-}
-
-static void
-cc_system_page_init (CcSystemPage *self)
-{
-}
-
-const gchar *
-cc_system_page_get_summary (CcSystemPage *self)
-{
-  g_return_val_if_fail (CC_IS_SYSTEM_PAGE (self), NULL);
-
-  CcSystemPagePrivate *priv = cc_system_page_get_instance_private (self);
-
-  return priv->summary;
-}
-
-void
-cc_system_page_set_summary (CcSystemPage *self,
-                            const gchar  *summary)
-{
-  g_return_if_fail (CC_IS_SYSTEM_PAGE (self));
-
-  CcSystemPagePrivate *priv = cc_system_page_get_instance_private (self);
-
-  priv->summary = g_strdup (summary);
-
-  g_object_notify_by_pspec (G_OBJECT (self), props[PROP_SUMMARY]);
-}
diff --git a/panels/system/cc-system-page.h b/panels/system/cc-system-page.h
deleted file mode 100644
index b9a1581874..0000000000
--- a/panels/system/cc-system-page.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * cc-system-page.h
- *
- * Copyright 2023 Red Hat Inc
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * Author(s):
- *  Felipe Borges <felipeborges@gnome.org>
- */
-
-#pragma once
-
-
-#include <adwaita.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_SYSTEM_PAGE (cc_system_page_get_type ())
-G_DECLARE_DERIVABLE_TYPE (CcSystemPage, cc_system_page, CC, SYSTEM_PAGE, AdwNavigationPage)
-
-struct _CcSystemPageClass
-{
-  AdwNavigationPageClass parent;
-};
-
-const gchar *cc_system_page_get_summary (CcSystemPage *self);
-
-void         cc_system_page_set_summary (CcSystemPage *self,
-                                         const gchar  *summary);
-
-G_END_DECLS
-
diff --git a/panels/system/cc-system-panel.ui b/panels/system/cc-system-panel.ui
index 692ca74a34..9a7e304957 100644
--- a/panels/system/cc-system-panel.ui
+++ b/panels/system/cc-system-panel.ui
@@ -21,7 +21,7 @@
                         <child>
                           <object class="CcListRow">
                             <property name="title" translatable="yes">_Region &amp;amp; Language</property>
-                            <property name="subtitle" bind-source="region_page" bind-property="summary" bind-flags="sync-create|bidirectional"/>
+                            <property name="subtitle" translatable="yes">System language and localization</property>
                             <property name="icon-name">org.gnome.Settings-region-symbolic</property>
                             <property name="use-underline">True</property>
                             <property name="show-arrow">True</property>
@@ -33,7 +33,7 @@
                         <child>
                           <object class="CcListRow">
                             <property name="title" translatable="yes">_Date &amp;amp; Time</property>
-                            <property name="subtitle" bind-source="datetime_page" bind-property="summary" bind-flags="sync-create|bidirectional"/>
+                            <property name="subtitle" translatable="yes">Time zone and clock settings</property>
                             <property name="icon-name">org.gnome.Settings-time-symbolic</property>
                             <property name="use-underline">True</property>
                             <property name="show-arrow">True</property>
@@ -45,7 +45,7 @@
                         <child>
                           <object class="CcListRow">
                             <property name="title" translatable="yes">_Remote Desktop</property>
-                            <property name="subtitle" bind-source="remote_desktop_page" bind-property="summary" bind-flags="sync-create|bidirectional"/>
+                            <property name="subtitle" translatable="yes">Allow this device to be used remotely</property>
                             <property name="icon-name">preferences-desktop-display-symbolic</property>
                             <property name="use-underline">True</property>
                             <property name="show-arrow">True</property>
@@ -56,7 +56,7 @@
                         <child>
                           <object class="CcListRow">
                             <property name="title" translatable="yes">About</property>
-                            <property name="subtitle" bind-source="about_page" bind-property="summary" bind-flags="sync-create|bidirectional"/>
+                            <property name="subtitle" translatable="yes">Hardware details and software versions</property>
                             <property name="icon-name">info-symbolic</property>
                             <property name="use-underline">True</property>
                             <property name="show-arrow">True</property>
diff --git a/panels/system/datetime/cc-datetime-page.c b/panels/system/datetime/cc-datetime-page.c
index 5be96d208f..d232b34edf 100644
--- a/panels/system/datetime/cc-datetime-page.c
+++ b/panels/system/datetime/cc-datetime-page.c
@@ -68,7 +68,7 @@
 
 struct _CcDateTimePage
 {
-  CcSystemPage  parent_instance;
+  AdwNavigationPage  parent_instance;
 
   GList *toplevels;
 
@@ -124,7 +124,7 @@ struct _CcDateTimePage
   int        month; /* index starts from 1 */
 };
 
-G_DEFINE_TYPE (CcDateTimePage, cc_date_time_page, CC_TYPE_SYSTEM_PAGE)
+G_DEFINE_TYPE (CcDateTimePage, cc_date_time_page, ADW_TYPE_NAVIGATION_PAGE)
 
 static void update_time (CcDateTimePage *self);
 
@@ -795,17 +795,6 @@ sort_date_box (GtkListBoxRow  *a,
   return 0;
 }
 
-static void
-update_page_summary (CcDateTimePage *self)
-{
-  gboolean enabled =
-    gtk_switch_get_active (GTK_SWITCH (self->network_time_switch));
-
-  cc_system_page_set_summary (CC_SYSTEM_PAGE (self), enabled ?
-                              _("Automatic date and time") :
-                              gtk_label_get_text (self->timezone_label));
-}
-
 static void
 cc_date_time_page_class_init (CcDateTimePageClass *klass)
 {
@@ -852,7 +841,6 @@ cc_date_time_page_class_init (CcDateTimePageClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, change_clock_settings);
   gtk_widget_class_bind_template_callback (widget_class, on_date_box_row_activated_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_month_selection_changed_cb);
-  gtk_widget_class_bind_template_callback (widget_class, update_page_summary);
 
   bind_textdomain_codeset (GETTEXT_PACKAGE_TIMEZONES, "UTF-8");
 }
@@ -911,8 +899,6 @@ cc_date_time_page_init (CcDateTimePage *self)
   /* setup_timezone_dialog (self); */
   setup_datetime_dialog (self);
 
-  update_page_summary (self);
-
   /* set up network time switch */
   bind_switch_to_row (self,
                       self->network_time_switch,
diff --git a/panels/system/datetime/cc-datetime-page.h b/panels/system/datetime/cc-datetime-page.h
index 7e26f9058e..c0a50cfd68 100644
--- a/panels/system/datetime/cc-datetime-page.h
+++ b/panels/system/datetime/cc-datetime-page.h
@@ -21,11 +21,11 @@
 
 #pragma once
 
-#include "cc-system-page.h"
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_DATE_TIME_PAGE (cc_date_time_page_get_type ())
-G_DECLARE_FINAL_TYPE (CcDateTimePage, cc_date_time_page, CC, DATE_TIME_PAGE, CcSystemPage)
+G_DECLARE_FINAL_TYPE (CcDateTimePage, cc_date_time_page, CC, DATE_TIME_PAGE, AdwNavigationPage)
 
 G_END_DECLS
diff --git a/panels/system/datetime/cc-datetime-page.ui b/panels/system/datetime/cc-datetime-page.ui
index 790ca27e1b..007001e20f 100644
--- a/panels/system/datetime/cc-datetime-page.ui
+++ b/panels/system/datetime/cc-datetime-page.ui
@@ -114,7 +114,7 @@
       </object>
     </property>
   </object>
-  <template class="CcDateTimePage" parent="CcSystemPage">
+  <template class="CcDateTimePage" parent="AdwNavigationPage">
     <property name="title" translatable="yes">Date &amp; Time</property>
     <property name="tag">system-date-time-page</property>
     <property name="child">
@@ -142,7 +142,6 @@
                     <child>
                       <object class="GtkSwitch" id="network_time_switch">
                         <property name="valign">center</property>
-                        <signal name="notify::active" handler="update_page_summary" object="CcDateTimePage" swapped="yes"/>
                       </object>
                     </child>
                   </object>
diff --git a/panels/system/meson.build b/panels/system/meson.build
index e47c5e1e94..f550aeb25d 100644
--- a/panels/system/meson.build
+++ b/panels/system/meson.build
@@ -12,7 +12,6 @@ i18n.merge_file(
 
 sources = files(
   'cc-system-panel.c',
-  'cc-system-page.c',
   'about/cc-about-page.c',
   'about/cc-system-details-window.c',
   'about/cc-info-entry.c',
diff --git a/panels/system/region/cc-region-page.c b/panels/system/region/cc-region-page.c
index 48e81bcbb5..e354faa016 100644
--- a/panels/system/region/cc-region-page.c
+++ b/panels/system/region/cc-region-page.c
@@ -35,7 +35,6 @@
 #include "cc-region-page.h"
 
 #include <act/act.h>
-#include <adwaita.h>
 #include <errno.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
@@ -60,7 +59,7 @@ typedef enum {
 } CcLocaleTarget;
 
 struct _CcRegionPage {
-        CcSystemPage     parent_instance;
+        AdwNavigationPage parent_instance;
 
         CcListRow       *formats_row;
         AdwBanner       *banner;
@@ -87,7 +86,7 @@ struct _CcRegionPage {
         GCancellable    *cancellable;
 };
 
-G_DEFINE_TYPE (CcRegionPage, cc_region_page, CC_TYPE_SYSTEM_PAGE)
+G_DEFINE_TYPE (CcRegionPage, cc_region_page, ADW_TYPE_NAVIGATION_PAGE)
 
 /* Auxiliary methods */
 
@@ -527,7 +526,6 @@ update_user_language_row (CcRegionPage *self)
                 name = gnome_get_language_from_locale (DEFAULT_LOCALE, DEFAULT_LOCALE);
 
         adw_action_row_set_subtitle (ADW_ACTION_ROW (self->language_row), name);
-        cc_system_page_set_summary (CC_SYSTEM_PAGE (self), name);
 
         /* Formats will change too if not explicitly set. */
         update_user_region_row (self);
diff --git a/panels/system/region/cc-region-page.h b/panels/system/region/cc-region-page.h
index 9a26e10770..5d9107f86f 100644
--- a/panels/system/region/cc-region-page.h
+++ b/panels/system/region/cc-region-page.h
@@ -23,13 +23,12 @@
 
 #pragma once
 
-
-#include "cc-system-page.h"
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_REGION_PAGE (cc_region_page_get_type ())
 
-G_DECLARE_FINAL_TYPE (CcRegionPage, cc_region_page, CC, REGION_PAGE, CcSystemPage)
+G_DECLARE_FINAL_TYPE (CcRegionPage, cc_region_page, CC, REGION_PAGE, AdwNavigationPage)
 
 G_END_DECLS
diff --git a/panels/system/region/cc-region-page.ui b/panels/system/region/cc-region-page.ui
index 5e38b0cf1c..816878c12e 100644
--- a/panels/system/region/cc-region-page.ui
+++ b/panels/system/region/cc-region-page.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="CcRegionPage" parent="CcSystemPage">
+  <template class="CcRegionPage" parent="AdwNavigationPage">
     <property name="title" translatable="yes">Region &amp; Language</property>
     <property name="tag">system-region-page</property>
 
diff --git a/panels/system/remote-desktop/cc-remote-desktop-page.c b/panels/system/remote-desktop/cc-remote-desktop-page.c
index 6a8e1e311e..26781bdc82 100644
--- a/panels/system/remote-desktop/cc-remote-desktop-page.c
+++ b/panels/system/remote-desktop/cc-remote-desktop-page.c
@@ -55,7 +55,7 @@
 #define REMOTE_DESKTOP_SERVICE "gnome-remote-desktop.service"
 
 struct _CcRemoteDesktopPage {
-  CcSystemPage  parent_instance;
+  AdwNavigationPage parent_instance;
 
   GtkWidget *remote_control_switch;
   GtkWidget *remote_desktop_toast_overlay;
@@ -78,7 +78,7 @@ struct _CcRemoteDesktopPage {
   GCancellable *cancellable;
 };
 
-G_DEFINE_TYPE (CcRemoteDesktopPage, cc_remote_desktop_page, CC_TYPE_SYSTEM_PAGE)
+G_DEFINE_TYPE (CcRemoteDesktopPage, cc_remote_desktop_page, ADW_TYPE_NAVIGATION_PAGE)
 
 static void
 remote_desktop_show_encryption_fingerprint (CcRemoteDesktopPage *self)
@@ -571,16 +571,6 @@ pw_generate (void)
   return g_steal_pointer (&res);
 }
 
-static void
-update_page_summary (CcRemoteDesktopPage *self)
-{
-  gboolean enabled =
-    gtk_switch_get_active (GTK_SWITCH (self->remote_desktop_switch));
-
-  cc_system_page_set_summary (CC_SYSTEM_PAGE (self),
-                              enabled ? _("Enabled") : ("Disabled"));
-}
-
 static void
 cc_remote_desktop_page_setup_remote_desktop_dialog (CcRemoteDesktopPage *self)
 {
@@ -750,7 +740,6 @@ cc_remote_desktop_page_class_init (CcRemoteDesktopPageClass * klass)
   gtk_widget_class_bind_template_callback (widget_class, on_device_address_copy_clicked);
   gtk_widget_class_bind_template_callback (widget_class, on_username_copy_clicked);
   gtk_widget_class_bind_template_callback (widget_class, on_password_copy_clicked);
-  gtk_widget_class_bind_template_callback (widget_class, update_page_summary);
   gtk_widget_class_bind_template_callback (widget_class, remote_desktop_show_encryption_fingerprint);
 }
 
@@ -763,7 +752,6 @@ cc_remote_desktop_page_init (CcRemoteDesktopPage *self)
 
   gtk_switch_set_active (GTK_SWITCH (self->remote_desktop_switch),
                          is_remote_desktop_enabled (self));
-  update_page_summary (self);
 
   self->cancellable = g_cancellable_new ();
   gsd_sharing_proxy_new_for_bus (G_BUS_TYPE_SESSION,
diff --git a/panels/system/remote-desktop/cc-remote-desktop-page.h b/panels/system/remote-desktop/cc-remote-desktop-page.h
index 98192b9b17..1c6c179867 100644
--- a/panels/system/remote-desktop/cc-remote-desktop-page.h
+++ b/panels/system/remote-desktop/cc-remote-desktop-page.h
@@ -19,12 +19,12 @@
 
 #pragma once
 
-#include "cc-system-page.h"
+#include <adwaita.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_REMOTE_DESKTOP_PAGE (cc_remote_desktop_page_get_type ())
 
-G_DECLARE_FINAL_TYPE (CcRemoteDesktopPage, cc_remote_desktop_page, CC, CC_TYPE_REMOTE_DESKTOP_PAGE, CcSystemPage)
+G_DECLARE_FINAL_TYPE (CcRemoteDesktopPage, cc_remote_desktop_page, CC, CC_TYPE_REMOTE_DESKTOP_PAGE, AdwNavigationPage)
 
 G_END_DECLS
diff --git a/panels/system/remote-desktop/cc-remote-desktop-page.ui b/panels/system/remote-desktop/cc-remote-desktop-page.ui
index 20f340c451..3bc0ab6702 100644
--- a/panels/system/remote-desktop/cc-remote-desktop-page.ui
+++ b/panels/system/remote-desktop/cc-remote-desktop-page.ui
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <template class="CcRemoteDesktopPage" parent="CcSystemPage">
+  <template class="CcRemoteDesktopPage" parent="AdwNavigationPage">
     <property name="title" translatable="yes">Remote Desktop</property>
     <property name="tag">system-remote-desktop-page</property>
 
@@ -27,7 +27,6 @@
                           <object class="GtkSwitch" id="remote_desktop_switch">
                             <property name="active">False</property>
                             <property name="valign">center</property>
-                            <signal name="notify::active" handler="update_page_summary" object="CcRemoteDesktopPage" swapped="yes"/>
                           </object>
                         </child>
                       </object>
-- 
GitLab


From 9ee0795c0ab7ad5c7dcdd7927bde4d73f71783f4 Mon Sep 17 00:00:00 2001
From: Felipe Borges <felipeborges@gnome.org>
Date: Tue, 3 Jan 2023 14:13:14 +0100
Subject: [PATCH 2/2] notifications: Don't list system services

The current system related entries are ambiguous, as it isn't clear
what the actual notifications are.

System services should handle their own notification settings
instead.

Fixes #527
Fixes #1175
---
 panels/notifications/cc-notifications-panel.c | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/panels/notifications/cc-notifications-panel.c b/panels/notifications/cc-notifications-panel.c
index ba12a28429..8030226071 100644
--- a/panels/notifications/cc-notifications-panel.c
+++ b/panels/notifications/cc-notifications-panel.c
@@ -277,6 +277,26 @@ add_application (CcNotificationsPanel *self,
   g_hash_table_add (self->known_applications, g_strdup (app->canonical_app_id));
 }
 
+static gboolean
+app_is_system_service (GDesktopAppInfo *app)
+{
+  g_auto(GStrv) split = NULL;
+  const gchar *categories;
+
+  categories = g_desktop_app_info_get_categories (app);
+  if (categories == NULL || categories[0] == '\0')
+    return FALSE;
+
+  split = g_strsplit (categories, ";", -1);
+  if (g_strv_contains ((const gchar* const*) split, "X-GNOME-Settings-Panel") ||
+      g_strv_contains ((const gchar* const*) split, "Settings") ||
+      g_strv_contains ((const gchar* const*) split, "System")) {
+    return TRUE;
+  }
+
+  return FALSE;
+}
+
 static void
 maybe_add_app_id (CcNotificationsPanel *self,
                   const char *canonical_app_id)
@@ -307,6 +327,11 @@ maybe_add_app_id (CcNotificationsPanel *self,
     return;
   }
 
+  if (app_is_system_service (G_DESKTOP_APP_INFO (app_info))) {
+    /* We don't want to show system services in the notification list */
+    return;
+  }
+
   app = g_slice_new (Application);
   app->canonical_app_id = g_strdup (canonical_app_id);
   app->settings = g_object_ref (settings);
@@ -396,6 +421,11 @@ load_apps (CcNotificationsPanel *self)
 
       app = iter->data;
       if (g_desktop_app_info_get_boolean (app, "X-GNOME-UsesNotifications")) {
+        if (app_is_system_service (app)) {
+          g_debug ("Skipped app '%s', as it is a system service", g_app_info_get_id (G_APP_INFO (app)));
+          continue;
+        }
+
         process_app_info (self, G_APP_INFO (app));
         g_debug ("Processing app '%s'", g_app_info_get_id (G_APP_INFO (app)));
       } else {
-- 
GitLab