43.2

It makes the build fail apparently.

.gitlab-ci.yml

@@ -52,7 +52,7 @@ stages:
     # stable branch.
     # Could probably also switch away from rawhide,
     # to stable fedora branch as well.
-    FDO_DISTRIBUTION_TAG: '2022-03-29.0-main'
+    FDO_DISTRIBUTION_TAG: '2022-10-25.0-main'
     FDO_DISTRIBUTION_VERSION: rawhide
 
 #############################################
@@ -130,6 +130,7 @@ build.container.fedora@x86_64:
       alsa-lib-devel
       nss-devel
       gcr-devel
+      setxkbmap
     FDO_DISTRIBUTION_EXEC: |-
       git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \
         cd gsettings-desktop-schemas && \
@@ -223,6 +224,7 @@ test:
 
   script:
     - *environment_information
+    - *build_procedure
     - *run_tests
 
     - |
@@ -247,7 +249,7 @@ coverage:
     BUILD_OPTS: "-Db_coverage=true"
     coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
   only:
-    - master@GNOME/gnome-control-center
+    - main@GNOME/gnome-control-center
 
   script:
     - *environment_information
@@ -287,7 +289,7 @@ pages:
     paths:
       - public
   only:
-    - master@GNOME/gnome-control-center
+    - main@GNOME/gnome-control-center
 
   except:
     variables:
@@ -301,7 +303,7 @@ pages:
 ##
 flatpak:
   stage: manual
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
+  image: quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master
   artifacts:
     name: package
     paths:
@@ -312,9 +314,7 @@ flatpak:
     OLD_APPID: "org.gnome.Settings"
     APPID: "org.gnome.SettingsDevel"
     BUNDLE: "org.gnome.SettingsDevel.flatpak"
-    MANIFEST_PATH: "org.gnome.Settings.json"
-    PATCHES: "build-aux/flatpak/*.patch"
-    PROJECT_FILE: "build-aux/flatpak/org.gnome.Settings.json"
+    MANIFEST_PATH: "build-aux/flatpak/org.gnome.Settings.json"
     PROJECT_ID: "org.gnome.Settings"
     PROJECT_NAME: "gnome-control-center.git"
     RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
@@ -322,10 +322,6 @@ flatpak:
   script:
     - echo "== Flatpak packaging =="
 
-    # Move needed files to the root folder
-    - cp ${PATCHES} . || true
-    - cp ${PROJECT_FILE} ${MANIFEST_PATH}
-
     # Make it a develoment manifest
     - sed -i -n "p; s/$PROJECT_NAME//p" ${MANIFEST_PATH}
     - >
@@ -343,7 +339,7 @@ flatpak:
     - mv data/icons/hicolor/scalable/apps/$OLD_APPID.svg data/icons/hicolor/scalable/apps/$APPID.svg
     - mv data/icons/hicolor/symbolic/apps/$OLD_APPID-symbolic.svg data/icons/hicolor/symbolic/apps/$APPID-symbolic.svg
 
-    - flatpak-builder --bundle-sources --repo=devel build ${MANIFEST_PATH}
+    - flatpak-builder --bundle-sources --disable-rofiles-fuse --repo=devel build ${MANIFEST_PATH}
     - flatpak build-bundle devel ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APPID}
 
   cache:
@@ -353,7 +349,7 @@ flatpak:
   except:
     - tags
     - gnome-3-.*
-    - master@GNOME/gnome-control-center
+    - main@GNOME/gnome-control-center
 
 
 # Runs the sanitizers [address, thread, undefined, and memory].

.gitlab/issue_templates/Bug.md

@@ -4,7 +4,7 @@ Not following the communication guidelines [1] will mean your issue or comment
 will be removed. Read it carefully before submitting this issue.
 
 
-[1] https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/CONTRIBUTING.md#communication-guideline
+[1] https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/CONTRIBUTING.md#communication-guidelines
 
  -->
 

.gitlab/issue_templates/Feature.md

@@ -4,7 +4,7 @@ Not following the communication guidelines [1] will mean your issue or comment
 will be removed. Read it carefully before submitting this issue.
 
 
-[1] https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/CONTRIBUTING.md#communication-guideline
+[1] https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/CONTRIBUTING.md#communication-guidelines
 
  -->
 

NEWS

@@ -1,3 +1,146 @@
+================
+Version 43.2
+================
+
+- Updated translations
+
+About
+- Update distro logo when dark-mode changes
+
+Applications
+- Don't recurse into symlinks when clearing cache
+
+Cellular
+- Avoid duplicated entries in SIM providers list
+
+Color
+- Fix crash when first device row is non-existent
+
+Common
+- Make list row switches work when annimations are OFF
+
+Display
+- Allow the Night Light error label to wrap for small screens
+
+Mouse
+- Fix activation of rows while navigating with keyboard
+
+Network
+- Fix crashes when EAP password is missing
+- Fix wrong signal of SEA password visibility toggle
+
+Notifications
+- Sync lock screen notification setting string
+
+Users
+- Show a missing-avatar image when avatars cannot be loaded
+
+================
+Version 43.1
+================
+
+- Updated translations
+
+Network
+- Fix crashes editing networks
+
+Power
+- Don't assert if we can't find the widget for a profile
+
+Printers
+- Small visual improvements
+
+================
+Version 43.0
+================
+
+- Updated translations
+
+================
+Version 43.rc
+================
+
+- Fix initial AM/PM label value
+- Remove no longer used icon
+- Select panel only if non-folded when search is canceled
+- Updated translations
+
+Appearance
+- Allow backgrounds to use any image format
+
+Device Security
+- Several UI improvements
+
+Display
+- Fix primary monitor selection
+
+Info
+- Improve dark theme support
+
+Keyboard
+- Fix activation of input source toggle button
+- Improve handling of Shift shortcuts
+
+Power
+- Fix blank screen and power button behavior settings
+
+Printers
+- Show empty state after removing last printer
+
+Search
+- Fix Move Up and Move Down actions
+
+Sound
+- Fix sound alert selection
+
+Wacom
+- Better support Wacom Express Key Remote
+
+================
+Version 43.beta
+================
+
+- Updated translations
+
+Cellular
+- Add WWAN 5G connection support
+
+Device Security
+- Polish failure messages
+- Various style updates
+
+Display
+- Support privacy screens
+
+Info
+- Show build id in a separate row
+
+Network
+- Fix VPN empty state
+
+Sound
+- Update default sounds
+
+User Accounts
+- Fix back button not appearing sometimes
+
+================
+Version 43.alpha
+================
+
+- Improved accessibility in various panels
+- New Device Security panel
+- Updated translations
+
+Date & Time
+- Update visual style of the timezone map
+
+Display
+- Various visual improvements
+
+Sound
+- Remove dog barking sounds
+
 ================
 Version 42.1
 ================

README.md

@@ -1,6 +1,6 @@
-[![Build Status](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/master/pipeline.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/pipelines)
-[![Coverage report](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/master/coverage.svg)](https://gnome.pages.gitlab.gnome.org/gnome-control-center/)
-[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/COPYING)
+[![Build Status](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/main/pipeline.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/pipelines)
+[![Coverage report](https://gitlab.gnome.org/GNOME/gnome-control-center/badges/main/coverage.svg)](https://gnome.pages.gitlab.gnome.org/gnome-control-center/)
+[![License](https://img.shields.io/badge/License-GPL%20v2-blue.svg)](https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/COPYING)
 
 GNOME Settings
 ====================
@@ -60,4 +60,4 @@ Note that GNOME Settings Flatpak will only work if you are running
 the latest GNOME version in your host system.
 
 
-[communication-guidelines]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/CONTRIBUTING.md#communication-guidelines
+[communication-guidelines]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/CONTRIBUTING.md#communication-guidelines

build-aux/meson.build

@@ -1 +0,0 @@
-meson.add_install_script('meson/meson_post_install.py', control_center_datadir)

build-aux/meson/meson_post_install.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import subprocess
-import sys
-
-gsettingsschemadir = os.path.join(sys.argv[1], 'glib-2.0', 'schemas')
-icondir = os.path.join(sys.argv[1], 'icons', 'hicolor')
-
-if not os.environ.get('DESTDIR'):
-    print('Compiling gsettings schemas...')
-    subprocess.call(['glib-compile-schemas', gsettingsschemadir])
-
-    print('Update icon cache...')
-    subprocess.call(['gtk-update-icon-cache', '-f', '-t', icondir])

docs/CONTRIBUTING.md

@@ -66,7 +66,7 @@ size, disability, ethnicity, gender identity and expression, level of experience
 nationality, personal appearance, race, religion, or sexual identity and
 orientation.
 
-### Communication Guideline
+### Communication Guidelines
 
 It is of ultimate importance to maintain a community in which everyone feels free to express
 themselves, review, and comment on each others ideas, both technical and otherwise. Correspondingly,
@@ -209,4 +209,4 @@ available at [http://contributor-covenant.org/version/1/4][version]
 
 [homepage]: http://contributor-covenant.org
 [version]: http://contributor-covenant.org/version/1/4/
-[maintainers]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/docs/MAINTAINERS.md
+[maintainers]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/docs/MAINTAINERS.md

docs/MAINTAINERS.md

@@ -50,7 +50,7 @@ by being explicit. Suggested acceptance phrase:
 Urgency commits should never happen, but in case they're needed, they are defined by the following
 criteria:
 
- * On stable branches (or master right after a stable release)
+ * On stable branches (or `main` right after a stable release)
  * Symptoms:
    * Always OR often reproducible; AND
    * Crash; OR
@@ -59,4 +59,4 @@ criteria:
  * Quickly followed by an emergency release (at most 2 days after the commit)
 
 
-[doap]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/master/gnome-control-center.doap
+[doap]: https://gitlab.gnome.org/GNOME/gnome-control-center/blob/main/gnome-control-center.doap

meson.build

@@ -1,8 +1,8 @@
 project(
   'gnome-control-center', 'c',
-        version : '42.2',
+        version : '43.2',
         license : 'GPL2+',
-  meson_version : '>= 0.53.0'
+  meson_version : '>= 0.57.0'
 )
 
 control_center_prefix = get_option('prefix')
@@ -50,6 +50,17 @@ foreach define: set_defines
   config_h.set_quoted(define[0], define[1])
 endforeach
 
+distributor_logo = get_option('distributor_logo')
+if (distributor_logo != '')
+  config_h.set_quoted('DISTRIBUTOR_LOGO', distributor_logo,
+                      description: 'Define to absolute path of distributor logo')
+  dark_mode_distributor_logo = get_option('dark_mode_distributor_logo')
+  if (dark_mode_distributor_logo != '')
+    config_h.set_quoted('DARK_MODE_DISTRIBUTOR_LOGO', dark_mode_distributor_logo,
+                        description: 'Define to absolute path of distributor logo for use in dark mode')
+  endif
+endif
+
 # meson does not support octal values, so it must be handled as a
 # string. See: https://github.com/mesonbuild/meson/issues/2047
 config_h.set('USER_DIR_MODE', '0700',
@@ -104,7 +115,7 @@ pulse_req_version = '>= 2.0'
 
 libadwaita_dep = dependency(
   'libadwaita-1',
-  version: '>= 1.1',
+  version: '>= 1.2.alpha',
   fallback: ['libadwaita', 'libadwaita_dep'],
   default_options: ['examples=false', 'introspection=disabled', 'tests=false', 'vapi=false'],
 )
@@ -113,7 +124,7 @@ accounts_dep = dependency('accountsservice', version: '>= 0.6.39')
 colord_dep = dependency('colord', version: '>= 0.1.34')
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', version: '>= 2.23.0')
 gio_dep = dependency('gio-2.0')
-glib_dep = dependency('glib-2.0', version: '>= 2.68.0')
+glib_dep = dependency('glib-2.0', version: '>= 2.70.0')
 gnome_desktop_dep = dependency('gnome-desktop-4')
 gnome_bg_dep = dependency('gnome-bg-4')
 gnome_rr_dep = dependency('gnome-rr-4')
@@ -270,7 +281,6 @@ install_subdir(
 top_inc = include_directories('.')
 shell_inc = include_directories('shell')
 
-subdir('build-aux')
 subdir('data/icons')
 subdir('po')
 subdir('panels')
@@ -285,6 +295,11 @@ if get_option('documentation')
   subdir('man')
 endif
 
+gnome.post_install(
+  glib_compile_schemas: true,
+  gtk_update_icon_cache: true,
+)
+
 configure_file(
   output: 'config.h',
   configuration: config_h

meson_options.txt

@@ -7,3 +7,5 @@ option('tracing', type: 'boolean', value: false, description: 'add extra debuggi
 option('wayland', type: 'boolean', value: true, description: 'build with Wayland support')
 option('profile', type: 'combo', choices: ['default','development'], value: 'default')
 option('malcontent', type: 'boolean', value: false, description: 'build with malcontent support')
+option('distributor_logo', type: 'string', description: 'absolute path to distributor logo for the About panel')
+option('dark_mode_distributor_logo', type: 'string', description: 'absolute path to distributor logo dark mode variant')

panels/applications/cc-applications-panel.c

@@ -92,10 +92,11 @@ struct _CcApplicationsPanel
   GtkWidget       *settings_box;
   GtkButton       *install_button;
 
-  GtkWidget       *integration_section;
+  AdwPreferencesGroup *integration_section;
   CcToggleRow     *notification;
   CcToggleRow     *background;
   CcToggleRow     *wallpaper;
+  CcToggleRow     *screenshot;
   CcToggleRow     *sound;
   CcInfoRow       *no_sound;
   CcToggleRow     *search;
@@ -111,6 +112,9 @@ struct _CcApplicationsPanel
   GtkDialog       *builtin_dialog;
   AdwPreferencesGroup *builtin_group;
   GtkListBox      *builtin_list;
+#ifdef HAVE_SNAP
+  GList           *snap_permission_rows;
+#endif
 
   GtkButton       *handler_reset;
   GtkDialog       *handler_dialog;
@@ -512,6 +516,37 @@ wallpaper_cb (CcApplicationsPanel *self)
     set_wallpaper_allowed (self, cc_toggle_row_get_allowed (self->wallpaper));
 }
 
+/* --- screenshot --- */
+
+static void
+get_screenshot_allowed (CcApplicationsPanel *self,
+                        const gchar         *app_id,
+                        gboolean            *set,
+                        gboolean            *allowed)
+{
+  g_auto(GStrv) perms = get_portal_permissions (self, "screenshot", "screenshot", app_id);
+
+  *set = perms != NULL;
+  *allowed = perms == NULL || strcmp (perms[0], "no") != 0;
+}
+
+static void
+set_screenshot_allowed (CcApplicationsPanel *self,
+                        gboolean             allowed)
+{
+  const gchar *perms[2] = { NULL, NULL };
+
+  perms[0] = allowed ? "yes" : "no";
+  set_portal_permissions (self, "screenshot", "screenshot", self->current_app_id, perms);
+}
+
+static void
+screenshot_cb (CcApplicationsPanel *self)
+{
+  if (self->current_app_id)
+    set_screenshot_allowed (self, cc_toggle_row_get_allowed (self->screenshot));
+}
+
 /* --- shortcuts permissions (flatpak) --- */
 
 static void
@@ -541,7 +576,7 @@ set_shortcuts_allowed (CcApplicationsPanel *self,
 
   /* "GRANTED" and "DENIED" here match the values set by the "inhibit shortcut
    * dialog" is GNOME Shell:
-   * https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/master/js/ui/inhibitShortcutsDialog.js
+   * https://gitlab.gnome.org/GNOME/gnome-shell/-/blob/main/js/ui/inhibitShortcutsDialog.js
    */
   perms[0] = granted ? "GRANTED" : "DENIED";
   perms[1] = NULL;
@@ -650,20 +685,11 @@ location_cb (CcApplicationsPanel *self)
 static void
 remove_snap_permissions (CcApplicationsPanel *self)
 {
-  g_autoptr(GList) rows = NULL;
-  GList *link;
+  GList *l;
 
-  rows = gtk_container_get_children (GTK_CONTAINER (self->permission_list));
-  for (link = rows; link; link = link->next)
-    {
-      GtkWidget *row = link->data;
-
-      if (row == GTK_WIDGET (self->builtin))
-        break;
-
-      if (CC_IS_SNAP_ROW (row))
-        gtk_container_remove (GTK_CONTAINER (self->permission_list), GTK_WIDGET (row));
-    }
+  for (l = self->snap_permission_rows; l; l = l->next)
+    adw_preferences_group_remove (self->integration_section, l->data);
+  g_clear_pointer (&self->snap_permission_rows, g_list_free);
 }
 
 static gboolean
@@ -672,8 +698,6 @@ add_snap_permissions (CcApplicationsPanel *self,
                       const gchar         *app_id)
 {
   const gchar *snap_name;
-  g_autoptr(GList) rows = NULL;
-  gint index;
   g_autoptr(SnapdClient) client = NULL;
   g_autoptr(GPtrArray) interfaces = NULL;
   g_autoptr(GPtrArray) plugs = NULL;
@@ -687,10 +711,6 @@ add_snap_permissions (CcApplicationsPanel *self,
     return FALSE;
   snap_name = app_id + strlen (PORTAL_SNAP_PREFIX);
 
-  rows = gtk_container_get_children (GTK_CONTAINER (self->permission_list));
-  index = g_list_index (rows, self->builtin);
-  g_assert (index >= 0);
-
   client = snapd_client_new ();
 
   interfaces = snapd_client_get_interfaces2_sync (client,
@@ -753,9 +773,8 @@ add_snap_permissions (CcApplicationsPanel *self,
         }
 
       row = cc_snap_row_new (cc_panel_get_cancellable (CC_PANEL (self)), interface, plug, available_slots);
-      gtk_widget_show (GTK_WIDGET (row));
-      gtk_list_box_insert (GTK_LIST_BOX (self->permission_list), GTK_WIDGET (row), index);
-      index++;
+      adw_preferences_group_add (self->integration_section, GTK_WIDGET (row));
+      self->snap_permission_rows = g_list_prepend (self->snap_permission_rows, row);
       added++;
     }
 
@@ -846,7 +865,7 @@ static void
 update_header_section (CcApplicationsPanel *self,
                        GAppInfo            *info)
 {
-  g_autoptr(GIcon) icon = NULL;
+  GIcon *icon;
 
   icon = g_app_info_get_icon (info);
   gtk_image_set_from_gicon (self->app_icon_image, icon);
@@ -885,6 +904,10 @@ update_integration_section (CcApplicationsPanel *self,
       gtk_widget_hide (GTK_WIDGET (self->shortcuts));
     }
 
+#ifdef HAVE_SNAP
+  remove_snap_permissions (self);
+#endif
+
   if (portal_app_id != NULL)
     {
       g_clear_object (&self->notification_settings);
@@ -903,6 +926,11 @@ update_integration_section (CcApplicationsPanel *self,
       gtk_widget_set_visible (GTK_WIDGET (self->wallpaper), set);
       has_any |= set;
 
+      get_screenshot_allowed (self, portal_app_id, &set, &allowed);
+      cc_toggle_row_set_allowed (self->screenshot, allowed);
+      gtk_widget_set_visible (GTK_WIDGET (self->screenshot), set);
+      has_any |= set;
+
       disabled = g_settings_get_boolean (self->privacy_settings, "disable-sound-output");
       get_device_allowed (self, "speakers", portal_app_id, &set, &allowed);
       cc_toggle_row_set_allowed (self->sound, allowed);
@@ -931,7 +959,6 @@ update_integration_section (CcApplicationsPanel *self,
       has_any |= set;
 
     #ifdef HAVE_SNAP
-      remove_snap_permissions (self);
       has_any |= add_snap_permissions (self, info, portal_app_id);
     #endif
     }
@@ -945,6 +972,7 @@ update_integration_section (CcApplicationsPanel *self,
 
       gtk_widget_hide (GTK_WIDGET (self->background));
       gtk_widget_hide (GTK_WIDGET (self->wallpaper));
+      gtk_widget_hide (GTK_WIDGET (self->screenshot));
       gtk_widget_hide (GTK_WIDGET (self->sound));
       gtk_widget_hide (GTK_WIDGET (self->no_sound));
       gtk_widget_hide (GTK_WIDGET (self->camera));
@@ -955,7 +983,7 @@ update_integration_section (CcApplicationsPanel *self,
       gtk_widget_hide (GTK_WIDGET (self->no_location));
     }
 
-  gtk_widget_set_visible (self->integration_section, has_any);
+  gtk_widget_set_visible (GTK_WIDGET (self->integration_section), has_any);
 }
 
 /* --- handler section --- */
@@ -1220,7 +1248,7 @@ update_total_size (CcApplicationsPanel *self)
   g_object_set (self->total, "info", formatted_size, NULL);
 
   /* Translators: '%s' is the formatted size, e.g. "26.2 MB" */
-  subtitle = g_strdup_printf (_("%s of disk space used"), formatted_size);
+  subtitle = g_strdup_printf (_("%s of disk space used."), formatted_size);
   g_object_set (self->storage, "subtitle", subtitle, NULL);
 }
 
@@ -1610,6 +1638,9 @@ cc_applications_panel_dispose (GObject *object)
   CcApplicationsPanel *self = CC_APPLICATIONS_PANEL (object);
 
   remove_all_handler_rows (self);
+#ifdef HAVE_SNAP
+  remove_snap_permissions (self);
+#endif
   g_clear_object (&self->monitor);
   g_clear_object (&self->perm_store);
 
@@ -1751,6 +1782,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, notification);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, background);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, wallpaper);
+  gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, screenshot);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, shortcuts);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_box);
   gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_listbox);
@@ -1772,6 +1804,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, notification_cb);
   gtk_widget_class_bind_template_callback (widget_class, background_cb);
   gtk_widget_class_bind_template_callback (widget_class, wallpaper_cb);
+  gtk_widget_class_bind_template_callback (widget_class, screenshot_cb);
   gtk_widget_class_bind_template_callback (widget_class, shortcuts_cb);
   gtk_widget_class_bind_template_callback (widget_class, privacy_link_cb);
   gtk_widget_class_bind_template_callback (widget_class, sound_cb);

panels/applications/cc-applications-panel.ui

@@ -130,11 +130,18 @@
                 </child>
                 <child>
                   <object class="CcToggleRow" id="background">
-                    <property name="title" translatable="yes">Run in background</property>
+                    <property name="title" translatable="yes">Run in Background</property>
                     <property name="subtitle" translatable="yes">Allow activity when the app is closed.</property>
                     <signal name="notify::allowed" handler="background_cb" swapped="yes"/>
                   </object>
                 </child>
+                <child>
+                  <object class="CcToggleRow" id="screenshot">
+                    <property name="title" translatable="yes">Screenshots</property>
+                    <property name="subtitle" translatable="yes">Take pictures of the screen at any time.</property>
+                    <signal name="notify::allowed" handler="screenshot_cb" object="CcApplicationsPanel" swapped="yes"/>
+                  </object>
+                </child>
                 <child>
                   <object class="CcToggleRow" id="wallpaper">
                     <property name="title" translatable="yes">Change Wallpaper</property>

panels/applications/cc-info-row.c

@@ -26,7 +26,7 @@
 
 struct _CcInfoRow
 {
-  GtkListBoxRow parent;
+  AdwActionRow parent;
 
   GtkWidget    *info;
   GtkWidget    *expander;

panels/applications/cc-snap-row.c

@@ -26,9 +26,8 @@
 
 struct _CcSnapRow
 {
-  GtkListBoxRow parent;
+  AdwActionRow parent;
 
-  GtkLabel     *title_label;
   GtkSwitch    *slot_toggle;
   GtkComboBox  *slots_combo;
   GtkListStore *slots_combo_model;
@@ -40,7 +39,7 @@ struct _CcSnapRow
   GPtrArray    *slots;
 };
 
-G_DEFINE_TYPE (CcSnapRow, cc_snap_row, GTK_TYPE_LIST_BOX_ROW)
+G_DEFINE_TYPE (CcSnapRow, cc_snap_row, ADW_TYPE_ACTION_ROW)
 
 typedef struct
 {
@@ -245,7 +244,6 @@ cc_snap_row_class_init (CcSnapRowClass *klass)
 
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-snap-row.ui");
 
-  gtk_widget_class_bind_template_child (widget_class, CcSnapRow, title_label);
   gtk_widget_class_bind_template_child (widget_class, CcSnapRow, slot_toggle);
   gtk_widget_class_bind_template_child (widget_class, CcSnapRow, slots_combo);
   gtk_widget_class_bind_template_child (widget_class, CcSnapRow, slots_combo_model);
@@ -295,7 +293,7 @@ cc_snap_row_new (GCancellable *cancellable, SnapdInterface *interface, SnapdPlug
     label = snapd_interface_make_label (interface);
   else
     label = g_strdup (snapd_plug_get_interface (plug));
-  gtk_label_set_label (self->title_label, label);
+  adw_preferences_row_set_title (ADW_PREFERENCES_ROW (self), label);
 
   /* Add option into combo box */
   gtk_list_store_append (self->slots_combo_model, &iter);

panels/applications/cc-snap-row.h

@@ -20,13 +20,13 @@
 
 #pragma once
 
-#include <gtk/gtk.h>
+#include <adwaita.h>
 #include <snapd-glib/snapd-glib.h>
 
 G_BEGIN_DECLS
 
 #define CC_TYPE_SNAP_ROW (cc_snap_row_get_type())
-G_DECLARE_FINAL_TYPE (CcSnapRow, cc_snap_row, CC, SNAP_ROW, GtkListBoxRow)
+G_DECLARE_FINAL_TYPE (CcSnapRow, cc_snap_row, CC, SNAP_ROW, AdwActionRow)
 
 CcSnapRow* cc_snap_row_new      (GCancellable   *cancellable,
                                  SnapdInterface *interface,

panels/applications/cc-snap-row.ui

@@ -8,45 +8,27 @@
       <column type="gchararray"/>
     </columns>
   </object>
-  <template class="CcSnapRow" parent="GtkListBoxRow">
-    <property name="visible">True</property>
+  <template class="CcSnapRow" parent="AdwActionRow">
     <property name="can-focus">True</property>
     <property name="activatable">False</property>
     <child>
-      <object class="GtkBox">
-        <property name="visible">True</property>
-        <property name="border-width">12</property>
-        <property name="spacing">12</property>
+      <object class="GtkSwitch" id="slot_toggle">
+        <property name="valign">center</property>
+        <signal name="notify::active" handler="switch_changed_cb" swapped="yes"/>
+      </object>
+    </child>
+    <child>
+      <object class="GtkComboBox" id="slots_combo">
+        <property name="valign">center</property>
+        <property name="model">slots_combo_model</property>
+        <signal name="changed" handler="combo_changed_cb" swapped="yes"/>
         <child>
-          <object class="GtkLabel" id="title_label">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="hexpand">1</property>
+          <object class="GtkCellRendererText">
             <property name="ellipsize">end</property>
           </object>
-        </child>
-        <child>
-          <object class="GtkSwitch" id="slot_toggle">
-            <property name="visible">True</property>
-            <property name="valign">center</property>
-            <signal name="notify::active" handler="switch_changed_cb" swapped="yes"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkComboBox" id="slots_combo">
-            <property name="visible">True</property>
-            <property name="valign">center</property>
-            <property name="model">slots_combo_model</property>
-            <signal name="changed" handler="combo_changed_cb" swapped="yes"/>
-            <child>
-              <object class="GtkCellRendererText">
-                <property name="ellipsize">end</property>
-              </object>
-              <attributes>
-                <attribute name="text">1</attribute>
-              </attributes>
-            </child>
-          </object>
+          <attributes>
+            <attribute name="text">1</attribute>
+          </attributes>
         </child>
       </object>
     </child>

panels/applications/gnome-applications-panel.desktop.in.in

@@ -11,6 +11,6 @@ NoDisplay=true
 StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-AccountSettings;
 OnlyShowIn=GNOME;Unity;
-# Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+# Translators: Search terms to find the Applications panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=application;flatpak;permission;setting;
 X-GNOME-ControlCenter-HasSidebar=true

panels/applications/utils.c

@@ -53,7 +53,7 @@ file_remove_thread_func (GTask        *task,
   GFile *file = source_object;
   g_autofree gchar *path = g_file_get_path (file);
 
-  nftw (path, ftw_remove_cb, 20, FTW_DEPTH);
+  nftw (path, ftw_remove_cb, 20, FTW_PHYS | FTW_DEPTH);
 
   if (g_task_set_return_on_cancel (task, FALSE))
     g_task_return_boolean (task, TRUE);

panels/background/bg-recent-source.c

@@ -41,17 +41,6 @@ struct _BgRecentSource
 
 G_DEFINE_TYPE (BgRecentSource, bg_recent_source, BG_TYPE_SOURCE)
 
-
-static const gchar * const content_types[] = {
-	"image/png",
-	"image/jp2",
-	"image/jpeg",
-	"image/bmp",
-	"image/svg+xml",
-	"image/x-portable-anymap",
-	NULL
-};
-
 static int
 sort_func (gconstpointer a,
            gconstpointer b,
@@ -89,7 +78,7 @@ add_file_from_info (BgRecentSource *self,
   content_type = g_file_info_get_content_type (info);
   mtime = g_file_info_get_attribute_uint64 (info, G_FILE_ATTRIBUTE_TIME_MODIFIED);
 
-  if (!content_type || !g_strv_contains (content_types, content_type))
+  if (!content_type || !g_content_type_is_a (content_type, "image/*"))
     return;
 
   uri = g_file_get_uri (file);

panels/background/bg-wallpapers-source.c

@@ -35,6 +35,32 @@ struct _BgWallpapersSource
 
 G_DEFINE_TYPE (BgWallpapersSource, bg_wallpapers_source, BG_TYPE_SOURCE)
 
+static int
+sort_func (gconstpointer a,
+           gconstpointer b,
+           gpointer      user_data)
+{
+  CcBackgroundItem *item_a;
+  CcBackgroundItem *item_b;
+  const char *name_a;
+  const char *name_b;
+
+  item_a = (CcBackgroundItem *) a;
+  item_b = (CcBackgroundItem *) b;
+
+  name_a = cc_background_item_get_name (item_a);
+  name_b = cc_background_item_get_name (item_b);
+
+  if (name_a && strcmp (name_a, "Default Background") == 0)
+    return -1;
+  if (name_b && strcmp (name_b, "Default Background") == 0)
+    return 1;
+
+
+  return strcmp (cc_background_item_get_name (item_a),
+                 cc_background_item_get_name (item_b));
+}
+
 static void
 load_wallpapers (gchar              *key,
                  CcBackgroundItem   *item,
@@ -48,7 +74,7 @@ load_wallpapers (gchar              *key,
   if (deleted)
     return;
 
-  g_list_store_append (store, item);
+  g_list_store_insert_sorted (store, item, sort_func, NULL);
 }
 
 static void

panels/background/cc-background-chooser.c

@@ -157,6 +157,11 @@ create_widget_func (gpointer model_item,
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), check);
   if (button)
     gtk_overlay_add_overlay (GTK_OVERLAY (overlay), button);
+  gtk_accessible_update_property (GTK_ACCESSIBLE (overlay),
+                                  GTK_ACCESSIBLE_PROPERTY_LABEL,
+                                  cc_background_item_get_name (item),
+                                  -1);
+
 
   child = gtk_flow_box_child_new ();
   gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
@@ -315,6 +320,7 @@ cc_background_chooser_select_file (CcBackgroundChooser *self)
   filter = gtk_file_filter_new ();
   gtk_file_filter_add_pixbuf_formats (filter);
   gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (filechooser), filter);
+  gtk_file_chooser_set_select_multiple (GTK_FILE_CHOOSER (filechooser), TRUE);
 
   pictures_folder = g_file_new_for_path (g_get_user_special_dir (G_USER_DIRECTORY_PICTURES));
   gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (filechooser),

panels/background/cc-background-panel.c

@@ -63,9 +63,9 @@ struct _CcBackgroundPanel
   CcBackgroundItem *current_background;
 
   CcBackgroundChooser *background_chooser;
-  CcBackgroundPreview *light_preview;
+  CcBackgroundPreview *default_preview;
   CcBackgroundPreview *dark_preview;
-  GtkToggleButton *light_toggle;
+  GtkToggleButton *default_toggle;
   GtkToggleButton *dark_toggle;
 };
 
@@ -84,7 +84,7 @@ load_custom_css (CcBackgroundPanel *self)
 }
 
 static void
-reload_light_dark_toggles (CcBackgroundPanel *self)
+reload_color_scheme_toggles (CcBackgroundPanel *self)
 {
   GDesktopColorScheme scheme;
 
@@ -92,7 +92,7 @@ reload_light_dark_toggles (CcBackgroundPanel *self)
 
   if (scheme == G_DESKTOP_COLOR_SCHEME_DEFAULT)
     {
-      gtk_toggle_button_set_active (self->light_toggle, TRUE);
+      gtk_toggle_button_set_active (self->default_toggle, TRUE);
     }
   else if (scheme == G_DESKTOP_COLOR_SCHEME_PREFER_DARK)
     {
@@ -100,7 +100,7 @@ reload_light_dark_toggles (CcBackgroundPanel *self)
     }
   else
     {
-      gtk_toggle_button_set_active (self->light_toggle, FALSE);
+      gtk_toggle_button_set_active (self->default_toggle, FALSE);
       gtk_toggle_button_set_active (self->dark_toggle, FALSE);
     }
 }
@@ -149,9 +149,9 @@ set_color_scheme (CcBackgroundPanel   *self,
 /* Color schemes */
 
 static void
-on_light_dark_toggle_active_cb (CcBackgroundPanel *self)
+on_color_scheme_toggle_active_cb (CcBackgroundPanel *self)
 {
-  if (gtk_toggle_button_get_active (self->light_toggle))
+  if (gtk_toggle_button_get_active (self->default_toggle))
     set_color_scheme (self, G_DESKTOP_COLOR_SCHEME_DEFAULT);
   else if (gtk_toggle_button_get_active (self->dark_toggle))
     set_color_scheme (self, G_DESKTOP_COLOR_SCHEME_PREFER_DARK);
@@ -182,7 +182,7 @@ update_preview (CcBackgroundPanel *panel)
   CcBackgroundItem *current_background;
 
   current_background = panel->current_background;
-  cc_background_preview_set_item (panel->light_preview, current_background);
+  cc_background_preview_set_item (panel->default_preview, current_background);
   cc_background_preview_set_item (panel->dark_preview, current_background);
 }
 
@@ -389,12 +389,12 @@ cc_background_panel_class_init (CcBackgroundPanelClass *klass)
   gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/background/cc-background-panel.ui");
 
   gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, background_chooser);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, light_preview);
+  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, default_preview);
   gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, dark_preview);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, light_toggle);
+  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, default_toggle);
   gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, dark_toggle);
 
-  gtk_widget_class_bind_template_callback (widget_class, on_light_dark_toggle_active_cb);
+  gtk_widget_class_bind_template_callback (widget_class, on_color_scheme_toggle_active_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_chooser_background_chosen_cb);
   gtk_widget_class_bind_template_callback (widget_class, on_add_picture_button_clicked_cb);
 }
@@ -433,11 +433,11 @@ cc_background_panel_init (CcBackgroundPanel *panel)
   g_signal_connect_object (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel, G_CONNECT_SWAPPED);
 
   /* Interface settings */
-  reload_light_dark_toggles (panel);
+  reload_color_scheme_toggles (panel);
 
   g_signal_connect_object (panel->interface_settings,
                            "changed::" INTERFACE_COLOR_SCHEME_KEY,
-                           G_CALLBACK (reload_light_dark_toggles),
+                           G_CALLBACK (reload_color_scheme_toggles),
                            panel,
                            G_CONNECT_SWAPPED);
 

panels/background/cc-background-panel.ui

@@ -18,6 +18,7 @@
                     <property name="tightening_threshold">300</property>
                     <child>
                       <object class="GtkGrid">
+                        <property name="column-homogeneous">True</property>
                         <property name="column-spacing">24</property>
                         <property name="row-spacing">12</property>
                         <property name="margin-start">12</property>
@@ -26,10 +27,13 @@
                         <property name="margin-bottom">12</property>
                         <property name="hexpand">True</property>
                         <child>
-                          <object class="GtkToggleButton" id="light_toggle">
-                            <signal name="notify::active" handler="on_light_dark_toggle_active_cb" swapped="true"/>
+                          <object class="GtkToggleButton" id="default_toggle">
+                            <accessibility>
+                              <relation name="labelled-by">default_label</relation>
+                            </accessibility>
+                            <signal name="notify::active" handler="on_color_scheme_toggle_active_cb" swapped="true"/>
                             <child>
-                              <object class="CcBackgroundPreview" id="light_preview"/>
+                              <object class="CcBackgroundPreview" id="default_preview"/>
                             </child>
                             <style>
                               <class name="background-preview-button"/>
@@ -41,8 +45,8 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Light</property>
+                          <object class="GtkLabel" id="default_label">
+                            <property name="label" translatable="yes">Default</property>
                             <layout>
                               <property name="column">0</property>
                               <property name="row">1</property>
@@ -51,8 +55,11 @@
                         </child>
                         <child>
                           <object class="GtkToggleButton" id="dark_toggle">
-                            <property name="group">light_toggle</property>
-                            <signal name="notify::active" handler="on_light_dark_toggle_active_cb" swapped="true"/>
+                            <property name="group">default_toggle</property>
+                            <accessibility>
+                              <relation name="labelled-by">dark_label</relation>
+                            </accessibility>
+                            <signal name="notify::active" handler="on_color_scheme_toggle_active_cb" swapped="true"/>
                             <child>
                               <object class="CcBackgroundPreview" id="dark_preview">
                                 <property name="is-dark">True</property>
@@ -68,7 +75,7 @@
                           </object>
                         </child>
                         <child>
-                          <object class="GtkLabel">
+                          <object class="GtkLabel" id="dark_label">
                             <property name="label" translatable="yes">Dark</property>
                             <layout>
                               <property name="column">1</property>

panels/background/gnome-background-panel.desktop.in.in

@@ -11,4 +11,4 @@ StartupNotify=true
 Categories=GNOME;GTK;Settings;DesktopSettings;X-GNOME-Settings-Panel;X-GNOME-PersonalizationSettings;
 OnlyShowIn=GNOME;
 # Translators: Search terms to find the Appearance panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=Background;Wallpaper;Screen;Desktop;Style;Light;Dark;
+Keywords=Background;Wallpaper;Screen;Desktop;Style;Light;Dark;Appearance;

panels/background/preview.css

@@ -12,7 +12,6 @@ background-preview .window {
 
 background-preview .window .header-bar {
   min-height: 15px;
-  box-shadow: inset 0 -1px @borders;
 }
 
 background-preview .window.light {
@@ -20,6 +19,10 @@ background-preview .window.light {
   color: alpha(black, .8);
 }
 
+background-preview .window.light .header-bar {
+  box-shadow: inset 0 -1px alpha(black, .07);
+}
+
 background-preview .window.front.light .header-bar {
   background-color: #ebebeb;
 }
@@ -29,6 +32,10 @@ background-preview .window.dark {
   color: white;
 }
 
+background-preview .window.dark .header-bar {
+  box-shadow: inset 0 -1px alpha(black, .36);
+}
+
 background-preview .window.front.dark .header-bar {
   background-color: #303030;
 }

panels/bluetooth/bluetooth-panel-scenario-tester.py

@@ -117,8 +117,8 @@ class GccDBusTestCase(DBusTestCase):
         adapter.UpdateProperties('org.bluez.Adapter1',
                 {'Powered': dbus.Boolean(self.hci0_powered, variant_level=1)})
         self.devices = []
-        self.add_device('hci0', '22:33:44:55:66:77', "Bastien's mouse", True, 0x580, 'input-mouse')
-        self.add_device('hci0', '22:33:44:55:66:78', 'Bloutouf keyboard', True, 0x540, 'input-keyboard')
+        self.add_device('hci0', '22:33:44:55:66:77', "Bastienʼs mouse", True, 0x580, 'input-mouse')
+        self.add_device('hci0', '22:33:44:55:66:78', 'Bloutouf keyboard & keys', True, 0x540, 'input-keyboard')
         self.add_device('hci0', '60:8B:0E:55:66:79', 'iPhoone 19S', True, 0x20C, 'phone')
         # Uncategorised audio device
         self.add_device('hci0', '22:33:44:55:66:79', 'MEGA Speakers', True, 0x200400, 'audio-card')

panels/bluetooth/cc-bluetooth-panel.ui

@@ -7,6 +7,9 @@
         <child>
           <object class="GtkSwitch" id="enable_switch">
             <property name="valign">center</property>
+            <accessibility>
+              <property name="label" translatable="yes">Enable</property>
+            </accessibility>
             <signal name="state-set" handler="enable_switch_state_set_cb" object="CcBluetoothPanel" swapped="yes"/>
           </object>
         </child>

panels/camera/cc-camera-panel.ui

@@ -4,6 +4,9 @@
 
     <child type="titlebar-end">
       <object class="GtkSwitch" id="main_switch">
+        <accessibility>
+          <property name="label" translatable="yes">Enable</property>
+        </accessibility>
         <property name="valign">center</property>
       </object>
     </child>

panels/camera/gnome-camera-panel.desktop.in.in

@@ -15,5 +15,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME
 X-GNOME-Bugzilla-Product=gnome-control-center
 X-GNOME-Bugzilla-Component=privacy
 X-GNOME-Bugzilla-Version=@VERSION@
-# Translators: Search terms to find the Privacy panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=screen;lock;diagnostics;crash;private;recent;temporary;tmp;index;name;network;identity;
+# Translators: Search terms to find the Camera panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
+Keywords=camera;photos;video;webcam;lock;private;privacy;

panels/color/cc-color-calibrate.c

@@ -603,96 +603,6 @@ cc_color_calibrate_cancel (CcColorCalibrate *calibrate)
   g_main_loop_quit (calibrate->loop);
 }
 
-static gboolean
-cc_color_calibrate_move_and_resize_window (GtkWindow *window,
-                                           CdDevice *device,
-                                           GError **error)
-{
-  g_autoptr(GListModel) monitors = NULL;
-  g_autoptr(GdkMonitor) monitor = NULL;
-  const gchar *xrandr_name;
-  gboolean ret = TRUE;
-  GdkRectangle rect;
-  GdkDisplay *display;
-  gint i;
-  gint monitor_num = -1;
-  gint num_monitors;
-
-  /* find the monitor num of the device output */
-  display = gdk_display_get_default ();
-  monitors = gdk_display_get_monitors (display);
-  num_monitors = g_list_model_get_n_items (monitors);
-  xrandr_name = cd_device_get_metadata_item (device, CD_DEVICE_METADATA_XRANDR_NAME);
-  for (i = 0; i < num_monitors; i++)
-    {
-      g_autoptr(GdkMonitor) m = NULL;
-      const gchar *plug_name;
-
-      m = g_list_model_get_item (monitors, i);
-      plug_name = gdk_monitor_get_model (m);
-
-      if (g_strcmp0 (plug_name, xrandr_name) == 0)
-        monitor_num = i;
-    }
-  if (monitor_num == -1)
-    {
-      ret = FALSE;
-      g_set_error (error,
-                   CD_SESSION_ERROR,
-                   CD_SESSION_ERROR_INTERNAL,
-                   "failed to find output %s",
-                   xrandr_name);
-      goto out;
-    }
-
-  /* move the window, and set it to the right size */
-  monitor = g_list_model_get_item (monitors, monitor_num);
-  gdk_monitor_get_geometry (monitor, &rect);
-  g_debug ("Setting window to %ix%i with size %ix%i",
-           rect.x, rect.y, rect.width, rect.height);
-out:
-  return ret;
-}
-#if 0
-static void
-cc_color_calibrate_window_realize_cb (CcColorCalibrate *self)
-{
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (gtk_builder_get_object (self->builder,
-                                               "dialog_calibrate"));
-  gtk_window_fullscreen (GTK_WINDOW (widget));
-  gtk_window_maximize (GTK_WINDOW (widget));
-}
-
-static gboolean
-cc_color_calibrate_window_state_cb (CcColorCalibrate *calibrate,
-                                    GdkEvent *event)
-{
-  gboolean ret;
-  g_autoptr(GError) error = NULL;
-  GdkEventWindowState *event_state = (GdkEventWindowState *) event;
-  GtkWindow *window;
-
-  window = GTK_WINDOW (gtk_builder_get_object (calibrate->builder,
-                                               "dialog_calibrate"));
-
-  /* check event */
-  if (event->type != GDK_WINDOW_STATE)
-    return TRUE;
-  if (event_state->changed_mask != GDK_WINDOW_STATE_FULLSCREEN)
-    return TRUE;
-
-  /* resize to the correct screen */
-  ret = cc_color_calibrate_move_and_resize_window (window,
-                                                   calibrate->device,
-                                                   &error);
-  if (!ret)
-    g_warning ("Failed to resize window: %s", error->message);
-  return TRUE;
-}
-#endif
-
 static void
 cc_color_calibrate_button_done_cb (CcColorCalibrate *calibrate)
 {
@@ -989,14 +899,6 @@ cc_color_calibrate_start (CcColorCalibrate *calibrate,
   return TRUE;
 }
 
-static gboolean
-cc_color_calibrate_delete_event_cb (CcColorCalibrate *calibrate)
-{
-  /* do not destroy the window */
-  cc_color_calibrate_cancel (calibrate);
-  return TRUE;
-}
-
 static void
 cc_color_calibrate_finalize (GObject *object)
 {
@@ -1079,19 +981,6 @@ cc_color_calibrate_init (CcColorCalibrate *calibrate)
   /* setup the specialist calibration window */
   window = GTK_WINDOW (gtk_builder_get_object (calibrate->builder,
                                                "dialog_calibrate"));
-  /*
-  g_signal_connect_object (window, "draw",
-                           G_CALLBACK (cc_color_calibrate_alpha_window_draw), calibrate, G_CONNECT_SWAPPED);
-  g_signal_connect_object (window, "realize",
-                           G_CALLBACK (cc_color_calibrate_window_realize_cb), calibrate, G_CONNECT_SWAPPED);
-  g_signal_connect_object (window, "window-state-event",
-                           G_CALLBACK (cc_color_calibrate_window_state_cb), calibrate, G_CONNECT_SWAPPED);
-  g_signal_connect_object (window, "delete-event",
-                           G_CALLBACK (cc_color_calibrate_delete_event_cb), calibrate, G_CONNECT_SWAPPED);
-  cc_color_calibrate_alpha_screen_changed_cb (calibrate);
-  g_signal_connect_object (window, "screen-changed",
-                           G_CALLBACK (cc_color_calibrate_alpha_screen_changed_cb), calibrate, G_CONNECT_SWAPPED);
-   */
   calibrate->window = window;
 }
 

panels/color/cc-color-panel.c

@@ -1642,7 +1642,8 @@ gcm_prefs_update_device_list_extra_entry (CcColorPanel *prefs)
   gtk_widget_set_visible (prefs->box_devices, first_row != NULL);
 
   /* if we have only one device expand it by default */
-  if (gtk_list_box_get_row_at_index (prefs->list_box, 1) == NULL)
+  if (first_row != NULL &&
+      gtk_list_box_get_row_at_index (prefs->list_box, 1) == NULL)
     cc_color_device_set_expanded (CC_COLOR_DEVICE (first_row), TRUE);
 }
 

panels/common/cc-language-row.c

@@ -112,9 +112,17 @@ cc_language_row_new (const gchar *locale_id)
   self->language_local = get_language_label (language_code, modifier, NULL);
   gtk_label_set_label (self->language_label, self->language);
 
-  self->country = gnome_get_country_from_code (country_code, locale_id);
-  self->country_local = gnome_get_country_from_code (country_code, NULL);
-  gtk_label_set_label (self->country_label, self->country);
+  if (country_code == NULL)
+    {
+      self->country = NULL;
+      self->country_local = NULL;
+    }
+  else
+    {
+      self->country = gnome_get_country_from_code (country_code, locale_id);
+      self->country_local = gnome_get_country_from_code (country_code, NULL);
+      gtk_label_set_label (self->country_label, self->country);
+    }
 
   return self;
 }

panels/common/cc-list-row.c

@@ -61,36 +61,6 @@ enum {
 
 static GParamSpec *properties[N_PROPS];
 
-static void
-cc_list_row_activated_cb (CcListRow     *self,
-                          GtkListBoxRow *row)
-{
-  g_assert (CC_IS_LIST_ROW (self));
-
-  if (!self->show_switch || row != GTK_LIST_BOX_ROW (self))
-    return;
-
-  cc_list_row_activate (self);
-}
-
-static void
-cc_list_row_parent_changed_cb (CcListRow *self)
-{
-  GtkWidget *parent;
-
-  g_assert (CC_IS_LIST_ROW (self));
-
-  parent = gtk_widget_get_parent (GTK_WIDGET (self));
-
-  if (!parent)
-    return;
-
-  g_return_if_fail (GTK_IS_LIST_BOX (parent));
-  g_signal_connect_object (parent, "row-activated",
-                           G_CALLBACK (cc_list_row_activated_cb),
-                           self, G_CONNECT_SWAPPED);
-}
-
 static void
 cc_list_row_switch_active_cb (CcListRow *self)
 {
@@ -228,9 +198,6 @@ cc_list_row_init (CcListRow *self)
   g_resources_register (cc_common_get_resource ());
 
   gtk_widget_init_template (GTK_WIDGET (self));
-  g_signal_connect_object (self, "notify::parent",
-                           G_CALLBACK (cc_list_row_parent_changed_cb),
-                           self, G_CONNECT_SWAPPED);
 }
 
 void
@@ -272,18 +239,6 @@ cc_list_row_get_active (CcListRow *self)
   return self->switch_active;
 }
 
-void
-cc_list_row_activate (CcListRow *self)
-{
-  g_return_if_fail (CC_IS_LIST_ROW (self));
-  g_return_if_fail (self->show_switch);
-
-  self->switch_active = !self->switch_active;
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ACTIVE]);
-
-  gtk_widget_activate (GTK_WIDGET (self->enable_switch));
-}
-
 void
 cc_list_row_set_secondary_label (CcListRow   *self,
                                  const gchar *label)

panels/common/cc-list-row.h

@@ -37,7 +37,6 @@ void     cc_list_row_set_show_arrow       (CcListRow   *self,
 void     cc_list_row_set_show_switch      (CcListRow   *self,
                                            gboolean     show_switch);
 gboolean cc_list_row_get_active           (CcListRow   *self);
-void     cc_list_row_activate             (CcListRow   *self);
 void     cc_list_row_set_secondary_label  (CcListRow   *self,
                                            const gchar *label);
 void     cc_list_row_set_secondary_markup (CcListRow   *self,

panels/common/cc-permission-infobar.ui

@@ -27,6 +27,7 @@
                     <child>
                       <object class="GtkLabel" id="title">
                         <property name="halign">start</property>
+                        <property name="wrap">True</property>
                         <!-- Actual string set in code -->
                         <property name="label"></property>
                         <attributes>
@@ -37,6 +38,7 @@
                     <child>
                       <object class="GtkLabel">
                         <property name="halign">start</property>
+                        <property name="wrap">True</property>
                         <property name="label" translatable="yes">Some settings must be unlocked before they can be changed.</property>
                       </object>
                     </child>
@@ -55,6 +57,7 @@
                   <object class="GtkLockButton" id="lock_button">
                     <property name="receives-default">True</property>
                     <property name="label" translatable="yes">Unlock…</property>
+                    <property name="valign">GTK_ALIGN_CENTER</property>
                   </object>
                 </child>
               </object>

panels/common/cc-time-editor.c

@@ -108,6 +108,7 @@ time_editor_time_changed_cb (CcTimeEditor *self)
 {
   g_assert (CC_IS_TIME_EDITOR (self));
 
+  time_editor_clock_changed_cb (self);
   g_signal_emit (self, signals[TIME_CHANGED], 0);
 }
 

panels/common/cc-time-entry.c

@@ -568,6 +568,8 @@ cc_time_entry_set_time (CcTimeEntry *self,
   self->minute = CLAMP (minute, 0, 59);
 
   cc_time_entry_set_am_pm (self, is_am_pm);
+
+  g_signal_emit (self, signals[TIME_CHANGED], 0);
   time_entry_fill_time (self);
 }
 

panels/datetime/cc-datetime-panel.ui

@@ -168,6 +168,9 @@
                 <child>
                   <object class="GtkSwitch" id="network_time_switch">
                     <property name="valign">center</property>
+                    <accessibility>
+                      <property name="label" translatable="yes">Enable</property>
+                    </accessibility>
                   </object>
                 </child>
               </object>
@@ -205,6 +208,9 @@
                 <child>
                   <object class="GtkSwitch" id="auto_timezone_switch">
                     <property name="valign">center</property>
+                    <accessibility>
+                      <property name="label" translatable="yes">Enabled</property>
+                    </accessibility>
                   </object>
                 </child>
               </object>

panels/datetime/cc-timezone-map.c

@@ -48,11 +48,8 @@ struct _CcTimezoneMap
   GdkTexture *orig_background_dim;
 
   GdkTexture *background;
-  GdkTexture *color_map;
   GdkTexture *pin;
 
-  gdouble selected_offset;
-
   TzDB *tzdb;
   TzLocation *location;
 
@@ -85,7 +82,6 @@ cc_timezone_map_dispose (GObject *object)
 {
   CcTimezoneMap *self = CC_TIMEZONE_MAP (object);
 
-  g_clear_object (&self->color_map);
   g_clear_object (&self->orig_background);
   g_clear_object (&self->orig_background_dim);
   g_clear_object (&self->background);
@@ -286,12 +282,8 @@ cc_timezone_map_snapshot (GtkWidget   *widget,
                           GtkSnapshot *snapshot)
 {
   CcTimezoneMap *map = CC_TIMEZONE_MAP (widget);
-  g_autoptr(GdkTexture) orig_highlight = NULL;
-  g_autofree gchar *file = NULL;
-  g_autoptr(GError) err = NULL;
   gdouble pointx, pointy;
   gint width, height;
-  char buf[16];
 
   width = gtk_widget_get_width (widget);
   height = gtk_widget_get_height (widget);
@@ -301,35 +293,6 @@ cc_timezone_map_snapshot (GtkWidget   *widget,
                                map->background,
                                &GRAPHENE_RECT_INIT (0, 0, width, height));
 
-  /* paint highlight */
-  if (gtk_widget_is_sensitive (widget))
-    {
-      file = g_strdup_printf (DATETIME_RESOURCE_PATH "/timezone_%s.png",
-                              g_ascii_formatd (buf, sizeof (buf),
-                                               "%g", map->selected_offset));
-    }
-  else
-    {
-      file = g_strdup_printf (DATETIME_RESOURCE_PATH "/timezone_%s_dim.png",
-                              g_ascii_formatd (buf, sizeof (buf),
-                                               "%g", map->selected_offset));
-
-    }
-
-  orig_highlight = texture_from_resource (file, &err);
-
-  if (!orig_highlight)
-    {
-      g_warning ("Could not load highlight: %s",
-                 (err) ? err->message : "Unknown Error");
-    }
-  else
-    {
-      gtk_snapshot_append_texture (snapshot,
-                                   orig_highlight,
-                                   &GRAPHENE_RECT_INIT (0, 0, width, height));
-    }
-
   if (map->location)
     {
       pointx = convert_longitude_to_x (map->location->longitude, width);
@@ -426,8 +389,6 @@ set_location (CcTimezoneMap *map,
 
   info = tz_info_from_location (map->location);
 
-  map->selected_offset = tz_location_get_base_utc_offset (map->location)
-    / (60.0*60.0);
   gtk_widget_queue_draw (GTK_WIDGET (map));
 
   g_signal_emit (map, signals[LOCATION_CHANGED], 0, map->location);
@@ -499,14 +460,6 @@ cc_timezone_map_init (CcTimezoneMap *map)
       g_clear_error (&err);
     }
 
-  map->color_map = texture_from_resource (DATETIME_RESOURCE_PATH "/cc.png", &err);
-  if (!map->color_map)
-    {
-      g_warning ("Could not load background image: %s",
-                 (err) ? err->message : "Unknown error");
-      g_clear_error (&err);
-    }
-
   map->pin = texture_from_resource (DATETIME_RESOURCE_PATH "/pin.png", &err);
   if (!map->pin)
     {