EOL master

Update Swedish translation
Update Ukrainian translation
2022-04-26 15:46:10 -03:00 · 2022-04-26 18:26:44 +00:00 · 2022-04-26 17:39:23 +00:00 · 2022-04-26 17:23:45 +00:00 · 2022-04-26 17:17:41 +00:00 · 2022-04-26 14:16:07 -03:00
1336 changed files with 1 additions and 1283891 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +0,0 @@
-__pycache__
-_build/
-**/*~
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,412 +0,0 @@
-include:
- - remote: 'https://gitlab.freedesktop.org/freedesktop/ci-templates/-/raw/34f4ade99434043f88e164933f570301fd18b125/templates/fedora.yml'
-
-variables:
-  FDO_UPSTREAM_REPO: gnome/gnome-control-center
-
-stages:
-  - prepare
-  - build
-  - test
-  - manual
-  - deploy
-
-.Log files: &log_files  [./*.log, _build/meson-logs/]
-
-.Build logs: &save_build_logs
-  artifacts:
-    name: log
-    when: always
-    paths: *log_files
-
-.Git Untracked files: &save_untracked_files
-  artifacts:
-    name: untracked
-    paths: [$(pwd)]
-    expire_in: 3h30min
-
-.Show Info: &environment_information
-  build-aux/ci/ci-helper.sh "INFO" &&
-  build-aux/ci/ci-helper.sh "GIT_INFO"
-
-.Build procedure: &build_procedure
-  echo "== Building ==" &&
-  rm -rf _build/ &&
-  meson . _build ${BUILD_OPTS} -Dprofile=development &&
-  ninja -C _build 2>&1 | tee compilation.log
-
-.Run Tests: &run_tests
-  echo "== Testing ==" &&
-  meson test -C _build --verbose --no-stdsplit
-
-.fedora.container.common:
-  # As of 2022-03-07 runners not tagged with "crun" have broken seccomp rules
-  # affecting the close_range syscall and breaking g_spawn
-  # Note that "asan" tests are disabled for the same reason, see below.
-  # https://gitlab.gnome.org/Infrastructure/GitLab/-/issues/545
-  tags: [ crun ]
-  variables:
-    # When branching a stable release, change 'main'
-    # to the release number/branch to ensure that
-    # a new image will be created, tailored for the
-    # stable branch.
-    # Could probably also switch away from rawhide,
-    # to stable fedora branch as well.
-    FDO_DISTRIBUTION_TAG: '2022-01-19.0-main'
-    FDO_DISTRIBUTION_VERSION: rawhide
-
-#############################################
-#          Create CI Docker Images          #
-#############################################
-
-# See also https://gitlab.freedesktop.org/freedesktop/ci-templates
-build.container.fedora@x86_64:
-  extends:
-  - '.fdo.container-build@fedora'
-  - '.fedora.container.common'
-  stage: 'prepare'
-  variables:
-    # no need to pull the whole tree for rebuilding the image
-    GIT_STRATEGY: none
-    # Expiry sets fdo.expires on the image
-    FDO_EXPIRES_AFTER: 8w
-    # NOTES:
-    # - gobject-introspection-devel is needed for gsettings-desktop-schemas
-    FDO_DISTRIBUTION_PACKAGES: >-
-      @c-development @development-tools
-      git
-      llvm clang libasan libtsan libubsan gcovr
-      meson
-      accountsservice-devel
-      cheese-libs-devel
-      chrpath
-      colord-devel colord-gtk-devel
-      cups-devel
-      desktop-file-utils
-      docbook-style-xsl
-      flatpak-devel
-      gdk-pixbuf2-devel
-      gettext
-      glib2-devel
-      gobject-introspection-devel
-      gnome-bluetooth-libs-devel
-      gnome-desktop3-devel
-      gnome-online-accounts-devel
-      grilo-devel
-      gsettings-desktop-schemas-devel
-      gsound-devel
-      gtk3-devel ibus-devel
-      gtk4-devel
-      intltool
-      libadwaita-devel
-      libcanberra-devel
-      libgtop2-devel
-      libgudev-devel
-      libnma-devel
-      libnotify-devel
-      libpwquality-devel
-      libsmbclient-devel
-      libsoup-devel
-      libudisks2-devel
-      libwacom-devel
-      libX11-devel
-      libXi-devel
-      libxml2-devel
-      libxslt
-      ModemManager-glib-devel
-      NetworkManager-libnm-devel
-      polkit-devel
-      pulseaudio-libs-devel
-      upower-devel
-      python3-dbusmock
-      xorg-x11-server-Xvfb
-      mesa-dri-drivers
-      libsecret-devel
-      geocode-glib-devel
-      libgweather-devel
-      lcms2-devel
-      geoclue2-devel
-      libnotify-devel
-      alsa-lib-devel
-      nss-devel
-      gcr-devel
-    FDO_DISTRIBUTION_EXEC: |-
-      git clone https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas.git && \
-        cd gsettings-desktop-schemas && \
-        meson . _build --prefix=/usr && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd .. && \
-      git clone https://gitlab.gnome.org/GNOME/gnome-desktop.git && \
-        cd gnome-desktop && \
-        meson . _build --prefix=/usr -Ddesktop_docs=false && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd .. && \
-      git clone https://gitlab.gnome.org/GNOME/gnome-bluetooth.git && \
-        cd gnome-bluetooth && \
-        meson . _build --prefix=/usr -Dsendto=false && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd .. && \
-      git clone https://gitlab.gnome.org/GNOME/libnma.git && \
-        cd libnma && \
-        meson . _build --prefix=/usr -Dlibnma_gtk4=true -Dmobile_broadband_provider_info=false -Dgcr=false -Dgtk_doc=false && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd .. && \
-      git clone https://github.com/hughsie/colord-gtk.git && \
-        cd colord-gtk && \
-        meson . _build --prefix=/usr -Dgtk4=true -Ddocs=false -Dtests=false -Dman=false && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd .. && \
-      git clone https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git && \
-        cd gnome-settings-daemon && \
-        meson . _build --prefix=/usr && \
-        ninja -C _build && \
-        ninja -C _build install && \
-        cd ..
-
-##
-# Stage: Build
-#
-# Checks if GNOME Control Center is properly building and installing. This is the
-# most important stage of the CI, and no MR should ever be merged if it breaks
-# any of them.
-##
-build:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-
-  <<: *save_untracked_files
-  stage: build
-
-  script:
-    - dnf -y install gcr-devel
-    - *environment_information
-    - *build_procedure
-
-    - echo "== Installing =="
-    - ninja -C _build install
-
-    - echo "== Report =="
-    - build-aux/ci/ci-helper.sh "WARNINGS"
-
-    # Save all but git-related files
-    - rm -rf .git .gitignore .gitmodules
-
-  except:
-    variables:
-      - $CI_PIPELINE_SOURCE == "schedule"
-
-##
-# Stage: Test
-#
-# Runs the unit tests.
-##
-test:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  <<: *save_build_logs
-  stage: test
-
-  dependencies:
-    - build
-
-  script:
-    - dnf -y install gcr-devel
-    - *environment_information
-    - *run_tests
-
-    - |
-      if [[ -n "${CI_COMMIT_TAG}" ]]; then
-        echo "== Distro Test =="
-        ninja dist -C _build
-      fi
-
-  except:
-    variables:
-      - $CI_PIPELINE_SOURCE == "schedule"
-      - $CI_COMMIT_TITLE =~ /^Update.*translation$/
-
-# Runs the coverage test.
-coverage:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  <<: *save_build_logs
-  stage: test
-  variables:
-    BUILD_OPTS: "-Db_coverage=true"
-    coverage: '/^Lines:.\d+.\d+.(\d+\.\d+\%)/'
-  only:
-    - master@GNOME/gnome-control-center
-
-  script:
-    - dnf -y install gcr-devel
-    - *environment_information
-    - *build_procedure
-    - *run_tests
-
-    - ninja -C _build coverage-html
-
-    # Parse the report to get the coverage result
-    - |
-      echo == Coverage ==
-      sed -e 's/<[^>]*>//g' _build/meson-logs/coveragereport/index.html | tr -d ' \t' | grep -A3 -P '^Lines:$'  | tr '\n' ' '; echo
-
-  except:
-    variables:
-      - $CI_PIPELINE_SOURCE == "schedule"
-      - $CI_COMMIT_TITLE =~ /^Update.*translation$/
-
-# Runs the address sanitizer.
-# - below, at the "sanitizers section"
-
-##
-# Stage: Deploy
-#
-# Publishes the Coverage Report generated above
-##
-pages:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  stage: deploy
-  dependencies:
-    - coverage
-  script:
-    - mv _build/meson-logs/coveragereport/ public/
-  artifacts:
-    paths:
-      - public
-  only:
-    - master@GNOME/gnome-control-center
-
-  except:
-    variables:
-      - $CRON_TASK == "BUILD_CI_IMAGES"
-      - $CI_COMMIT_TITLE =~ /^Update.*translation$/
-
-##
-# Stage: Manual
-#
-# Creates a flatpak
-##
-flatpak:
-  stage: manual
-  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
-  artifacts:
-    name: package
-    paths:
-    - $(pwd)/*.flatpak
-    expire_in: 7 days
-
-  variables:
-    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"
-    PROJECT_ID: "org.gnome.Settings"
-    PROJECT_NAME: "gnome-control-center.git"
-    RUNTIME_REPO: "https://sdk.gnome.org/gnome-nightly.flatpakrepo"
-
-  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}
-    - >
-      sed -i "s,\"app-id\" : \"$PROJECT_ID\",\"app-id\" : \"<<ID>>\",g" ${MANIFEST_PATH}
-    - >
-      sed -i "s,\"url\" : \"https://gitlab.gnome.org/GNOME/$PROJECT_NAME\",\"branch\" : \"<<current>>\"\,,g" ${MANIFEST_PATH}
-    - >
-      sed -i "s,\"url\" : \"https://gitlab.gnome.org/GNOME/\",\"path\" : \".\",g" ${MANIFEST_PATH}
-
-    # Adjust the manifest to HEAD
-    - sed -i "s,<<ID>>,$APPID,g" ${MANIFEST_PATH}
-    - sed -i "s,<<current>>,origin/$CI_COMMIT_REF_NAME,g" ${MANIFEST_PATH}
-
-    # Update the icon name
-    - 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 build-bundle devel ${BUNDLE} --runtime-repo=${RUNTIME_REPO} ${APPID}
-
-  cache:
-    paths:
-    - .flatpak-builder/cache
-  when: manual
-  except:
-    - tags
-    - gnome-3-.*
-    - master@GNOME/gnome-control-center
-
-
-# Runs the sanitizers [address, thread, undefined, and memory].
-.sanitizer: &sanitizer
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  <<: *save_build_logs
-  stage: manual
-  when: manual
-  script:
-    - dnf -y install gcr-devel
-    - *environment_information
-    - *build_procedure
-    - *run_tests
-
-  except:
-    variables:
-      - $CI_PIPELINE_SOURCE == "schedule"
-      - $CI_COMMIT_TITLE =~ /^Update.*translation$/
-
-# Disabled because we currently need "crun" tagged runners, see above
-#asan:
-#  extends:
-#    - '.fdo.distribution-image@fedora'
-#    - '.fedora.container.common'
-#  <<: *sanitizer
-#  # ASAN requires debugging capabilities
-#  tags: [ asan ]
-#  stage: manual
-#  when: manual
-#  variables:
-#    BUILD_OPTS: "-Db_sanitize=address"
-#    LSAN_OPTIONS: "suppressions=${CI_PROJECT_DIR}/build-aux/ci/lsan.supp"
-
-tsan:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  <<: *sanitizer
-  variables:
-    BUILD_OPTS: "-Db_sanitize=thread"
-
-ubsan:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  <<: *sanitizer
-  variables:
-    BUILD_OPTS: "-Db_sanitize=undefined"
-
-msan:
-  extends:
-    - '.fdo.distribution-image@fedora'
-    - '.fedora.container.common'
-  <<: *sanitizer
-  variables:
-    BUILD_OPTS: "-Db_sanitize=memory"
-    CC: "clang"
--- a/.gitlab/issue_templates/Bug.md
+++ b/.gitlab/issue_templates/Bug.md
@@ -1,18 +0,0 @@
-<!--
-
-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
-
- -->
-
-Detailed description of the issue. Put as much information as you can, potentially
-with images showing the issue.
-
-Steps to reproduce:
-
-1. Open GNOME Settings
-2. Change X to something else
-3. ...
--- a/.gitlab/issue_templates/Epic.md
+++ b/.gitlab/issue_templates/Epic.md
@@ -1,41 +0,0 @@
-# Current problems
-<!--
-What are the problems that the current project has?
-
-For example:
-* User cannot use the keyboard to perform most common actions
-or
-* User cannot see documents from cloud services
-->
-
-# Goals & use cases
-<!--
-What are the use cases that this proposal will cover? What are the end goals?
-
-For example:
-* User needs to share a file with their friends.
-or
-* It should be easy to edit a picture within the app.
-->
-
-# Requirements
-<!--
-What does the solution needs to ensure for being succesful?
-
-For example:
-* Work on small form factors and touch
-or
-* Use the Meson build system and integrate with it
-->
-
-# Relevant art
-<!--
-Is there any product that has implemented something similar? Put links to other
-projects, pictures, links to other code, etc.
-->
-
-# Proposal & plan
-<!-- What's the solution and how should be achieved? It can be split in smaller
-tasks of minimum change, so they can be delivered across several releases. -->
-
-/label ~"1. Epic"
--- a/.gitlab/issue_templates/Feature.md
+++ b/.gitlab/issue_templates/Feature.md
@@ -1,27 +0,0 @@
-<!--
-
-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
-
- -->
-
-Detailed description of the feature. Put as much information as you can.
-
-Proposed Mockups:
-
-(Add mockups of the proposed feature)
-
-## Design Tasks
-
-* [ ]  design tasks
-
-## Development Tasks
-
-* [ ]  development tasks
-
-## QA Tasks
-
-* [ ]  qa (quality assurance) tasks
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +0,0 @@
-[submodule "subprojects/gvc"]
-	path = subprojects/gvc
-	url = https://gitlab.gnome.org/GNOME/libgnome-volume-control.git
--- a/340
+++ b/340
@@ -1,340 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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 2 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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
-
--- a/10166
+++ b/10166
--- a/README.md
+++ b/README.md
@@ -1,63 +1 @@
-[![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)
-
-GNOME Settings
-====================
-
-GNOME Settings is GNOME's main interface for configuration of various aspects of your desktop.
-
-## Contributing
-
-See `docs/CONTRIBUTING.md` for details on the contribution process, and `docs/HACKING.md`
-for the coding style guidelines.
-
-## Reporting Bugs
-
-Before reporting any bugs or opening feature requests, [read the communication guidelines][communication-guidelines].
-
-Bugs should be reported to the GNOME bug tracking system under the product
-gnome-control-center. It is available at [GitLab Issues](https://gitlab.gnome.org/GNOME/gnome-control-center/issues).
-
-In the report please include the following information:
-
- * Operating system and version
- * For Linux, version of the C library
- * Exact error message
- * Steps to reproduce the bug
- * If the bug is a visual defect, attach a screenshot
- * If the bug is a crash, attach a backtrace if possible [see below]
-
-### How to get a backtrace
-
-If the crash is reproducible, follow the steps to obtain a 
-backtrace:
-
-Install debug symbols for gnome-control-center.
-
-Run the program in gdb [the GNU debugger] or any other debugger.
-
-    gdb gnome-control-center
-
-Start the program.
-    
-    (gdb) run
-
-Reproduce the crash and when the program exits to (gdb) prompt, get the backtrace.
-
-    (gdb) bt full
-
-Once you have the backtrace, copy and paste it into the 'Comments' field or attach it as
-a file to the bug report.
-
-## Testing Unstable Settings
-
-It is quite easy to test and give feedback about the development version of GNOME
-Settings. Just access https://gitlab.gnome.org/GNOME/gnome-control-center/environments,
-get the latest version, download it, double-click the file, install and run.
-
-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
+This branch is now unused. Please use the `main` branch for development.
--- a/build-aux/ci/ci-helper.sh
+++ b/build-aux/ci/ci-helper.sh
@@ -1,61 +0,0 @@
-#!/bin/bash -e
-
-function do_print_labels(){
-
-    if [[ -n "${1}" ]]; then
-        label_len=${#1}
-        span=$(((54 - $label_len) / 2))
-
-        echo
-        echo "= ======================================================== ="
-        printf "%s %${span}s %s %${span}s %s\n" "=" "" "$1" "" "="
-        echo "= ======================================================== ="
-    else
-        echo "= ========================= Done ========================= ="
-        echo
-    fi
-}
-
-function do_show_info(){
-
-    local compiler=gcc
-
-    echo -n "Processors: "; grep -c ^processor /proc/cpuinfo
-    grep ^MemTotal /proc/meminfo
-    id; uname -a
-    printenv
-    echo '-----------------------------------------'
-    cat /etc/*-release
-    echo '-----------------------------------------'
-
-    if [[ ! -z $CC ]]; then
-        compiler=$CC
-    fi
-    echo 'Compiler version'
-    $compiler --version
-    echo '-----------------------------------------'
-    $compiler -dM -E -x c /dev/null
-    echo '-----------------------------------------'
-}
-
-function do_check_warnings(){
-
-    cat compilation.log | grep "warning:" | awk '{total+=1}END{print "Total number of warnings: "total}'
-}
-
-# -----------  -----------
-if [[ $1 == "INFO" ]]; then
-    do_print_labels 'Build environment '
-    do_show_info
-    do_print_labels
-
-elif [[ $1 == "GIT_INFO" ]]; then
-    do_print_labels 'Commit'
-    git log --pretty=format:"%h %cd %s" -1; echo
-    do_print_labels
-
-elif [[ $1 == "WARNINGS" ]]; then
-    do_print_labels 'Warning Report '
-    do_check_warnings
-    do_print_labels
-fi
--- a/build-aux/ci/lsan.supp
+++ b/build-aux/ci/lsan.supp
@@ -1,19 +0,0 @@
-# https://bugs.freedesktop.org/show_bug.cgi?id=105466
-leak:libfontconfig.so.1
-
-# Unknown and unreported bugs
-leak:__GI___vasprintf_chk
-leak:__interceptor_malloc
-leak:__alloc_dir
-leak:libglib-2.0.so.0
-
-# Needing attention
-leak:<unknown module>
-leak:test_timezone_gfx
-
-########
-# __GI___vasprintf_chk /usr/src/debug/glibc-2.27.9000-432-g104502102c/debug/vasprintf_chk.c:80
-# __alloc_dir ../sysdeps/posix/opendir.c:118
-# g_malloc (/lib64/libglib-2.0.so.0+0x523c5)
-# g_realloc (/lib64/libglib-2.0.so.0+0x5247d)
-########
--- a/build-aux/flatpak/libparted-include.patch
+++ b/build-aux/flatpak/libparted-include.patch
@@ -1,22 +0,0 @@
-From ba5e0451b51c983e40afd123b6e0d3eddb55e610 Mon Sep 17 00:00:00 2001
-From: "Richard W.M. Jones" <rjones@redhat.com>
-Date: Sat, 24 Mar 2018 17:37:02 +0000
-Subject: linux: Include <sys/sysmacros.h> for major() macro.
-
-Since glibc 2.27 this header is required.
---
- libparted/arch/linux.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c
-index 31b98ab..7e86b51 100644
--- a/libparted/arch/linux.c
-+++ b/libparted/arch/linux.c
-@@ -41,6 +41,7 @@
- #include <sys/utsname.h>        /* for uname() */
- #include <scsi/scsi.h>
- #include <assert.h>
-+#include <sys/sysmacros.h>
- #ifdef ENABLE_DEVICE_MAPPER
- #include <libdevmapper.h>
- #endif
--- a/build-aux/flatpak/org.gnome.Settings.json
+++ b/build-aux/flatpak/org.gnome.Settings.json
@@ -1,660 +0,0 @@
-{
-    "app-id" : "org.gnome.Settings",
-    "runtime" : "org.gnome.Sdk",
-    "runtime-version" : "master",
-    "sdk" : "org.gnome.Sdk",
-    "command" : "gnome-control-center",
-    "tags" : [
-        "devel"
-    ],
-    "desktop-file-name-prefix" : "(Development) ",
-    "finish-args" : [
-        "--device=dri",
-        "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
-        "--filesystem=host",
-        "--own-name=org.gnome.SessionManager",
-        "--share=ipc",
-        "--share=network",
-        "--socket=x11",
-        "--socket=pulseaudio",
-        "--socket=session-bus",
-        "--socket=system-bus",
-        "--socket=wayland"
-    ],
-    "build-options" : {
-        "cflags" : "-O2 -g",
-        "cxxflags" : "-O2 -g",
-        "env" : {
-            "V" : "1"
-        }
-    },
-    "x-run-args" : [
-        "--verbose"
-    ],
-    "cleanup" : [
-        "/include",
-        "/share/aclocal",
-        "/man",
-        "/share/man",
-        "/share/gtk-doc",
-        "/share/vala",
-        "*.la",
-        "*.a"
-    ],
-    "modules" : [
-        {
-            "name" : "pwquality",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--disable-python-bindings"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/libpwquality/libpwquality.git"
-                }
-            ]
-        },
-        {
-            "name": "intltool",
-            "cleanup": [ "*" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz",
-                    "sha256": "67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd"
-                }
-            ]
-        },
-        {
-            "name" : "polkit",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--disable-polkitd",
-                "--disable-man-pages",
-                "--disable-introspection",
-                "--disable-examples",
-                "--disable-gtk-doc",
-                "--disable-libelogind",
-                "--disable-libsystemd-login",
-                "--with-systemdsystemunitdir=no",
-                "--with-authdb=dummy",
-                "--with-authfw=none"
-            ],
-            "rm-configure" : true,
-            "cleanup" : [
-                "/bin/*",
-                "/etc/pam.d",
-                "/etc/dbus-1",
-                "/share/dbus-1/system-services/*",
-                "/share/polkit-1",
-                "/lib/polkit-1"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://www.freedesktop.org/software/polkit/releases/polkit-0.116.tar.gz",
-                    "sha256" : "88170c9e711e8db305a12fdb8234fac5706c61969b94e084d0f117d8ec5d34b1"
-                },
-                {
-                    "type" : "patch",
-                    "path" : "polkit-build-Add-option-to-build-without-polkitd.patch"
-                },
-                {
-                    "type" : "file",
-                    "path" : "polkit-autogen",
-                    "dest-filename" : "autogen.sh"
-                }
-            ]
-        },
-        {
-            "name" : "accountservice",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Ddocbook=false",
-                "-Delogind=false",
-                "-Dgtk_doc=false",
-                "-Dintrospection=false",
-                "-Dsystemd=false",
-                "-Dsystemdsystemunitdir=no"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://anongit.freedesktop.org/accountsservice"
-                }
-            ]
-        },
-        {
-            "name" : "libusb1",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--disable-udev"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://github.com/libusb/libusb.git"
-                }
-            ]
-        },
-        {
-            "name" : "gusb",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Ddocs=false",
-                "-Dtests=false",
-                "-Dvapi=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://github.com/hughsie/libgusb.git",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "udev",
-            "config-opts" : [
-                "--disable-hwdb",
-                "--disable-logging",
-                "--disable-gudev",
-                "--disable-introspection",
-                "--disable-keymap",
-                "--disable-mtd_probe"
-            ],
-            "cleanup" : [
-                "/include",
-                "/etc",
-                "/libexec",
-                "/sbin",
-                "/lib/pkgconfig",
-                "/man",
-                "/share/aclocal",
-                "/share/doc",
-                "/share/gtk-doc",
-                "/share/man",
-                "/share/pkgconfig",
-                "*.la",
-                "*.a"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://github.com/gentoo/eudev.git"
-                }
-            ]
-        },
-        {
-            "name" : "gudev",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dtests=disabled",
-                "-Dintrospection=disabled"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libgudev.git"
-                }
-            ]
-        },
-        {
-            "name" : "colord",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dargyllcms_sensor=false",
-                "-Dbash_completion=false",
-                "-Dman=false",
-                "-Dudev_rules=false",
-                "-Dsystemd=false",
-                "-Dvapi=false",
-                "-Ddocs=false",
-                "-Dtests=false",
-                "-Dinstalled_tests=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "branch" : "main",
-                    "url" : "git://github.com/hughsie/colord.git"
-                }
-            ]
-        },
-        {
-            "name" : "colord-gtk",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dman=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://github.com/hughsie/colord-gtk.git"
-                }
-            ]
-        },
-        {
-            "name" : "rest",
-            "buildsystem" : "autotools",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "branch" : "librest-0-7",
-                    "url" : "https://gitlab.gnome.org/GNOME/librest.git"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-online-accounts",
-            "buildsystem" : "meson",
-            "build-options" : {
-                "cflags" : "-Wno-error"
-            },
-            "config-opts" : [
-                "-Dgtk_doc=false",
-                "-Dintrospection=false",
-                "-Dvapi=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gnome-online-accounts.git"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-desktop",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gnome-desktop.git"
-                }
-            ]
-        },
-        {
-            "name" : "geocode-glib",
-            "buildsystem" : "meson",
-            "config-opts" : [
-            	"-Denable-gtk-doc=false",
-            	"-Denable-introspection=false",
-            	"-Denable-installed-tests=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/geocode-glib.git"
-                }
-            ]
-        },
-        {
-            "name" : "libgweather",
-            "buildsystem" : "meson",
-            "config-opts" : [
-            	"-Dglade_catalog=false",
-            	"-Denable_vala=false",
-            	"-Dgtk_doc=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libgweather.git",
-                    "branch" : "libgweather-3"
-                }
-            ]
-        },
-        {
-            "name" : "upower",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dsystemdsystemunitdir=/app/lib/systemd/system",
-                "-Dgtk-doc=false",
-                "-Dman=false",
-                "-Dintrospection=disabled"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://anongit.freedesktop.org/upower"
-                }
-            ]
-        },
-        {
-            "name" : "libwacom",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Ddocumentation=disabled",
-                "-Dtests=disabled"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/linuxwacom/libwacom.git"
-                }
-            ]
-        },
-        {
-            "name" : "libndp",
-            "buildsystem" : "autotools",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : " http://libndp.org/files/libndp-1.6.tar.gz",
-                    "sha256" : "0c7dfa84e013bd5e569ef2c6292a6f72cfaf14f4ff77a77425e52edc33ffac0e"
-                }
-            ]
-        },
-        {
-            "name" : "NetworkManager",
-            "buildsystem" : "meson",
-            "build-options" : {
-                "cflags" : "-ltinfo",
-                "cxxflags" : "-ltinfo"
-            },
-            "config-opts" : [
-                "-Dlibaudit=no",
-                "-Ddbus_conf_dir=/app/etc/dbus-1/system.d",
-                "-Ddbus_ifaces_dir=/app/share/dbus-1/interfaces",
-                "-Ddbus_sys_dir=/app/share/dbus-1/system.d",
-                "-Ddnsmasq=/usr/bin/true",
-                "-Ddocs=false",
-                "-Dintrospection=false",
-                "-Diptables=/usr/bin/true",
-                "-Djson_validation=false",
-                "-Dlibnm_glib=false",
-                "-Dlibpsl=false",
-                "-Dmodem_manager=false",
-                "-Dnmtui=false",
-                "-Dovs=false",
-                "-Dppp=false",
-                "-Dqt=false",
-                "-Dselinux=false",
-                "-Dsession_tracking=no",
-                "-Dsystemdsystemunitdir='no'",
-                "-Dsystemd_journal=false",
-                "-Dtests=no",
-                "-Dvapi=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "branch": "main",
-                    "url" : "https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git"
-                }
-            ]
-        },
-        {
-            "name" : "mobile-broadband-provider-info",
-            "buildsystem" : "autotools",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/mobile-broadband-provider-info.git"
-                }
-            ]
-        },
-        {
-            "name" : "libnma",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dlibnma_gtk4=true",
-                "-Dgtk_doc=false",
-                "-Dintrospection=false",
-                "-Dvapi=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libnma.git",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "network-manager-applet",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dappindicator=no",
-                "-Dgtk_doc=false",
-                "-Dintrospection=false",
-                "-Dlibnm_gtk=false",
-                "-Dselinux=false",
-                "-Dteam=false",
-                "-Dwwan=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/network-manager-applet.git",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "ModemManager",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dintrospection=false",
-                "-Dbash_completion=false",
-                "-Dudevdir=/app/lib",
-                "-Dsystemdsystemunitdir=/app/lib/systemd/system",
-                "-Dmbim=false",
-                "-Dplugin_dell=disabled",
-                "-Dplugin_foxconn=disabled",
-                "-Dqmi=false",
-                "-Dqrtr=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "git://anongit.freedesktop.org/ModemManager/ModemManager",
-                    "branch" : "main"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-settings-daemon",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dsystemd=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gnome-settings-daemon.git"
-                }
-            ],
-            "modules": [
-                {
-                    "name": "libcanberra",
-                    "sources": [
-                        {
-                            "type": "archive",
-                            "url": "http://0pointer.de/lennart/projects/libcanberra/libcanberra-0.30.tar.xz",
-                            "sha256": "c2b671e67e0c288a69fc33dc1b6f1b534d07882c2aceed37004bf48c601afa72"
-                        }
-                    ],
-                    "config-opts": [
-                        "--disable-alsa",
-                        "--disable-null",
-                        "--disable-oss"
-                    ]
-                }
-            ]
-        },
-        {
-            "name" : "gsound",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gsound.git"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-bluetooth",
-            "buildsystem" : "meson",
-            "config-opts" : [
-                "-Dintrospection=false"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gnome-bluetooth.git"
-                }
-            ]
-        },
-        {
-            "name" : "openldap",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--disable-slapd"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://www.openldap.org/software/download/OpenLDAP/openldap-release/openldap-2.4.46.tgz",
-                    "sha256" : "9a90dcb86b99ae790ccab93b7585a31fbcbeec8c94bf0f7ab0ca0a87ea0c4b2d"
-                }
-            ]
-        },
-        {
-            "name" : "libtirpc",
-            "buildsystem" : "autotools",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "http://downloads.sourceforge.net/sourceforge/libtirpc/libtirpc-1.2.6.tar.bz2",
-                    "sha256" : "4278e9a5181d5af9cd7885322fdecebc444f9a3da87c526e7d47f7a12a37d1cc"
-                }
-            ]
-        },
-        {
-            "name" : "rpcsvc-proto",
-            "buildsystem" : "autotools",
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://github.com/thkukuk/rpcsvc-proto/archive/v1.4.tar.gz",
-                    "sha256" : "eaa227686b84e8ae20181d2119c0ccac29d82371441844008019a134dafe3613"
-                }
-            ]
-        },
-        {
-            "name" : "lmdb",
-            "buildsystem" : "simple",
-            "build-commands" : [
-                "cd libraries/liblmdb/ && make prefix=/app install"
-            ],
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://github.com/LMDB/lmdb/archive/LMDB_0.9.23.tar.gz",
-                    "sha256" : "abf42e91f046787ed642d9eb21812a5c473f3ba5854124484d16eadbe0aa9c81"
-                }
-            ]
-        },
-        {
-            "name": "yapp-driver",
-            "buildsystem": "simple",
-            "build-commands": [
-                "perl Makefile.PL",
-                "make install -j1"
-            ],
-            "build-options" : {
-                "env" :  {
-                    "PERL5LIB": "/app/lib/perl5/",
-                    "PERL_MM_OPT": "INSTALL_BASE=/app"
-                }
-            },
-            "cleanup": [ "*" ],
-            "sources": [
-                {
-                    "type": "archive",
-                    "url": "https://cpan.metacpan.org/authors/id/W/WB/WBRASWELL/Parse-Yapp-1.21.tar.gz",
-                    "sha256": "3810e998308fba2e0f4f26043035032b027ce51ce5c8a52a8b8e340ca65f13e5"
-                }
-            ]
-        },
-        {
-            "name" : "samba",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--without-json",
-                "--without-ad-dc",
-                "--without-pam"
-            ],
-            "build-options" : {
-                "env" :  {
-                    "PERL5LIB": "/app/lib/perl5/",
-                    "PERL_MM_OPT": "INSTALL_BASE=/app"
-                }
-            },
-            "sources" : [
-                {
-                    "type" : "archive",
-                    "url" : "https://download.samba.org/pub/samba/stable/samba-4.14.5.tar.gz",
-                    "sha256" : "bb6ef5d2f16b85288d823578abc453d9a80514c42e5a2ea2c4e3c60dc42335c3"
-                }
-            ]
-        },
-        {
-            "name" : "libgtop2",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--disable-introspection"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/libgtop.git"
-                }
-            ]
-        },
-        {
-            "name" : "udisks",
-            "buildsystem" : "autotools",
-            "config-opts" : [
-                "--disable-introspection",
-                "--disable-lvm2",
-                "--enable-daemon=no",
-                "--with-systemdsystemunitdir=/app/lib/systemd/system",
-                "--with-tmpfilesdir=/app/lib/tmpfiles.d"
-            ],
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://github.com/storaged-project/udisks.git"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-backgrounds",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "branch": "main",
-                    "url" : "https://gitlab.gnome.org/GNOME/gnome-backgrounds.git"
-                }
-            ]
-        },
-        {
-            "name" : "gnome-control-center",
-            "buildsystem" : "meson",
-            "sources" : [
-                {
-                    "type" : "git",
-                    "url" : "https://gitlab.gnome.org/GNOME/gnome-control-center.git"
-                }
-            ],
-            "config-opts" : [
-                "-Dtracing=true",
-                "-Dprofile=development"
-            ]
-        }
-    ]
-}
--- a/build-aux/flatpak/polkit-autogen
+++ b/build-aux/flatpak/polkit-autogen
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-gtkdocize --flavour no-tmpl
-autoreconf -if
--- a/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
+++ b/build-aux/flatpak/polkit-build-Add-option-to-build-without-polkitd.patch
@@ -1,132 +0,0 @@
-From 1073a44277316348d40d86ecec908f1d4812f360 Mon Sep 17 00:00:00 2001
-From: Christian Hergert <chergert@redhat.com>
-Date: Mon, 27 May 2019 11:49:09 -0700
-Subject: [PATCH] flatpak: make polkit suitable for use within flatpak
-
-This is based on patches from Patrick Griffis with additional fixes
-to allow us to disable use of PAM within Flaptak.
---
- configure.ac                | 20 ++++++++++++++++----
- src/Makefile.am             |  6 +++++-
- src/polkitagent/Makefile.am |  5 +++++
- test/Makefile.am            |  6 +++++-
- 4 files changed, 31 insertions(+), 6 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5cedb4e..729d78d 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -79,11 +79,13 @@ PKG_CHECK_MODULES(GLIB, [gmodule-2.0 gio-unix-2.0 >= 2.30.0])
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
- 
-PKG_CHECK_MODULES(LIBJS, [mozjs-60])
-+AS_IF([test x${enable_polkitd} = yes], [
-+  PKG_CHECK_MODULES(LIBJS, [mozjs-60])
- 
-AC_SUBST(LIBJS_CFLAGS)
-AC_SUBST(LIBJS_CXXFLAGS)
-AC_SUBST(LIBJS_LIBS)
-+  AC_SUBST(LIBJS_CFLAGS)
-+  AC_SUBST(LIBJS_CXXFLAGS)
-+  AC_SUBST(LIBJS_LIBS)
-+])
- 
- EXPAT_LIB=""
- AC_ARG_WITH(expat, [  --with-expat=<dir>      Use expat from here],
-@@ -236,6 +238,15 @@ if test "x$with_systemdsystemunitdir" != "xno"; then
- fi
- AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$systemdsystemunitdir"])
- 
-+dnl ---------------------------------------------------------------------------
-+dnl - Disable polkitd when using library alone
-+dnl ---------------------------------------------------------------------------
-+
-+AC_ARG_ENABLE([polkitd],
-+              [AS_HELP_STRING([--disable-polkitd], [Do not build polkitd])],
-+              [enable_polkitd=$enableval], [enable_polkitd=yes])
-+AM_CONDITIONAL(BUILD_POLKITD, [test x${enable_polkitd} = yes])
-+
- dnl ---------------------------------------------------------------------------
- dnl - User for running polkitd
- dnl ---------------------------------------------------------------------------
-@@ -579,6 +590,7 @@ echo "
-         Session tracking:           ${SESSION_TRACKING}
-         PAM support:                ${have_pam}
-         systemdsystemunitdir:       ${systemdsystemunitdir}
-+        polkitd:                    ${enable_polkitd}
-         polkitd user:               ${POLKITD_USER}"
- 
- if test "$have_pam" = yes ; then
-diff --git a/src/Makefile.am b/src/Makefile.am
-index 09fc7b3..c6fe91b 100644
--- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -1,5 +1,9 @@
- 
-SUBDIRS = polkit polkitbackend polkitagent programs
-+SUBDIRS = polkit polkitagent programs
-+
-+if BUILD_POLKITD
-+SUBDIRS += polkitbackend
-+endif
- 
- if BUILD_EXAMPLES
- SUBDIRS += examples
-diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am
-index 49720db..633f9d4 100644
--- a/src/polkitagent/Makefile.am
-+++ b/src/polkitagent/Makefile.am
-@@ -79,6 +79,7 @@ libpolkit_agent_1_la_LIBADD =                               		\
- 
- libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)'
- 
-+if !POLKIT_AUTHFW_NONE
- libprivdir = $(prefix)/lib/polkit-1
- libpriv_PROGRAMS = polkit-agent-helper-1
- 
-@@ -113,6 +114,8 @@ polkit_agent_helper_1_LDFLAGS = 					\
- 	$(AM_LDFLAGS)							\
- 	$(NULL)
- 
-+endif # !POLKIT_AUTHFW_NONE
-+
- if HAVE_INTROSPECTION
- 
- girdir = $(INTROSPECTION_GIRDIR)
-@@ -142,6 +145,7 @@ include $(INTROSPECTION_MAKEFILE)
- 
- endif # HAVE_INTROSPECTION
- 
-+if !POLKIT_AUTHFW_NONE
- # polkit-agent-helper-1 need to be setuid root because it's used to
- # authenticate not only the invoking user, but possibly also root
- # and/or other users.
-@@ -149,6 +153,7 @@ endif # HAVE_INTROSPECTION
- install-data-hook:
- 	-chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1
- 	-chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1
-+endif # !POLKIT_AUTHFW_NONE
- 
- EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template
- CLEANFILES = $(gir_DATA) $(typelibs_DATA)
-diff --git a/test/Makefile.am b/test/Makefile.am
-index 59d0680..d43b0fe 100644
--- a/test/Makefile.am
-+++ b/test/Makefile.am
-@@ -1,7 +1,11 @@
- 
-SUBDIRS = mocklibc . polkit polkitbackend
-+SUBDIRS = mocklibc . polkit
- AM_CFLAGS = $(GLIB_CFLAGS)
- 
-+if BUILD_POLKITD
-+SUBDIRS += polkitbackend
-+endif
-+
- noinst_LTLIBRARIES = libpolkit-test-helper.la
- libpolkit_test_helper_la_SOURCES = polkittesthelper.c polkittesthelper.h
- libpolkit_test_helper_la_LIBADD = $(GLIB_LIBS)
-- 
-2.21.0
-
--- a/build-aux/meson.build
+++ b/build-aux/meson.build
@@ -1 +0,0 @@
-meson.add_install_script('meson/meson_post_install.py', control_center_datadir)
--- a/build-aux/meson/find_xdg_file.py
+++ b/build-aux/meson/find_xdg_file.py
@@ -1,38 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import sys
-
-def usage():
-    print('Usage:')
-    print('find_xdg_file.py FILENAME')
-    print('')
-    print('Looks for FILENAME in the XDG data directories and returns if path if found')
-
-if len(sys.argv) != 2:
-    usage()
-    sys.exit(1)
-
-filename = sys.argv[1]
-
-data_home = os.getenv('XDG_DATA_HOME')
-if not data_home or data_home == '':
-    data_home = os.path.join(os.path.expanduser("~"), "local", "share")
-
-data_dirs_str = os.getenv('XDG_DATA_DIRS')
-if not data_dirs_str or data_dirs_str == '':
-    data_dirs_str = '/usr/local/share/:/usr/share/'
-
-dirs = []
-dirs += [ data_home ]
-for _dir in data_dirs_str.split(':'):
-    dirs += [ _dir ]
-
-for _dir in dirs:
-    full_path = os.path.join(_dir, filename)
-    if os.path.exists(full_path):
-        print(full_path)
-        sys.exit(0)
-
-print(f"'{filename}' not found in XDG data directories")
-sys.exit(1)
--- a/build-aux/meson/meson_post_install.py
+++ b/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])
--- a/data/icons/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
+++ b/data/icons/hicolor/scalable/apps/org.gnome.Settings.Devel.svg
@@ -1,109 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="64" x2="64" y1="262.5" y2="232">
-        <stop offset="0" stop-color="#9a9996"/>
-        <stop offset="1" stop-color="#77767b"/>
-    </linearGradient>
-    <radialGradient id="b" cx="-243.066583" cy="-74.599978" gradientUnits="userSpaceOnUse" r="28.266656">
-        <stop offset="0" stop-color="#d5d3cf"/>
-        <stop offset="1" stop-color="#949390"/>
-    </radialGradient>
-    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="203.999985" x2="267.999985" y1="-64" y2="-64">
-        <stop offset="0" stop-color="#d5d3cf"/>
-        <stop offset="1" stop-color="#f6f5f4"/>
-    </linearGradient>
-    <clipPath id="d">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="e">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <filter id="f" height="100%" width="100%" x="0%" y="0%">
-        <feColorMatrix in="SourceGraphic" type="matrix" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/>
-    </filter>
-    <mask id="g">
-        <g clip-path="url(#e)" filter="url(#f)">
-            <g clip-path="url(#d)">
-                <path d="m 667 292 h -6 l -2 -16 h 10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(1 0 0 1 -600 -170)"/>
-                <path d="m 661 180 h 6 l 2 16 h -10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(1 0 0 1 -600 -170)"/>
-                <path d="m 667.000092 291.999908 h -6 l -2 -16 h 10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 299.999908 -598.000092)"/>
-                <path d="m 661.000092 179.999908 h 6 l 2 16 h -10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 299.999908 -598.000092)"/>
-                <path d="m 666.999051 291.998922 l -5.999272 -0.00042 l -2.001544 -15.998026 l 9.999915 0.000049 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -391.041005)"/>
-                <path d="m 661.001107 180.000804 l 5.999273 0.000419 l 2.001544 15.998026 l -10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -391.041005)"/>
-                <path d="m 667.000347 291.998468 l -5.999273 0.00042 l -2.002482 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -61.618176)"/>
-                <path d="m 660.999745 180.00119 l 5.999273 -0.00042 l 2.002481 16.00035 l -10.003298 -0.001904 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -61.618176)"/>
-                <path d="m 666.999018 291.999047 l -5.999273 -0.00042 l -2.001544 -15.998026 l 10.003298 -0.001904 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -470.382008)"/>
-                <path d="m 661.001074 180.000929 l 5.999273 0.00042 l 2.001543 15.998025 l -10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -470.382008)"/>
-                <path d="m 667.00038 291.998593 l -5.999273 0.00042 l -2.002481 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -627.040914)"/>
-                <path d="m 660.999779 180.001315 l 5.999272 -0.00042 l 1.999099 15.998397 l -9.999915 0.000049 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -627.040914)"/>
-                <path d="m 667 292 h -6 l -2 -16 h 10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(1 0 0 1 -600 -172)"/>
-                <path d="m 661 180 h 6 l 2 16 h -10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(1 0 0 1 -600 -172)"/>
-                <path d="m 667.000092 291.999908 h -6 l -2 -16 h 10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 299.999908 -600.000092)"/>
-                <path d="m 661.000092 179.999908 h 6 l 2 16 h -10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 299.999908 -600.000092)"/>
-                <path d="m 666.999051 291.998922 l -5.999272 -0.00042 l -2.001544 -15.998026 l 9.999915 0.000049 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -393.041005)"/>
-                <path d="m 661.001107 180.000804 l 5.999273 0.000419 l 2.001544 15.998026 l -10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -393.041005)"/>
-                <path d="m 667.000347 291.998468 l -5.999273 0.00042 l -2.002482 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -63.618176)"/>
-                <path d="m 660.999745 180.00119 l 5.999273 -0.00042 l 2.002481 16.00035 l -10.003298 -0.001904 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -63.618176)"/>
-                <path d="m 666.999018 291.999047 l -5.999273 -0.00042 l -2.001544 -15.998026 l 10.003298 -0.001904 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -472.382008)"/>
-                <path d="m 661.001074 180.000929 l 5.999273 0.00042 l 2.001543 15.998025 l -10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -472.382008)"/>
-                <path d="m 667.00038 291.998593 l -5.999273 0.00042 l -2.002481 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -629.040914)"/>
-                <path d="m 660.999779 180.001315 l 5.999272 -0.00042 l 1.999099 15.998397 l -9.999915 0.000049 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" stroke-width="8" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -629.040914)"/>
-                <path d="m 100 238 c 0 19.882812 -16.117188 36 -36 36 s -36 -16.117188 -36 -36 s 16.117188 -36 36 -36 s 36 16.117188 36 36 z m 0 0" fill="none" stroke="url(#a)" stroke-width="24" transform="matrix(1 0 0 1 0 -172)"/>
-                <path d="m 102 236 c 0 20.988281 -17.011719 38 -38 38 s -38 -17.011719 -38 -38 s 17.011719 -38 38 -38 s 38 17.011719 38 38 z m 0 0" fill="none" stroke="#f6f5f4" stroke-width="20" transform="matrix(1 0 0 1 0 -172)"/>
-                <path d="m -209.5 -64 c 0 14.636719 -11.863281 26.5 -26.5 26.5 s -26.5 -11.863281 -26.5 -26.5 s 11.863281 -26.5 26.5 -26.5 s 26.5 11.863281 26.5 26.5 z m 0 0" fill="none" stroke="url(#b)" stroke-linecap="square" stroke-linejoin="round" stroke-width="5" transform="matrix(0 -1 -1 0 0 -172)"/>
-                <path d="m 268 -64 c 0 17.671875 -14.328125 32 -32 32 s -32 -14.328125 -32 -32 s 14.328125 -32 32 -32 s 32 14.328125 32 32 z m 0 0" fill="none" stroke="url(#c)" stroke-linecap="square" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 0 -172)"/>
-            </g>
-        </g>
-    </mask>
-    <mask id="h">
-        <g filter="url(#f)">
-            <rect fill-opacity="0.8" height="128" width="128"/>
-        </g>
-    </mask>
-    <linearGradient id="i" gradientTransform="matrix(0 0.37 -0.98462 0 295.38501 -30.360001)" gradientUnits="userSpaceOnUse" x1="300" x2="428" y1="235" y2="235">
-        <stop offset="0" stop-color="#f9f06b"/>
-        <stop offset="1" stop-color="#f5c211"/>
-    </linearGradient>
-    <clipPath id="j">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <clipPath id="k">
-        <rect height="128" width="128"/>
-    </clipPath>
-    <g stroke-linecap="round" stroke-linejoin="round" stroke-width="8">
-        <path d="m 67 122 h -6 l -2 -16 h 10 z m 0 0" fill="#9a9996" stroke="#9a9996"/>
-        <path d="m 61 10 h 6 l 2 16 h -10 z m 0 0" fill="#9a9996" stroke="#9a9996"/>
-        <path d="m 667.000092 291.999908 h -6 l -2 -16 h 10 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(0 1 -1 0 299.999908 -598.000092)"/>
-        <path d="m 661.000092 179.999908 h 6 l 2 16 h -10 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(0 1 -1 0 299.999908 -598.000092)"/>
-        <path d="m 666.999051 291.998922 l -5.999272 -0.00042 l -2.001544 -15.998026 l 9.999915 0.000049 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -391.041005)"/>
-        <path d="m 661.001107 180.000804 l 5.999273 0.000419 l 2.001544 15.998026 l -10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -391.041005)"/>
-        <path d="m 667.000347 291.998468 l -5.999273 0.00042 l -2.002482 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -61.618176)"/>
-        <path d="m 660.999745 180.00119 l 5.999273 -0.00042 l 2.002481 16.00035 l -10.003298 -0.001904 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -61.618176)"/>
-        <path d="m 666.999018 291.999047 l -5.999273 -0.00042 l -2.001544 -15.998026 l 10.003298 -0.001904 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -470.382008)"/>
-        <path d="m 661.001074 180.000929 l 5.999273 0.00042 l 2.001543 15.998025 l -10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -470.382008)"/>
-        <path d="m 667.00038 291.998593 l -5.999273 0.00042 l -2.002481 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -627.040914)"/>
-        <path d="m 660.999779 180.001315 l 5.999272 -0.00042 l 1.999099 15.998397 l -9.999915 0.000049 z m 0 0" fill="#9a9996" stroke="#9a9996" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -627.040914)"/>
-        <path d="m 67 120 h -6 l -2 -16 h 10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4"/>
-        <path d="m 61 8 h 6 l 2 16 h -10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4"/>
-        <path d="m 667.000092 291.999908 h -6 l -2 -16 h 10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(0 1 -1 0 299.999908 -600.000092)"/>
-        <path d="m 661.000092 179.999908 h 6 l 2 16 h -10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(0 1 -1 0 299.999908 -600.000092)"/>
-        <path d="m 666.999051 291.998922 l -5.999272 -0.00042 l -2.001544 -15.998026 l 9.999915 0.000049 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -393.041005)"/>
-        <path d="m 661.001107 180.000804 l 5.999273 0.000419 l 2.001544 15.998026 l -10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -393.041005)"/>
-        <path d="m 667.000347 291.998468 l -5.999273 0.00042 l -2.002482 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -63.618176)"/>
-        <path d="m 660.999745 180.00119 l 5.999273 -0.00042 l 2.002481 16.00035 l -10.003298 -0.001904 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -63.618176)"/>
-        <path d="m 666.999018 291.999047 l -5.999273 -0.00042 l -2.001544 -15.998026 l 10.003298 -0.001904 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -472.382008)"/>
-        <path d="m 661.001074 180.000929 l 5.999273 0.00042 l 2.001543 15.998025 l -10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -472.382008)"/>
-        <path d="m 667.00038 291.998593 l -5.999273 0.00042 l -2.002481 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -629.040914)"/>
-        <path d="m 660.999779 180.001315 l 5.999272 -0.00042 l 1.999099 15.998397 l -9.999915 0.000049 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -629.040914)"/>
-    </g>
-    <path d="m 100 238 c 0 19.882812 -16.117188 36 -36 36 s -36 -16.117188 -36 -36 s 16.117188 -36 36 -36 s 36 16.117188 36 36 z m 0 0" fill="none" stroke="url(#a)" stroke-width="24" transform="matrix(1 0 0 1 0 -172)"/>
-    <path d="m 102 64 c 0 20.988281 -17.011719 38 -38 38 s -38 -17.011719 -38 -38 s 17.011719 -38 38 -38 s 38 17.011719 38 38 z m 0 0" fill="none" stroke="#f6f5f4" stroke-width="20"/>
-    <path d="m -209.5 -64 c 0 14.636719 -11.863281 26.5 -26.5 26.5 s -26.5 -11.863281 -26.5 -26.5 s 11.863281 -26.5 26.5 -26.5 s 26.5 11.863281 26.5 26.5 z m 0 0" fill="none" stroke="url(#b)" stroke-linecap="square" stroke-linejoin="round" stroke-width="5" transform="matrix(0 -1 -1 0 0 -172)"/>
-    <path d="m 268 -64 c 0 17.671875 -14.328125 32 -32 32 s -32 -14.328125 -32 -32 s 14.328125 -32 32 -32 s 32 14.328125 32 32 z m 0 0" fill="none" stroke="url(#c)" stroke-linecap="square" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 0 -172)"/>
-    <g clip-path="url(#k)" mask="url(#g)">
-        <g clip-path="url(#j)" mask="url(#h)">
-            <path d="m 128 80.640625 v 47.359375 h -128 v -47.359375 z m 0 0" fill="url(#i)"/>
-            <path d="m 13.308594 80.640625 l 47.355468 47.359375 h 21.214844 l -47.359375 -47.359375 z m 42.421875 0 l 47.363281 47.359375 h 21.214844 l -47.363282 -47.359375 z m 42.429687 0 l 29.839844 29.839844 v -21.210938 l -8.628906 -8.628906 z m -98.160156 7.90625 v 21.214844 l 18.238281 18.238281 h 21.214844 z m 0 0"/>
-        </g>
-    </g>
-</svg>
--- a/data/icons/hicolor/scalable/apps/org.gnome.Settings.svg
+++ b/data/icons/hicolor/scalable/apps/org.gnome.Settings.svg
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="128px" viewBox="0 0 128 128" width="128px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <linearGradient id="a" gradientUnits="userSpaceOnUse" x1="64" x2="64" y1="262.5" y2="232">
-        <stop offset="0" stop-color="#9a9996"/>
-        <stop offset="1" stop-color="#77767b"/>
-    </linearGradient>
-    <radialGradient id="b" cx="-243.066583" cy="-74.599978" gradientUnits="userSpaceOnUse" r="28.266656">
-        <stop offset="0" stop-color="#d5d3cf"/>
-        <stop offset="1" stop-color="#949390"/>
-    </radialGradient>
-    <linearGradient id="c" gradientUnits="userSpaceOnUse" x1="203.999985" x2="267.999985" y1="-64" y2="-64">
-        <stop offset="0" stop-color="#d5d3cf"/>
-        <stop offset="1" stop-color="#f6f5f4"/>
-    </linearGradient>
-    <g stroke-width="8">
-        <path d="m 67 122 h -6 l -2 -16 h 10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="m 61 10 h 6 l 2 16 h -10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="m 667.000092 291.999908 h -6 l -2 -16 h 10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 1 -1 0 299.999908 -598.000092)"/>
-        <path d="m 661.000092 179.999908 h 6 l 2 16 h -10 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 1 -1 0 299.999908 -598.000092)"/>
-        <path d="m 666.999051 291.998922 l -5.999272 -0.00042 l -2.001544 -15.998026 l 9.999915 0.000049 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -391.041005)"/>
-        <path d="m 661.001107 180.000804 l 5.999273 0.000419 l 2.001544 15.998026 l -10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -391.041005)"/>
-        <path d="m 667.000347 291.998468 l -5.999273 0.00042 l -2.002482 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -61.618176)"/>
-        <path d="m 660.999745 180.00119 l 5.999273 -0.00042 l 2.002481 16.00035 l -10.003298 -0.001904 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -61.618176)"/>
-        <path d="m 666.999018 291.999047 l -5.999273 -0.00042 l -2.001544 -15.998026 l 10.003298 -0.001904 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -470.382008)"/>
-        <path d="m 661.001074 180.000929 l 5.999273 0.00042 l 2.001543 15.998025 l -10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -470.382008)"/>
-        <path d="m 667.00038 291.998593 l -5.999273 0.00042 l -2.002481 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -627.040914)"/>
-        <path d="m 660.999779 180.001315 l 5.999272 -0.00042 l 1.999099 15.998397 l -9.999915 0.000049 z m 0 0" fill="#9a9996" stroke="#9a9996" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -627.040914)"/>
-        <path d="m 67 120 h -6 l -2 -16 h 10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="m 61 8 h 6 l 2 16 h -10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round"/>
-        <path d="m 667.000092 291.999908 h -6 l -2 -16 h 10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 1 -1 0 299.999908 -600.000092)"/>
-        <path d="m 661.000092 179.999908 h 6 l 2 16 h -10 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0 1 -1 0 299.999908 -600.000092)"/>
-        <path d="m 666.999051 291.998922 l -5.999272 -0.00042 l -2.001544 -15.998026 l 9.999915 0.000049 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -393.041005)"/>
-        <path d="m 661.001107 180.000804 l 5.999273 0.000419 l 2.001544 15.998026 l -10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.5 0.866025 -0.866025 -0.5 600.381916 -393.041005)"/>
-        <path d="m 667.000347 291.998468 l -5.999273 0.00042 l -2.002482 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -63.618176)"/>
-        <path d="m 660.999745 180.00119 l 5.999273 -0.00042 l 2.002481 16.00035 l -10.003298 -0.001904 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(-0.866025 0.5 -0.5 -0.866025 757.040822 -63.618176)"/>
-        <path d="m 666.999018 291.999047 l -5.999273 -0.00042 l -2.001544 -15.998026 l 10.003298 -0.001904 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -472.382008)"/>
-        <path d="m 661.001074 180.000929 l 5.999273 0.00042 l 2.001543 15.998025 l -10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.866025 0.5 -0.5 0.866025 -393.040914 -472.382008)"/>
-        <path d="m 667.00038 291.998593 l -5.999273 0.00042 l -2.002481 -16.00035 l 10.003298 0.001905 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -629.040914)"/>
-        <path d="m 660.999779 180.001315 l 5.999272 -0.00042 l 1.999099 15.998397 l -9.999915 0.000049 z m 0 0" fill="#f6f5f4" stroke="#f6f5f4" stroke-linecap="round" stroke-linejoin="round" transform="matrix(0.5 0.866025 -0.866025 0.5 -63.618084 -629.040914)"/>
-    </g>
-    <path d="m 100 238 c 0 19.882812 -16.117188 36 -36 36 s -36 -16.117188 -36 -36 s 16.117188 -36 36 -36 s 36 16.117188 36 36 z m 0 0" fill="none" stroke="url(#a)" stroke-width="24" transform="matrix(1 0 0 1 0 -172)"/>
-    <path d="m 102 64 c 0 20.988281 -17.011719 38 -38 38 s -38 -17.011719 -38 -38 s 17.011719 -38 38 -38 s 38 17.011719 38 38 z m 0 0" fill="none" stroke="#f6f5f4" stroke-width="20"/>
-    <path d="m -209.5 -64 c 0 14.636719 -11.863281 26.5 -26.5 26.5 s -26.5 -11.863281 -26.5 -26.5 s 11.863281 -26.5 26.5 -26.5 s 26.5 11.863281 26.5 26.5 z m 0 0" fill="none" stroke="url(#b)" stroke-linecap="square" stroke-linejoin="round" stroke-width="5" transform="matrix(0 -1 -1 0 0 -172)"/>
-    <path d="m 268 -64 c 0 17.671875 -14.328125 32 -32 32 s -32 -14.328125 -32 -32 s 14.328125 -32 32 -32 s 32 14.328125 32 32 z m 0 0" fill="none" stroke="url(#c)" stroke-linecap="square" stroke-linejoin="round" stroke-width="8" transform="matrix(0 1 -1 0 0 -172)"/>
-</svg>
--- a/data/icons/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg
+++ b/data/icons/hicolor/symbolic/apps/org.gnome.Settings-symbolic.svg
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <path d="m 7.480469 0.015625 h 1.066406 c 0.589844 0 1.066406 0.476563 1.066406 1.066406 v 1.066407 c 0 0.589843 -0.476562 1.066406 -1.066406 1.066406 h -1.066406 c -0.589844 0 -1.066407 -0.476563 -1.066407 -1.066406 v -1.066407 c 0 -0.589843 0.476563 -1.066406 1.066407 -1.066406 z m 0 12.796875 h 1.066406 c 0.589844 0 1.066406 0.476562 1.066406 1.070312 v 1.0625 c 0 0.59375 -0.476562 1.070313 -1.066406 1.070313 h -1.066406 c -0.589844 0 -1.066407 -0.476563 -1.066407 -1.070313 v -1.0625 c 0 -0.59375 0.476563 -1.070312 1.066407 -1.070312 z m -5.5 -10.078125 l 0.753906 -0.753906 c 0.199219 -0.199219 0.46875 -0.3125 0.753906 -0.3125 c 0.28125 0 0.554688 0.113281 0.753907 0.3125 l 0.753906 0.753906 c 0.417968 0.417969 0.417968 1.089844 0 1.507813 l -0.753906 0.753906 c -0.199219 0.203125 -0.472657 0.316406 -0.753907 0.316406 c -0.285156 0 -0.554687 -0.113281 -0.753906 -0.316406 l -0.753906 -0.753906 c -0.203125 -0.199219 -0.316407 -0.46875 -0.316407 -0.753907 c 0 -0.28125 0.113282 -0.554687 0.316407 -0.753906 z m 9.050781 9.050781 l 0.753906 -0.753906 c 0.199219 -0.199219 0.472656 -0.3125 0.753906 -0.3125 c 0.285157 0 0.554688 0.113281 0.753907 0.3125 l 0.753906 0.753906 c 0.417969 0.417969 0.417969 1.089844 0 1.507813 l -0.753906 0.753906 c -0.199219 0.203125 -0.46875 0.316406 -0.753907 0.316406 c -0.28125 0 -0.554687 -0.113281 -0.753906 -0.316406 l -0.753906 -0.753906 c -0.203125 -0.199219 -0.3125 -0.46875 -0.3125 -0.753907 c 0 -0.28125 0.109375 -0.554687 0.3125 -0.753906 z m -11.015625 -3.238281 v -1.066406 c 0 -0.589844 0.472656 -1.066407 1.066406 -1.066407 h 1.066407 c 0.589843 0 1.066406 0.476563 1.066406 1.066407 v 1.066406 c 0 0.589844 -0.476563 1.066406 -1.066406 1.066406 h -1.066407 c -0.59375 0 -1.066406 -0.476562 -1.066406 -1.066406 z m 12.796875 0 v -1.066406 c 0 -0.589844 0.476562 -1.066407 1.066406 -1.066407 h 1.066406 c 0.59375 0 1.070313 0.476563 1.070313 1.066407 v 1.066406 c 0 0.589844 -0.476563 1.066406 -1.070313 1.066406 h -1.066406 c -0.589844 0 -1.066406 -0.476562 -1.066406 -1.066406 z m -10.078125 5.5 l -0.753906 -0.753906 c -0.203125 -0.199219 -0.316407 -0.46875 -0.316407 -0.753907 c 0 -0.28125 0.113282 -0.554687 0.316407 -0.753906 l 0.753906 -0.753906 c 0.199219 -0.199219 0.46875 -0.3125 0.753906 -0.3125 c 0.28125 0 0.554688 0.113281 0.753907 0.3125 l 0.753906 0.753906 c 0.417968 0.417969 0.417968 1.089844 0 1.507813 l -0.753906 0.753906 c -0.199219 0.203125 -0.472657 0.316406 -0.753907 0.316406 c -0.285156 0 -0.554687 -0.113281 -0.753906 -0.316406 z m 9.050781 -9.050781 l -0.753906 -0.753906 c -0.203125 -0.199219 -0.3125 -0.46875 -0.3125 -0.753907 c 0 -0.28125 0.109375 -0.554687 0.3125 -0.753906 l 0.753906 -0.753906 c 0.199219 -0.199219 0.472656 -0.3125 0.753906 -0.3125 c 0.285157 0 0.554688 0.113281 0.753907 0.3125 l 0.753906 0.753906 c 0.417969 0.417969 0.417969 1.089844 0 1.507813 l -0.753906 0.753906 c -0.199219 0.203125 -0.46875 0.316406 -0.753907 0.316406 c -0.28125 0 -0.554687 -0.113281 -0.753906 -0.316406 z m 0 0" fill="#241f31"/>
-    <path d="m 8.015625 1.515625 c -3.574219 0 -6.5 2.925781 -6.5 6.5 c 0 3.570313 2.925781 6.5 6.5 6.5 c 3.570313 0 6.5 -2.929687 6.5 -6.5 c 0 -3.574219 -2.929687 -6.5 -6.5 -6.5 z m 0 3 c 1.949219 0 3.5 1.546875 3.5 3.5 c 0 1.949219 -1.550781 3.5 -3.5 3.5 c -1.953125 0 -3.5 -1.550781 -3.5 -3.5 c 0 -1.953125 1.546875 -3.5 3.5 -3.5 z m 0 0" fill="#241f31"/>
-</svg>
--- a/data/icons/meson.build
+++ b/data/icons/meson.build
@@ -1,13 +0,0 @@
-install_subdir(
-     'hicolor',
-  install_dir : control_center_icondir
-)
-
-if get_option('profile') == 'development'
-  icondir = join_paths('hicolor', 'scalable', 'apps')
-  install_data(
-    join_paths(icondir, 'org.gnome.Settings.Devel.svg'),
-    install_dir: join_paths(control_center_icondir, icondir),
-    rename: 'org.gnome.Settings.svg'
-  )
-endif
--- a/docs/CONTRIBUTING.md
+++ b/docs/CONTRIBUTING.md
@@ -1,212 +0,0 @@
-# Contributing
-
-When contributing to the development of GNOME Settings, please first discuss the change you wish to
-make via issue, email, or any other method with the maintainers before making a change.
-
-Please note we have a Code of Conduct, please follow it in all your interactions with the project.
-
-## Pull Request Process
-
-1. Create a fork in GitLab and push your work to there
-2. Open a Merge Request
-  1. Always allow maintainer edits
-  2. Mark the Merge Request as WIP if your work is not ready to be reviewed
-3. Assign the correct maintainer to the Merge Request (see [`MAINTAINERS.md`][maintainers] to select
-   the correct maintainer)
-4. Format commit messages as follows:
-   ```
-   component: <summary>
-   ‌
-   A paragraph explaining the problem and its context.
-   ‌
-   Another one explaining how you solved that.
-   ‌
-   <link to the issue>
-   ```
-4. You may merge the pull request in once you have the sign-off of the maintainers, or if you
-   do not have permission to do that, you may request the second reviewer to merge it for you.
-
-## Code of Conduct
-
-GNOME Settings is a project developed based on GNOME Code of Conduct and GitHub's community
-guidelines. You can read it below:
-
-### Summary
-
-GNOME creates software for a better world. We achieve this by behaving well towards
-each other.
-
-Therefore this document suggests what we consider ideal behaviour, so you know what
-to expect when getting involved in GNOME. This is who we are and what we want to be.
-There is no official enforcement of these principles, and this should not be interpreted
-like a legal document.
-
-### Advice
-
- * **Be respectful and considerate**: Disagreement is no excuse for poor behaviour or personal
-     attacks. Remember that a community where people feel uncomfortable is not a productive one.
-
- * **Be patient and generous**: If someone asks for help it is because they need it. Do politely
-     suggest specific documentation or more appropriate venues where appropriate, but avoid
-     aggressive or vague responses such as "RTFM".
-
- * **Assume people mean well**: Remember that decisions are often a difficult choice between
-     competing priorities. If you disagree, please do so politely. If something seems outrageous,
-     check that you did not misinterpret it. Ask for clarification, but do not assume the worst.
-
- * **Try to be concise**: Avoid repeating what has been said already. Making a conversation larger
-     makes it difficult to follow, and people often feel personally attacked if they receive multiple
-     messages telling them the same thing.
-
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-### Communication Guideline
-
-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,
-an environment in which individuals are silenced, berated, or are otherwise afraid to speak up is
-unlikely to foster fruitful dialog.
-
-Everyone interacting with members of the community should always keep in mind the asymmetry of
-communication: while your interaction with community members (and in particular, maintainers and
-long-term contributors) may be singular and fleeting, these members generally interact with a high
-volume of individuals each day. Before writing a comment, opening a new issue, or engaging as part
-of any forum or IRC discussion, please take a moment to appreciate that fact.
-
-While communicating, it is expected that all involved participants be respectful and civil at all
-times and refrain from personal attacks.
-
-#### Communication Rules
-
-The following behavior will not be tolerated on any occasion:
-
- * **Threats of violence**: You may not threaten violence towards others or use the site to organize,
-   promote, or incite acts of real-world violence or terrorism. Think carefully about the words you
-   use, the images you post, and even the software you write, and how they may be interpreted by
-   others. Even if you mean something as a joke, it might not be received that way. If you think
-   that someone else might interpret the content you post as a threat or as promoting violence or
-   terrorism, stop. Don't post it. In extraordinary cases, we may report threats of violence to law
-   enforcement if we think there may be a genuine risk of physical harm or a threat to public safety.
-
- * **Hate speech and discrimination**: While it is not forbidden to broach topics such as age, body
-   size, disability, ethnicity, gender identity and expression, level of experience, nationality,
-   personal appearance, race, religion, or sexual identity and orientation, we do not tolerate speech
-   that attacks a person or group of people on the basis of who they are. When approached in an
-   aggressive or insulting manner these (and other) sensitive topics can make others feel unwelcome,
-   or perhaps even unsafe. While there's always the potential for misunderstandings, we expect our
-   community members to remain respectful and civil when discussing sensitive topics.
-
- * **Bullying and harassment**: We do not tolerate bullying, harassment, or any other means of
-   habitual badgering or intimidation targeted at a specific person or group of people. In general,
-   if your actions are unwanted and you cease to terminate this form of engagement, there is a good
-   chance that your behavior will be classified as bullying or harassment.
-
- * **Impersonation**: You may not seek to mislead others as to your identity by copying another
-   person's avatar, posting content under their email address, using a similar username, or otherwise
-   posing as someone else. Impersonation and identity theft is a form of harassment.
-
- * **Doxxing and invasion of privacy**: Don't post other people's personal information, such as phone
-   numbers, private email addresses, physical addresses, credit card numbers, Social Security/National
-   Identity numbers, or passwords. Depending on the context, we may consider such behavior to be an
-   invasion of privacy, with particularly egregious examples potentially escalating to the point of
-   legal action, such as when the released material presents a safety risk to the subject.
-
- * **Obscene content**: In essence, do not post pornography, gore, or any other depiction of violence.
-
-#### General Advice
-
-The following advice will help to increase the efficiency of communication with community members:
-
- * Do not post "me too" comments. Use the GitLab reactions instead, e.g. “thumbs up” or “thumbs down”.
- * Avoid adding priority, time, or relevance hints if you are not involved with the development of
-   the application. For example, `“This is an urgent issue”`, or `“This should be fixed now”`, or
-   even `“The majority of users need this feature”`.
- * Do not use passive-aggressive communication tactics.
- * When reporting technical problems with the application, such as misbehavior or crashes, focus on
-   sharing as many details as possible and avoid adding non-technical information to it.
-
-   An example of a **good** issue report:
-
-   ```
-   GNOME Settings crashes when opening the Wi-Fi panel with 3+ Wi-Fi adapters
-
-   Steps to reproduce (assuming 3+ Wi-Fi adapters are present):
-
-     1. Open GNOME Settings
-     2. Select the Wi-Fi panel
-     3. Observe the crash
-
-   This does not happen with 2 or less adapters. Here is a backtrace of the
-   crash: backtrace.txt
-   ```
-
-   In contrast, here is an example of a **bad** issue report:
-
-   ```
-   GNOME Settings crashed while I was trying to connect to the internet. How can such
-   a thing happen and nobody notice? Did you not test it before releasing it?
-
-   This should be fixed as quick as possible!
-   ```
-
- * When asking for new features, try and add as much information as possible to justify its relevance,
-   why should it not be implemented as an auxiliary program, what problems it would solve, and offer
-   suggestions about how you think it should be implemented.
-
-   Example of a **good** feature request:
-
-   ```
-   GNOME Settings needs to expose IPv6 options
-
-   As of now, the connection editor dialog does not allow editing various IPv6
-   options. This is relevant because without some of these options, it is not
-   possible to have a valid IPv6 configuration and, consequently, not have access
-   to various websites and services.
-
-   The list of missing configurations that are essential is:
-
-    * <Feature A>
-    * <Feature B>
-
-   Optionally, the following configurations can also be added:
-
-    * <Feature C>
-    * <Feature D>
-
-   Here is a quick sketch I have made showing how I think these options
-   should be exposed as a user interface: sketch.png.
-   ```
-
-   Example of a **bad** feature request:
-
-   ```
-   Merge GNOME Tweaks in GNOME Settings
-
-   The options in GNOME Tweaks are absolutely essential to the majority of us
-   users. Why was it not merged already? This is an urgent issue and should
-   have been addressed years ago. You should allocate all your resources on
-   merging those two applications.
-   ```
-
-#### What happens if someone breaks these rules or guidelines?
-
-Actions that may be taken in response to an abusive comment include but are not limited to:
-
- * Content removal (when breaking any of the guidelines or rules)
- * Content blocking (when breaking any of the guidelines or rules)
- * Formal report to the Code of Conduct Committee (when breaking any of the rules)
-
-### Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.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
--- a/docs/HACKING.md
+++ b/docs/HACKING.md
@@ -1,291 +0,0 @@
-# Style
-
-GNOME Settings has a coding style based on GTK Coding Style, but with a few more
-rules. Please read them carefully and, if in doubt, ask a maintainer for directions.
-
-## General
-
-The most important rule is: **see the surrounding code, and copy its style**.
-
-That said, GNOME Settings assumes:
-
- * 2 spaces of indentation
- * 120 columns of line width
- * Newline before `{`
-
-Another rule that applies to function declarations is that all parameters are
-aligned by the last '*'. There are plenty of examples below.
-
-## Comments
-
-Comment blocks should be formatted as following:
-
-```c
-/* Single line comment */
-
-/* Multiline comments start at the first line of the comment block,
- * but have the closing slash a line after. Every line starts with
- * an asterisk that is aligned with every the rest of the block.
- */
-```
-
-## Conditionals
-
-Conditionals should either be all in one line, or one per line. Newlines inside
-conditionals are aligned by the last parenthesis.
-
-
-Some examples below:
-
-```c
-// Single line if
-if (a || b || (c && d))
-  return;
-
-// Multiline if with nested parenthesis
-if (long_boolean_variable_used_in_this_condition_a ||
-    long_boolean_variable_used_in_this_condition_b ||
-    (long_boolean_variable_used_in_this_condition_c &&
-     long_boolean_variable_used_in_this_condition_d))
-  {
-    return;
-  }
-
-// Another single line example with do {} while (...)
-do
-  {
-    /* something */
-  }
-while (a || b || (c && d));
-```
-
-## Structs and Enums
-
-Structures and enums are formatted as following:
-
-```c
-struct _FooBar
-{
-  guint32    field_one;
-  gchar     *text;
-};
-
-typedef struct
-{
-  FooParent     parent;
-
-  guint32       field_one;
-  gchar        *text;
-
-  struct
-  {
-    CustomType *something;
-    guint       something_else;
-  } inner_struct;
-
-  gboolean      flag : 1;
-} FooBar;
-
-enum
-{
-  FIRST,
-  SECOND,
-  LAST,
-};
-
-typedef enum
-{
-  FOO_BAR_FIRST,
-  FOO_BAR_SECOND,
-  FOO_BAR_LAST,
-} FooEnumBar;
-```
-
-## Header (.h) files
-
-It is organized by the following structure:
-
- 1. GPL header
- 2. Local includes
- 3. System includes
- 4. `G_BEGIN_DECLS`
- 5. `#defines`
- 6. `G_DECLARE_{FINAL,DERIVABLE}_TYPE`
- 7. Public API
- 8. `G_END_DECLS`
-
-The following style rules apply:
-
- * The '*' and the type come together, without any spaces in between.
- * Function names are aligned by the widest return value.
- * Parenthesis after function name is aligned by the widest function name
- * The last '*' in parameters are aligned by the widest parameter type
- * No new line at the end of the file
-
-As an example, this is how a header file should look like (extracted from
-the `cc-object-storage.h` file):
-
-```c
-/* cc-object-storage.h
- *
- * Copyright 2018 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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 2 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/>.
- */
-
-#pragma once
-
-#include <glib-object.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-/* Default storage keys */
-#define CC_OBJECT_NMCLIENT  "CcObjectStorage::nm-client"
-
-
-#define CC_TYPE_OBJECT_STORAGE (cc_object_storage_get_type())
-
-G_DECLARE_FINAL_TYPE (CcObjectStorage, cc_object_storage, CC, OBJECT_STORAGE, GObject)
-
-gboolean cc_object_storage_has_object             (const gchar         *key);
-
-void     cc_object_storage_add_object             (const gchar         *key,
-                                                   gpointer             object);
-
-gpointer cc_object_storage_get_object             (const gchar         *key);
-
-gpointer cc_object_storage_create_dbus_proxy_sync (GBusType             bus_type,
-                                                   GDBusProxyFlags     flags,
-                                                   const gchar         *name,
-                                                   const gchar         *path,
-                                                   const gchar         *interface,
-                                                   GCancellable        *cancellable,
-                                                   GError             **error);
-
-void     cc_object_storage_create_dbus_proxy      (GBusType              bus_type,
-                                                   GDBusProxyFlags       flags,
-                                                   const gchar          *name,
-                                                   const gchar          *path,
-                                                   const gchar          *interface,
-                                                   GCancellable         *cancellable,
-                                                   GAsyncReadyCallback   callback,
-                                                   gpointer              user_data);
-
-G_END_DECLS
-```
-
-## Source code
-
-The source file keeps an order of methods. The order will be as following:
-
-  1. GPL header
-  2. Structures
-  3. Function prototypes
-  4. G_DEFINE_TYPE()
-  5. Enums
-  6. Static variables
-  7. Auxiliary methods
-  8. Callbacks
-  9. Interface implementations
-  10. Parent class overrides
-  11. class_init and init
-  12. Public API
-
-### Structures
-
-The structures must have the first pointer asterisk aligned one space after the
-widest type name. For example:
-
-```c
-typedef struct
-{
-  GBusType         bus_type;
-  GDBusProxyFlags  flags;
-  gchar           *name;
-  gchar           *path;
-  gchar           *interface;
-  gboolean         cached;
-} TaskData;
-
-```
-
-### Function Prototypes
-
-Function prototypes must be formatted just like in header files.
-
-### Auxiliary Methods
-
-Auxiliary method names must have a verb in the dictionary form, and should always
-perform an action over something. They don't have the `cc_` prefix. For example:
-
-```c
-static void
-execute_something_on_data (Foo *data,
-                           Bar *bar)
-{
-  /* ... */
-}
-```
-
-### Callbacks
-
- * Callbacks always have the `_cb` suffix
- * Signal callbacks always have the `on_<object_name>` prefix
- * Callback names must have the name of the signal in the past
-
-For example:
-
-```c
-static void
-on_foo_size_allocated_cb (GtkWidget     *widget,
-                          GtkAllocation *allocation,
-                          gpointer       user_data)
-{
-  /* ... */
-}
-```
-
-### Line Splitting
-
-Line splitting works following the GTK code style, but legibility comes over above
-all. If a function call looks unbalanced following the GTK style, it is fine to
-slightly escape the rules.
-
-For example, this feels extremelly unbalanced:
-
-```c
-foo_bar_do_somthing_sync (a,
-                          1,
-                          object,
-                          data,
-                          something
-                          cancellable,
-                          &error);
-```
-
-Notice the empty space before the arguments, and how empty and odd it looks. In
-comparison, it will look better if written like this:
-
-```c
-foo_bar_do_somthing_sync (a, 1, object, data,
-                          something
-                          cancellable,
-                          &error);
-```
-
-# Contributing guidelines
-
-See CONTRIBUTIONS.md file for the contribution guidelines, and the Code of Conduct
-that contributors are expected to follow.
--- a/docs/MAINTAINERS.md
+++ b/docs/MAINTAINERS.md
@@ -1,62 +0,0 @@
-This document describes how maintainership works on GNOME Settings. It is intended to be a guideline
-for future reference.
-
-The list of current maintainers can be found at the [gnome-control-center.doap][doap] DOAP file.
-
-# General Rules
-
-The purpose of the shared maintainership model in GNOME Settings is to avoid as much as possible
-pushing unreviewed code in the main repository. Not only it is a good engineering practice, but it
-also increases the code quality and reduces the number of bugs.
-
-GNOME Settings has two types of maintainers:
-
- * **General Maintainer**: take care of the whole codebase and of panels without a specific maintainer.
- * **Panel Maintainer**: take care of a specific panel with a stronger authority over General
-   Maintainers.
-
-
-## For Contributors
-
-Panel Maintainers have a stronger authority over their panels than a General Maintainer. If you are
-contributing to a specific panel, and that panel has a dedicate maintainer, they should be the main
-point of contact.
-
-In the rare case of Panel Maintainers not being responsive, it is allowed to contact General
-Maintainers.
-
-## For Maintainers
-
-If you are a Panel Maintainer, your merge requests will be reviewed by General Maintainer. The
-opposite is true as well - General Maintainers contributing to a specific panel will have their
-merge requests reviewed by the Panel Maintainer of that panel.
-
-If you are a General Maintainer contributing to an unmaintained panel, or to the main codebase, your
-merge requests will be reviewed by another General Maintainer.
-
-Avoid pushing commits without an explicit review, except in the following cases:
-
- * The commit is a translation commit
- * The commit is trivial
- * The commit is urgent and no reviewers were available in time
-
-When accepting a merge request and allowing the other maintainer to merge, avoid misunderstandings
-by being explicit. Suggested acceptance phrase:
-
-`I approve this merge request. You are allowed to merge it.`
-
-### Urgency Commits
-
-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)
- * Symptoms:
-   * Always OR often reproducible; AND
-   * Crash; OR
-   * Data loss; OR
-   * System corruption
- * 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
--- a/gettext/its/gnome-keybindings.its
+++ b/gettext/its/gnome-keybindings.its
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<its:rules xmlns:its="http://www.w3.org/2005/11/its"
-           xmlns:gt="https://www.gnu.org/s/gettext/ns/its/extensions/1.0"
-           version="2.0">
-  <its:translateRule selector="/KeyListEntries" translate="no"/>
-  <its:translateRule selector="/KeyListEntries/@name" translate="yes"/>
-  <its:translateRule selector="//KeyListEntry" translate="yes"/>
-  <its:translateRule selector="//KeyListEntry/@description" translate="yes"/>
-
-  <gt:contextRule selector="//KeyListEntry[@msgctxt]" contextPointer="@msgctxt"/>
-
-  <!-- Extracted strings are consumed by the library and are never
-       merged back; we don't want to escape special characters.  -->
-  <gt:escapeRule selector="/KeyListEntries" escape="no"/>
-</its:rules>
--- a/gettext/its/gnome-keybindings.loc
+++ b/gettext/its/gnome-keybindings.loc
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<locatingRules>
-  <locatingRule name="GnomeKeybindings" pattern="*.xml">
-    <documentRule localName="KeyListEntries" target="gnome-keybindings.its"/>
-  </locatingRule>
-</locatingRules>
--- a/gettext/its/sounds.its
+++ b/gettext/its/sounds.its
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<its:rules xmlns:its="http://www.w3.org/2005/11/its"
-           version="2.0">
-  <its:translateRule selector="/sounds" translate="no"/>
-  <its:translateRule selector="//name" translate="yes"/>
-</its:rules>
--- a/gettext/its/sounds.loc
+++ b/gettext/its/sounds.loc
@@ -1,6 +0,0 @@
-<?xml version="1.0"?>
-<locatingRules>
-  <locatingRule name="sounds" pattern="*.xml">
-    <documentRule localName="sounds" target="sounds.its"/>
-  </locatingRule>
-</locatingRules>
--- a/gnome-control-center.doap
+++ b/gnome-control-center.doap
@@ -1,95 +0,0 @@
-<Project xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:rdfs="http://www.w3.org/2000/01/rdf-schema#"
-         xmlns:foaf="http://xmlns.com/foaf/0.1/"
-         xmlns:gnome="http://api.gnome.org/doap-extensions#"
-         xmlns="http://usefulinc.com/ns/doap#">
-
-  <name xml:lang="en">GNOME Settings</name>
-  <shortdesc xml:lang="en">GNOME's main interface to configure various aspects of the desktop</shortdesc>
-  <description xml:lang="en">GNOME's main interface to configure various aspects of the desktop</description>
-  <mailing-list rdf:resource="http://mail.gnome.org/mailman/listinfo/gnomecc-list" />
-  <download-page rdf:resource="http://download.gnome.org/sources/gnome-control-center/" />
-  <bug-database rdf:resource="http://gitlab.gnome.org/GNOME/gnome-control-center/issues" />
-  <category rdf:resource="http://api.gnome.org/doap-extensions#core" />
-  <programming-language>C</programming-language>
-
-  <!-- General, Multitasking -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Georges Basile Stavracas Neto</foaf:name>
-      <foaf:mbox rdf:resource="mailto:gbsneto@gnome.org" />
-      <gnome:userid>gbsneto</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- General, Region & Language -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Robert Ancell</foaf:name>
-      <foaf:mbox rdf:resource="mailto:rancell@gnome.org" />
-      <gnome:userid>rancell</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Bluetooth -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Bastien Nocera</foaf:name>
-      <foaf:mbox rdf:resource="mailto:hadess@gnome.org" />
-      <gnome:userid>hadess</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Display -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Benjamin Berg</foaf:name>
-      <foaf:mbox rdf:resource="mailto:bberg@gnome.org" />
-      <gnome:userid>bberg</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Mouse & Touchpad, Printers -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Felipe Borges</foaf:name>
-      <foaf:mbox rdf:resource="mailto:felipeborges@gnome.org" />
-      <gnome:userid>felipeborges</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Online Accounts -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Debarshi Ray</foaf:name>
-      <foaf:mbox rdf:resource="mailto:debarshir@gnome.org" />
-      <gnome:userid>debarshir</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Printers -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Marek Kašík</foaf:name>
-      <foaf:mbox rdf:resource="mailto:mkasik@gnome.org" />
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Thunderbolt -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Christian Kellner</foaf:name>
-      <foaf:mbox rdf:resource="mailto:gicmo@gnome.org" />
-      <gnome:userid>gicmo</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-
-  <!-- Wacom -->
-  <maintainer>
-    <foaf:Person>
-      <foaf:name>Carlos Garnacho</foaf:name>
-      <foaf:mbox rdf:resource="mailto:carlosg@gnome.org" />
-      <gnome:userid>carlosg</gnome:userid>
-    </foaf:Person>
-  </maintainer>
-</Project>
--- a/man/gnome-control-center.xml
+++ b/man/gnome-control-center.xml
@@ -1,361 +0,0 @@
-<?xml version='1.0'?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
-        "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-
-<refentry id="gnome-control-center">
-
-        <refentryinfo>
-                <title>gnome-control-center</title>
-                <productname>GNOME</productname>
-
-                <authorgroup>
-                        <author>
-                                <contrib>Maintainer</contrib>
-                                <firstname>Bastien</firstname>
-                                <surname>Nocera</surname>
-                                <email>hadess@hadess.net</email>
-                        </author>
-                </authorgroup>
-
-        </refentryinfo>
-
-        <refmeta>
-                <refentrytitle>gnome-control-center</refentrytitle>
-                <manvolnum>1</manvolnum>
-                <refmiscinfo class="manual">User Commands</refmiscinfo>
-        </refmeta>
-
-        <refnamediv>
-                <refname>gnome-control-center</refname>
-                <refpurpose>Configure GNOME settings</refpurpose>
-        </refnamediv>
-
-        <refsynopsisdiv>
-                <cmdsynopsis>
-                        <command>gnome-control-center <arg choice="opt" rep="repeat">OPTION</arg> <arg choice="opt">PANEL</arg> <arg choice="opt" rep="repeat">ARG</arg></command>
-                </cmdsynopsis>
-        </refsynopsisdiv>
-
-        <refsect1>
-                <title>Description</title>
-
-                <para><command>gnome-control-center</command> is a graphical
-                user interface to configure various aspects of GNOME.</para>
-
-                <para>When run without arguments, the shell displays the
-                <firstterm>overview</firstterm>, which shows all available
-                configuration panels. The overview allows to open individual
-                panels by clicking on them. It also has a search entry
-                to find panels by searching keywords.</para>
-
-                <para>It is also possible to specify a panel name
-                as commandline argument to go directly to that panel.
-                Individual panels may accept further arguments to specify
-                which tab to open (for multi-tabbed panels) or which
-                item to display (for panels with lists).</para>
-
-                <para>Note that <command>gnome-control-center</command>
-                is not meant to expose each and every setting that is
-                available. The settings that can be found here represent
-                what is considered useful and commonly needed options.
-                For more exotic or uncommon options, you can look at
-                <command>gnome-tweak-tool</command> or the
-                <command>gsettings</command> commandline utility.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>Panels</title>
-
-                <para>The following panel names can be specified:</para>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>background</option></term>
-
-                                <listitem><para>The background panel lets you
-                                set your desktop background.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>bluetooth</option></term>
-
-                                <listitem><para>The bluetooth panel lets you
-                                configure your computer's Bluetooth adapter,
-                                and pair the computer with Bluetooth keyboards,
-                                phones, etc.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>color</option></term>
-
-                                <listitem><para>The color panel can calibrate
-                                monitors, web cams and printers for accurate
-                                color reproduction.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>datetime</option></term>
-
-                                <listitem><para>The datetime panel lets you
-                                set the timezone and time format.</para>
-                                <para>Some operations in this panel
-                                affect all user accounts on the computer
-                                and require privieges.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>display</option></term>
-
-                                <listitem><para>The display panel configures
-                                the resolution and arrangement of monitors
-                                and laptop panels. Note that monitors can be
-                                rearranged by drag-and-drop, and you can change
-                                which monitor is your main display by dragging
-                                the black bar.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>info-overview</option></term>
-
-                                <listitem><para>The info-overview panel shows a general
-                                overview of the system configuration. It also
-                                lets you change the default applications for
-                                various tasks and the handling of removable
-                                media.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>keyboard</option></term>
-
-                                <listitem><para>The keyboard panel can
-                                change how the keyboard reacts to key
-                                presses and lets you change keyboard
-                                shortcuts or create custom shortcuts.</para>
-                                <para>You can open this panel on a
-                                specific tab by passing <option>typing</option>
-                                or <option>shortcuts</option> as extra
-                                argument.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>mouse</option></term>
-
-                                <listitem><para>The mouse panel can change
-                                how mice and touchpads react to user
-                                input.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>network</option></term>
-
-                                <listitem><para>The network panel provides
-                                a view of available network devices (wired,
-                                wireless or mobile) and their current
-                                configuration. It also provides a way to
-                                create new VPN connections and configure
-                                proxy settings.</para>
-                                <para>You can open this panel on a
-                                specific dialog by passing
-                                <option>create-wifi</option>,
-                                <option>connect-hidden-wifi</option>,
-                                <option>connect-3g</option>,
-                                <option>connect-8021x-wifi</option> or
-                                <option>show-device</option> as extra
-                                argument. The last three parameters
-                                require an additional extra argument for
-                                the network object in the form 
-                                <replaceable>/org/freedesktop/NetworkManager/Devices/0</replaceable>.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>notifications</option></term>
-
-                                <listitem><para>The notifications panel provides
-                                a way to control the display of notifications.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>online-accounts</option></term>
-
-                                <listitem><para>The online-accounts panel
-                                shows your configured online accounts and
-                                lets you add or remove accounts.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>power</option></term>
-
-                                <listitem><para>The power panel shows
-                                the fill level of batteries and can
-                                configure what happens when the computer
-                                is idle or runs out of battery.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>printers</option></term>
-
-                                <listitem><para>The printers panel shows
-                                all known printers and their status. It is
-                                possible to inspect queued print jobs and
-                                add new printers.</para>
-                                <para>Some operations in this panel require
-                                privileges.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>privacy</option></term>
-
-                                <listitem><para>The privacy panel allows
-                                to control visible file usage history, temporary
-                                files, and name.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>region</option></term>
-
-                                <listitem><para>The region panel
-                                contains regional settings such as
-                                the display language, formatting for
-                                times, dates, numbers, and input sources.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>search</option></term>
-
-                                <listitem><para>The search panel controls
-                                the results visible in the overview, and the
-                                files and folders to be indexed.
-                                </para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>screen</option></term>
-
-                                <listitem><para>The screen panel contains
-                                settings that control the screen brightness
-                                and screen lock behavior.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>sharing</option></term>
-
-                                <listitem><para>The sharing panel contains
-                                settings that control what is shared over the
-                                network.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>sound</option></term>
-
-                                <listitem><para>The sound panel shows
-                                all known sound devices and their configuration,
-                                including volume and balance settings.</para>
-                                <para>You can open this panel on a
-                                specific tab by passing
-                                <option>output</option>,
-                                <option>input</option>,
-                                <option>hardware</option>,
-                                <option>effects</option> or
-                                <option>applications</option> as extra
-                                argument.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>universal-access</option></term>
-
-                                <listitem><para>The universal-access panel
-                                contains settings for accessible technologies
-                                such as the screen reader, magnifier, screen
-                                keyboard and AccessX options.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>user-accounts</option></term>
-
-                                <listitem><para>The user-accounts panel
-                                shows all user accounts that exist on the
-                                computer and allows to change them in some
-                                ways, such as changing the user name, password
-                                or permissions. It also allows to create
-                                or remove accounts.</para>
-                                <para>Some operations in this panel require
-                                privileges.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>wacom</option></term>
-
-                                <listitem><para>the wacom panel shows
-                                connected Wacom graphics tablets and lets
-                                you calibrate and configure such devices.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-
-        </refsect1>
-
-        <refsect1>
-                <title>Options</title>
-
-                <variablelist>
-                        <varlistentry>
-                                <term><option>-?</option>, <option>--help</option></term>
-
-                                <listitem><para>Prints a short help
-                                text and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>--version</option></term>
-
-                                <listitem><para>Prints the program version
-                                and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-v</option>, <option>--verbose</option></term>
-
-                                <listitem><para>Enables verbose mode.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-l</option>, <option>--list</option></term>
-
-                                <listitem><para>Lists the available panels
-                                and exits.</para></listitem>
-                        </varlistentry>
-
-                        <varlistentry>
-                                <term><option>-o</option>, <option>--overview</option></term>
-
-                                <listitem><para>Opens the overview.</para></listitem>
-			</varlistentry>
-
-                        <varlistentry>
-				<term><option>-s</option> <replaceable>term</replaceable>, <option>--search</option> <replaceable>term</replaceable></term>
-
-                                <listitem><para>Sets the following search term.</para></listitem>
-                        </varlistentry>
-
-                </variablelist>
-        </refsect1>
-
-        <refsect1>
-                <title>Exit status</title>
-
-                <para>On success 0 is returned, a non-zero failure
-                code otherwise.</para>
-        </refsect1>
-
-        <refsect1>
-                <title>See Also</title>
-                <para>
-                        <citerefentry><refentrytitle>gsettings</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-                </para>
-        </refsect1>
-
-</refentry>
--- a/man/meson.build
+++ b/man/meson.build
@@ -1,26 +0,0 @@
-xsltproc = find_program('xsltproc', required: false)
-assert(xsltproc.found(), 'xsltproc is required to build documentation')
-
-xsltproc_cmd = [
-  xsltproc,
-  '--output', '@OUTPUT@',
-  '--nonet',
-  '--stringparam', 'man.output.quietly', '1',
-  '--stringparam', 'funcsynopsis.style', 'ansi',
-  '--stringparam', 'man.th.extra1.suppress', '1',
-  '--stringparam', 'man.authors.section.enabled', '0',
-  '--stringparam', 'man.copyright.section.enabled', '0',
-  'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
-  '@INPUT@'
-]
-
-output = meson.project_name() + '.1'
-
-custom_target(
-        output,
-        input : meson.project_name() + '.xml',
-       output : output,
-      command : xsltproc_cmd,
-      install : true,
-  install_dir : join_paths(control_center_mandir, 'man1')
-)
--- a/meson.build
+++ b/meson.build
@@ -1,310 +0,0 @@
-project(
-  'gnome-control-center', 'c',
-        version : '42.0',
-        license : 'GPL2+',
-  meson_version : '>= 0.53.0'
-)
-
-control_center_prefix = get_option('prefix')
-control_center_bindir = join_paths(control_center_prefix, get_option('bindir'))
-control_center_datadir = join_paths(control_center_prefix, get_option('datadir'))
-control_center_libexecdir = join_paths(control_center_prefix, get_option('libexecdir'))
-control_center_localedir = join_paths(control_center_prefix, get_option('localedir'))
-control_center_mandir = join_paths(control_center_prefix, get_option('mandir'))
-control_center_sysconfdir = join_paths(control_center_prefix, get_option('sysconfdir'))
-
-control_center_pkgdatadir = join_paths(control_center_datadir, meson.project_name())
-control_center_desktopdir = join_paths(control_center_datadir, 'applications')
-control_center_icondir = join_paths(control_center_datadir, 'icons')
-control_center_schemadir = join_paths (control_center_datadir, 'glib-2.0', 'schemas')
-
-control_center_gettext = meson.project_name() + '-2.0'
-
-host_is_linux = host_machine.system().contains('linux')
-host_is_linux_not_s390 = host_is_linux and not host_machine.cpu().contains('s390')
-
-cc = meson.get_compiler('c')
-
-# Tracing
-enable_tracing = get_option('tracing')
-
-config_h = configuration_data()
-
-py = import('python')
-python = py.find_installation('python3')
-
-config_h.set_quoted('TEST_NM_PYTHON', python.path())
-
-# defines
-set_defines = [
-  # package
-  ['PACKAGE', meson.project_name()],
-  ['PACKAGE_VERSION', meson.project_version()],
-  ['VERSION', meson.project_version()],
-  ['PROFILE', get_option('profile')],
-  # i18n
-  ['GETTEXT_PACKAGE', control_center_gettext]
-]
-
-foreach define: set_defines
-  config_h.set_quoted(define[0], define[1])
-endforeach
-
-# 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',
-             description: 'Permissions for creating the user\'s config, cache and data directories')
-
-# compiler flags
-common_flags = ['-DHAVE_CONFIG_H']
-
-# Only add this when optimizing is enabled (default)
-optimized_src = '''
-  #if __OPTIMIZE__ == 0
-  #error No optimization
-  #endif
-'''
-
-control_center_optimized = get_option('buildtype').contains('optimized') and cc.compiles(optimized_src)
-
-if control_center_optimized
-  common_flags += '-Wp,-D_FORTIFY_SOURCE=2'
-endif
-
-if get_option('buildtype').contains('debug')
-  test_cflags = [
-    '-Wcast-align',
-    '-Wmissing-field-initializers',
-    '-Wmissing-declarations',
-    '-Wmissing-prototypes',
-    '-Wnested-externs',
-    '-Wno-strict-aliasing',
-    '-Wno-sign-compare'
-  ]
-
-  common_flags += cc.get_supported_arguments(test_cflags)
-endif
-
-add_project_arguments(common_flags, language: 'c')
-
-# Check that we meet the dependencies
-libgvc = subproject(
-  'gvc',
-  default_options: [
-    'static=true',
-    'alsa=false',
-    'package_name=' + control_center_gettext,
-    'package_version=' + meson.project_version(),
-  ]
-)
-libgvc_dep = libgvc.get_variable('libgvc_dep')
-
-goa_req_version = '>= 3.25.3'
-pulse_req_version = '>= 2.0'
-
-libadwaita_dep = dependency(
-  'libadwaita-1',
-  version: '>= 1.1',
-  fallback: ['libadwaita', 'libadwaita_dep'],
-  default_options: ['examples=false', 'introspection=disabled', 'tests=false', 'vapi=false'],
-)
-
-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')
-gnome_desktop_dep = dependency('gnome-desktop-4')
-gnome_bg_dep = dependency('gnome-bg-4')
-gnome_rr_dep = dependency('gnome-rr-4')
-gnome_settings_dep = dependency('gnome-settings-daemon', version: '>= 41.0')
-goa_dep = dependency('goa-1.0', version: goa_req_version)
-gsettings_desktop_dep = dependency('gsettings-desktop-schemas', version: '>= 42.alpha')
-libxml_dep = dependency('libxml-2.0')
-pulse_dep = dependency('libpulse', version: pulse_req_version)
-pulse_mainloop_dep = dependency('libpulse-mainloop-glib', version: pulse_req_version)
-upower_glib_dep = dependency('upower-glib', version: '>= 0.99.8')
-gudev_dep = dependency('gudev-1.0', version: '>= 232')
-x11_dep = dependency('x11')
-xi_dep = dependency('xi', version: '>= 1.2')
-epoxy_dep = dependency('epoxy')
-gcr_dep = dependency('gcr-base-3')
-pwquality_dep = dependency('pwquality', version: '>= 1.2.2')
-
-m_dep = cc.find_library('m')
-
-common_deps = [
-  gio_dep,
-  glib_dep,
-  gsettings_desktop_dep,
-  libadwaita_dep,
-  dependency('gio-unix-2.0'),
-  dependency('gthread-2.0'),
-  dependency('gtk4', version: '>= 4.4'),
-]
-
-polkit_gobject_dep = dependency('polkit-gobject-1', version: '>= 0.103')
-# Also verify that polkit ITS files exist:
-# https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/491
-polkit_files = [ 'gettext/its/polkit.its', 'gettext/its/polkit.loc' ]
-foreach polkit_file: polkit_files
-  r = run_command('build-aux/meson/find_xdg_file.py', polkit_file, check: true)
-  assert(r.returncode() == 0, 'ITS support missing from polkit, please upgrade or contact your distribution')
-endforeach
-
-# Check for CUPS 1.4 or newer
-cups_dep = dependency('cups', version : '>= 1.4', required: false)
-assert(cups_dep.found(), 'CUPS 1.4 or newer not found')
-
-# https://bugzilla.gnome.org/show_bug.cgi?id=696766
-cups_cflags = []
-if cups_dep.version().version_compare('>= 1.6')
-  cups_cflags += '-D_PPD_DEPRECATED='
-endif
-
-# cups headers
-check_headers = [
-  ['HAVE_CUPS_CUPS_H', 'cups/cups.h'],
-  ['HAVE_CUPS_PPD_H', 'cups/ppd.h']
-]
-
-foreach header: check_headers
-  assert(cc.has_header(header[1], args: cups_cflags), 'CUPS headers not found: ' + header[1])
-endforeach
-
-config_h.set10('HAVE_CUPS_HTTPCONNECT2',
-               cc.has_function('httpConnect2', dependencies: cups_dep),
-               description: 'Define if httpConnect2() is available in CUPS')
-
-# IBus support
-enable_ibus = get_option('ibus')
-if enable_ibus
-  ibus_dep = dependency('ibus-1.0', version: '>= 1.5.2')
-endif
-config_h.set('HAVE_IBUS', enable_ibus,
-             description: 'Defined if IBus support is enabled')
-
-# thunderbolt
-config_h.set10('HAVE_FN_EXPLICIT_BZERO',
-               cc.has_function('explicit_bzero', prefix: '''#include <string.h>'''),
-               description: 'Define if explicit_bzero is available')
-
-# Snap support
-enable_snap = get_option('snap')
-if enable_snap
-  snapd_glib_deps = [
-    dependency('snapd-glib', version: '>= 1.57')
-  ]
-endif
-config_h.set('HAVE_SNAP', enable_snap,
-             description: 'Define to 1 if Snap support is enabled')
-
-# malcontent support
-enable_malcontent = get_option('malcontent')
-if enable_malcontent
-  malcontent_dep = dependency('malcontent-0', version: '>= 0.7.0')
-  config_h.set('HAVE_MALCONTENT_0_10', malcontent_dep.version().version_compare('>= 0.10.0'),
-               description: 'Define to 1 if malcontent ≥ 0.10.0')
-endif
-config_h.set('HAVE_MALCONTENT', enable_malcontent,
-             description: 'Define to 1 if malcontent support is enabled')
-
-if host_is_linux
-  # network manager
-  network_manager_deps = [
-    dependency('libnm', version: '>= 1.24.0'),
-    dependency('libnma-gtk4', version: '>= 1.8.0'),
-    dependency('mm-glib', version: '>= 0.7')
-  ]
-endif
-config_h.set('BUILD_NETWORK', host_is_linux,
-             description: 'Define to 1 to build the Network panel')
-config_h.set('HAVE_NETWORK_MANAGER', host_is_linux,
-             description: 'Define to 1 if NetworkManager is available')
-config_h.set('BUILD_WWAN', host_is_linux,
-             description: 'Define to 1 to build the WWan panel')
-config_h.set('HAVE_WWAN', host_is_linux,
-             description: 'Define to 1 if WWan is available')
-
-if host_is_linux_not_s390
-  # gnome-bluetooth
-  gnome_bluetooth_dep = dependency('gnome-bluetooth-ui-3.0')
-
-  libwacom_dep = dependency('libwacom', version: '>= 0.7')
-
-  wacom_deps = [
-    libwacom_dep,
-  ]
-  config_h.set('HAVE_WACOM_3D_STYLUS', libwacom_dep.version().version_compare('>= 0.27'),
-               description: 'Define to 1 if libwacom provides definition for 3D styli')
-else
-  message('Bluetooth and Wacom panels will not be built (no USB support on this platform)')
-  message('Thunderbolt panel will not be built (not supported on this platform)')
-endif
-config_h.set('BUILD_BLUETOOTH', host_is_linux_not_s390,
-             description: 'Define to 1 to build the Bluetooth panel')
-config_h.set('HAVE_BLUETOOTH', host_is_linux_not_s390,
-             description: 'Define to 1 if bluetooth support is available')
-config_h.set('BUILD_WACOM', host_is_linux_not_s390,
-             description: 'Define to 1 to build the Wacom panel')
-config_h.set('HAVE_WACOM', host_is_linux_not_s390,
-             description: 'Define to 1 if Wacom is supportted')
-config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390,
-             description: 'Define to 1 to build the Thunderbolt panel')
-
-gnome = import('gnome')
-i18n = import('i18n')
-pkg = import('pkgconfig')
-
-desktop_conf = configuration_data()
-desktop_conf.set('VERSION', meson.project_version())
-
-po_dir = join_paths(meson.source_root(), 'po')
-its_dir = join_paths(meson.source_root(), 'gettext')
-
-install_subdir(
-  'gettext',
-  install_dir: control_center_datadir
-)
-
-top_inc = include_directories('.')
-shell_inc = include_directories('shell')
-
-subdir('build-aux')
-subdir('data/icons')
-subdir('po')
-subdir('panels')
-subdir('shell')
-subdir('search-provider')
-
-if get_option('tests')
-  subdir('tests')
-endif
-
-if get_option('documentation')
-  subdir('man')
-endif
-
-configure_file(
-  output: 'config.h',
-  configuration: config_h
-)
-
-summary({
-  'Documentation': get_option('documentation'),
-  'Tests': get_option('tests'),
-  'Tracing': enable_tracing,
-  'Optimized': control_center_optimized,
-})
-
-summary({
-  'GNOME Bluetooth': host_is_linux_not_s390,
-  'NetworkManager': host_is_linux,
-  'Wacom': host_is_linux_not_s390,
-}, section: 'Dependencies')
-
-summary({
-  'IBus': enable_ibus,
-  'Snap': enable_snap,
-  'Malcontent': enable_malcontent,
-}, section: 'Optional Dependencies')
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,9 +0,0 @@
-option('documentation', type: 'boolean', value: false, description: 'build documentation')
-option('ibus', type: 'boolean', value: true, description: 'build with IBus support')
-option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions')
-option('snap', type: 'boolean', value: false, description: 'build with Snap support')
-option('tests', type: 'boolean', value: true, description: 'build tests')
-option('tracing', type: 'boolean', value: false, description: 'add extra debugging information')
-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')
--- a/panels/applications/applications.gresource.xml
+++ b/panels/applications/applications.gresource.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/control-center/applications">
-    <file preprocess="xml-stripblanks">cc-applications-panel.ui</file>
-    <file preprocess="xml-stripblanks">cc-applications-row.ui</file>
-    <file preprocess="xml-stripblanks">cc-info-row.ui</file>
-    <file preprocess="xml-stripblanks">cc-snap-row.ui</file>
-    <file preprocess="xml-stripblanks">cc-toggle-row.ui</file>
-  </gresource>
-</gresources>
--- a/panels/applications/cc-applications-panel.c
+++ b/panels/applications/cc-applications-panel.c
--- a/panels/applications/cc-applications-panel.h
+++ b/panels/applications/cc-applications-panel.h
@@ -1,30 +0,0 @@
-/* cc-applications-panel.h
- *
- * Copyright 2018 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <shell/cc-panel.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_APPLICATIONS_PANEL (cc_applications_panel_get_type())
-G_DECLARE_FINAL_TYPE (CcApplicationsPanel, cc_applications_panel, CC, APPLICATIONS_PANEL, CcPanel)
-
-G_END_DECLS
--- a/panels/applications/cc-applications-panel.ui
+++ b/panels/applications/cc-applications-panel.ui
@@ -1,458 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcApplicationsPanel" parent="CcPanel">
-
-    <child type="titlebar">
-      <object class="AdwHeaderBar">
-        <property name="show-end-title-buttons">True</property>
-        <property name="show-start-title-buttons">False</property>
-        <child type="start">
-          <object class="GtkButton">
-            <property name="visible" bind-source="CcApplicationsPanel" bind-property="folded" bind-flags="default|sync-create" />
-            <property name="icon-name">go-previous-symbolic</property>
-            <property name="action-name">window.navigate</property>
-            <property name="action-target">0</property> <!-- 0: ADW_NAVIGATION_DIRECTION_BACK -->
-          </object>
-        </child>
-        <property name="title-widget">
-          <object class="AdwWindowTitle" id="header_title">
-            <property name="title" translatable="yes">Applications</property>
-          </object>
-        </property>
-      </object>
-    </child>
-
-    <child type="content">
-      <object class="GtkStack" id="stack">
-
-        <child>
-          <object class="AdwStatusPage" id="empty_box">
-            <property name="icon-name">org.gnome.Software-symbolic</property>
-            <property name="title" translatable="yes">No applications</property>
-            <child>
-              <object class="GtkButton" id="install_button">
-                <property name="label" translatable="yes">Install some…</property>
-                <property name="halign">center</property>
-                <signal name="clicked" handler="open_software_cb" object="CcApplicationsPanel" swapped="yes"/>
-                <style>
-                  <class name="pill" />
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <child>
-          <object class="AdwPreferencesPage" id="settings_box">
-
-            <!-- App icon & buttons -->
-            <child>
-              <object class="AdwPreferencesGroup">
-
-                <child>
-                  <object class="GtkBox">
-                    <property name="orientation">vertical</property>
-                    <property name="spacing">18</property>
-                    <child>
-                      <object class="GtkImage" id="app_icon_image">
-                        <property name="icon-name">org.gnome.Software</property>
-                        <property name="pixel-size">96</property>
-                        <style>
-                          <class name="icon-dropshadow" />
-                        </style>
-                      </object>
-                    </child>
-
-                    <child>
-                      <object class="GtkLabel" id="app_name_label">
-                        <property name="wrap">True</property>
-                        <style>
-                          <class name="title" />
-                          <class name="title-1" />
-                        </style>
-                      </object>
-                    </child>
-
-                    <child>
-                      <object class="GtkBox">
-                        <property name="halign">center</property>
-                        <property name="margin-top">12</property>
-                        <property name="margin-bottom">12</property>
-                        <property name="spacing">18</property>
-                        <child>
-                          <object class="GtkButton" id="launch_button">
-                            <property name="label" translatable="yes">Open</property>
-                            <signal name="clicked" handler="on_launch_button_clicked_cb" object="CcApplicationsPanel" swapped="no" />
-                            <style>
-                              <class name="pill" />
-                              <class name="suggested-action" />
-                            </style>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkButton" id="view_details_button">
-                            <property name="label" translatable="yes">View Details</property>
-                            <style>
-                              <class name="pill" />
-                            </style>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-
-              </object>
-            </child>
-
-            <child>
-              <object class="AdwPreferencesGroup" id="integration_section">
-                <child>
-                  <object class="CcToggleRow" id="search">
-                    <property name="title" translatable="yes">Search</property>
-                    <property name="subtitle" translatable="yes">Receive system searches and send results.</property>
-                    <signal name="notify::allowed" handler="search_cb" object="CcApplicationsPanel" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="no_search">
-                    <property name="title" translatable="yes">Search</property>
-                    <property name="subtitle" translatable="yes">Receive system searches and send results.</property>
-                    <property name="info" translatable="yes">Disabled</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="notification">
-                    <property name="title" translatable="yes">Notifications</property>
-                    <property name="subtitle" translatable="yes">Show system notifications.</property>
-                    <signal name="notify::allowed" handler="notification_cb" object="CcApplicationsPanel" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="background">
-                    <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="wallpaper">
-                    <property name="title" translatable="yes">Change Wallpaper</property>
-                    <property name="subtitle" translatable="yes">Change the desktop wallpaper.</property>
-                    <signal name="notify::allowed" handler="wallpaper_cb" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="sound">
-                    <property name="title" translatable="yes">Sounds</property>
-                    <property name="subtitle" translatable="yes">Reproduce sounds.</property>
-                    <signal name="notify::allowed" handler="sound_cb" object="CcApplicationsPanel" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="no_sound">
-                    <property name="title" translatable="yes">Sounds</property>
-                    <property name="subtitle" translatable="yes">Reproduce sounds.</property>
-                    <property name="info" translatable="yes">Disabled</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="shortcuts">
-                    <property name="title" translatable="yes">Inhibit Shortcuts</property>
-                    <property name="subtitle" translatable="yes">Block standard keyboard shortcuts.</property>
-                    <signal name="notify::allowed" handler="shortcuts_cb" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="camera">
-                    <property name="title" translatable="yes">Camera</property>
-                    <property name="subtitle" translatable="yes">Take pictures with the camera.</property>
-                    <signal name="notify::allowed" handler="camera_cb" object="CcApplicationsPanel" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="no_camera">
-                    <property name="title" translatable="yes">Camera</property>
-                    <property name="subtitle" translatable="yes">Take pictures with the camera.</property>
-                    <property name="info" translatable="yes">Disabled</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="microphone">
-                    <property name="title" translatable="yes">Microphone</property>
-                    <property name="subtitle" translatable="yes">Record audio with the microphone.</property>
-                    <signal name="notify::allowed" handler="microphone_cb" object="CcApplicationsPanel" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="no_microphone">
-                    <property name="title" translatable="yes">Microphone</property>
-                    <property name="subtitle" translatable="yes">Record audio with the microphone.</property>
-                    <property name="info" translatable="yes">Disabled</property>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcToggleRow" id="location">
-                    <property name="title" translatable="yes">Location Services</property>
-                    <property name="subtitle" translatable="yes">Access device location data.</property>
-                    <signal name="notify::allowed" handler="location_cb" object="CcApplicationsPanel" swapped="yes"/>
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="no_location">
-                    <property name="title" translatable="yes">Location Services</property>
-                    <property name="subtitle" translatable="yes">Access device location data.</property>
-                    <property name="info" translatable="yes">Disabled</property>
-                  </object>
-                </child>
-              </object>
-            </child>
-
-            <child>
-              <object class="AdwPreferencesGroup" id="usage_section">
-                <child>
-                  <object class="CcInfoRow" id="builtin">
-                    <property name="title" translatable="yes">Built-in Permissions</property>
-                    <property name="subtitle" translatable="yes">System access that is required by the app</property>
-                    <property name="has-expander">True</property>
-                    <property name="is-link">True</property>
-                    <signal name="activated" handler="on_builtin_row_activated_cb" object="CcApplicationsPanel" swapped="no" />
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="handler_row">
-                    <property name="title" translatable="yes">File &amp;amp; Link Associations</property>
-                    <property name="has-expander">True</property>
-                    <property name="is-link">True</property>
-                    <signal name="activated" handler="on_handler_row_activated_cb" object="CcApplicationsPanel" swapped="no" />
-                  </object>
-                </child>
-                <child>
-                  <object class="CcInfoRow" id="storage">
-                    <property name="title" translatable="yes">Storage</property>
-                    <property name="has-expander">1</property>
-                    <property name="is-link">1</property>
-                    <signal name="activated" handler="on_storage_row_activated_cb" object="CcApplicationsPanel" swapped="no" />
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-
-  <!-- Sidebar -->
-  <object class="GtkBox" id="sidebar_box">
-    <property name="orientation">vertical</property>
-    <child>
-      <object class="GtkSearchEntry" id="sidebar_search_entry">
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">6</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <signal name="activate" handler="on_sidebar_search_entry_activated_cb" object="CcApplicationsPanel" swapped="yes" />
-        <signal name="search-changed" handler="on_sidebar_search_entry_search_changed_cb" object="CcApplicationsPanel" swapped="yes" />
-        <signal name="stop-search" handler="on_sidebar_search_entry_search_stopped_cb" object="CcApplicationsPanel" swapped="yes" />
-      </object>
-    </child>
-    <child>
-      <object class="GtkListBox" id="sidebar_listbox">
-        <property name="vexpand">True</property>
-        <property name="selection-mode">browse</property>
-        <style>
-          <class name="navigation-sidebar" />
-        </style>
-
-        <child type="placeholder">
-          <object class="GtkBox" id="empty_search_placeholder">
-            <property name="can_focus">False</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
-            <property name="margin-top">18</property>
-            <property name="margin-bottom">18</property>
-            <property name="margin-start">18</property>
-            <property name="margin-end">18</property>
-            <property name="orientation">vertical</property>
-            <property name="spacing">6</property>
-            <child>
-              <object class="GtkImage">
-                <property name="can_focus">False</property>
-                <property name="pixel_size">64</property>
-                <property name="icon_name">edit-find-symbolic</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">No results found</property>
-                <attributes>
-                  <attribute name="weight" value="bold"/>
-                  <attribute name="scale" value="1.44"/>
-                </attributes>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Try a different search</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-
-      </object>
-    </child>
-  </object>
-
-  <!-- Built-in Permissions dialog -->
-  <object class="GtkDialog" id="builtin_dialog">
-    <property name="title" translatable="yes">Built-in Permissions</property>
-    <property name="modal">1</property>
-    <property name="use-header-bar">1</property>
-    <property name="resizable">True</property>
-    <property name="hide-on-close">True</property>
-    <child>
-      <object class="AdwPreferencesPage">
-        <child>
-          <object class="AdwPreferencesGroup" id="builtin_group">
-            <child>
-              <object class="GtkListBox" id="builtin_list">
-                <property name="selection-mode">none</property>
-                <style>
-                  <class name="boxed-list"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-
-  <!-- File & Link handlers dialog -->
-  <object class="GtkDialog" id="handler_dialog">
-    <property name="title" translatable="yes">File &amp; Link Associations</property>
-    <property name="modal">1</property>
-    <property name="use-header-bar">1</property>
-    <property name="resizable">True</property>
-    <property name="hide-on-close">True</property>
-    <property name="default-width">500</property>
-    <property name="default-height">400</property>
-    <child>
-      <object class="AdwPreferencesPage">
-
-        <child>
-          <object class="AdwPreferencesGroup">
-            <child>
-              <object class="GtkLabel" id="handler_title_label">
-                <property name="wrap">True</property>
-                <property name="xalign">0.0</property>
-              </object>
-            </child>
-          </object>
-        </child>
-
-        <child>
-          <object class="AdwPreferencesGroup" id="handler_file_group">
-            <property name="title" translatable="yes">File Types</property>
-          </object>
-        </child>
-
-        <child>
-          <object class="AdwPreferencesGroup" id="handler_link_group">
-            <property name="title" translatable="yes">Link Types</property>
-          </object>
-        </child>
-
-        <child>
-          <object class="AdwPreferencesGroup">
-            <child>
-              <object class="GtkButton" id="handler_reset">
-                <property name="valign">center</property>
-                <property name="margin-top">12</property>
-                <property name="label" translatable="yes">Reset</property>
-                <signal name="clicked" handler="handler_reset_cb" object="CcApplicationsPanel" swapped="yes"/>
-                <style>
-                  <class name="destructive-action" />
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-
-      </object>
-    </child>
-  </object>
-
-  <!-- Storage dialog -->
-  <object class="GtkDialog" id="storage_dialog">
-    <property name="title" translatable="yes">Storage</property>
-    <property name="modal">1</property>
-    <property name="use-header-bar">1</property>
-    <property name="resizable">True</property>
-    <property name="hide-on-close">True</property>
-    <property name="default-width">420</property>
-    <property name="default-height">420</property>
-    <child>
-      <object class="AdwPreferencesPage">
-        <child>
-          <object class="AdwPreferencesGroup">
-            <property name="description" translatable="yes">How much disk space this application is occupying with app data and caches.</property>
-            <child>
-              <object class="CcInfoRow" id="app">
-                <property name="title" translatable="yes">Application</property>
-                <property name="info">Unknown</property>
-              </object>
-            </child>
-            <child>
-              <object class="CcInfoRow" id="data">
-                <property name="title" translatable="yes">Data</property>
-                <property name="info">Unknown</property>
-              </object>
-            </child>
-            <child>
-              <object class="CcInfoRow" id="cache">
-                <property name="title" translatable="yes">Cache</property>
-                <property name="info">Unknown</property>
-              </object>
-            </child>
-            <child>
-              <object class="CcInfoRow" id="total">
-                <property name="title" translatable="yes">&lt;b&gt;Total&lt;/b&gt;</property>
-                <property name="info">Unknown</property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="AdwPreferencesGroup">
-            <child>
-              <object class="GtkButton" id="clear_cache_button">
-                <property name="label" translatable="yes">Clear Cache…</property>
-                <signal name="clicked" handler="clear_cache_cb" object="CcApplicationsPanel" swapped="yes"/>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-
-  <object class="GtkSizeGroup">
-    <property name="mode">horizontal</property>
-    <widgets>
-      <widget name="launch_button" />
-      <widget name="view_details_button" />
-    </widgets>
-  </object>
-</interface>
--- a/panels/applications/cc-applications-row.c
+++ b/panels/applications/cc-applications-row.c
@@ -1,108 +0,0 @@
-/* cc-applications-row.c
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#include <config.h>
-#include <glib/gi18n.h>
-
-#include "cc-applications-row.h"
-#include "cc-applications-resources.h"
-
-struct _CcApplicationsRow
-{
-  GtkListBoxRow parent;
-
-  GAppInfo     *info;
-  gchar        *sortkey;
-
-  GtkWidget    *box;
-  GtkWidget    *image;
-  GtkWidget    *label;
-};
-
-G_DEFINE_TYPE (CcApplicationsRow, cc_applications_row, GTK_TYPE_LIST_BOX_ROW)
-
-static void
-cc_applications_row_finalize (GObject *object)
-{
-  CcApplicationsRow *self = CC_APPLICATIONS_ROW (object);
-
-  g_object_unref (self->info);
-  g_free (self->sortkey);
-
-  G_OBJECT_CLASS (cc_applications_row_parent_class)->finalize (object);
-}
-
-static void
-cc_applications_row_class_init (CcApplicationsRowClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->finalize = cc_applications_row_finalize;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-applications-row.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsRow, box);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsRow, image);
-  gtk_widget_class_bind_template_child (widget_class, CcApplicationsRow, label);
-}
-
-static void
-cc_applications_row_init (CcApplicationsRow *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-}
-
-CcApplicationsRow *
-cc_applications_row_new (GAppInfo *info)
-{
-  CcApplicationsRow *self;
-  g_autofree gchar *key = NULL;
-  GIcon *icon;
-
-  self = g_object_new (CC_TYPE_APPLICATIONS_ROW, NULL);
-
-  self->info = g_object_ref (info);
-
-  key = g_utf8_casefold (g_app_info_get_display_name (info), -1);
-  self->sortkey = g_utf8_collate_key (key, -1);
-
-  icon = g_app_info_get_icon (info);
-  if (icon != NULL)
-    gtk_image_set_from_gicon (GTK_IMAGE (self->image), g_app_info_get_icon (info));
-  else
-    gtk_image_set_from_icon_name (GTK_IMAGE (self->image), "application-x-executable");
-
-  gtk_label_set_label (GTK_LABEL (self->label), g_app_info_get_display_name (info));
-
-  return self;
-}
-
-GAppInfo *
-cc_applications_row_get_info (CcApplicationsRow *self)
-{
-  return self->info;
-}
-
-const gchar *
-cc_applications_row_get_sort_key (CcApplicationsRow *self)
-{
-  return self->sortkey;
-}
--- a/panels/applications/cc-applications-row.h
+++ b/panels/applications/cc-applications-row.h
@@ -1,36 +0,0 @@
-/* cc-applications-row.h
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_APPLICATIONS_ROW (cc_applications_row_get_type())
-G_DECLARE_FINAL_TYPE (CcApplicationsRow, cc_applications_row, CC, APPLICATIONS_ROW, GtkListBoxRow)
-
-CcApplicationsRow* cc_applications_row_new          (GAppInfo          *info);
-
-GAppInfo*          cc_applications_row_get_info     (CcApplicationsRow *row);
-
-const gchar*       cc_applications_row_get_sort_key (CcApplicationsRow *row);
-
-G_END_DECLS
--- a/panels/applications/cc-applications-row.ui
+++ b/panels/applications/cc-applications-row.ui
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcApplicationsRow" parent="GtkListBoxRow">
-    <child>
-      <object class="GtkBox" id="box">
-        <property name="margin-top">6</property>
-        <property name="margin-bottom">6</property>
-        <property name="margin-start">6</property>
-        <property name="margin-end">6</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkImage" id="image">
-            <property name="pixel-size">32</property>
-            <style>
-              <class name="lowres-icon"/>
-            </style>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="label">
-            <property name="xalign">0</property>
-            <property name="ellipsize">end</property>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
--- a/panels/applications/cc-info-row.c
+++ b/panels/applications/cc-info-row.c
@@ -1,187 +0,0 @@
-/* cc-info-row.c
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#include <config.h>
-#include <glib/gi18n.h>
-
-#include "cc-info-row.h"
-#include "cc-applications-resources.h"
-
-struct _CcInfoRow
-{
-  GtkListBoxRow parent;
-
-  GtkWidget    *info;
-  GtkWidget    *expander;
-
-  gboolean      expanded;
-  gboolean      link;
-};
-
-G_DEFINE_TYPE (CcInfoRow, cc_info_row, ADW_TYPE_ACTION_ROW)
-
-enum
-{
-  PROP_0,
-  PROP_INFO,
-  PROP_HAS_EXPANDER,
-  PROP_IS_LINK,
-  PROP_EXPANDED
-};
-
-static void
-cc_info_row_get_property (GObject    *object,
-                          guint       prop_id,
-                          GValue     *value,
-                          GParamSpec *pspec)
-{
-  CcInfoRow *row = CC_INFO_ROW (object);
-
-  switch (prop_id)
-    {
-    case PROP_INFO:
-      g_value_set_string (value, gtk_label_get_label (GTK_LABEL (row->info)));
-      break;
-    case PROP_HAS_EXPANDER:
-      g_value_set_boolean (value, gtk_widget_get_visible (row->expander));
-      break;
-    case PROP_IS_LINK:
-      g_value_set_boolean (value, row->link);
-      break;
-    case PROP_EXPANDED:
-      g_value_set_boolean (value, cc_info_row_get_expanded (row));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-update_expander (CcInfoRow *row)
-{
-  if (row->link)
-    gtk_image_set_from_icon_name (GTK_IMAGE (row->expander), "go-next-symbolic");
-  else if (row->expanded)
-    gtk_image_set_from_icon_name (GTK_IMAGE (row->expander), "pan-down-symbolic");
-  else
-    gtk_image_set_from_icon_name (GTK_IMAGE (row->expander), "pan-end-symbolic");
-}
-
-static void
-cc_info_row_set_property (GObject      *object,
-                            guint         prop_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
-{
-  CcInfoRow *row = CC_INFO_ROW (object);
-
-  switch (prop_id)
-    {
-    case PROP_INFO:
-      gtk_label_set_label (GTK_LABEL (row->info), g_value_get_string (value));
-      break;
-
-    case PROP_HAS_EXPANDER:
-      gtk_widget_set_visible (row->expander, g_value_get_boolean (value));
-      gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), g_value_get_boolean (value));
-      break;
-
-    case PROP_IS_LINK:
-      row->link = g_value_get_boolean (value);
-      update_expander (row);
-      break;
-
-    case PROP_EXPANDED:
-      cc_info_row_set_expanded (row, g_value_get_boolean (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-cc_info_row_class_init (CcInfoRowClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->get_property = cc_info_row_get_property;
-  object_class->set_property = cc_info_row_set_property;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-info-row.ui");
-
-  g_object_class_install_property (object_class,
-                                   PROP_INFO,
-                                   g_param_spec_string ("info", "info", "info",
-                                                        NULL, G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_HAS_EXPANDER,
-                                   g_param_spec_boolean ("has-expander", "has-expander", "has-expander",
-                                                         FALSE, G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_EXPANDED,
-                                   g_param_spec_boolean ("expanded", "expanded", "expanded",
-                                                         FALSE, G_PARAM_READWRITE));
-
-  g_object_class_install_property (object_class,
-                                   PROP_IS_LINK,
-                                   g_param_spec_boolean ("is-link", "is-link", "is-link",
-                                                         FALSE, G_PARAM_READWRITE));
-
-  gtk_widget_class_bind_template_child (widget_class, CcInfoRow, info);
-  gtk_widget_class_bind_template_child (widget_class, CcInfoRow, expander);
-}
-
-static void
-cc_info_row_init (CcInfoRow *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-}
-
-CcInfoRow *
-cc_info_row_new (void)
-{
-  return CC_INFO_ROW (g_object_new (CC_TYPE_INFO_ROW, NULL));
-}
-
-gboolean
-cc_info_row_get_expanded (CcInfoRow *row)
-{
-  return row->expanded;
-}
-
-void
-cc_info_row_set_expanded (CcInfoRow *row,
-                          gboolean   expanded)
-{
-  if (row->expanded == expanded)
-    return;
-
-  row->expanded = expanded;
-  update_expander (row);
-
-  g_object_notify (G_OBJECT (row), "expanded");
-}
-
--- a/panels/applications/cc-info-row.h
+++ b/panels/applications/cc-info-row.h
@@ -1,37 +0,0 @@
-/* cc-info-row.h
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <adwaita.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_INFO_ROW (cc_info_row_get_type())
-G_DECLARE_FINAL_TYPE (CcInfoRow, cc_info_row, CC, INFO_ROW, AdwActionRow)
-
-CcInfoRow* cc_info_row_new          (void);
-
-void       cc_info_row_set_expanded (CcInfoRow *row,
-                                     gboolean expanded);
-
-gboolean   cc_info_row_get_expanded (CcInfoRow *row);
-
-G_END_DECLS
--- a/panels/applications/cc-info-row.ui
+++ b/panels/applications/cc-info-row.ui
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcInfoRow" parent="AdwActionRow">
-    <child>
-      <object class="GtkLabel" id="info">
-        <property name="valign">center</property>
-        <style>
-          <class name="dim-label"/>
-        </style>
-      </object>
-    </child>
-    <child>
-      <object class="GtkImage" id="expander">
-        <property name="visible">False</property>
-        <property name="valign">center</property>
-        <property name="icon-name">pan-end-symbolic</property>
-      </object>
-    </child>
-  </template>
-</interface>
--- a/panels/applications/cc-snap-row.c
+++ b/panels/applications/cc-snap-row.c
@@ -1,316 +0,0 @@
-/* cc-snap-row.c
- *
- * Copyright 2019 Canonical Ltd.
- *
- * 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
- */
-
-#include <config.h>
-#include <glib/gi18n.h>
-
-#include "cc-snap-row.h"
-#include "cc-applications-resources.h"
-
-struct _CcSnapRow
-{
-  GtkListBoxRow parent;
-
-  GtkLabel     *title_label;
-  GtkSwitch    *slot_toggle;
-  GtkComboBox  *slots_combo;
-  GtkListStore *slots_combo_model;
-
-  GCancellable *cancellable;
-
-  SnapdPlug    *plug;
-  SnapdSlot    *connected_slot;
-  GPtrArray    *slots;
-};
-
-G_DEFINE_TYPE (CcSnapRow, cc_snap_row, GTK_TYPE_LIST_BOX_ROW)
-
-typedef struct
-{
-  CcSnapRow *self;
-  SnapdSlot *slot;
-} ConnectData;
-
-static void
-update_state (CcSnapRow *self)
-{
-  gboolean have_single_option;
-  GtkTreeIter iter;
-
-  have_single_option = self->slots->len == 1;
-  gtk_widget_set_visible (GTK_WIDGET (self->slot_toggle), have_single_option);
-  gtk_widget_set_visible (GTK_WIDGET (self->slots_combo), !have_single_option);
-
-  gtk_switch_set_active (self->slot_toggle, self->connected_slot != NULL);
-
-  if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (self->slots_combo_model), &iter))
-    {
-      do
-        {
-          SnapdSlot *slot;
-
-          gtk_tree_model_get (GTK_TREE_MODEL (self->slots_combo_model), &iter, 0, &slot, -1);
-          if (slot == self->connected_slot)
-            gtk_combo_box_set_active_iter (self->slots_combo, &iter);
-        } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (self->slots_combo_model), &iter));
-    }
-}
-
-static void
-disable_controls (CcSnapRow *self)
-{
-  gtk_widget_set_sensitive (GTK_WIDGET (self->slot_toggle), FALSE);
-  gtk_widget_set_sensitive (GTK_WIDGET (self->slots_combo), FALSE);
-}
-
-static void
-enable_controls (CcSnapRow *self)
-{
-  gtk_widget_set_sensitive (GTK_WIDGET (self->slot_toggle), TRUE);
-  gtk_widget_set_sensitive (GTK_WIDGET (self->slots_combo), TRUE);
-}
-
-static ConnectData *
-connect_data_new (CcSnapRow *self, SnapdSlot *slot)
-{
-  ConnectData *data;
-
-  data = g_new0 (ConnectData, 1);
-  data->self = self;
-  data->slot = g_object_ref (slot);
-
-  return data;
-}
-
-static void
-connect_data_free (ConnectData *data)
-{
-  g_clear_object (&data->slot);
-  g_free (data);
-}
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC (ConnectData, connect_data_free)
-
-static void
-connect_interface_cb (GObject *client, GAsyncResult *result, gpointer user_data)
-{
-  g_autoptr(ConnectData) data = user_data;
-  CcSnapRow *self = data->self;
-  SnapdSlot *slot = data->slot;
-  g_autoptr(GError) error = NULL;
-
-  if (snapd_client_connect_interface_finish (SNAPD_CLIENT (client), result, &error))
-    {
-      g_clear_object (&self->connected_slot);
-      self->connected_slot = g_object_ref (slot);
-    }
-  else
-    {
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        return;
-      g_warning ("Failed to connect interface: %s", error->message);
-    }
-
-  update_state (self);
-  enable_controls (self);
-}
-
-static void
-connect_plug (CcSnapRow *self, SnapdSlot *slot)
-{
-  g_autoptr(SnapdClient) client = NULL;
-
-  /* already connected */
-  if (self->connected_slot == slot)
-    return;
-
-  disable_controls (self);
-
-  client = snapd_client_new ();
-  snapd_client_connect_interface_async (client,
-                                        snapd_plug_get_snap (self->plug), snapd_plug_get_name (self->plug),
-                                        snapd_slot_get_snap (slot), snapd_slot_get_name (slot),
-                                        NULL, NULL,
-                                        self->cancellable,
-                                        connect_interface_cb, connect_data_new (self, slot));
-}
-
-static void
-disconnect_interface_cb (GObject *client, GAsyncResult *result, gpointer user_data)
-{
-  CcSnapRow *self = user_data;
-  g_autoptr(GError) error = NULL;
-
-  if (snapd_client_disconnect_interface_finish (SNAPD_CLIENT (client), result, &error))
-    {
-      g_clear_object (&self->connected_slot);
-    }
-  else
-    {
-      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        return;
-      g_warning ("Failed to disconnect interface: %s", error->message);
-    }
-
-  update_state (self);
-  enable_controls (self);
-}
-
-static void
-disconnect_plug (CcSnapRow *self)
-{
-  g_autoptr(SnapdClient) client = NULL;
-
-  /* already disconnected */
-  if (self->connected_slot == NULL)
-    return;
-
-  disable_controls (self);
-
-  client = snapd_client_new ();
-  snapd_client_disconnect_interface_async (client,
-                                           snapd_plug_get_snap (self->plug), snapd_plug_get_name (self->plug),
-                                           NULL, NULL,
-                                           NULL, NULL,
-                                           self->cancellable,
-                                           disconnect_interface_cb, self);
-}
-
-static void
-switch_changed_cb (CcSnapRow *self)
-{
-  if (gtk_switch_get_active (self->slot_toggle))
-    {
-      if (self->slots->len == 1)
-        connect_plug (self, g_ptr_array_index (self->slots, 0));
-    }
-  else
-    {
-      disconnect_plug (self);
-    }
-}
-
-static void
-combo_changed_cb (CcSnapRow *self)
-{
-  GtkTreeIter iter;
-  SnapdSlot *slot = NULL;
-
-  if (!gtk_combo_box_get_active_iter (self->slots_combo, &iter))
-    return;
-
-  gtk_tree_model_get (GTK_TREE_MODEL (self->slots_combo_model), &iter, 0, &slot, -1);
-  if (slot != NULL)
-    connect_plug (self, slot);
-  else
-    disconnect_plug (self);
-}
-
-static void
-cc_snap_row_finalize (GObject *object)
-{
-  CcSnapRow *self = CC_SNAP_ROW (object);
-
-  g_clear_object (&self->cancellable);
-  g_clear_object (&self->plug);
-  g_clear_pointer (&self->slots, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (cc_snap_row_parent_class)->finalize (object);
-}
-
-static void
-cc_snap_row_class_init (CcSnapRowClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->finalize = cc_snap_row_finalize;
-
-  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);
-
-  gtk_widget_class_bind_template_callback (widget_class, combo_changed_cb);
-  gtk_widget_class_bind_template_callback (widget_class, switch_changed_cb);
-}
-
-static void
-cc_snap_row_init (CcSnapRow *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-}
-
-CcSnapRow *
-cc_snap_row_new (GCancellable *cancellable, SnapdInterface *interface, SnapdPlug *plug, GPtrArray *slots)
-{
-  CcSnapRow *self;
-  GPtrArray *connected_slots;
-  g_autofree gchar *label = NULL;
-  GtkTreeIter iter;
-
-  g_return_val_if_fail (SNAPD_IS_PLUG (plug), NULL);
-
-  self = CC_SNAP_ROW (g_object_new (CC_TYPE_SNAP_ROW, NULL));
-
-  self->cancellable = g_object_ref (cancellable);
-  self->plug = g_object_ref (plug);
-  self->slots = g_ptr_array_ref (slots);
-
-  connected_slots = snapd_plug_get_connected_slots (plug);
-  if (connected_slots->len > 0)
-    {
-      SnapdSlotRef *connected_slot_ref = g_ptr_array_index (connected_slots, 0);
-
-      for (int i = 0; i < slots->len; i++)
-        {
-          SnapdSlot *slot = g_ptr_array_index (slots, i);
-
-          if (g_strcmp0 (snapd_slot_get_snap (slot), snapd_slot_ref_get_snap (connected_slot_ref)) == 0 &&
-              g_strcmp0 (snapd_slot_get_name (slot), snapd_slot_ref_get_slot (connected_slot_ref)) == 0)
-            self->connected_slot = slot;
-        }
-    }
-
-  if (interface != NULL)
-    label = snapd_interface_make_label (interface);
-  else
-    label = g_strdup (snapd_plug_get_interface (plug));
-  gtk_label_set_label (self->title_label, label);
-
-  /* Add option into combo box */
-  gtk_list_store_append (self->slots_combo_model, &iter);
-  gtk_list_store_set (self->slots_combo_model, &iter, 1, "--", -1);
-  for (int i = 0; i < slots->len; i++)
-    {
-      SnapdSlot *slot = g_ptr_array_index (slots, i);
-      g_autofree gchar *label = NULL;
-
-      label = g_strdup_printf ("%s:%s", snapd_slot_get_snap (slot), snapd_slot_get_name (slot));
-      gtk_list_store_append (self->slots_combo_model, &iter);
-      gtk_list_store_set (self->slots_combo_model, &iter, 0, slot, 1, label, -1);
-    }
-
-  update_state (self);
-
-  return self;
-}
--- a/panels/applications/cc-snap-row.h
+++ b/panels/applications/cc-snap-row.h
@@ -1,36 +0,0 @@
-/* cc-snap-row.h
- *
- * Copyright 2019 Canonical Ltd.
- *
- * 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
- */
-
-#pragma once
-
-#include <gtk/gtk.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)
-
-CcSnapRow* cc_snap_row_new      (GCancellable   *cancellable,
-                                 SnapdInterface *interface,
-                                 SnapdPlug      *plug,
-                                 GPtrArray      *slots);
-
-G_END_DECLS
--- a/panels/applications/cc-snap-row.ui
+++ b/panels/applications/cc-snap-row.ui
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkListStore" id="slots_combo_model">
-    <columns>
-      <!-- column-name slot -->
-      <column type="GObject"/>
-      <!-- column-name label -->
-      <column type="gchararray"/>
-    </columns>
-  </object>
-  <template class="CcSnapRow" parent="GtkListBoxRow">
-    <property name="visible">True</property>
-    <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>
-        <child>
-          <object class="GtkLabel" id="title_label">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="hexpand">1</property>
-            <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>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
--- a/panels/applications/cc-toggle-row.c
+++ b/panels/applications/cc-toggle-row.c
@@ -1,130 +0,0 @@
-/* cc-toggle-row.c
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#include <config.h>
-#include <glib/gi18n.h>
-
-#include "cc-toggle-row.h"
-#include "cc-applications-resources.h"
-
-struct _CcToggleRow
-{
-  AdwActionRow  parent;
-
-  GtkWidget    *toggle;
-};
-
-G_DEFINE_TYPE (CcToggleRow, cc_toggle_row, ADW_TYPE_ACTION_ROW)
-
-enum
-{
-  PROP_0,
-  PROP_ALLOWED
-};
-
-static void
-changed_cb (CcToggleRow *row)
-{
-  g_object_notify (G_OBJECT (row), "allowed");
-}
-
-static void
-cc_toggle_row_get_property (GObject    *object,
-                            guint       prop_id,
-                            GValue     *value,
-                            GParamSpec *pspec)
-{
-  CcToggleRow *row = CC_TOGGLE_ROW (object);
-
-  switch (prop_id)
-    {
-    case PROP_ALLOWED:
-      g_value_set_boolean (value, cc_toggle_row_get_allowed (row));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-cc_toggle_row_set_property (GObject      *object,
-                            guint         prop_id,
-                            const GValue *value,
-                            GParamSpec   *pspec)
-{
-  CcToggleRow *row = CC_TOGGLE_ROW (object);
-
-  switch (prop_id)
-    {
-    case PROP_ALLOWED:
-      cc_toggle_row_set_allowed (row, g_value_get_boolean (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-cc_toggle_row_class_init (CcToggleRowClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->get_property = cc_toggle_row_get_property;
-  object_class->set_property = cc_toggle_row_set_property;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-toggle-row.ui");
-
-  g_object_class_install_property (object_class,
-                                   PROP_ALLOWED,
-                                   g_param_spec_boolean ("allowed", "allowed", "allowed",
-                                                         FALSE, G_PARAM_READWRITE));
-
-  gtk_widget_class_bind_template_child (widget_class, CcToggleRow, toggle);
-
-  gtk_widget_class_bind_template_callback (widget_class, changed_cb);
-}
-
-static void
-cc_toggle_row_init (CcToggleRow *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-}
-
-CcToggleRow *
-cc_toggle_row_new (void)
-{
-  return CC_TOGGLE_ROW (g_object_new (CC_TYPE_TOGGLE_ROW, NULL));
-}
-
-void
-cc_toggle_row_set_allowed (CcToggleRow *self,
-                           gboolean     allowed)
-{
-  gtk_switch_set_active (GTK_SWITCH (self->toggle), allowed);
-}
-
-gboolean
-cc_toggle_row_get_allowed (CcToggleRow *self)
-{
-  return gtk_switch_get_active (GTK_SWITCH (self->toggle));
-}
--- a/panels/applications/cc-toggle-row.h
+++ b/panels/applications/cc-toggle-row.h
@@ -1,37 +0,0 @@
-/* cc-toggle-row.h
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <adwaita.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_TOGGLE_ROW (cc_toggle_row_get_type())
-G_DECLARE_FINAL_TYPE (CcToggleRow, cc_toggle_row, CC, TOGGLE_ROW, AdwActionRow)
-
-CcToggleRow* cc_toggle_row_new         (void);
-
-void         cc_toggle_row_set_allowed (CcToggleRow *row,
-                                        gboolean     allowed);
-
-gboolean     cc_toggle_row_get_allowed (CcToggleRow *row);
-
-G_END_DECLS
--- a/panels/applications/cc-toggle-row.ui
+++ b/panels/applications/cc-toggle-row.ui
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcToggleRow" parent="AdwActionRow">
-    <property name="activatable-widget">toggle</property>
-    <child>
-      <object class="GtkSwitch" id="toggle">
-        <property name="valign">center</property>
-        <signal name="notify::active" handler="changed_cb" swapped="yes"/>
-      </object>
-    </child>
-  </template>
-</interface>
--- a/panels/applications/globs.c
+++ b/panels/applications/globs.c
@@ -1,62 +0,0 @@
-/* globs.c
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#include <config.h>
-
-#include "globs.h"
-
-/* parse mime/globs and return a string->string hash table */
-GHashTable *
-parse_globs (void)
-{
-  GHashTable *globs;
-  const gchar * const *dirs;
-  gint i;
-
-  globs = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-
-  dirs = g_get_system_data_dirs ();
-
-  for (i = 0; dirs[i]; i++)
-    {
-      g_autofree gchar *file = g_build_filename (dirs[i], "mime", "globs", NULL);
-      g_autofree gchar *contents = NULL;
-
-      if (g_file_get_contents (file, &contents, NULL, NULL))
-        {
-          g_auto(GStrv) strv = NULL;
-          int i;
-
-          strv = g_strsplit (contents, "\n", 0);
-          for (i = 0; strv[i]; i++)
-            {
-              g_auto(GStrv) parts = NULL;
-
-              if (strv[i][0] == '#' || strv[i][0] == '\0')
-                continue;
-
-              parts = g_strsplit (strv[i], ":", 2);
-              g_hash_table_insert (globs, g_strdup (parts[0]), g_strdup (parts[1]));
-            }
-        }
-    }
-
-  return globs;
-}
--- a/panels/applications/globs.h
+++ b/panels/applications/globs.h
@@ -1,29 +0,0 @@
-/* globs.h
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-GHashTable* parse_globs (void);
-
-G_END_DECLS
--- a/panels/applications/gnome-applications-panel.desktop.in.in
+++ b/panels/applications/gnome-applications-panel.desktop.in.in
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Name=Applications
-Comment=Control various application permissions and settings
-Exec=gnome-control-center applications
-# FIXME
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-applications-symbolic
-Terminal=false
-Type=Application
-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!
-Keywords=application;flatpak;permission;setting;
-X-GNOME-ControlCenter-HasSidebar=true
--- a/panels/applications/icons/meson.build
+++ b/panels/applications/icons/meson.build
@@ -1,4 +0,0 @@
-install_data(
-  'scalable/org.gnome.Settings-applications-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
-)
--- a/panels/applications/icons/scalable/org.gnome.Settings-applications-symbolic.svg
+++ b/panels/applications/icons/scalable/org.gnome.Settings-applications-symbolic.svg
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <path d="m 2 0 c -1.089844 0 -2 0.910156 -2 2 v 3 c 0 1.089844 0.910156 2 2 2 h 3 c 1.089844 0 2 -0.910156 2 -2 v -3 c 0 -1.089844 -0.910156 -2 -2 -2 z m 8 0 c -1.089844 0 -2 0.910156 -2 2 v 3 c 0 1.089844 0.910156 2 2 2 h 3 c 1.089844 0 2 -0.910156 2 -2 v -3 c 0 -1.089844 -0.910156 -2 -2 -2 z m -8 2 h 3 v 3 h -3 z m 8 0 h 3 v 3 h -3 z m -8 6 c -1.089844 0 -2 0.910156 -2 2 v 3 c 0 1.089844 0.910156 2 2 2 h 3 c 1.089844 0 2 -0.910156 2 -2 v -3 c 0 -1.089844 -0.910156 -2 -2 -2 z m 8 0 c -1.089844 0 -2 0.910156 -2 2 v 3 c 0 1.089844 0.910156 2 2 2 h 3 c 1.089844 0 2 -0.910156 2 -2 v -3 c 0 -1.089844 -0.910156 -2 -2 -2 z m -8 2 h 3 v 3 h -3 z m 8 0 h 3 v 3 h -3 z m 0 0" fill="#2e3436"/>
-</svg>
--- a/panels/applications/meson.build
+++ b/panels/applications/meson.build
@@ -1,58 +0,0 @@
-panels_list += cappletname
-desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
-
-desktop_in = configure_file(
-          input : desktop + '.in.in',
-         output : desktop + '.in',
-  configuration : desktop_conf
-)
-
-i18n.merge_file(
-         type : 'desktop',
-        input : desktop_in,
-       output : desktop,
-       po_dir : po_dir,
-      install : true,
-  install_dir : control_center_desktopdir
-)
-
-sources = files(
-  'cc-applications-panel.c',
-  'cc-applications-row.c',
-  'cc-toggle-row.c',
-  'cc-info-row.c',
-  'globs.c',
-  'search.c',
-  'utils.c',
-)
-
-resource_data = files('cc-applications-panel.ui')
-
-sources += gnome.compile_resources(
-  'cc-' + cappletname + '-resources',
-  cappletname + '.gresource.xml',
-        c_name : 'cc_' + cappletname,
-  dependencies : resource_data,
-        export : true
-)
-
-deps = common_deps
-
-if enable_snap
-  deps += snapd_glib_deps
-  sources += files('cc-snap-row.c')
-endif
-
-if enable_malcontent
-  deps += malcontent_dep
-endif
-
-panels_libs += static_library(
-           cappletname,
-              sources : sources,
-  include_directories : [ top_inc, common_inc ],
-         dependencies : deps,
-               c_args : cflags
-)
-
-subdir('icons')
--- a/panels/applications/search.c
+++ b/panels/applications/search.c
@@ -1,133 +0,0 @@
-/* search.c
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#include <config.h>
-
-#include "search.h"
-
-
-#define SHELL_PROVIDER_GROUP "Shell Search Provider"
-
-static void
-add_one_provider (GHashTable *search_providers,
-                  GFile      *file)
-{
-  g_autoptr(GKeyFile) keyfile = NULL;
-  g_autoptr(GError) error = NULL;
-  g_autofree gchar *app_id = NULL;
-  g_autofree gchar *path = NULL;
-  gboolean default_disabled;
-
-  path = g_file_get_path (file);
-  keyfile = g_key_file_new ();
-  g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, &error);
-
-  if (error != NULL)
-    {
-      g_warning ("Error loading %s: %s - search provider will be ignored",
-                 path, error->message);
-      return;
-    }
-
-  if (!g_key_file_has_group (keyfile, SHELL_PROVIDER_GROUP))
-    {
-      g_debug ("Shell search provider group missing from '%s', ignoring", path);
-      return;
-    }
-
-  app_id = g_key_file_get_string (keyfile, SHELL_PROVIDER_GROUP, "DesktopId", &error);
-
-  if (error != NULL)
-    {
-      g_warning ("Unable to read desktop ID from %s: %s - search provider will be ignored",
-                 path, error->message);
-      return;
-    }
-
-  if (g_str_has_suffix (app_id, ".desktop"))
-    app_id[strlen (app_id) - strlen (".desktop")] = '\0';
-
-  default_disabled = g_key_file_get_boolean (keyfile, SHELL_PROVIDER_GROUP, "DefaultDisabled", NULL);
-
-  g_hash_table_insert (search_providers, g_strdup (app_id), GINT_TO_POINTER (default_disabled));
-}
-
-static void
-parse_search_providers_one_dir (GHashTable  *search_providers,
-                                const gchar *system_dir)
-{
-  g_autoptr(GFileEnumerator) enumerator = NULL;
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GFile) providers_location = NULL;
-  g_autofree gchar *providers_path = NULL;
-
-  providers_path = g_build_filename (system_dir, "gnome-shell", "search-providers", NULL);
-  providers_location = g_file_new_for_path (providers_path);
-
-  enumerator = g_file_enumerate_children (providers_location,
-                                          "standard::type,standard::name,standard::content-type",
-                                          G_FILE_QUERY_INFO_NONE,
-                                          NULL, &error);
-
-  if (error != NULL)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND) &&
-          !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Error opening %s: %s - search provider configuration won't be possible",
-                   providers_path, error->message);
-      return;
-    }
-
-  while (TRUE)
-    {
-      GFile *provider = NULL;
-
-      if (!g_file_enumerator_iterate (enumerator, NULL, &provider, NULL, &error))
-        {
-          g_warning ("Error while reading %s: %s - search provider configuration won't be possible",
-                   providers_path, error->message);
-          return;
-        }
-
-      if (provider == NULL)
-        break;
-
-      add_one_provider (search_providers, provider);
-    }
-}
-
-/* parse gnome-shell/search-provider files and return a string->boolean hash table */
-GHashTable *
-parse_search_providers (void)
-{
-  GHashTable *search_providers;
-  const gchar * const *dirs;
-  gint i;
-
-  search_providers = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
-
-  dirs = g_get_system_data_dirs ();
-
-  for (i = 0; dirs[i]; i++)
-    parse_search_providers_one_dir (search_providers, dirs[i]);
-
-  return search_providers;
-}
-
--- a/panels/applications/search.h
+++ b/panels/applications/search.h
@@ -1,29 +0,0 @@
-/* globs.h
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-GHashTable* parse_search_providers (void);
-
-G_END_DECLS
--- a/panels/applications/utils.c
+++ b/panels/applications/utils.c
@@ -1,266 +0,0 @@
-/* utils.c
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#ifndef _XOPEN_SOURCE
-#define _XOPEN_SOURCE 600
-#endif
-
-#include <config.h>
-#include <glib/gi18n.h>
-#ifdef HAVE_SNAP
-#include <snapd-glib/snapd-glib.h>
-#endif
-#include <sys/types.h>
-#include <sys/stat.h>
-
-#include <ftw.h>
-
-#include "utils.h"
-
-static gint
-ftw_remove_cb (const gchar       *path,
-               const struct stat *sb,
-               gint               typeflags,
-               struct FTW        *ftwbuf)
-{
-  remove (path);
-  return 0;
-}
-
-static void
-file_remove_thread_func (GTask        *task,
-                         gpointer      source_object,
-                         gpointer      task_data,
-                         GCancellable *cancellable)
-{
-  GFile *file = source_object;
-  g_autofree gchar *path = g_file_get_path (file);
-
-  nftw (path, ftw_remove_cb, 20, FTW_DEPTH);
-
-  if (g_task_set_return_on_cancel (task, FALSE))
-    g_task_return_boolean (task, TRUE);
-}
-
-void
-file_remove_async (GFile               *file,
-                   GCancellable        *cancellable,
-                   GAsyncReadyCallback  callback,
-                   gpointer             data)
-{
-  g_autoptr(GTask) task = g_task_new (file, cancellable, callback, data);
-  g_task_set_return_on_cancel (task, TRUE);
-  g_task_run_in_thread (task, file_remove_thread_func);
-}
-
-gboolean
-file_remove_finish (GFile        *file,
-                    GAsyncResult *result,
-                    GError      **error)
-{
-  g_return_val_if_fail (g_task_is_valid (result, file), FALSE);
-  return g_task_propagate_boolean (G_TASK (result), error);
-}
-
-static GPrivate size_key = G_PRIVATE_INIT (g_free);
-
-static gint
-ftw_size_cb (const gchar       *path,
-             const struct stat *sb,
-             gint               typeflags,
-             struct FTW        *ftwbuf)
-{
-  guint64 *size = (guint64*)g_private_get (&size_key);
-  if (typeflags == FTW_F)
-    *size += sb->st_size;
-  return 0;
-}
-
-static void
-file_size_thread_func (GTask        *task,
-                       gpointer      source_object,
-                       gpointer      task_data,
-                       GCancellable *cancellable)
-{
-  GFile *file = source_object;
-  g_autofree gchar *path = g_file_get_path (file);
-  guint64 *total;
-
-  g_private_replace (&size_key, g_new0 (guint64, 1));
-
-  nftw (path, ftw_size_cb, 20, FTW_DEPTH);
-
-  total = g_new0 (guint64, 1);
-  *total = *(guint64*)g_private_get (&size_key);
-
-  if (g_task_set_return_on_cancel (task, FALSE))
-    g_task_return_pointer (task, total, g_free);
-}
-
-void
-file_size_async (GFile               *file,
-                 GCancellable        *cancellable,
-                 GAsyncReadyCallback  callback,
-                 gpointer             data)
-{
-  g_autoptr(GTask) task = g_task_new (file, cancellable, callback, data);
-  g_task_set_return_on_cancel (task, TRUE);
-  g_task_run_in_thread (task, file_size_thread_func);
-}
-
-gboolean
-file_size_finish (GFile        *file,
-                  GAsyncResult *result,
-                  guint64      *size,
-                  GError      **error)
-{
-  g_autofree guint64 *data = NULL;
-
-  g_return_val_if_fail (g_task_is_valid (result, file), FALSE);
-  data = g_task_propagate_pointer (G_TASK (result), error);
-  if (data == NULL)
-    return FALSE;
-  if (size != NULL)
-    *size = *data;
-  return TRUE;
-}
-
-void
-listbox_remove_all (GtkListBox *listbox)
-{
-  GtkWidget *child;
-
-  while ((child = gtk_widget_get_first_child (GTK_WIDGET (listbox))))
-    gtk_list_box_remove (listbox, child);
-}
-
-static gchar *
-get_output_of (const gchar **argv)
-{
-  g_autofree gchar *output = NULL;
-  int status;
-
-  if (!g_spawn_sync (NULL,
-                     (gchar**) argv,
-                     NULL,
-                     G_SPAWN_SEARCH_PATH,
-                     NULL, NULL,
-                     &output, NULL,
-                     &status, NULL))
-    return NULL;
-
-  if (!g_spawn_check_wait_status (status, NULL))
-    return NULL;
-
-  return g_steal_pointer (&output);
-}
-
-GKeyFile *
-get_flatpak_metadata (const gchar *app_id)
-{
-  const gchar *argv[5] = { "flatpak", "info", "-m", "app", NULL };
-  g_autofree gchar *data = NULL;
-  g_autoptr(GError) error = NULL;
-  g_autoptr(GKeyFile) keyfile = NULL;
-
-  argv[3] = app_id;
-
-  data = get_output_of (argv);
-  if (data == NULL)
-    return NULL;
-
-  keyfile = g_key_file_new ();
-  if (!g_key_file_load_from_data (keyfile, data, -1, 0, &error))
-    {
-      g_warning ("%s", error->message);
-      return NULL;
-    }
-
-  return g_steal_pointer (&keyfile);
-}
-
-guint64
-get_flatpak_app_size (const gchar *app_id)
-{
-  const gchar *argv[5] = { "flatpak", "info", "-s", "app", NULL };
-  g_autofree gchar *data = NULL;
-  guint64 factor;
-  double val;
-
-  argv[3] = app_id;
-
-  data = get_output_of (argv);
-  if (data == NULL)
-    return 0;
-
-  data = g_strstrip (data);
-
-  if (g_str_has_suffix (data, "kB") || g_str_has_suffix (data, "kb"))
-    factor = 1000;
-  else if (g_str_has_suffix (data, "MB") || g_str_has_suffix (data, "Mb"))
-    factor = 1000 * 1000;
-  else if (g_str_has_suffix (data, "GB") || g_str_has_suffix (data, "Gb"))
-    factor = 1000 * 1000 * 1000;
-  else if (g_str_has_suffix (data, "KiB") || g_str_has_suffix (data, "Kib"))
-    factor = 1024;
-  else if (g_str_has_suffix (data, "MiB") || g_str_has_suffix (data, "Mib"))
-    factor = 1024 * 1024;
-  else if (g_str_has_suffix (data, "GiB") || g_str_has_suffix (data, "Gib"))
-    factor = 1024 * 1024 * 1024;
-  else
-    factor = 1;
-
-  val = g_ascii_strtod (data, NULL);
-
-  return (guint64)(val * factor);
-}
-
-guint64
-get_snap_app_size (const gchar *snap_name)
-{
-#ifdef HAVE_SNAP
-  g_autoptr(SnapdClient) client = NULL;
-  g_autoptr(SnapdSnap) snap = NULL;
-  g_autoptr(GError) error = NULL;
-
-  client = snapd_client_new ();
-  snap = snapd_client_get_snap_sync (client, snap_name, NULL, &error);
-  if (snap == NULL)
-    {
-      g_warning ("Failed to get snap size: %s", error->message);
-      return 0;
-    }
-
-  return snapd_snap_get_installed_size (snap);
-#else
-  return 0;
-#endif
-}
-
-char *
-get_app_id (GAppInfo *info)
-{
-  gchar *app_id = g_strdup (g_app_info_get_id (info));
-
-  if (g_str_has_suffix (app_id, ".desktop"))
-    app_id[strlen (app_id) - strlen (".desktop")] = '\0';
-
-  return app_id;
-}
--- a/panels/applications/utils.h
+++ b/panels/applications/utils.h
@@ -1,57 +0,0 @@
-/* utils.h
- *
- * Copyright 2018 Matthias Clasen <matthias.clasen@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <gio/gio.h>
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-void      file_remove_async    (GFile               *file,
-                                GCancellable        *cancellable,
-                                GAsyncReadyCallback  callback,
-                                gpointer             data);
-
-gboolean  file_remove_finish   (GFile               *file,
-                                GAsyncResult        *result,
-                                GError             **error);
-
-void      file_size_async      (GFile               *file,
-                                GCancellable        *cancellable,
-                                GAsyncReadyCallback  callback,
-                                gpointer             data);
-
-gboolean  file_size_finish     (GFile               *file,
-                                GAsyncResult        *result,
-                                guint64             *size,
-                                GError             **error);
-
-void      listbox_remove_all   (GtkListBox          *listbox);
-
-GKeyFile* get_flatpak_metadata (const gchar         *app_id);
-
-guint64   get_flatpak_app_size (const gchar         *app_id);
-
-guint64   get_snap_app_size    (const gchar         *snap_name);
-
-gchar*    get_app_id           (GAppInfo            *info);
-
-G_END_DECLS
--- a/panels/background/background-selected-symbolic.svg
+++ b/panels/background/background-selected-symbolic.svg
@@ -1 +0,0 @@
-<svg width="16" height="16" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg"><path d="M3.843.627a.397.397 0 0 0-.56.034L1.45 2.73l-.775-.763a.397.397 0 0 0-.56.004.397.397 0 0 0 .003.562L1.191 3.59a.397.397 0 0 0 .576-.02l2.11-2.382a.397.397 0 0 0-.034-.56Z" style="fill:#3d3846"/></svg>
--- a/panels/background/background.gresource.xml
+++ b/panels/background/background.gresource.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/control-center/background">
-    <file preprocess="xml-stripblanks">cc-background-chooser.ui</file>
-    <file preprocess="xml-stripblanks">cc-background-panel.ui</file>
-    <file preprocess="xml-stripblanks">cc-background-preview.ui</file>
-    <file>preview.css</file>
-  </gresource>
-
-  <gresource prefix="/org/gnome/Settings/icons/scalable/actions">
-    <file preprocess="xml-stripblanks">background-selected-symbolic.svg</file>
-    <file preprocess="xml-stripblanks">slideshow-symbolic.svg</file>
-  </gresource>
-</gresources>
--- a/panels/background/bg-colors-source.c
+++ b/panels/background/bg-colors-source.c
@@ -1,219 +0,0 @@
-/* bg-colors-source.c */
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#include <config.h>
-#include "bg-colors-source.h"
-
-#include "cc-background-item.h"
-
-#include <cairo-gobject.h>
-#include <glib/gi18n-lib.h>
-#include <gdesktop-enums.h>
-
-struct _BgColorsSource
-{
-  BgSource parent_instance;
-};
-
-G_DEFINE_TYPE (BgColorsSource, bg_colors_source, BG_TYPE_SOURCE)
-
-struct {
-  GDesktopBackgroundShading type;
-  int orientation;
-  const char *pcolor;
-} items[] = {
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#000000" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#db5d33" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#008094" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#5d479d" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#ab2876" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#fad166" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#437740" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#d272c4" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#ed9116" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#ff89a9" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#7a8aa2" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#888888" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#475b52" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#425265" },
-  { G_DESKTOP_BACKGROUND_SHADING_SOLID, -1, "#7a634b" },
-};
-
-static gchar *
-get_colors_path (void)
-{
-  return g_build_filename (g_get_user_config_dir (), "gnome-control-center", "backgrounds", "colors.ini", NULL);
-}
-
-static char *
-get_colors_dir (void)
-{
-  return g_build_filename (g_get_user_config_dir (), "gnome-control-center", "backgrounds", NULL);
-}
-
-static void
-bg_colors_source_add_color (BgColorsSource               *self,
-                            GListStore                   *store,
-                            const char                   *color)
-{
-  CcBackgroundItemFlags flags;
-  g_autoptr(CcBackgroundItem) item = NULL;
-
-  item = cc_background_item_new (NULL);
-  flags = CC_BACKGROUND_ITEM_HAS_PCOLOR |
-          CC_BACKGROUND_ITEM_HAS_SCOLOR |
-          CC_BACKGROUND_ITEM_HAS_SHADING |
-          CC_BACKGROUND_ITEM_HAS_PLACEMENT |
-          CC_BACKGROUND_ITEM_HAS_URI;
-  /* It does have a URI, it's "none" */
-
-  g_object_set (G_OBJECT (item),
-                "uri", "file:///" DATADIR "/gnome-control-center/pixmaps/noise-texture-light.png",
-                "primary-color", color,
-                "secondary-color", color,
-                "shading", G_DESKTOP_BACKGROUND_SHADING_SOLID,
-                "placement", G_DESKTOP_BACKGROUND_STYLE_WALLPAPER,
-                "flags", flags,
-                NULL);
-  cc_background_item_load (item, NULL);
-
-  /* insert the item into the liststore */
-  g_list_store_append (store, item);
-}
-
-static void
-bg_colors_source_constructed (GObject *object)
-{
-  BgColorsSource *self = BG_COLORS_SOURCE (object);
-  guint i;
-  GListStore *store;
-  g_autoptr(GKeyFile) keyfile = NULL;
-  g_autofree gchar *path = NULL;
-
-  G_OBJECT_CLASS (bg_colors_source_parent_class)->constructed (object);
-
-  store = bg_source_get_liststore (BG_SOURCE (self));
-
-  for (i = 0; i < G_N_ELEMENTS (items); i++)
-    bg_colors_source_add_color (self, store, items[i].pcolor);
-
-  keyfile = g_key_file_new ();
-  path = get_colors_path ();
-  if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL))
-    {
-      g_auto(GStrv) colors = NULL;
-
-      colors = g_key_file_get_string_list (keyfile, "Colors", "custom-colors", NULL, NULL);
-      for (i = 0; colors != NULL && colors[i] != NULL; i++)
-        bg_colors_source_add_color (self, store, colors[i]);
-    }
-}
-
-gboolean
-bg_colors_source_add (BgColorsSource       *self,
-                      GdkRGBA              *rgba,
-                      GtkTreeRowReference **ret_row_ref)
-{
-  GListStore *store;
-  g_autofree gchar *c = NULL;
-  g_auto(GStrv) colors = NULL;
-  gsize len;
-  g_autoptr(GKeyFile) keyfile = NULL;
-  g_autoptr(GError) error = NULL;
-  g_autofree gchar *dir = NULL;
-  g_autofree gchar *path = NULL;
-
-  c = g_strdup_printf ("#%02x%02x%02x",
-                       (int)(255*rgba->red),
-                       (int)(255*rgba->green),
-                       (int)(255*rgba->blue));
-
-  store = bg_source_get_liststore (BG_SOURCE (self));
-
-  bg_colors_source_add_color (self, store, c);
-
-  /* Save to the keyfile */
-  dir = get_colors_dir ();
-  g_mkdir_with_parents (dir, 0700);
-
-  path = get_colors_path ();
-  colors = NULL;
-  len = 0;
-
-  keyfile = g_key_file_new ();
-  if (g_key_file_load_from_file (keyfile, path, G_KEY_FILE_NONE, NULL))
-    colors = g_key_file_get_string_list (keyfile, "Colors", "custom-colors", &len, NULL);
-
-  if (len == 0 && colors != NULL)
-    g_clear_pointer (&colors, g_strfreev);
-
-  if (colors == NULL)
-    {
-      colors = g_new0 (char *, 2);
-      colors[0] = g_steal_pointer (&c);
-      len = 1;
-    }
-  else
-    {
-      char **new_colors;
-      guint i;
-
-      new_colors = g_new0 (char *, len + 2);
-      for (i = 0; colors[i] != NULL; i++)
-        {
-          new_colors[i] = colors[i];
-          colors[i] = NULL;
-        }
-
-      new_colors[len] = g_steal_pointer (&c);
-      len++;
-
-      g_strfreev (colors);
-      colors = new_colors;
-    }
-
-  g_key_file_set_string_list (keyfile, "Colors", "custom-colors", (const gchar * const*) colors, len);
-
-  if (!g_key_file_save_to_file (keyfile, path, &error))
-      g_warning ("Could not save custom color: %s", error->message);
-
-  return TRUE;
-}
-
-static void
-bg_colors_source_init (BgColorsSource *self)
-{
-}
-
-static void
-bg_colors_source_class_init (BgColorsSourceClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->constructed = bg_colors_source_constructed;
-}
-
-BgColorsSource *
-bg_colors_source_new (GtkWidget *widget)
-{
-  return g_object_new (BG_TYPE_COLORS_SOURCE, "widget", widget, NULL);
-}
-
--- a/panels/background/bg-colors-source.h
+++ b/panels/background/bg-colors-source.h
@@ -1,38 +0,0 @@
-/* bg-colors-source.h */
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-#include "bg-source.h"
-
-G_BEGIN_DECLS
-
-#define BG_TYPE_COLORS_SOURCE (bg_colors_source_get_type ())
-G_DECLARE_FINAL_TYPE (BgColorsSource, bg_colors_source, BG, COLORS_SOURCE, BgSource)
-
-BgColorsSource *bg_colors_source_new (GtkWidget *widget);
-
-gboolean bg_colors_source_add        (BgColorsSource       *self,
-                                      GdkRGBA              *rgba,
-                                      GtkTreeRowReference **ret_row_ref);
-
-G_END_DECLS
--- a/panels/background/bg-recent-source.c
+++ b/panels/background/bg-recent-source.c
@@ -1,470 +0,0 @@
-/* bg-recent-source.c
- *
- * Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "bg-recent-source"
-
-#include "bg-recent-source.h"
-#include "cc-background-item.h"
-
-#define ATTRIBUTES G_FILE_ATTRIBUTE_STANDARD_NAME "," \
-                   G_FILE_ATTRIBUTE_STANDARD_CONTENT_TYPE "," \
-                   G_FILE_ATTRIBUTE_TIME_MODIFIED
-
-struct _BgRecentSource
-{
-  BgSource      parent;
-
-  GFile        *backgrounds_folder;
-  GFileMonitor *monitor;
-
-  GCancellable *cancellable;
-  GHashTable   *items;
-};
-
-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,
-           gpointer      user_data)
-{
-  CcBackgroundItem *item_a;
-  CcBackgroundItem *item_b;
-  guint64 modified_a;
-  guint64 modified_b;
-  int retval;
-
-  item_a = (CcBackgroundItem *) a;
-  item_b = (CcBackgroundItem *) b;
-  modified_a = cc_background_item_get_modified (item_a);
-  modified_b = cc_background_item_get_modified (item_b);
-
-  retval = modified_b - modified_a;
-
-  return retval;
-}
-
-static void
-add_file_from_info (BgRecentSource *self,
-                    GFile          *file,
-                    GFileInfo      *info)
-{
-  g_autoptr(CcBackgroundItem) item = NULL;
-  CcBackgroundItemFlags flags = 0;
-  g_autofree gchar *source_uri = NULL;
-  g_autofree gchar *uri = NULL;
-  GListStore *store;
-  const gchar *content_type;
-  guint64 mtime;
-
-  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))
-    return;
-
-  uri = g_file_get_uri (file);
-  item = cc_background_item_new (uri);
-  flags |= CC_BACKGROUND_ITEM_HAS_SHADING | CC_BACKGROUND_ITEM_HAS_PLACEMENT;
-  g_object_set (G_OBJECT (item),
-                "flags", flags,
-                "shading", G_DESKTOP_BACKGROUND_SHADING_SOLID,
-                "placement", G_DESKTOP_BACKGROUND_STYLE_ZOOM,
-                "modified", mtime,
-                "needs-download", FALSE,
-                "source-url", source_uri,
-                NULL);
-
-  store = bg_source_get_liststore (BG_SOURCE (self));
-  g_list_store_insert_sorted (store, item, sort_func, self);
-
-  g_hash_table_insert (self->items, g_strdup (uri), g_object_ref (item));
-}
-
-static void
-remove_item (BgRecentSource   *self,
-             CcBackgroundItem *item)
-{
-  GListStore *store;
-  const gchar *uri;
-  guint i;
-
-  g_return_if_fail (BG_IS_RECENT_SOURCE (self));
-  g_return_if_fail (CC_IS_BACKGROUND_ITEM (item));
-
-  uri = cc_background_item_get_uri (item);
-  store = bg_source_get_liststore (BG_SOURCE (self));
-
-  g_debug ("Removing wallpaper %s", uri);
-
-  for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (store)); i++)
-    {
-      g_autoptr(CcBackgroundItem) tmp = NULL;
-
-      tmp = g_list_model_get_item (G_LIST_MODEL (store), i);
-
-      if (tmp == item)
-        {
-          g_list_store_remove (store, i);
-          break;
-        }
-    }
-
-  g_hash_table_remove (self->items, cc_background_item_get_uri (item));
-}
-
-static void
-query_info_finished_cb (GObject      *source,
-                        GAsyncResult *result,
-                        gpointer      user_data)
-{
-  BgRecentSource *self;
-  g_autoptr(GFileInfo) file_info = NULL;
-  g_autoptr(GError) error = NULL;
-  GFile *file = NULL;
-
-  file = G_FILE (source);
-  file_info = g_file_query_info_finish (file, result, &error);
-  if (error)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Could not get pictures file information: %s", error->message);
-      return;
-    }
-
-  self = BG_RECENT_SOURCE (user_data);
-
-  g_debug ("Adding wallpaper %s (%d)",
-           g_file_info_get_name (file_info),
-           G_IS_FILE (self->backgrounds_folder));
-
-  add_file_from_info (self, file, file_info);
-}
-
-static void
-on_file_changed_cb (BgRecentSource    *self,
-                    GFile             *file,
-                    GFile             *other_file,
-                    GFileMonitorEvent  event_type)
-{
-  g_autofree gchar *uri = NULL;
-
-  switch (event_type)
-    {
-    case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
-      g_file_query_info_async (file,
-                               ATTRIBUTES,
-                               G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                               G_PRIORITY_DEFAULT,
-                               self->cancellable,
-                               query_info_finished_cb,
-                               self);
-      break;
-
-    case G_FILE_MONITOR_EVENT_DELETED:
-      uri = g_file_get_uri (file);
-      remove_item (self, g_hash_table_lookup (self->items, uri));
-      break;
-
-    default:
-      return;
-    }
-}
-
-static int
-file_sort_func (gconstpointer a,
-                gconstpointer b)
-{
-  GFileInfo *file_a = G_FILE_INFO (a);
-  GFileInfo *file_b = G_FILE_INFO (b);
-  guint64 modified_a, modified_b;
-
-  modified_a = g_file_info_get_attribute_uint64 (file_a, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-  modified_b = g_file_info_get_attribute_uint64 (file_b, G_FILE_ATTRIBUTE_TIME_MODIFIED);
-
-  return modified_b - modified_a;
-}
-
-static void
-file_info_async_ready_cb (GObject      *source,
-                          GAsyncResult *result,
-                          gpointer      user_data)
-{
-  BgRecentSource *self;
-  g_autolist(GFileInfo) file_infos = NULL;
-  g_autoptr(GError) error = NULL;
-  GFile *parent = NULL;
-  GList *l;
-
-  file_infos = g_file_enumerator_next_files_finish (G_FILE_ENUMERATOR (source),
-                                                    result,
-                                                    &error);
-  if (error)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Could not get pictures file information: %s", error->message);
-      return;
-    }
-
-  self = BG_RECENT_SOURCE (user_data);
-  parent = g_file_enumerator_get_container (G_FILE_ENUMERATOR (source));
-
-  file_infos = g_list_sort (file_infos, file_sort_func);
-
-  for (l = file_infos; l; l = l->next)
-    {
-      g_autoptr(GFile) file = NULL;
-      GFileInfo *info;
-
-      info = l->data;
-      file = g_file_get_child (parent, g_file_info_get_name (info));
-
-      g_debug ("Found recent wallpaper %s", g_file_info_get_name (info));
-
-      add_file_from_info (self, file, info);
-    }
-
-  g_file_enumerator_close (G_FILE_ENUMERATOR (source), self->cancellable, &error);
-
-  if (error)
-    g_warning ("Error closing file enumerator: %s", error->message);
-}
-
-static void
-enumerate_children_finished_cb (GObject      *source,
-                                GAsyncResult *result,
-                                gpointer      user_data)
-{
-  BgRecentSource *self;
-  g_autoptr(GFileEnumerator) enumerator = NULL;
-  g_autoptr(GError) error = NULL;
-
-  enumerator = g_file_enumerate_children_finish (G_FILE (source), result, &error);
-
-  if (error)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_warning ("Could not fill pictures source: %s", error->message);
-      return;
-    }
-
-  self = BG_RECENT_SOURCE (user_data);
-  g_file_enumerator_next_files_async (enumerator,
-                                      G_MAXINT,
-                                      G_PRIORITY_DEFAULT,
-                                      self->cancellable,
-                                      file_info_async_ready_cb,
-                                      self);
-}
-
-static void
-load_backgrounds (BgRecentSource *self)
-{
-  g_autofree gchar *backgrounds_path = NULL;
-  g_autoptr(GError) error = NULL;
-
-  if (!g_file_make_directory_with_parents (self->backgrounds_folder, self->cancellable, &error) &&
-      !g_error_matches (error, G_IO_ERROR, G_IO_ERROR_EXISTS))
-    {
-      g_critical ("Failed to create local background directory: %s", error->message);
-      return;
-    }
-
-  backgrounds_path = g_file_get_path (self->backgrounds_folder);
-  g_debug ("Enumerating wallpapers under %s", backgrounds_path);
-
-  g_file_enumerate_children_async (self->backgrounds_folder,
-                                   ATTRIBUTES,
-                                   G_FILE_QUERY_INFO_NOFOLLOW_SYMLINKS,
-                                   G_PRIORITY_DEFAULT,
-                                   self->cancellable,
-                                   enumerate_children_finished_cb,
-                                   self);
-
-  self->monitor = g_file_monitor_directory (self->backgrounds_folder,
-                                            G_FILE_MONITOR_WATCH_MOVES,
-                                            self->cancellable,
-                                            &error);
-
-  if (!self->monitor)
-    {
-      g_critical ("Failed to monitor background directory: %s", error->message);
-      return;
-    }
-
-  g_signal_connect_object (self->monitor, "changed", G_CALLBACK (on_file_changed_cb), self, G_CONNECT_SWAPPED);
-}
-
-/* Callbacks */
-
-static void
-on_file_copied_cb (GObject      *source,
-                   GAsyncResult *result,
-                   gpointer      user_data)
-{
-  g_autoptr(BgRecentSource) self = BG_RECENT_SOURCE (user_data);
-  g_autofree gchar *original_file = NULL;
-  g_autoptr(GError) error = NULL;
-
-  g_file_copy_finish (G_FILE (source), result, &error);
-
-  if (error)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_critical ("Failed to copy file: %s", error->message);
-      return;
-    }
-
-   original_file = g_file_get_path (G_FILE (source));
-   g_debug ("Successfully copied wallpaper: %s", original_file);
-}
-
-static void
-on_file_deleted_cb (GObject      *source,
-                    GAsyncResult *result,
-                    gpointer      user_data)
-{
-  g_autoptr(BgRecentSource) self = BG_RECENT_SOURCE (user_data);
-  g_autofree gchar *original_file = NULL;
-  g_autoptr(GError) error = NULL;
-
-  g_file_delete_finish (G_FILE (source), result, &error);
-
-  if (error)
-    {
-      if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-        g_critical ("Failed to delete wallpaper: %s", error->message);
-      return;
-    }
-
-  original_file = g_file_get_path (G_FILE (source));
-  g_debug ("Successfully deleted wallpaper: %s", original_file);
-}
-
-/* GObject overrides */
-
-static void
-bg_recent_source_finalize (GObject *object)
-{
-  BgRecentSource *self = (BgRecentSource *)object;
-
-  g_cancellable_cancel (self->cancellable);
-  g_clear_object (&self->cancellable);
-  g_clear_object (&self->monitor);
-
-  G_OBJECT_CLASS (bg_recent_source_parent_class)->finalize (object);
-}
-
-static void
-bg_recent_source_class_init (BgRecentSourceClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->finalize = bg_recent_source_finalize;
-}
-
-static void
-bg_recent_source_init (BgRecentSource *self)
-{
-  g_autofree gchar *backgrounds_path = NULL;
-
-  backgrounds_path = g_build_filename (g_get_user_data_dir (), "backgrounds", NULL);
-
-  self->items = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_object_unref);
-  self->cancellable = g_cancellable_new ();
-  self->backgrounds_folder = g_file_new_for_path (backgrounds_path);
-
-  load_backgrounds (self);
-}
-
-BgRecentSource*
-bg_recent_source_new (GtkWidget *widget)
-{
-  return g_object_new (BG_TYPE_RECENT_SOURCE,
-                       "widget", widget,
-                       NULL);
-}
-
-void
-bg_recent_source_add_file (BgRecentSource *self,
-                           const gchar    *path)
-{
-  g_autoptr(GDateTime) now = NULL;
-  g_autofree gchar *destination_name = NULL;
-  g_autofree gchar *formatted_now = NULL;
-  g_autofree gchar *basename = NULL;
-  g_autoptr(GFile) destination = NULL;
-  g_autoptr(GFile) file = NULL;
-
-  g_return_if_fail (BG_IS_RECENT_SOURCE (self));
-  g_return_if_fail (path && *path);
-
-  g_debug ("Importing wallpaper %s", path);
-
-  now = g_date_time_new_now_local ();
-  formatted_now = g_date_time_format (now, "%Y-%m-%d-%H-%M-%S");
-
-  file = g_file_new_for_path (path);
-
-  basename = g_file_get_basename (file);
-  destination_name = g_strdup_printf ("%s-%s", formatted_now, basename);
-  destination = g_file_get_child (self->backgrounds_folder, destination_name);
-
-  g_file_copy_async (file,
-                     destination,
-                     G_FILE_COPY_NONE,
-                     G_PRIORITY_DEFAULT,
-                     self->cancellable,
-                     NULL, NULL,
-                     on_file_copied_cb,
-                     g_object_ref (self));
-}
-
-void
-bg_recent_source_remove_item (BgRecentSource   *self,
-                              CcBackgroundItem *item)
-{
-  g_autoptr(GFile) file = NULL;
-  const gchar *uri;
-
-  g_return_if_fail (BG_IS_RECENT_SOURCE (self));
-  g_return_if_fail (CC_IS_BACKGROUND_ITEM (item));
-
-  uri = cc_background_item_get_uri (item);
-  file = g_file_new_for_uri (uri);
-
-  g_file_delete_async (file,
-                       G_PRIORITY_DEFAULT,
-                       self->cancellable,
-                       on_file_deleted_cb,
-                       g_object_ref (self));
-}
--- a/panels/background/bg-recent-source.h
+++ b/panels/background/bg-recent-source.h
@@ -1,39 +0,0 @@
-/* bg-recent-source.h
- *
- * Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include "bg-source.h"
-#include "cc-background-item.h"
-
-G_BEGIN_DECLS
-
-#define BG_TYPE_RECENT_SOURCE (bg_recent_source_get_type())
-G_DECLARE_FINAL_TYPE (BgRecentSource, bg_recent_source, BG, RECENT_SOURCE, BgSource)
-
-BgRecentSource* bg_recent_source_new         (GtkWidget        *widget);
-
-void            bg_recent_source_add_file    (BgRecentSource   *self,
-                                              const gchar      *path);
-
-void            bg_recent_source_remove_item (BgRecentSource   *self,
-                                              CcBackgroundItem *item);
-
-G_END_DECLS
--- a/panels/background/bg-source.c
+++ b/panels/background/bg-source.c
@@ -1,213 +0,0 @@
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#include "bg-source.h"
-#include "cc-background-item.h"
-
-#include <cairo-gobject.h>
-
-#define THUMBNAIL_WIDTH 144
-#define THUMBNAIL_HEIGHT (THUMBNAIL_WIDTH * 3 / 4)
-
-typedef struct
-{
-  GnomeDesktopThumbnailFactory *thumbnail_factory;
-  GListStore *store;
-  GtkWidget *widget;
-  gint thumbnail_height;
-  gint thumbnail_width;
-} BgSourcePrivate;
-
-G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (BgSource, bg_source, G_TYPE_OBJECT)
-
-enum
-{
-  PROP_LISTSTORE = 1,
-  PROP_WIDGET
-};
-
-
-static void
-bg_source_calculate_thumbnail_dimensions (BgSource *source)
-{
-  BgSourcePrivate *priv = bg_source_get_instance_private (source);
-  gint scale_factor;
-
-  priv->thumbnail_height = THUMBNAIL_HEIGHT;
-  priv->thumbnail_width = THUMBNAIL_WIDTH;
-
-  if (priv->widget == NULL)
-    return;
-
-  scale_factor = gtk_widget_get_scale_factor (priv->widget);
-  if (scale_factor > 1)
-    {
-      priv->thumbnail_height *= scale_factor;
-      priv->thumbnail_width *= scale_factor;
-    }
-}
-
-static void
-bg_source_constructed (GObject *object)
-{
-  G_OBJECT_CLASS (bg_source_parent_class)->constructed (object);
-
-  bg_source_calculate_thumbnail_dimensions (BG_SOURCE (object));
-}
-
-static void
-bg_source_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  BgSource *source = BG_SOURCE (object);
-
-  switch (property_id)
-    {
-    case PROP_LISTSTORE:
-      g_value_set_object (value, bg_source_get_liststore (source));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-bg_source_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  BgSource *source = BG_SOURCE (object);
-  BgSourcePrivate *priv = bg_source_get_instance_private (source);
-
-  switch (property_id)
-    {
-    case PROP_WIDGET:
-      priv->widget = GTK_WIDGET (g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-    }
-}
-
-static void
-bg_source_dispose (GObject *object)
-{
-  BgSource *source = BG_SOURCE (object);
-  BgSourcePrivate *priv = bg_source_get_instance_private (source);
-
-  g_clear_object (&priv->thumbnail_factory);
-  g_clear_object (&priv->store);
-
-  G_OBJECT_CLASS (bg_source_parent_class)->dispose (object);
-}
-
-static void
-bg_source_class_init (BgSourceClass *klass)
-{
-  GParamSpec *pspec;
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->constructed = bg_source_constructed;
-  object_class->get_property = bg_source_get_property;
-  object_class->set_property = bg_source_set_property;
-  object_class->dispose = bg_source_dispose;
-
-  pspec = g_param_spec_object ("liststore",
-                               "Liststore",
-                               "Liststore used in the source",
-                               G_TYPE_LIST_STORE,
-                               G_PARAM_READABLE | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_LISTSTORE, pspec);
-
-  pspec = g_param_spec_object ("widget",
-                               "Widget",
-                               "Widget used to view the source",
-                               GTK_TYPE_WIDGET,
-                               G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_STATIC_STRINGS);
-  g_object_class_install_property (object_class, PROP_WIDGET, pspec);
-}
-
-static void
-bg_source_init (BgSource *self)
-{
-  BgSourcePrivate *priv = bg_source_get_instance_private (self);
-  priv->store = g_list_store_new (CC_TYPE_BACKGROUND_ITEM);
-  priv->thumbnail_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-}
-
-GListStore*
-bg_source_get_liststore (BgSource *source)
-{
-  BgSourcePrivate *priv;
-
-  g_return_val_if_fail (BG_IS_SOURCE (source), NULL);
-
-  priv = bg_source_get_instance_private (source);
-  return priv->store;
-}
-
-gint
-bg_source_get_scale_factor (BgSource *source)
-{
-  BgSourcePrivate *priv;
-
-  g_return_val_if_fail (BG_IS_SOURCE (source), 1);
-
-  priv = bg_source_get_instance_private (source);
-  return gtk_widget_get_scale_factor (priv->widget);
-}
-
-gint
-bg_source_get_thumbnail_height (BgSource *source)
-{
-  BgSourcePrivate *priv;
-
-  g_return_val_if_fail (BG_IS_SOURCE (source), THUMBNAIL_HEIGHT);
-
-  priv = bg_source_get_instance_private (source);
-  return priv->thumbnail_height;
-}
-
-gint
-bg_source_get_thumbnail_width (BgSource *source)
-{
-  BgSourcePrivate *priv;
-
-  g_return_val_if_fail (BG_IS_SOURCE (source), THUMBNAIL_WIDTH);
-
-  priv = bg_source_get_instance_private (source);
-  return priv->thumbnail_width;
-}
-
-GnomeDesktopThumbnailFactory*
-bg_source_get_thumbnail_factory (BgSource *source)
-{
-  BgSourcePrivate *priv;
-
-  g_return_val_if_fail (BG_IS_SOURCE (source), NULL);
-
-  priv = bg_source_get_instance_private (source);
-  return priv->thumbnail_factory;
-}
--- a/panels/background/bg-source.h
+++ b/panels/background/bg-source.h
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
-
-G_BEGIN_DECLS
-
-#define BG_TYPE_SOURCE (bg_source_get_type ())
-G_DECLARE_DERIVABLE_TYPE (BgSource, bg_source, BG, SOURCE, GObject)
-
-struct _BgSourceClass
-{
-  GObjectClass parent_class;
-};
-
-GListStore* bg_source_get_liststore (BgSource *source);
-
-gint bg_source_get_scale_factor (BgSource *source);
-
-gint bg_source_get_thumbnail_height (BgSource *source);
-
-gint bg_source_get_thumbnail_width (BgSource *source);
-
-GnomeDesktopThumbnailFactory* bg_source_get_thumbnail_factory (BgSource *source);
-
-G_END_DECLS
--- a/panels/background/bg-wallpapers-source.c
+++ b/panels/background/bg-wallpapers-source.c
@@ -1,138 +0,0 @@
-/* bg-wallpapers-source.c */
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#include "bg-wallpapers-source.h"
-
-#include "cc-background-item.h"
-#include "cc-background-xml.h"
-
-#include <cairo-gobject.h>
-#include <gio/gio.h>
-
-struct _BgWallpapersSource
-{
-  BgSource parent_instance;
-  CcBackgroundXml *xml;
-};
-
-G_DEFINE_TYPE (BgWallpapersSource, bg_wallpapers_source, BG_TYPE_SOURCE)
-
-static void
-load_wallpapers (gchar              *key,
-                 CcBackgroundItem   *item,
-                 BgWallpapersSource *source)
-{
-  GListStore *store = bg_source_get_liststore (BG_SOURCE (source));
-  gboolean deleted;
-
-  g_object_get (G_OBJECT (item), "is-deleted", &deleted, NULL);
-
-  if (deleted)
-    return;
-
-  g_list_store_append (store, item);
-}
-
-static void
-list_load_cb (GObject *source_object,
-	      GAsyncResult *res,
-	      gpointer user_data)
-{
-  g_autoptr(GError) error = NULL;
-  if (!cc_background_xml_load_list_finish (CC_BACKGROUND_XML (source_object), res, &error))
-    g_warning ("Failed to load background list: %s", error->message);
-}
-
-static void
-item_added (BgWallpapersSource *self,
-            CcBackgroundItem   *item)
-{
-  load_wallpapers (NULL, item, self);
-}
-
-static void
-load_default_bg (BgWallpapersSource *self)
-{
-  const char * const *system_data_dirs;
-  guint i;
-
-  /* FIXME We could do this nicer if we had the XML source in GSettings */
-
-  system_data_dirs = g_get_system_data_dirs ();
-  for (i = 0; system_data_dirs[i]; i++) {
-    g_autofree gchar *filename = NULL;
-
-    filename = g_build_filename (system_data_dirs[i],
-				 "gnome-background-properties",
-				 "adwaita.xml",
-				 NULL);
-    if (cc_background_xml_load_xml (self->xml, filename))
-      break;
-  }
-}
-
-static void
-bg_wallpapers_source_constructed (GObject *object)
-{
-  BgWallpapersSource *self = BG_WALLPAPERS_SOURCE (object);
-
-  G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->constructed (object);
-
-  g_signal_connect_object (G_OBJECT (self->xml), "added",
-                           G_CALLBACK (item_added), self, G_CONNECT_SWAPPED);
-
-  /* Try adding the default background first */
-  load_default_bg (self);
-
-  cc_background_xml_load_list_async (self->xml, NULL, list_load_cb, self);
-}
-
-static void
-bg_wallpapers_source_dispose (GObject *object)
-{
-  BgWallpapersSource *self = BG_WALLPAPERS_SOURCE (object);
-
-  g_clear_object (&self->xml);
-
-  G_OBJECT_CLASS (bg_wallpapers_source_parent_class)->dispose (object);
-}
-
-static void
-bg_wallpapers_source_init (BgWallpapersSource *self)
-{
-  self->xml = cc_background_xml_new ();
-}
-
-static void
-bg_wallpapers_source_class_init (BgWallpapersSourceClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->constructed = bg_wallpapers_source_constructed;
-  object_class->dispose = bg_wallpapers_source_dispose;
-}
-
-BgWallpapersSource *
-bg_wallpapers_source_new (GtkWidget *widget)
-{
-  return g_object_new (BG_TYPE_WALLPAPERS_SOURCE, "widget", widget, NULL);
-}
-
--- a/panels/background/bg-wallpapers-source.h
+++ b/panels/background/bg-wallpapers-source.h
@@ -1,34 +0,0 @@
-/* bg-wallpapers-source.h */
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-#include "bg-source.h"
-
-G_BEGIN_DECLS
-
-#define BG_TYPE_WALLPAPERS_SOURCE (bg_wallpapers_source_get_type ())
-G_DECLARE_FINAL_TYPE (BgWallpapersSource, bg_wallpapers_source, BG, WALLPAPERS_SOURCE, BgSource)
-
-BgWallpapersSource *bg_wallpapers_source_new (GtkWidget *widget);
-
-G_END_DECLS
--- a/panels/background/cc-background-chooser.c
+++ b/panels/background/cc-background-chooser.c
@@ -1,331 +0,0 @@
-/* cc-background-chooser.c
- *
- * Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#undef G_LOG_DOMAIN
-#define G_LOG_DOMAIN "cc-background-chooser"
-
-#include <glib/gi18n.h>
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
-
-#include "bg-colors-source.h"
-#include "bg-recent-source.h"
-#include "bg-wallpapers-source.h"
-#include "cc-background-chooser.h"
-#include "cc-background-paintable.h"
-
-struct _CcBackgroundChooser
-{
-  GtkBox              parent;
-
-  GtkFlowBox         *flowbox;
-  GtkWidget          *recent_box;
-  GtkFlowBox         *recent_flowbox;
-
-  gboolean            recent_selected;
-
-  BgWallpapersSource *wallpapers_source;
-  BgRecentSource     *recent_source;
-};
-
-G_DEFINE_TYPE (CcBackgroundChooser, cc_background_chooser, GTK_TYPE_BOX)
-
-enum
-{
-  BACKGROUND_CHOSEN,
-  N_SIGNALS,
-};
-
-static guint signals [N_SIGNALS];
-
-static void
-emit_background_chosen (CcBackgroundChooser *self)
-{
-  g_autoptr(GList) list = NULL;
-  CcBackgroundItem *item;
-  GtkFlowBox *flowbox;
-
-  flowbox = self->recent_selected ? self->recent_flowbox : self->flowbox;
-  list = gtk_flow_box_get_selected_children (flowbox);
-  g_assert (g_list_length (list) == 1);
-
-  item = g_object_get_data (list->data, "item");
-
-  g_signal_emit (self, signals[BACKGROUND_CHOSEN], 0, item);
-}
-
-static void
-on_delete_background_clicked_cb (GtkButton *button,
-                                 BgRecentSource  *source)
-{
-  GtkWidget *parent;
-  CcBackgroundItem *item;
-
-  parent = gtk_widget_get_parent (gtk_widget_get_parent (GTK_WIDGET (button)));
-  g_assert (GTK_IS_FLOW_BOX_CHILD (parent));
-
-  item = g_object_get_data (G_OBJECT (parent), "item");
-
-  bg_recent_source_remove_item (source, item);
-}
-
-static void
-direction_changed_cb (GtkWidget        *widget,
-                      GtkTextDirection *previous_direction,
-                      GdkPaintable     *paintable)
-{
-  g_object_set (paintable,
-                "text-direction", gtk_widget_get_direction (widget),
-                NULL);
-}
-
-static GtkWidget*
-create_widget_func (gpointer model_item,
-                    gpointer user_data)
-{
-  g_autoptr(CcBackgroundPaintable) paintable = NULL;
-  CcBackgroundItem *item;
-  GtkWidget *overlay;
-  GtkWidget *child;
-  GtkWidget *picture;
-  GtkWidget *icon;
-  GtkWidget *check;
-  GtkWidget *button = NULL;
-  BgSource *source;
-
-  source = BG_SOURCE (user_data);
-  item = CC_BACKGROUND_ITEM (model_item);
-
-  paintable = cc_background_paintable_new (source, item);
-
-  picture = gtk_picture_new_for_paintable (GDK_PAINTABLE (paintable));
-  gtk_picture_set_can_shrink (GTK_PICTURE (picture), FALSE);
-
-  g_object_bind_property (picture, "scale-factor",
-                          paintable, "scale-factor", G_BINDING_SYNC_CREATE);
-  g_signal_connect_object (picture, "direction-changed",
-                           G_CALLBACK (direction_changed_cb), paintable, 0);
-
-  icon = gtk_image_new_from_icon_name ("slideshow-symbolic");
-  gtk_widget_set_halign (icon, GTK_ALIGN_START);
-  gtk_widget_set_valign (icon, GTK_ALIGN_END);
-  gtk_widget_set_visible (icon, cc_background_item_changes_with_time (item));
-  gtk_widget_add_css_class (icon, "slideshow-icon");
-
-  check = gtk_image_new_from_icon_name ("background-selected-symbolic");
-  gtk_widget_set_halign (check, GTK_ALIGN_END);
-  gtk_widget_set_valign (check, GTK_ALIGN_END);
-  gtk_widget_add_css_class (check, "selected-check");
-
-  if (BG_IS_RECENT_SOURCE (source))
-    {
-      button = gtk_button_new_from_icon_name ("window-close-symbolic");
-      gtk_widget_set_halign (button, GTK_ALIGN_END);
-      gtk_widget_set_valign (button, GTK_ALIGN_START);
-
-      gtk_widget_add_css_class (button, "osd");
-      gtk_widget_add_css_class (button, "circular");
-      gtk_widget_add_css_class (button, "remove-button");
-
-      g_signal_connect (button,
-                        "clicked",
-                        G_CALLBACK (on_delete_background_clicked_cb),
-                        source);
-    }
-
-  overlay = gtk_overlay_new ();
-  gtk_widget_set_overflow (overlay, GTK_OVERFLOW_HIDDEN);
-  gtk_widget_add_css_class (overlay, "background-thumbnail");
-  gtk_overlay_set_child (GTK_OVERLAY (overlay), picture);
-  gtk_overlay_add_overlay (GTK_OVERLAY (overlay), icon);
-  gtk_overlay_add_overlay (GTK_OVERLAY (overlay), check);
-  if (button)
-    gtk_overlay_add_overlay (GTK_OVERLAY (overlay), button);
-
-  child = gtk_flow_box_child_new ();
-  gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
-  gtk_flow_box_child_set_child (GTK_FLOW_BOX_CHILD (child), overlay);
-
-  g_object_set_data_full (G_OBJECT (child), "item", g_object_ref (item), g_object_unref);
-
-  return child;
-}
-
-static void
-update_recent_visibility (CcBackgroundChooser *self)
-{
-  GListStore *store;
-  gboolean has_items;
-
-  store = bg_source_get_liststore (BG_SOURCE (self->recent_source));
-  has_items = g_list_model_get_n_items (G_LIST_MODEL (store)) != 0;
-
-  gtk_widget_set_visible (self->recent_box, has_items);
-}
-
-static void
-setup_flowbox (CcBackgroundChooser *self)
-{
-  GListStore *store;
-
-  store = bg_source_get_liststore (BG_SOURCE (self->wallpapers_source));
-
-  gtk_flow_box_bind_model (self->flowbox,
-                           G_LIST_MODEL (store),
-                           create_widget_func,
-                           self->wallpapers_source,
-                           NULL);
-
-  store = bg_source_get_liststore (BG_SOURCE (self->recent_source));
-
-  gtk_flow_box_bind_model (self->recent_flowbox,
-                           G_LIST_MODEL (store),
-                           create_widget_func,
-                           self->recent_source,
-                           NULL);
-
-  update_recent_visibility (self);
-  g_signal_connect_object (store,
-                           "items-changed",
-                           G_CALLBACK (update_recent_visibility),
-                           self,
-                           G_CONNECT_SWAPPED);
-}
-
-static void
-on_item_activated_cb (GtkFlowBox          *flowbox,
-                      GtkFlowBoxChild     *child,
-                      CcBackgroundChooser *self)
-{
-  self->recent_selected = flowbox == self->recent_flowbox;
-  if (self->recent_selected)
-    gtk_flow_box_unselect_all (self->flowbox);
-  else
-    gtk_flow_box_unselect_all (self->recent_flowbox);
-  emit_background_chosen (self);
-}
-
-static void
-on_file_chooser_response_cb (GtkDialog           *filechooser,
-                             gint                 response,
-                             CcBackgroundChooser *self)
-{
-  if (response == GTK_RESPONSE_ACCEPT)
-    {
-      g_autoptr(GListModel) files = NULL;
-      guint i;
-
-      files = gtk_file_chooser_get_files (GTK_FILE_CHOOSER (filechooser));
-      for (i = 0; i < g_list_model_get_n_items (files); i++)
-        {
-          g_autoptr(GFile) file = g_list_model_get_item (files, i);
-          g_autofree gchar *filename = g_file_get_path (file);
-
-          bg_recent_source_add_file (self->recent_source, filename);
-        }
-    }
-
-  gtk_window_destroy (GTK_WINDOW (filechooser));
-}
-
-/* GObject overrides */
-
-static void
-cc_background_chooser_finalize (GObject *object)
-{
-  CcBackgroundChooser *self = (CcBackgroundChooser *)object;
-
-  g_clear_object (&self->recent_source);
-  g_clear_object (&self->wallpapers_source);
-
-  G_OBJECT_CLASS (cc_background_chooser_parent_class)->finalize (object);
-}
-
-static void
-cc_background_chooser_class_init (CcBackgroundChooserClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->finalize = cc_background_chooser_finalize;
-
-  signals[BACKGROUND_CHOSEN] = g_signal_new ("background-chosen",
-                                             CC_TYPE_BACKGROUND_CHOOSER,
-                                             G_SIGNAL_RUN_FIRST,
-                                             0, NULL, NULL, NULL,
-                                             G_TYPE_NONE,
-                                             1,
-                                             CC_TYPE_BACKGROUND_ITEM);
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/background/cc-background-chooser.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundChooser, flowbox);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundChooser, recent_box);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundChooser, recent_flowbox);
-
-  gtk_widget_class_bind_template_callback (widget_class, on_item_activated_cb);
-}
-
-static void
-cc_background_chooser_init (CcBackgroundChooser *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-
-  self->recent_source = bg_recent_source_new (GTK_WIDGET (self));
-  self->wallpapers_source = bg_wallpapers_source_new (GTK_WIDGET (self));
-  setup_flowbox (self);
-}
-
-void
-cc_background_chooser_select_file (CcBackgroundChooser *self)
-{
-  g_autoptr(GFile) pictures_folder = NULL;
-  GtkFileFilter *filter;
-  GtkWidget *filechooser;
-  GtkWindow *toplevel;
-
-  g_return_if_fail (CC_IS_BACKGROUND_CHOOSER (self));
-
-  toplevel = (GtkWindow*) gtk_widget_get_native (GTK_WIDGET (self));
-  filechooser = gtk_file_chooser_dialog_new (_("Select a picture"),
-                                             toplevel,
-                                             GTK_FILE_CHOOSER_ACTION_OPEN,
-                                             _("_Cancel"), GTK_RESPONSE_CANCEL,
-                                             _("_Open"), GTK_RESPONSE_ACCEPT,
-                                             NULL);
-  gtk_window_set_modal (GTK_WINDOW (filechooser), TRUE);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_add_pixbuf_formats (filter);
-  gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (filechooser), filter);
-
-  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),
-                                       pictures_folder,
-                                       NULL);
-
-  g_signal_connect_object (filechooser,
-                           "response",
-                           G_CALLBACK (on_file_chooser_response_cb),
-                           self,
-                           0);
-
-  gtk_window_present (GTK_WINDOW (filechooser));
-}
--- a/panels/background/cc-background-chooser.h
+++ b/panels/background/cc-background-chooser.h
@@ -1,32 +0,0 @@
-/* cc-background-chooser.h
- *
- * Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BACKGROUND_CHOOSER (cc_background_chooser_get_type())
-G_DECLARE_FINAL_TYPE (CcBackgroundChooser, cc_background_chooser, CC, BACKGROUND_CHOOSER, GtkBox)
-
-void cc_background_chooser_select_file (CcBackgroundChooser *self);
-
-G_END_DECLS
--- a/panels/background/cc-background-chooser.ui
+++ b/panels/background/cc-background-chooser.ui
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcBackgroundChooser" parent="GtkBox">
-    <property name="orientation">vertical</property>
-
-    <!-- Recent -->
-    <child>
-      <object class="GtkBox" id="recent_box">
-        <property name="orientation">vertical</property>
-        <property name="halign">center</property>
-
-        <child>
-          <object class="GtkFlowBox" id="recent_flowbox">
-            <property name="margin-top">12</property>
-            <property name="margin-bottom">12</property>
-            <property name="margin-start">12</property>
-            <property name="margin-end">12</property>
-            <property name="column-spacing">12</property>
-            <property name="row-spacing">12</property>
-            <property name="homogeneous">True</property>
-            <property name="halign">center</property>
-            <property name="min-children-per-line">1</property>
-            <property name="max-children-per-line">8</property>
-            <property name="activate-on-single-click">True</property>
-            <property name="selection-mode">single</property>
-            <signal name="child-activated" handler="on_item_activated_cb" object="CcBackgroundChooser" swapped="no" />
-            <style>
-              <class name="background-flowbox"/>
-            </style>
-          </object>
-        </child>
-
-        <child>
-          <object class="GtkSeparator">
-            <property name="margin-top">12</property>
-            <property name="margin-bottom">12</property>
-          </object>
-        </child>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkFlowBox" id="flowbox">
-        <property name="margin-top">12</property>
-        <property name="margin-bottom">12</property>
-        <property name="margin-start">12</property>
-        <property name="margin-end">12</property>
-        <property name="column-spacing">12</property>
-        <property name="row-spacing">12</property>
-        <property name="homogeneous">True</property>
-        <property name="halign">center</property>
-        <property name="min-children-per-line">1</property>
-        <property name="max-children-per-line">8</property>
-        <property name="activate-on-single-click">True</property>
-        <property name="selection-mode">single</property>
-        <signal name="child-activated" handler="on_item_activated_cb" object="CcBackgroundChooser" swapped="no" />
-        <style>
-          <class name="background-flowbox"/>
-        </style>
-      </object>
-    </child>
-
-  </template>
-</interface>
--- a/panels/background/cc-background-item.c
+++ b/panels/background/cc-background-item.c
--- a/panels/background/cc-background-item.h
+++ b/panels/background/cc-background-item.h
@@ -1,88 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2010-2011 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 2 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/>.
- *
- */
-
-#pragma once
-
-#include <glib-object.h>
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
-#include <gdesktop-enums.h>
-#include <gnome-bg/gnome-bg.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BACKGROUND_ITEM (cc_background_item_get_type ())
-G_DECLARE_FINAL_TYPE (CcBackgroundItem, cc_background_item, CC, BACKGROUND_ITEM, GObject)
-
-typedef enum {
-	CC_BACKGROUND_ITEM_HAS_SHADING   = 1 << 0,
-	CC_BACKGROUND_ITEM_HAS_PLACEMENT = 1 << 1,
-	CC_BACKGROUND_ITEM_HAS_PCOLOR    = 1 << 2,
-	CC_BACKGROUND_ITEM_HAS_SCOLOR    = 1 << 3,
-	CC_BACKGROUND_ITEM_HAS_URI       = 1 << 4,
-	CC_BACKGROUND_ITEM_HAS_URI_DARK  = 1 << 5
-} CcBackgroundItemFlags;
-
-#define CC_BACKGROUND_ITEM_HAS_ALL (CC_BACKGROUND_ITEM_HAS_SHADING &	\
-				    CC_BACKGROUND_ITEM_HAS_PLACEMENT &	\
-				    CC_BACKGROUND_ITEM_HAS_PCOLOR &	\
-				    CC_BACKGROUND_ITEM_HAS_SCOLOR &	\
-				    CC_BACKGROUND_ITEM_HAS_FNAME)
-
-CcBackgroundItem * cc_background_item_new                 (const char                   *uri);
-CcBackgroundItem * cc_background_item_copy                (CcBackgroundItem             *item);
-gboolean           cc_background_item_load                (CcBackgroundItem *item,
-                                                           GFileInfo        *info);
-gboolean           cc_background_item_changes_with_time   (CcBackgroundItem             *item);
-gboolean           cc_background_item_has_dark_version    (CcBackgroundItem             *item);
-
-GdkPixbuf *        cc_background_item_get_thumbnail       (CcBackgroundItem             *item,
-                                                           GnomeDesktopThumbnailFactory *thumbs,
-                                                           int                           width,
-                                                           int                           height,
-                                                           int                           scale_factor,
-                                                           gboolean                      dark);
-GdkPixbuf *        cc_background_item_get_frame_thumbnail (CcBackgroundItem             *item,
-                                                           GnomeDesktopThumbnailFactory *thumbs,
-                                                           int                           width,
-                                                           int                           height,
-                                                           int                           scale_factor,
-                                                           int                           frame,
-                                                           gboolean                      force_size,
-                                                           gboolean                      dark);
-
-GDesktopBackgroundStyle   cc_background_item_get_placement  (CcBackgroundItem *item);
-GDesktopBackgroundShading cc_background_item_get_shading    (CcBackgroundItem *item);
-const char *              cc_background_item_get_uri        (CcBackgroundItem *item);
-const char *              cc_background_item_get_uri_dark   (CcBackgroundItem *item);
-const char *              cc_background_item_get_source_url (CcBackgroundItem *item);
-const char *              cc_background_item_get_source_xml (CcBackgroundItem *item);
-CcBackgroundItemFlags     cc_background_item_get_flags      (CcBackgroundItem *item);
-const char *              cc_background_item_get_pcolor     (CcBackgroundItem *item);
-const char *              cc_background_item_get_scolor     (CcBackgroundItem *item);
-const char *              cc_background_item_get_name       (CcBackgroundItem *item);
-const char *              cc_background_item_get_size       (CcBackgroundItem *item);
-gboolean                  cc_background_item_get_needs_download (CcBackgroundItem *item);
-guint64                   cc_background_item_get_modified   (CcBackgroundItem *item);
-
-gboolean                  cc_background_item_compare        (CcBackgroundItem *saved,
-							     CcBackgroundItem *configured);
-void                      cc_background_item_dump           (CcBackgroundItem *item);
-
-G_END_DECLS
--- a/panels/background/cc-background-paintable.c
+++ b/panels/background/cc-background-paintable.c
@@ -1,314 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2021 Alexander Mikhaylenko <alexm@gnome.org>
- *
- * 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 2 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/>.
- *
- */
-
-#include <config.h>
-
-#include "cc-background-paintable.h"
-
-struct _CcBackgroundPaintable
-{
-  GObject           parent_instance;
-
-  BgSource         *source;
-  CcBackgroundItem *item;
-  int               scale_factor;
-  GtkTextDirection  text_direction;
-
-  GdkPaintable     *texture;
-  GdkPaintable     *dark_texture;
-};
-
-enum
-{
-  PROP_0,
-  PROP_SOURCE,
-  PROP_ITEM,
-  PROP_SCALE_FACTOR,
-  PROP_TEXT_DIRECTION,
-  N_PROPS
-};
-
-static GParamSpec *properties [N_PROPS];
-
-static void cc_background_paintable_paintable_init (GdkPaintableInterface *iface);
-
-G_DEFINE_TYPE_WITH_CODE (CcBackgroundPaintable, cc_background_paintable, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                cc_background_paintable_paintable_init))
-
-static void
-update_cache (CcBackgroundPaintable *self)
-{
-  g_autoptr (GdkPixbuf) pixbuf = NULL;
-  GnomeDesktopThumbnailFactory *factory;
-  int width, height;
-
-  g_clear_object (&self->texture);
-  g_clear_object (&self->dark_texture);
-
-  factory = bg_source_get_thumbnail_factory (self->source);
-  width = bg_source_get_thumbnail_width (self->source);
-  height = bg_source_get_thumbnail_height (self->source);
-
-  pixbuf = cc_background_item_get_thumbnail (self->item,
-                                             factory,
-                                             width,
-                                             height,
-                                             self->scale_factor,
-                                             FALSE);
-
-  self->texture = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));
-
-  if (cc_background_item_has_dark_version (self->item))
-    {
-      g_autoptr (GdkPixbuf) dark_pixbuf = NULL;
-
-      dark_pixbuf = cc_background_item_get_thumbnail (self->item,
-                                                      factory,
-                                                      width,
-                                                      height,
-                                                      self->scale_factor,
-                                                      TRUE);
-      self->dark_texture = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (dark_pixbuf));
-    }
-
-  gdk_paintable_invalidate_size (GDK_PAINTABLE (self));
-}
-
-static void
-cc_background_paintable_dispose (GObject *object)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (object);
-
-  g_clear_object (&self->item);
-  g_clear_object (&self->source);
-  g_clear_object (&self->texture);
-  g_clear_object (&self->dark_texture);
-
-  G_OBJECT_CLASS (cc_background_paintable_parent_class)->dispose (object);
-}
-
-static void
-cc_background_paintable_constructed (GObject *object)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (object);
-
-  G_OBJECT_CLASS (cc_background_paintable_parent_class)->constructed (object);
-
-  update_cache (self);
-}
-
-static void
-cc_background_paintable_get_property (GObject    *object,
-                                      guint       prop_id,
-                                      GValue     *value,
-                                      GParamSpec *pspec)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_SOURCE:
-      g_value_set_object (value, self->source);
-      break;
-
-    case PROP_ITEM:
-      g_value_set_object (value, self->item);
-      break;
-
-    case PROP_SCALE_FACTOR:
-      g_value_set_int (value, self->scale_factor);
-      break;
-
-    case PROP_TEXT_DIRECTION:
-      g_value_set_enum (value, self->text_direction);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-cc_background_paintable_set_property (GObject      *object,
-                                      guint         prop_id,
-                                      const GValue *value,
-                                      GParamSpec   *pspec)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (object);
-
-  switch (prop_id)
-    {
-    case PROP_SOURCE:
-      g_set_object (&self->source, g_value_get_object (value));
-      break;
-
-    case PROP_ITEM:
-      g_set_object (&self->item, g_value_get_object (value));
-      break;
-
-    case PROP_SCALE_FACTOR:
-      self->scale_factor = g_value_get_int (value);
-      update_cache (self);
-      break;
-
-    case PROP_TEXT_DIRECTION:
-      self->text_direction = g_value_get_enum (value);
-      gdk_paintable_invalidate_contents (GDK_PAINTABLE (self));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-cc_background_paintable_class_init (CcBackgroundPaintableClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-
-  object_class->dispose = cc_background_paintable_dispose;
-  object_class->constructed = cc_background_paintable_constructed;
-  object_class->get_property = cc_background_paintable_get_property;
-  object_class->set_property = cc_background_paintable_set_property;
-
-  properties[PROP_SOURCE] =
-    g_param_spec_object ("source",
-                         "Source",
-                         "Source",
-                         BG_TYPE_SOURCE,
-                         G_PARAM_READWRITE |
-                         G_PARAM_CONSTRUCT_ONLY |
-                         G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_ITEM] =
-    g_param_spec_object ("item",
-                         "Item",
-                         "Item",
-                         CC_TYPE_BACKGROUND_ITEM,
-                         G_PARAM_READWRITE |
-                         G_PARAM_CONSTRUCT_ONLY |
-                         G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_SCALE_FACTOR] =
-    g_param_spec_int ("scale-factor",
-                      "Scale Factor",
-                      "Scale Factor",
-                      1, G_MAXINT, 1,
-                      G_PARAM_READWRITE |
-                      G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_TEXT_DIRECTION] =
-    g_param_spec_enum ("text-direction",
-                       "Text Direction",
-                       "Text Direction",
-                       GTK_TYPE_TEXT_DIRECTION,
-                       GTK_TEXT_DIR_LTR,
-                       G_PARAM_READWRITE |
-                       G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, properties);
-}
-
-static void
-cc_background_paintable_init (CcBackgroundPaintable *self)
-{
-  self->scale_factor = 1;
-  self->text_direction = GTK_TEXT_DIR_LTR;
-}
-
-static void
-cc_background_paintable_snapshot (GdkPaintable *paintable,
-                                  GdkSnapshot  *snapshot,
-                                  double        width,
-                                  double        height)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (paintable);
-  gboolean is_rtl;
-
-  if (!self->dark_texture)
-    {
-      gdk_paintable_snapshot (self->texture, snapshot, width, height);
-      return;
-    }
-
-  is_rtl = self->text_direction == GTK_TEXT_DIR_RTL;
-
-  gtk_snapshot_push_clip (GTK_SNAPSHOT (snapshot),
-                          &GRAPHENE_RECT_INIT (is_rtl ? width / 2.0f : 0.0f,
-                                               0.0f,
-                                               width / 2.0f,
-                                               height));
-  gdk_paintable_snapshot (self->texture, snapshot, width, height);
-  gtk_snapshot_pop (GTK_SNAPSHOT (snapshot));
-
-  gtk_snapshot_push_clip (GTK_SNAPSHOT (snapshot),
-                          &GRAPHENE_RECT_INIT (is_rtl ? 0.0f : width / 2.0f,
-                                               0.0f,
-                                               width / 2.0f,
-                                               height));
-  gdk_paintable_snapshot (self->dark_texture, snapshot, width, height);
-  gtk_snapshot_pop (GTK_SNAPSHOT (snapshot));
-}
-
-static int
-cc_background_paintable_get_intrinsic_width (GdkPaintable *paintable)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (paintable);
-
-  return gdk_paintable_get_intrinsic_width (self->texture) / self->scale_factor;
-}
-
-static int
-cc_background_paintable_get_intrinsic_height (GdkPaintable *paintable)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (paintable);
-
-  return gdk_paintable_get_intrinsic_height (self->texture) / self->scale_factor;
-}
-
-static double
-cc_background_paintable_get_intrinsic_aspect_ratio (GdkPaintable *paintable)
-{
-  CcBackgroundPaintable *self = CC_BACKGROUND_PAINTABLE (paintable);
-
-  return gdk_paintable_get_intrinsic_aspect_ratio (self->texture);
-}
-
-static void
-cc_background_paintable_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = cc_background_paintable_snapshot;
-  iface->get_intrinsic_width = cc_background_paintable_get_intrinsic_width;
-  iface->get_intrinsic_height = cc_background_paintable_get_intrinsic_height;
-  iface->get_intrinsic_aspect_ratio = cc_background_paintable_get_intrinsic_aspect_ratio;
-}
-
-CcBackgroundPaintable *
-cc_background_paintable_new (BgSource         *source,
-                             CcBackgroundItem *item)
-{
-  g_return_val_if_fail (BG_IS_SOURCE (source), NULL);
-  g_return_val_if_fail (CC_IS_BACKGROUND_ITEM (item), NULL);
-
-  return g_object_new (CC_TYPE_BACKGROUND_PAINTABLE,
-                       "source", source,
-                       "item", item,
-                       NULL);
-}
--- a/panels/background/cc-background-paintable.h
+++ b/panels/background/cc-background-paintable.h
@@ -1,35 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 8 -*-
- *
- * Copyright (C) 2021 Alexander Mikhaylenko <alexm@gnome.org>
- *
- * 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 2 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/>.
- *
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#include "bg-source.h"
-#include "cc-background-item.h"
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BACKGROUND_PAINTABLE (cc_background_paintable_get_type ())
-G_DECLARE_FINAL_TYPE (CcBackgroundPaintable, cc_background_paintable, CC, BACKGROUND_PAINTABLE, GObject)
-
-CcBackgroundPaintable * cc_background_paintable_new (BgSource         *source,
-                                                     CcBackgroundItem *item);
-
-G_END_DECLS
--- a/panels/background/cc-background-panel.c
+++ b/panels/background/cc-background-panel.c
@@ -1,455 +0,0 @@
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#include <config.h>
-
-#include <string.h>
-#include <glib.h>
-#include <glib/gi18n-lib.h>
-#include <glib/gstdio.h>
-
-#include <gdesktop-enums.h>
-
-#include "cc-background-panel.h"
-
-#include "cc-background-chooser.h"
-#include "cc-background-item.h"
-#include "cc-background-preview.h"
-#include "cc-background-resources.h"
-#include "cc-background-xml.h"
-
-#define WP_PATH_ID "org.gnome.desktop.background"
-#define WP_LOCK_PATH_ID "org.gnome.desktop.screensaver"
-#define WP_URI_KEY "picture-uri"
-#define WP_URI_DARK_KEY "picture-uri-dark"
-#define WP_OPTIONS_KEY "picture-options"
-#define WP_SHADING_KEY "color-shading-type"
-#define WP_PCOLOR_KEY "primary-color"
-#define WP_SCOLOR_KEY "secondary-color"
-
-#define INTERFACE_PATH_ID "org.gnome.desktop.interface"
-#define INTERFACE_COLOR_SCHEME_KEY "color-scheme"
-
-struct _CcBackgroundPanel
-{
-  CcPanel parent_instance;
-
-  GDBusConnection *connection;
-
-  GSettings *settings;
-  GSettings *lock_settings;
-  GSettings *interface_settings;
-
-  GnomeDesktopThumbnailFactory *thumb_factory;
-  GDBusProxy *proxy;
-
-  CcBackgroundItem *current_background;
-
-  CcBackgroundChooser *background_chooser;
-  CcBackgroundPreview *light_preview;
-  CcBackgroundPreview *dark_preview;
-  GtkToggleButton *light_toggle;
-  GtkToggleButton *dark_toggle;
-};
-
-CC_PANEL_REGISTER (CcBackgroundPanel, cc_background_panel)
-
-static void
-load_custom_css (CcBackgroundPanel *self)
-{
-  g_autoptr(GtkCssProvider) provider = NULL;
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_resource (provider, "/org/gnome/control-center/background/preview.css");
-  gtk_style_context_add_provider_for_display (gdk_display_get_default (),
-                                              GTK_STYLE_PROVIDER (provider),
-                                              GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-}
-
-static void
-reload_light_dark_toggles (CcBackgroundPanel *self)
-{
-  GDesktopColorScheme scheme;
-
-  scheme = g_settings_get_enum (self->interface_settings, INTERFACE_COLOR_SCHEME_KEY);
-
-  if (scheme == G_DESKTOP_COLOR_SCHEME_DEFAULT)
-    {
-      gtk_toggle_button_set_active (self->light_toggle, TRUE);
-    }
-  else if (scheme == G_DESKTOP_COLOR_SCHEME_PREFER_DARK)
-    {
-      gtk_toggle_button_set_active (self->dark_toggle, TRUE);
-    }
-  else
-    {
-      gtk_toggle_button_set_active (self->light_toggle, FALSE);
-      gtk_toggle_button_set_active (self->dark_toggle, FALSE);
-    }
-}
-
-static void
-transition_screen (CcBackgroundPanel *self)
-{
-  g_autoptr (GError) error = NULL;
-
-  if (!self->proxy)
-    return;
-
-  g_dbus_proxy_call_sync (self->proxy,
-                          "ScreenTransition",
-                          NULL,
-                          G_DBUS_CALL_FLAGS_NONE,
-                          -1,
-                          NULL,
-                          &error);
-
-  if (error)
-    g_warning ("Couldn't transition screen: %s", error->message);
-}
-
-static void
-set_color_scheme (CcBackgroundPanel   *self,
-                  GDesktopColorScheme  color_scheme)
-{
-  GDesktopColorScheme scheme;
-
-  scheme = g_settings_get_enum (self->interface_settings,
-                                INTERFACE_COLOR_SCHEME_KEY);
-
-  /* We have to check the equality manually to avoid starting an unnecessary
-   * screen transition */
-  if (color_scheme == scheme)
-    return;
-
-  transition_screen (self);
-
-  g_settings_set_enum (self->interface_settings,
-                       INTERFACE_COLOR_SCHEME_KEY,
-                       color_scheme);
-}
-
-/* Color schemes */
-
-static void
-on_light_dark_toggle_active_cb (CcBackgroundPanel *self)
-{
-  if (gtk_toggle_button_get_active (self->light_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);
-}
-
-static void
-got_transition_proxy_cb (GObject      *source_object,
-                         GAsyncResult *res,
-                         gpointer      data)
-{
-  g_autoptr(GError) error = NULL;
-  CcBackgroundPanel *self = data;
-
-  self->proxy = g_dbus_proxy_new_for_bus_finish (res, &error);
-
-  if (self->proxy == NULL)
-    {
-      g_warning ("Error creating proxy: %s", error->message);
-      return;
-    }
-}
-
-/* Background */
-
-static void
-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->dark_preview, current_background);
-}
-
-static gchar *
-get_save_path (void)
-{
-  return g_build_filename (g_get_user_config_dir (),
-                           "gnome-control-center",
-                           "backgrounds",
-                           "last-edited.xml",
-                           NULL);
-}
-
-static void
-reload_current_bg (CcBackgroundPanel *panel)
-{
-  g_autoptr(CcBackgroundItem) saved = NULL;
-  CcBackgroundItem *configured;
-  GSettings *settings = NULL;
-  g_autofree gchar *uri = NULL;
-  g_autofree gchar *dark_uri = NULL;
-  g_autofree gchar *pcolor = NULL;
-  g_autofree gchar *scolor = NULL;
-
-  /* Load the saved configuration */
-  uri = get_save_path ();
-  saved = cc_background_xml_get_item (uri);
-
-  /* initalise the current background information from settings */
-  settings = panel->settings;
-  uri = g_settings_get_string (settings, WP_URI_KEY);
-  if (uri && *uri == '\0')
-    g_clear_pointer (&uri, g_free);
-
-
-  configured = cc_background_item_new (uri);
-
-  dark_uri = g_settings_get_string (settings, WP_URI_DARK_KEY);
-  pcolor = g_settings_get_string (settings, WP_PCOLOR_KEY);
-  scolor = g_settings_get_string (settings, WP_SCOLOR_KEY);
-  g_object_set (G_OBJECT (configured),
-                "name", _("Current background"),
-                "uri-dark", dark_uri,
-                "placement", g_settings_get_enum (settings, WP_OPTIONS_KEY),
-                "shading", g_settings_get_enum (settings, WP_SHADING_KEY),
-                "primary-color", pcolor,
-                "secondary-color", scolor,
-                NULL);
-
-  if (saved != NULL && cc_background_item_compare (saved, configured))
-    {
-      CcBackgroundItemFlags flags;
-      flags = cc_background_item_get_flags (saved);
-      /* Special case for colours */
-      if (cc_background_item_get_placement (saved) == G_DESKTOP_BACKGROUND_STYLE_NONE)
-        flags &=~ (CC_BACKGROUND_ITEM_HAS_PCOLOR | CC_BACKGROUND_ITEM_HAS_SCOLOR);
-      g_object_set (G_OBJECT (configured),
-		    "name", cc_background_item_get_name (saved),
-		    "flags", flags,
-		    "source-url", cc_background_item_get_source_url (saved),
-		    "source-xml", cc_background_item_get_source_xml (saved),
-		    NULL);
-    }
-
-  g_clear_object (&panel->current_background);
-  panel->current_background = configured;
-  cc_background_item_load (configured, NULL);
-}
-
-static gboolean
-create_save_dir (void)
-{
-  g_autofree char *path = NULL;
-
-  path = g_build_filename (g_get_user_config_dir (),
-			   "gnome-control-center",
-			   "backgrounds",
-			   NULL);
-  if (g_mkdir_with_parents (path, USER_DIR_MODE) < 0)
-    {
-      g_warning ("Failed to create directory '%s'", path);
-      return FALSE;
-    }
-  return TRUE;
-}
-
-static void
-set_background (CcBackgroundPanel *panel,
-                GSettings         *settings,
-                CcBackgroundItem  *item,
-                gboolean           set_dark)
-{
-  GDesktopBackgroundStyle style;
-  CcBackgroundItemFlags flags;
-  g_autofree gchar *filename = NULL;
-  const char *uri;
-
-  if (item == NULL)
-    return;
-
-  uri = cc_background_item_get_uri (item);
-  flags = cc_background_item_get_flags (item);
-
-  g_settings_set_string (settings, WP_URI_KEY, uri);
-
-  if (set_dark)
-    {
-      const char *uri_dark;
-
-      uri_dark = cc_background_item_get_uri_dark (item);
-
-      if (uri_dark && uri_dark[0])
-        g_settings_set_string (settings, WP_URI_DARK_KEY, uri_dark);
-      else
-        g_settings_set_string (settings, WP_URI_DARK_KEY, uri);
-    }
-
-  /* Also set the placement if we have a URI and the previous value was none */
-  if (flags & CC_BACKGROUND_ITEM_HAS_PLACEMENT)
-    {
-      g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
-    }
-  else if (uri != NULL)
-    {
-      style = g_settings_get_enum (settings, WP_OPTIONS_KEY);
-      if (style == G_DESKTOP_BACKGROUND_STYLE_NONE)
-        g_settings_set_enum (settings, WP_OPTIONS_KEY, cc_background_item_get_placement (item));
-    }
-
-  if (flags & CC_BACKGROUND_ITEM_HAS_SHADING)
-    g_settings_set_enum (settings, WP_SHADING_KEY, cc_background_item_get_shading (item));
-
-  g_settings_set_string (settings, WP_PCOLOR_KEY, cc_background_item_get_pcolor (item));
-  g_settings_set_string (settings, WP_SCOLOR_KEY, cc_background_item_get_scolor (item));
-
-  /* Apply all changes */
-  g_settings_apply (settings);
-
-  /* Save the source XML if there is one */
-  filename = get_save_path ();
-  if (create_save_dir ())
-    cc_background_xml_save (panel->current_background, filename);
-}
-
-static void
-on_chooser_background_chosen_cb (CcBackgroundPanel *self,
-                                 CcBackgroundItem  *item)
-{
-  set_background (self, self->settings, item, TRUE);
-  set_background (self, self->lock_settings, item, FALSE);
-}
-
-static void
-on_add_picture_button_clicked_cb (CcBackgroundPanel *self)
-{
-  cc_background_chooser_select_file (self->background_chooser);
-}
-
-static const char *
-cc_background_panel_get_help_uri (CcPanel *panel)
-{
-  return "help:gnome-help/look-background";
-}
-
-static void
-cc_background_panel_dispose (GObject *object)
-{
-  CcBackgroundPanel *panel = CC_BACKGROUND_PANEL (object);
-
-  g_clear_object (&panel->settings);
-  g_clear_object (&panel->lock_settings);
-  g_clear_object (&panel->interface_settings);
-  g_clear_object (&panel->thumb_factory);
-  g_clear_object (&panel->proxy);
-
-  G_OBJECT_CLASS (cc_background_panel_parent_class)->dispose (object);
-}
-
-static void
-cc_background_panel_finalize (GObject *object)
-{
-  CcBackgroundPanel *panel = CC_BACKGROUND_PANEL (object);
-
-  g_clear_object (&panel->current_background);
-
-  G_OBJECT_CLASS (cc_background_panel_parent_class)->finalize (object);
-}
-
-static void
-cc_background_panel_class_init (CcBackgroundPanelClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  g_type_ensure (CC_TYPE_BACKGROUND_CHOOSER);
-  g_type_ensure (CC_TYPE_BACKGROUND_PREVIEW);
-
-  panel_class->get_help_uri = cc_background_panel_get_help_uri;
-
-  object_class->dispose = cc_background_panel_dispose;
-  object_class->finalize = cc_background_panel_finalize;
-
-  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, dark_preview);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPanel, light_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_chooser_background_chosen_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_add_picture_button_clicked_cb);
-}
-
-static void
-on_settings_changed (CcBackgroundPanel *panel)
-{
-  reload_current_bg (panel);
-  update_preview (panel);
-}
-
-static void
-cc_background_panel_init (CcBackgroundPanel *panel)
-{
-  g_resources_register (cc_background_get_resource ());
-
-  gtk_widget_init_template (GTK_WIDGET (panel));
-
-  panel->connection = g_application_get_dbus_connection (g_application_get_default ());
-
-  panel->thumb_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-
-  panel->settings = g_settings_new (WP_PATH_ID);
-  g_settings_delay (panel->settings);
- 
-  panel->lock_settings = g_settings_new (WP_LOCK_PATH_ID);
-  g_settings_delay (panel->lock_settings);
-
-  panel->interface_settings = g_settings_new (INTERFACE_PATH_ID);
-
-  /* Load the background */
-  reload_current_bg (panel);
-  update_preview (panel);
-
-  /* Background settings */
-  g_signal_connect_object (panel->settings, "changed", G_CALLBACK (on_settings_changed), panel, G_CONNECT_SWAPPED);
-
-  /* Interface settings */
-  reload_light_dark_toggles (panel);
-
-  g_signal_connect_object (panel->interface_settings,
-                           "changed::" INTERFACE_COLOR_SCHEME_KEY,
-                           G_CALLBACK (reload_light_dark_toggles),
-                           panel,
-                           G_CONNECT_SWAPPED);
-
-  g_dbus_proxy_new_for_bus (G_BUS_TYPE_SESSION,
-                            G_DBUS_PROXY_FLAGS_NONE,
-                            NULL,
-                            "org.gnome.Shell",
-                            "/org/gnome/Shell",
-                            "org.gnome.Shell",
-                            NULL,
-                            got_transition_proxy_cb,
-                            panel);
-
-  load_custom_css (panel);
-}
--- a/panels/background/cc-background-panel.h
+++ b/panels/background/cc-background-panel.h
@@ -1,30 +0,0 @@
-/*
- * Copyright (C) 2010 Intel, 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 2 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/>.
- *
- * Author: Thomas Wood <thomas.wood@intel.com>
- *
- */
-
-#pragma once
-
-#include <shell/cc-panel.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BACKGROUND_PANEL (cc_background_panel_get_type ())
-G_DECLARE_FINAL_TYPE (CcBackgroundPanel, cc_background_panel, CC, BACKGROUND_PANEL, CcPanel)
-
-G_END_DECLS
--- a/panels/background/cc-background-panel.ui
+++ b/panels/background/cc-background-panel.ui
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcBackgroundPanel" parent="CcPanel">
-    <child type="content">
-      <object class="AdwPreferencesPage">
-
-        <child>
-          <object class="AdwPreferencesGroup">
-            <property name="title" translatable="yes">Style</property>
-
-            <child>
-              <object class="AdwPreferencesRow">
-                <property name="activatable">False</property>
-                <property name="focusable">False</property>
-                <child>
-                  <object class="AdwClamp">
-                    <property name="maximum_size">400</property>
-                    <property name="tightening_threshold">300</property>
-                    <child>
-                      <object class="GtkGrid">
-                        <property name="column-spacing">24</property>
-                        <property name="row-spacing">12</property>
-                        <property name="margin-start">12</property>
-                        <property name="margin-end">12</property>
-                        <property name="margin-top">18</property>
-                        <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"/>
-                            <child>
-                              <object class="CcBackgroundPreview" id="light_preview"/>
-                            </child>
-                            <style>
-                              <class name="background-preview-button"/>
-                            </style>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Light</property>
-                            <layout>
-                              <property name="column">0</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </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"/>
-                            <child>
-                              <object class="CcBackgroundPreview" id="dark_preview">
-                                <property name="is-dark">True</property>
-                              </object>
-                            </child>
-                            <style>
-                              <class name="background-preview-button"/>
-                            </style>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">0</property>
-                            </layout>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel">
-                            <property name="label" translatable="yes">Dark</property>
-                            <layout>
-                              <property name="column">1</property>
-                              <property name="row">1</property>
-                            </layout>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
-        <child>
-          <object class="AdwPreferencesGroup">
-            <property name="title" translatable="yes">Background</property>
-            <property name="header-suffix">
-              <object class="GtkButton">
-                <child>
-                  <object class="AdwButtonContent">
-                    <property name="icon-name">list-add-symbolic</property>
-                    <property name="label" translatable="yes">Add Picture…</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="on_add_picture_button_clicked_cb" object="CcBackgroundPanel" swapped="yes" />
-                <style>
-                  <class name="flat"/>
-                </style>
-              </object>
-            </property>
-
-            <child>
-              <object class="AdwBin">
-                <style>
-                  <class name="card"/>
-                </style>
-                <child>
-                  <object class="CcBackgroundChooser" id="background_chooser">
-                    <property name="hexpand">True</property>
-                    <signal name="background-chosen" handler="on_chooser_background_chosen_cb" object="CcBackgroundPanel" swapped="yes" />
-                  </object>
-                </child>
-              </object>
-            </child>
-
-          </object>
-        </child>
-
-      </object>
-    </child>
-  </template>
-</interface>
--- a/panels/background/cc-background-preview.c
+++ b/panels/background/cc-background-preview.c
@@ -1,351 +0,0 @@
-/* cc-background-preview.c
- *
- * Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#include <libgnome-desktop/gnome-desktop-thumbnail.h>
-
-#include "cc-background-preview.h"
-
-struct _CcBackgroundPreview
-{
-  GtkWidget         parent;
-
-  GtkWidget        *drawing_area;
-  GtkWidget        *light_dark_window;
-  GtkWidget        *dark_window;
-
-  GnomeDesktopThumbnailFactory *thumbnail_factory;
-
-  gboolean          is_dark;
-  CcBackgroundItem *item;
-};
-
-G_DEFINE_TYPE (CcBackgroundPreview, cc_background_preview, GTK_TYPE_WIDGET)
-
-enum
-{
-  PROP_0,
-  PROP_IS_DARK,
-  PROP_ITEM,
-  N_PROPS
-};
-
-static GParamSpec *properties [N_PROPS];
-
-/* Callbacks */
-
-static void
-draw_preview_func (GtkDrawingArea *drawing_area,
-                   cairo_t        *cr,
-                   gint            width,
-                   gint            height,
-                   gpointer        user_data)
-{
-  CcBackgroundPreview *self = CC_BACKGROUND_PREVIEW (user_data);
-  g_autoptr(GdkPixbuf) pixbuf = NULL;
-  gint scale_factor;
-
-  if (!self->item)
-    return;
-
-  scale_factor = gtk_widget_get_scale_factor (GTK_WIDGET (drawing_area));
-  pixbuf = cc_background_item_get_frame_thumbnail (self->item,
-                                                   self->thumbnail_factory,
-                                                   width,
-                                                   height,
-                                                   scale_factor,
-                                                   0,
-                                                   TRUE,
-                                                   self->is_dark &&
-                                                   cc_background_item_has_dark_version (self->item));
-
-
-  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-  cairo_paint (cr);
-}
-
-/* GObject overrides */
-
-static void
-cc_background_preview_dispose (GObject *object)
-{
-  CcBackgroundPreview *self = (CcBackgroundPreview *)object;
-
-  g_clear_pointer (&self->drawing_area, gtk_widget_unparent);
-  g_clear_pointer (&self->light_dark_window, gtk_widget_unparent);
-  g_clear_pointer (&self->dark_window, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (cc_background_preview_parent_class)->dispose (object);
-}
-
-static void
-cc_background_preview_finalize (GObject *object)
-{
-  CcBackgroundPreview *self = (CcBackgroundPreview *)object;
-
-  g_clear_object (&self->item);
-  g_clear_object (&self->thumbnail_factory);
-
-  G_OBJECT_CLASS (cc_background_preview_parent_class)->finalize (object);
-}
-
-static void
-set_is_dark (CcBackgroundPreview *self,
-             gboolean             is_dark)
-{
-  self->is_dark = is_dark;
-
-  if (self->is_dark)
-    {
-      gtk_widget_add_css_class (self->light_dark_window, "dark");
-      gtk_widget_remove_css_class (self->light_dark_window, "light");
-    }
-  else
-    {
-      gtk_widget_add_css_class (self->light_dark_window, "light");
-      gtk_widget_remove_css_class (self->light_dark_window, "dark");
-    }
-}
-
-static void
-cc_background_preview_get_property (GObject    *object,
-                                    guint       prop_id,
-                                    GValue     *value,
-                                    GParamSpec *pspec)
-{
-  CcBackgroundPreview *self = CC_BACKGROUND_PREVIEW (object);
-
-  switch (prop_id)
-    {
-    case PROP_IS_DARK:
-      g_value_set_boolean (value, self->is_dark);
-      break;
-
-    case PROP_ITEM:
-      g_value_set_object (value, self->item);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static void
-cc_background_preview_set_property (GObject      *object,
-                                    guint         prop_id,
-                                    const GValue *value,
-                                    GParamSpec   *pspec)
-{
-  CcBackgroundPreview *self = CC_BACKGROUND_PREVIEW (object);
-
-  switch (prop_id)
-    {
-    case PROP_IS_DARK:
-      set_is_dark (self, g_value_get_boolean (value));
-      break;
-
-    case PROP_ITEM:
-      cc_background_preview_set_item (self, g_value_get_object (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-    }
-}
-
-static GtkSizeRequestMode
-cc_background_preview_get_request_mode (GtkWidget *widget)
-{
-  return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
-}
-
-static void
-get_primary_monitor_geometry (int *width, int *height)
-{
-  GdkDisplay *display;
-  GListModel *monitors;
-
-  display = gdk_display_get_default ();
-
-  monitors = gdk_display_get_monitors (display);
-  if (monitors)
-    {
-      g_autoptr(GdkMonitor) primary_monitor = NULL;
-      GdkRectangle monitor_layout;
-
-      primary_monitor = g_list_model_get_item (monitors, 0);
-      gdk_monitor_get_geometry (primary_monitor, &monitor_layout);
-      if (width)
-        *width = monitor_layout.width;
-      if (height)
-        *height = monitor_layout.height;
-
-      return;
-    }
-
-  if (width)
-    *width = 1920;
-  if (height)
-    *height = 1080;
-}
-
-static void
-cc_background_preview_measure (GtkWidget      *widget,
-                               GtkOrientation  orientation,
-                               gint            for_size,
-                               gint           *minimum,
-                               gint           *natural,
-                               gint           *minimum_baseline,
-                               gint           *natural_baseline)
-{
-  GtkWidget *child;
-  int width;
-
-  get_primary_monitor_geometry (&width, NULL);
-
-  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    *natural = width;
-  else if (for_size < 0)
-    *natural = 0;
-  else
-    *natural = floor ((double) for_size * 0.75); /* 4:3 aspect ratio */
-
-  if (orientation == GTK_ORIENTATION_VERTICAL)
-    *minimum = *natural;
-  else
-    *minimum = 0;
-
-  for (child = gtk_widget_get_first_child (widget);
-       child;
-       child = gtk_widget_get_next_sibling (child))
-    {
-      int child_min, child_nat;
-
-      gtk_widget_measure (child, orientation, for_size,
-                          &child_min, &child_nat, NULL, NULL);
-
-      *minimum = MAX (*minimum, child_min);
-      *natural = MAX (*natural, child_nat);
-    }
-}
-
-static void
-cc_background_preview_size_allocate (GtkWidget *widget,
-                                     gint       width,
-                                     gint       height,
-                                     gint       baseline)
-{
-  CcBackgroundPreview *self = CC_BACKGROUND_PREVIEW (widget);
-  int window_width, window_height, margin_x, margin_y;
-  int opposite_margin_x, opposite_margin_y;
-  GskTransform *front_transform, *back_transform;
-  gboolean is_rtl;
-
-  window_width = ceil (width * 0.5);
-  window_height = ceil (height * 0.5);
-  margin_x = floor (width * 0.15);
-  margin_y = floor (height * 0.15);
-  opposite_margin_x = width - window_width - margin_x;
-  opposite_margin_y = height - window_height - margin_y;
-  is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL;
-
-  front_transform =
-    gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (is_rtl ? opposite_margin_x : margin_x,
-                                                         opposite_margin_y));
-  back_transform =
-    gsk_transform_translate (NULL, &GRAPHENE_POINT_INIT (is_rtl ? margin_x : opposite_margin_x,
-                                                         margin_y));
-
-  gtk_widget_allocate (self->drawing_area, width, height, baseline, NULL);
-  gtk_widget_allocate (self->dark_window, window_width, window_height,
-                       baseline, back_transform);
-  gtk_widget_allocate (self->light_dark_window, window_width, window_height,
-                       baseline, front_transform);
-}
-
-static void
-cc_background_preview_class_init (CcBackgroundPreviewClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = cc_background_preview_dispose;
-  object_class->finalize = cc_background_preview_finalize;
-  object_class->get_property = cc_background_preview_get_property;
-  object_class->set_property = cc_background_preview_set_property;
-
-  widget_class->get_request_mode = cc_background_preview_get_request_mode;
-  widget_class->measure = cc_background_preview_measure;
-  widget_class->size_allocate = cc_background_preview_size_allocate;
-
-  properties[PROP_IS_DARK] = g_param_spec_boolean ("is-dark",
-                                                   "Is dark",
-                                                   "Whether the preview is dark",
-                                                   FALSE,
-                                                   G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_ITEM] = g_param_spec_object ("item",
-                                               "Item",
-                                               "Background item",
-                                               CC_TYPE_BACKGROUND_ITEM,
-                                               G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (object_class, N_PROPS, properties);
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/background/cc-background-preview.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPreview, drawing_area);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPreview, light_dark_window);
-  gtk_widget_class_bind_template_child (widget_class, CcBackgroundPreview, dark_window);
-
-  gtk_widget_class_set_css_name (widget_class, "background-preview");
-}
-
-static void
-cc_background_preview_init (CcBackgroundPreview *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-
-  self->thumbnail_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE);
-}
-
-CcBackgroundItem*
-cc_background_preview_get_item (CcBackgroundPreview *self)
-{
-  g_return_val_if_fail (CC_IS_BACKGROUND_PREVIEW (self), NULL);
-
-  return self->item;
-}
-
-void
-cc_background_preview_set_item (CcBackgroundPreview *self,
-                                CcBackgroundItem    *item)
-{
-  g_return_if_fail (CC_IS_BACKGROUND_PREVIEW (self));
-  g_return_if_fail (CC_IS_BACKGROUND_ITEM (item));
-
-  if (!g_set_object (&self->item, item))
-    return;
-
-  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (self->drawing_area),
-                                  draw_preview_func, self, NULL);
-  gtk_widget_queue_draw (self->drawing_area);
-
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_ITEM]);
-}
--- a/panels/background/cc-background-preview.h
+++ b/panels/background/cc-background-preview.h
@@ -1,36 +0,0 @@
-/* cc-background-preview.h
- *
- * Copyright 2019 Georges Basile Stavracas Neto <georges.stavracas@gmail.com>
- *
- * 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
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-
-#include "cc-background-item.h"
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BACKGROUND_PREVIEW (cc_background_preview_get_type())
-G_DECLARE_FINAL_TYPE (CcBackgroundPreview, cc_background_preview, CC, BACKGROUND_PREVIEW, GtkWidget)
-
-CcBackgroundItem* cc_background_preview_get_item (CcBackgroundPreview *self);
-void              cc_background_preview_set_item (CcBackgroundPreview *self,
-                                                  CcBackgroundItem    *item);
-
-G_END_DECLS
--- a/panels/background/cc-background-preview.ui
+++ b/panels/background/cc-background-preview.ui
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcBackgroundPreview" parent="GtkWidget">
-    <property name="overflow">hidden</property>
-    <property name="width-request">2</property>
-    <property name="height-request">2</property>
-
-    <!-- Wallpaper -->
-    <child>
-      <object class="GtkDrawingArea" id="drawing_area"/>
-    </child>
-
-    <!-- Always dark window -->
-    <child>
-      <object class="AdwBin" id="dark_window">
-        <property name="overflow">hidden</property>
-        <style>
-          <class name="window"/>
-          <class name="back"/>
-          <class name="dark"/>
-        </style>
-        <child>
-          <object class="AdwBin">
-            <style>
-              <class name="header-bar"/>
-            </style>
-            <property name="valign">start</property>
-          </object>
-        </child>
-      </object>
-    </child>
-
-    <!-- Light/dark window -->
-    <child>
-      <object class="AdwBin" id="light_dark_window">
-        <property name="overflow">hidden</property>
-        <style>
-          <class name="window"/>
-          <class name="front"/>
-          <class name="light"/>
-        </style>
-        <child>
-          <object class="AdwBin">
-            <style>
-              <class name="header-bar"/>
-            </style>
-            <property name="valign">start</property>
-          </object>
-        </child>
-      </object>
-    </child>
-
-  </template>
-</interface>
--- a/panels/background/cc-background-xml.c
+++ b/panels/background/cc-background-xml.c
@@ -1,669 +0,0 @@
-/*
- *  Authors: Rodney Dawes <dobey@ximian.com>
- *  Bastien Nocera <hadess@hadess.net>
- *
- *  Copyright 2003-2006 Novell, Inc. (www.novell.com)
- *  Copyright 2011 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 2 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/>.
- */
-
-#include <gio/gio.h>
-#include <string.h>
-#include <libxml/parser.h>
-#include <gdesktop-enums.h>
-
-#include "gdesktop-enums-types.h"
-#include "cc-background-item.h"
-#include "cc-background-xml.h"
-
-/* The number of items we signal as "added" before
- * returning to the main loop */
-#define NUM_ITEMS_PER_BATCH 1
-
-struct _CcBackgroundXml
-{
-  GObject      parent_instance;
-
-  GHashTable  *wp_hash;
-  GAsyncQueue *item_added_queue;
-  guint        item_added_id;
-  GSList      *monitors; /* GSList of GFileMonitor */
-};
-
-enum {
-	ADDED,
-	LAST_SIGNAL
-};
-
-static guint signals[LAST_SIGNAL] = { 0 };
-
-G_DEFINE_TYPE (CcBackgroundXml, cc_background_xml, G_TYPE_OBJECT)
-
-static gboolean
-cc_background_xml_get_bool (const xmlNode *parent,
-			    const gchar   *prop_name)
-{
-  xmlChar *prop;
-  gboolean ret_val = FALSE;
-
-  g_return_val_if_fail (parent != NULL, FALSE);
-  g_return_val_if_fail (prop_name != NULL, FALSE);
-
-  prop = xmlGetProp ((xmlNode *) parent, (xmlChar*)prop_name);
-  if (prop != NULL) {
-    if (!g_ascii_strcasecmp ((gchar *)prop, "true") || !g_ascii_strcasecmp ((gchar *)prop, "1")) {
-      ret_val = TRUE;
-    } else {
-      ret_val = FALSE;
-    }
-    xmlFree (prop);
-  }
-
-  return ret_val;
-}
-
-static struct {
-	int value;
-	const char *string;
-} lookups[] = {
-	{ G_DESKTOP_BACKGROUND_SHADING_HORIZONTAL, "horizontal-gradient" },
-	{ G_DESKTOP_BACKGROUND_SHADING_VERTICAL, "vertical-gradient" },
-};
-
-static int
-enum_string_to_value (GType type,
-		      const char *string)
-{
-	GEnumClass *eclass;
-	GEnumValue *value;
-
-	eclass = G_ENUM_CLASS (g_type_class_peek (type));
-	value = g_enum_get_value_by_nick (eclass, string);
-
-	/* Here's a bit of hand-made parsing, bad bad */
-	if (value == NULL) {
-		guint i;
-		for (i = 0; i < G_N_ELEMENTS (lookups); i++) {
-			if (g_str_equal (lookups[i].string, string))
-				return lookups[i].value;
-		}
-		g_warning ("Unhandled value '%s' for enum '%s'",
-			   string, G_FLAGS_CLASS_TYPE_NAME (eclass));
-		return 0;
-	}
-
-	return value->value;
-}
-
-static gboolean
-idle_emit (CcBackgroundXml *xml)
-{
-	gint i;
-
-	g_async_queue_lock (xml->item_added_queue);
-
-	for (i = 0; i < NUM_ITEMS_PER_BATCH; i++) {
-		g_autoptr(GObject) item = NULL;
-
-		item = g_async_queue_try_pop_unlocked (xml->item_added_queue);
-		if (item == NULL)
-			break;
-		g_signal_emit (G_OBJECT (xml), signals[ADDED], 0, item);
-	}
-
-	g_async_queue_unlock (xml->item_added_queue);
-
-        if (g_async_queue_length (xml->item_added_queue) > 0) {
-                return TRUE;
-        } else {
-                xml->item_added_id = 0;
-                return FALSE;
-        }
-}
-
-static void
-emit_added_in_idle (CcBackgroundXml *xml,
-		    GObject         *object)
-{
-	g_async_queue_lock (xml->item_added_queue);
-	g_async_queue_push_unlocked (xml->item_added_queue, object);
-	if (xml->item_added_id == 0)
-		xml->item_added_id = g_idle_add ((GSourceFunc) idle_emit, xml);
-	g_async_queue_unlock (xml->item_added_queue);
-}
-
-#define NONE "(none)"
-#define UNSET_FLAG(flag) G_STMT_START{ (flags&=~(flag)); }G_STMT_END
-#define SET_FLAG(flag) G_STMT_START{ (flags|=flag); }G_STMT_END
-
-static gboolean
-cc_background_xml_load_xml_internal (CcBackgroundXml *xml,
-				     const gchar     *filename,
-				     gboolean         in_thread)
-{
-  xmlDoc * wplist;
-  xmlNode * root, * list, * wpa;
-  xmlChar * nodelang;
-  const gchar * const * syslangs;
-  gint i;
-  gboolean retval;
-
-  wplist = xmlParseFile (filename);
-  retval = FALSE;
-
-  if (!wplist)
-    return retval;
-
-  syslangs = g_get_language_names ();
-
-  root = xmlDocGetRootElement (wplist);
-
-  for (list = root->children; list != NULL; list = list->next) {
-    if (!strcmp ((gchar *)list->name, "wallpaper")) {
-      g_autoptr(CcBackgroundItem) item = NULL;
-      CcBackgroundItemFlags flags;
-      g_autofree gchar *uri = NULL;
-      g_autofree gchar *cname = NULL;
-      g_autofree gchar *id = NULL;
-
-      flags = 0;
-      item = cc_background_item_new (NULL);
-
-      g_object_set (G_OBJECT (item),
-		    "is-deleted", cc_background_xml_get_bool (list, "deleted"),
-		    "source-xml", filename,
-		    NULL);
-
-      for (wpa = list->children; wpa != NULL; wpa = wpa->next) {
-	if (wpa->type == XML_COMMENT_NODE) {
-	  continue;
-	} else if (!strcmp ((gchar *)wpa->name, "filename")) {
-	  if (wpa->last != NULL && wpa->last->content != NULL) {
-	    gchar *content = g_strstrip ((gchar *)wpa->last->content);
-	    g_autofree gchar *bg_uri = NULL;
-
-	    /* FIXME same rubbish as in other parts of the code */
-	    if (strcmp (content, NONE) == 0) {
-	      bg_uri = NULL;
-	    } else {
-	      g_autoptr(GFile) file = NULL;
-	      g_autofree gchar *dirname = NULL;
-
-	      dirname = g_path_get_dirname (filename);
-	      file = g_file_new_for_commandline_arg_and_cwd (content, dirname);
-	      bg_uri = g_file_get_uri (file);
-	    }
-	    SET_FLAG(CC_BACKGROUND_ITEM_HAS_URI);
-	    g_object_set (G_OBJECT (item), "uri", bg_uri, NULL);
-	  } else {
-	    break;
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "filename-dark")) {
-	  if (wpa->last != NULL && wpa->last->content != NULL) {
-	    gchar *content = g_strstrip ((gchar *)wpa->last->content);
-	    g_autofree gchar *bg_uri = NULL;
-
-	    /* FIXME same rubbish as in other parts of the code */
-	    if (strcmp (content, NONE) == 0) {
-	      bg_uri = NULL;
-	    } else {
-	      g_autoptr(GFile) file = NULL;
-	      g_autofree gchar *dirname = NULL;
-
-	      dirname = g_path_get_dirname (filename);
-	      file = g_file_new_for_commandline_arg_and_cwd (content, dirname);
-	      bg_uri = g_file_get_uri (file);
-	    }
-	    SET_FLAG(CC_BACKGROUND_ITEM_HAS_URI_DARK);
-	    g_object_set (G_OBJECT (item), "uri-dark", bg_uri, NULL);
-	  } else {
-	    break;
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "name")) {
-	  if (wpa->last != NULL && wpa->last->content != NULL) {
-	    g_autofree gchar *name = NULL;
-	    nodelang = xmlNodeGetLang (wpa->last);
-
-	    g_object_get (G_OBJECT (item), "name", &name, NULL);
-
-	    if (name == NULL && nodelang == NULL) {
-	       g_free (cname);
-	       cname = g_strdup (g_strstrip ((gchar *)wpa->last->content));
-	       g_object_set (G_OBJECT (item), "name", cname, NULL);
-            } else {
-	       for (i = 0; syslangs[i] != NULL; i++) {
-	         if (!strcmp (syslangs[i], (gchar *)nodelang)) {
-		   g_object_set (G_OBJECT (item), "name",
-				 g_strstrip ((gchar *)wpa->last->content), NULL);
-	           break;
-	         }
-	       }
-	    }
-
-	    xmlFree (nodelang);
-	  } else {
-	    break;
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "options")) {
-	  if (wpa->last != NULL) {
-	    g_object_set (G_OBJECT (item), "placement",
-			  enum_string_to_value (G_DESKTOP_TYPE_DESKTOP_BACKGROUND_STYLE,
-						g_strstrip ((gchar *)wpa->last->content)), NULL);
-	    SET_FLAG(CC_BACKGROUND_ITEM_HAS_PLACEMENT);
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "shade_type")) {
-	  if (wpa->last != NULL) {
-	    g_object_set (G_OBJECT (item), "shading",
-			  enum_string_to_value (G_DESKTOP_TYPE_DESKTOP_BACKGROUND_SHADING,
-						g_strstrip ((gchar *)wpa->last->content)), NULL);
-	    SET_FLAG(CC_BACKGROUND_ITEM_HAS_SHADING);
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "pcolor")) {
-	  if (wpa->last != NULL) {
-	    g_object_set (G_OBJECT (item), "primary-color",
-			  g_strstrip ((gchar *)wpa->last->content), NULL);
-	    SET_FLAG(CC_BACKGROUND_ITEM_HAS_PCOLOR);
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "scolor")) {
-	  if (wpa->last != NULL) {
-	    g_object_set (G_OBJECT (item), "secondary-color",
-			  g_strstrip ((gchar *)wpa->last->content), NULL);
-	    SET_FLAG(CC_BACKGROUND_ITEM_HAS_SCOLOR);
-	  }
-	} else if (!strcmp ((gchar *)wpa->name, "source_url")) {
-	   if (wpa->last != NULL) {
-             g_object_set (G_OBJECT (item),
-			   "source-url", g_strstrip ((gchar *)wpa->last->content),
-			   "needs-download", FALSE,
-			   NULL);
-	   }
-	} else if (!strcmp ((gchar *)wpa->name, "text")) {
-	  /* Do nothing here, libxml2 is being weird */
-	} else {
-	  g_debug ("Unknown Tag in %s: %s", filename, wpa->name);
-	}
-      }
-
-      /* Check whether the target file exists */
-      {
-        const char *uri;
-
-	uri = cc_background_item_get_uri (item);
-	if (uri != NULL)
-	  {
-            g_autoptr(GFile) file = NULL;
-
-            file = g_file_new_for_uri (uri);
-	    if (g_file_query_exists (file, NULL) == FALSE)
-	      {
-	        g_clear_pointer (&cname, g_free);
-	        g_clear_object (&item);
-	        continue;
-	      }
-	  }
-      }
-
-      /* FIXME, this is a broken way of doing,
-       * need to use proper code here */
-      uri = g_filename_to_uri (filename, NULL, NULL);
-      id = g_strdup_printf ("%s#%s", uri, cname);
-
-      /* Make sure we don't already have this one and that filename exists */
-      if (g_hash_table_lookup (xml->wp_hash, id) != NULL) {
-	continue;
-      }
-
-      g_object_set (G_OBJECT (item), "flags", flags, NULL);
-      g_hash_table_insert (xml->wp_hash,
-                           g_strdup (id),
-                           g_object_ref (item));
-      if (in_thread)
-        emit_added_in_idle (xml, g_object_ref (G_OBJECT (item)));
-      else
-        g_signal_emit (G_OBJECT (xml), signals[ADDED], 0, item);
-      retval = TRUE;
-    }
-  }
-  xmlFreeDoc (wplist);
-
-  return retval;
-}
-
-static void
-gnome_wp_file_changed (GFileMonitor *monitor,
-		       GFile *file,
-		       GFile *other_file,
-		       GFileMonitorEvent event_type,
-		       CcBackgroundXml *data)
-{
-  g_autofree gchar *filename = NULL;
-
-  switch (event_type) {
-  case G_FILE_MONITOR_EVENT_CHANGED:
-  case G_FILE_MONITOR_EVENT_CREATED:
-    filename = g_file_get_path (file);
-    cc_background_xml_load_xml_internal (data, filename, FALSE);
-    break;
-  default:
-    break;
-  }
-}
-
-static void
-cc_background_xml_add_monitor (GFile      *directory,
-			       CcBackgroundXml *data)
-{
-  GFileMonitor *monitor;
-  g_autoptr(GError) error = NULL;
-
-  monitor = g_file_monitor_directory (directory,
-                                      G_FILE_MONITOR_NONE,
-                                      NULL,
-                                      &error);
-  if (error != NULL) {
-    g_autofree gchar *path = NULL;
-
-    path = g_file_get_parse_name (directory);
-    g_warning ("Unable to monitor directory %s: %s",
-               path, error->message);
-    return;
-  }
-
-  g_signal_connect (monitor, "changed",
-                    G_CALLBACK (gnome_wp_file_changed),
-                    data);
-
-  data->monitors = g_slist_prepend (data->monitors, monitor);
-}
-
-static void
-cc_background_xml_load_from_dir (const gchar      *path,
-				 CcBackgroundXml  *data,
-				 gboolean          in_thread)
-{
-  g_autoptr(GFile) directory = NULL;
-  g_autoptr(GFileEnumerator) enumerator = NULL;
-  g_autoptr(GError) error = NULL;
-
-  if (!g_file_test (path, G_FILE_TEST_IS_DIR)) {
-    return;
-  }
-
-  directory = g_file_new_for_path (path);
-  enumerator = g_file_enumerate_children (directory,
-                                          G_FILE_ATTRIBUTE_STANDARD_NAME,
-                                          G_FILE_QUERY_INFO_NONE,
-                                          NULL,
-                                          &error);
-  if (error != NULL) {
-    g_warning ("Unable to check directory %s: %s", path, error->message);
-    return;
-  }
-
-  while (TRUE) {
-    g_autoptr(GFileInfo) info = NULL;
-    const gchar *filename;
-    g_autofree gchar *fullpath = NULL;
-
-    info = g_file_enumerator_next_file (enumerator, NULL, NULL);
-    if (info == NULL) {
-        g_file_enumerator_close (enumerator, NULL, NULL);
-        cc_background_xml_add_monitor (directory, data);
-        return;
-    }
-
-    filename = g_file_info_get_name (info);
-    fullpath = g_build_filename (path, filename, NULL);
-
-    cc_background_xml_load_xml_internal (data, fullpath, in_thread);
-  }
-}
-
-static void
-cc_background_xml_load_list (CcBackgroundXml *data,
-			     gboolean         in_thread)
-{
-  const char * const *system_data_dirs;
-  g_autofree gchar *datadir = NULL;
-  gint i;
-
-  datadir = g_build_filename (g_get_user_data_dir (),
-                              "gnome-background-properties",
-                              NULL);
-  cc_background_xml_load_from_dir (datadir, data, in_thread);
-
-  system_data_dirs = g_get_system_data_dirs ();
-  for (i = 0; system_data_dirs[i]; i++) {
-    g_autofree gchar *sdatadir = NULL;
-    sdatadir = g_build_filename (system_data_dirs[i],
-                                "gnome-background-properties",
-				NULL);
-    cc_background_xml_load_from_dir (sdatadir, data, in_thread);
-  }
-}
-
-gboolean
-cc_background_xml_load_list_finish (CcBackgroundXml *xml,
-				    GAsyncResult    *result,
-				    GError         **error)
-{
-	g_return_val_if_fail (g_task_is_valid (result, xml), FALSE);
-	g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-	return g_task_propagate_boolean (G_TASK (result), error);
-}
-
-static void
-load_list_thread (GTask *task,
-		  gpointer source_object,
-		  gpointer task_data,
-		  GCancellable *cancellable)
-{
-	CcBackgroundXml *xml = CC_BACKGROUND_XML (source_object);
-	cc_background_xml_load_list (xml, TRUE);
-	g_task_return_boolean (task, TRUE);
-}
-
-void
-cc_background_xml_load_list_async (CcBackgroundXml *xml,
-				   GCancellable *cancellable,
-				   GAsyncReadyCallback callback,
-				   gpointer user_data)
-{
-	g_autoptr(GTask) task = NULL;
-
-	g_return_if_fail (CC_IS_BACKGROUND_XML (xml));
-
-	task = g_task_new (xml, cancellable, callback, user_data);
-	g_task_run_in_thread (task, load_list_thread);
-}
-
-gboolean
-cc_background_xml_load_xml (CcBackgroundXml *xml,
-			    const gchar     *filename)
-{
-	g_return_val_if_fail (CC_IS_BACKGROUND_XML (xml), FALSE);
-
-	if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) == FALSE)
-		return FALSE;
-
-	return cc_background_xml_load_xml_internal (xml, filename, FALSE);
-}
-
-static void
-single_xml_added (CcBackgroundXml   *xml,
-		  CcBackgroundItem  *item,
-		  CcBackgroundItem **ret)
-{
-	g_assert (*ret == NULL);
-	*ret = g_object_ref (item);
-}
-
-CcBackgroundItem *
-cc_background_xml_get_item (const char *filename)
-{
-	g_autoptr(CcBackgroundXml) xml = NULL;
-	CcBackgroundItem *item = NULL;
-
-	if (g_file_test (filename, G_FILE_TEST_IS_REGULAR) == FALSE)
-		return NULL;
-
-	xml = cc_background_xml_new ();
-	g_signal_connect (G_OBJECT (xml), "added",
-			  G_CALLBACK (single_xml_added), &item);
-	if (cc_background_xml_load_xml (xml, filename) == FALSE)
-		return NULL;
-
-	return item;
-}
-
-static const char *
-enum_to_str (GType type,
-	     int   v)
-{
-	GEnumClass *eclass;
-	GEnumValue *value;
-
-	eclass = G_ENUM_CLASS (g_type_class_peek (type));
-	value = g_enum_get_value (eclass, v);
-
-	g_assert (value);
-
-	return value->value_nick;
-}
-
-void
-cc_background_xml_save (CcBackgroundItem *item,
-			const char       *filename)
-{
-  xmlDoc *wp;
-  xmlNode *root, *wallpaper;
-  xmlNode *xml_item G_GNUC_UNUSED;
-  const char * none = "(none)";
-  const char *placement_str, *shading_str;
-  g_autofree gchar *name = NULL;
-  g_autofree gchar *pcolor = NULL;
-  g_autofree gchar *scolor = NULL;
-  g_autofree gchar *uri = NULL;
-  g_autofree gchar *source_url = NULL;
-  CcBackgroundItemFlags flags;
-  GDesktopBackgroundStyle placement;
-  GDesktopBackgroundShading shading;
-
-  xmlKeepBlanksDefault (0);
-
-  wp = xmlNewDoc ((xmlChar *)"1.0");
-  xmlCreateIntSubset (wp, (xmlChar *)"wallpapers", NULL, (xmlChar *)"gnome-wp-list.dtd");
-  root = xmlNewNode (NULL, (xmlChar *)"wallpapers");
-  xmlDocSetRootElement (wp, root);
-
-  g_object_get (G_OBJECT (item),
-		"name", &name,
-		"uri", &uri,
-		"shading", &shading,
-		"placement", &placement,
-		"primary-color", &pcolor,
-		"secondary-color", &scolor,
-		"source-url", &source_url,
-		"flags", &flags,
-		NULL);
-
-  placement_str = enum_to_str (G_DESKTOP_TYPE_DESKTOP_BACKGROUND_STYLE, placement);
-  shading_str = enum_to_str (G_DESKTOP_TYPE_DESKTOP_BACKGROUND_SHADING, shading);
-
-  wallpaper = xmlNewChild (root, NULL, (xmlChar *)"wallpaper", NULL);
-  xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"name", (xmlChar *)name);
-  if (flags & CC_BACKGROUND_ITEM_HAS_URI &&
-      uri != NULL)
-    {
-      g_autoptr(GFile) file = NULL;
-      g_autofree gchar *fname = NULL;
-
-      file = g_file_new_for_commandline_arg (uri);
-      fname = g_file_get_path (file);
-      xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"filename", (xmlChar *)fname);
-    }
-  else if (flags & CC_BACKGROUND_ITEM_HAS_URI)
-    {
-      xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"filename", (xmlChar *)none);
-    }
-
-  if (flags & CC_BACKGROUND_ITEM_HAS_PLACEMENT)
-    xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"options", (xmlChar *)placement_str);
-  if (flags & CC_BACKGROUND_ITEM_HAS_SHADING)
-    xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"shade_type", (xmlChar *)shading_str);
-  if (flags & CC_BACKGROUND_ITEM_HAS_PCOLOR)
-    xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"pcolor", (xmlChar *)pcolor);
-  if (flags & CC_BACKGROUND_ITEM_HAS_SCOLOR)
-    xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"scolor", (xmlChar *)scolor);
-  if (source_url != NULL)
-    xml_item = xmlNewTextChild (wallpaper, NULL, (xmlChar *)"source_url", (xmlChar *)source_url);
-
-  xmlSaveFormatFile (filename, wp, 1);
-  xmlFreeDoc (wp);
-}
-
-static void
-cc_background_xml_finalize (GObject *object)
-{
-        CcBackgroundXml *xml;
-
-        g_return_if_fail (object != NULL);
-        g_return_if_fail (CC_IS_BACKGROUND_XML (object));
-
-        xml = CC_BACKGROUND_XML (object);
-
-        g_slist_free_full (xml->monitors, g_object_unref);
-
-	g_clear_pointer (&xml->wp_hash, g_hash_table_destroy);
-	if (xml->item_added_id != 0) {
-		g_source_remove (xml->item_added_id);
-		xml->item_added_id = 0;
-	}
-	g_clear_pointer (&xml->item_added_queue, g_async_queue_unref);
-
-        G_OBJECT_CLASS (cc_background_xml_parent_class)->finalize (object);
-}
-
-static void
-cc_background_xml_class_init (CcBackgroundXmlClass *klass)
-{
-        GObjectClass  *object_class = G_OBJECT_CLASS (klass);
-
-        object_class->finalize = cc_background_xml_finalize;
-
-	signals[ADDED] = g_signal_new ("added",
-				       G_OBJECT_CLASS_TYPE (object_class),
-				       G_SIGNAL_RUN_LAST,
-				       0,
-				       NULL, NULL,
-				       g_cclosure_marshal_VOID__OBJECT,
-				       G_TYPE_NONE, 1, CC_TYPE_BACKGROUND_ITEM);
-}
-
-static void
-cc_background_xml_init (CcBackgroundXml *xml)
-{
-        xml->wp_hash = g_hash_table_new_full (g_str_hash,
-                                              g_str_equal,
-                                              (GDestroyNotify) g_free,
-                                              (GDestroyNotify) g_object_unref);
-	xml->item_added_queue = g_async_queue_new_full ((GDestroyNotify) g_object_unref);
-}
-
-CcBackgroundXml *
-cc_background_xml_new (void)
-{
-	return CC_BACKGROUND_XML (g_object_new (CC_TYPE_BACKGROUND_XML, NULL));
-}
--- a/panels/background/cc-background-xml.h
+++ b/panels/background/cc-background-xml.h
@@ -1,46 +0,0 @@
-/*
- *  Authors: Rodney Dawes <dobey@ximian.com>
- *
- *  Copyright 2003-2012 Novell, Inc. (www.novell.com)
- *
- * 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 2 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/>.
- */
-
-#pragma once
-
-#include <gtk/gtk.h>
-#include <gio/gio.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BACKGROUND_XML (cc_background_xml_get_type ())
-G_DECLARE_FINAL_TYPE (CcBackgroundXml, cc_background_xml, CC, BACKGROUND_XML, GObject)
-
-CcBackgroundXml *cc_background_xml_new (void);
-
-void cc_background_xml_save                          (CcBackgroundItem   *item,
-						      const char         *filename);
-
-CcBackgroundItem *cc_background_xml_get_item         (const char         *filename);
-gboolean cc_background_xml_load_xml                  (CcBackgroundXml    *data,
-						      const char         *filename);
-void cc_background_xml_load_list_async               (CcBackgroundXml    *xml,
-						      GCancellable       *cancellable,
-						      GAsyncReadyCallback callback,
-						      gpointer            user_data);
-gboolean cc_background_xml_load_list_finish          (CcBackgroundXml    *xml,
-						      GAsyncResult       *result,
-						      GError            **error);
-
-G_END_DECLS
--- a/panels/background/gnome-background-panel.desktop.in.in
+++ b/panels/background/gnome-background-panel.desktop.in.in
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=Appearance
-Comment=Change your background image or the UI colors
-Exec=gnome-control-center background
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-appearance-symbolic
-Terminal=false
-Type=Application
-NoDisplay=true
-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;
--- a/panels/background/icons/meson.build
+++ b/panels/background/icons/meson.build
@@ -1,4 +0,0 @@
-install_data(
-  'scalable/org.gnome.Settings-appearance-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
-)
--- a/panels/background/icons/scalable/org.gnome.Settings-appearance-symbolic.svg
+++ b/panels/background/icons/scalable/org.gnome.Settings-appearance-symbolic.svg
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg height="16px" viewBox="0 0 16 16" width="16px" xmlns="http://www.w3.org/2000/svg">
-    <g fill="#2e3436">
-        <path d="m 3.011719 1 c -1.644531 0 -3.0000002 1.355469 -3.0000002 3 v 6 c 0 1.644531 1.3554692 3 3.0000002 3 h 10 c 1.644531 0 3 -1.355469 3 -3 v -6 c 0 -0.570312 -0.167969 -1.101562 -0.449219 -1.558594 l -1.550781 1.554688 v 6.003906 c 0 0.570312 -0.429688 1 -1 1 h -10 c -0.570313 0 -1 -0.429688 -1 -1 v -6 c 0 -0.570312 0.429687 -1 1 -1 h 5.96875 l 2.007812 -2 z m 0 0"/>
-        <path d="m 11.011719 7 c 0 1.65625 -1.339844 3.007812 -3 3 h -3 v -3 c 0 -1.660156 1.34375 -3 3 -3 c 1.660156 0 3 1.339844 3 3 z m 0 0"/>
-        <path d="m 13.410156 0 l -3.46875 3.457031 c 0.683594 0.355469 1.234375 0.910157 1.589844 1.589844 l 0.171875 -0.171875 l 0.007813 0.007812 l 4.300781 -4.300781 v -0.582031 z m 0 0"/>
-        <path d="m 5.011719 14 c -1.105469 0 -2 0.894531 -2 2 h 10 c 0 -1.105469 -0.894531 -2 -2 -2 z m 0 0"/>
-    </g>
-</svg>
--- a/panels/background/meson.build
+++ b/panels/background/meson.build
@@ -1,99 +0,0 @@
-panels_list += cappletname
-desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
-
-desktop_in = configure_file(
-  input: desktop + '.in.in',
-  output: desktop + '.in',
-  configuration: desktop_conf
-)
-
-i18n.merge_file(
-  type: 'desktop',
-  input: desktop_in,
-  output: desktop,
-  po_dir: po_dir,
-  install: true,
-  install_dir: control_center_desktopdir
-)
-
-install_data(
-  'noise-texture-light.png',
-  install_dir: join_paths(control_center_pkgdatadir, 'pixmaps')
-)
-
-common_sources = []
-
-enums = 'gdesktop-enums-types'
-enums_header = files(
-  gsettings_desktop_dep.get_pkgconfig_variable('prefix') + '/include/gsettings-desktop-schemas/gdesktop-enums.h',
-  'cc-background-item.h'
-)
-
-common_sources += gnome.mkenums(
-  enums + '.h',
-  sources: enums_header,
-  fhead: '#pragma once\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n',
-  fprod: '/* enumerations from "@filename@" */\n',
-  vhead: 'GType @enum_name@_get_type (void) G_GNUC_CONST;\n#define G_DESKTOP_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n',
-  ftail: 'G_END_DECLS\n'
-)
-
-common_sources += gnome.mkenums(
-  enums + '.c',
-  sources: enums_header,
-  fhead: '#include <gdesktop-enums.h>\n#include "gdesktop-enums-types.h"\n#include "cc-background-item.h"',
-  fprod: '\n/* enumerations from "@filename@" */',
-  vhead: 'GType\n@enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G@Type@Value values[] = {',
-  vprod: '      { @VALUENAME@, "@VALUENAME@", "@valuenick@" },',
-  vtail: '      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static ("@EnumName@", values);\n  }\n  return etype;\n}\n'
-)
-
-resource_data = files(
-  'cc-background-chooser.ui',
-  'cc-background-panel.ui',
-  'cc-background-preview.ui',
-  'preview.css',
-)
-
-common_sources += gnome.compile_resources(
-  'cc-@0@-resources'.format(cappletname),
-  cappletname + '.gresource.xml',
-  c_name: 'cc_' + cappletname,
-  dependencies: resource_data,
-  export: true
-)
-
-sources = common_sources + files(
-  'bg-colors-source.c',
-  'bg-recent-source.c',
-  'bg-source.c',
-  'bg-wallpapers-source.c',
-  'cc-background-chooser.c',
-  'cc-background-item.c',
-  'cc-background-paintable.c',
-  'cc-background-panel.c',
-  'cc-background-preview.c',
-  'cc-background-xml.c',
-)
-
-deps = common_deps + [
-  gdk_pixbuf_dep,
-  gnome_bg_dep,
-  libxml_dep,
-  dependency('cairo-gobject'),
-]
-
-cflags += [
-  '-DDATADIR="@0@"'.format(control_center_datadir),
-  '-DGNOME_DESKTOP_USE_UNSTABLE_API'
-]
-
-panels_libs += static_library(
-  cappletname,
-  sources: sources,
-  include_directories: top_inc,
-  dependencies: deps,
-  c_args: cflags,
-)
-
-subdir('icons')
--- a/panels/background/noise-texture-light.png
+++ b/panels/background/noise-texture-light.png
--- a/panels/background/preview.css
+++ b/panels/background/preview.css
@@ -1,89 +0,0 @@
-background-preview {
-  border-radius: 6px;
-}
-
-background-preview .window {
-  border-radius: 6px;
-  box-shadow: 0 1px 4px 1px alpha(black, 0.13),
-              0 1px 10px 5px alpha(black, 0.09),
-              0 3px 16px 8px alpha(black, 0.04),
-              0 0 0 1px alpha(black, .05);
-}
-
-background-preview .window .header-bar {
-  min-height: 15px;
-  box-shadow: inset 0 -1px @borders;
-}
-
-background-preview .window.light {
-  background-color: #fafafa;
-  color: alpha(black, .8);
-}
-
-background-preview .window.front.light .header-bar {
-  background-color: #ebebeb;
-}
-
-background-preview .window.dark {
-  background-color: #242424;
-  color: white;
-}
-
-background-preview .window.front.dark .header-bar {
-  background-color: #303030;
-}
-
-.background-preview-button {
-  background: none;
-  border-radius: 9px;
-  padding: 3px;
-  box-shadow: none;
-  outline: none;
-}
-
-.background-preview-button:checked {
-  box-shadow: 0 0 0 3px @accent_color;
-}
-
-.background-preview-button:focus:focus-visible {
-  box-shadow: 0 0 0 3px alpha(@accent_color, .3);
-}
-
-.background-preview-button:checked:focus:focus-visible {
-  box-shadow: 0 0 0 3px @accent_color, 0 0 0 6px alpha(@accent_color, .3);
-}
-
-.background-flowbox > flowboxchild {
-  background: none;
-  border-radius: 9px;
-}
-
-.background-thumbnail {
-  border-radius: 6px;
-}
-
-.slideshow-icon {
-  color: white;
-  -gtk-icon-shadow: 0 1px 2px rgba(0, 0, 0, 0.33);
-  margin: 8px;
-}
-
-.selected-check {
-  color: @accent_fg_color;
-  background: @accent_bg_color;
-  border-radius: 100px;
-  padding: 2px;
-  opacity: 0;
-  margin: 6px;
-}
-
-flowboxchild:selected .selected-check {
-  opacity: 1;
-}
-
-.remove-button {
-  padding: 2px;
-  min-width: 0;
-  min-height: 0;
-  margin: 6px;
-}
--- a/panels/background/slideshow-symbolic.svg
+++ b/panels/background/slideshow-symbolic.svg
@@ -1 +0,0 @@
-<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M7.486.02A7.492 7.492 0 0 0 0 7.508a7.492 7.492 0 0 0 7.486 7.484 7.492 7.492 0 0 0 7.487-7.484A7.492 7.492 0 0 0 7.486.02zm0 1.972A5.508 5.508 0 0 1 13 7.508a5.508 5.508 0 0 1-5.514 5.512 5.508 5.508 0 0 1-5.513-5.512 5.508 5.508 0 0 1 5.513-5.516zm3.01 2.01a.5.5 0 0 0-.103.006.5.5 0 0 0-.25.154L7.486 6.818 5.83 5.162a.5.5 0 1 0-.687.688l2 2a.5.5 0 0 0 .687 0l3-3a.5.5 0 0 0-.334-.848z" style="fill:#000"/></svg>
--- a/panels/bluetooth/bluetooth-panel-scenario-tester.py
+++ b/panels/bluetooth/bluetooth-panel-scenario-tester.py
@@ -1,226 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright (C) 2021 Red Hat Inc.
-#
-# Author: Bastien Nocera <hadess@hadess.net>
-#
-# SPDX-License-Identifier: GPL-2.0-or-later
-
-import dbus
-import sys
-import os
-import fcntl
-import gi
-import subprocess
-import time
-from collections import OrderedDict
-from dbusmock import DBusTestCase, mockobject
-from dbus.mainloop.glib import DBusGMainLoop
-from consolemenu import *
-from consolemenu.items import *
-
-from gi.repository import Gio
-from gi.repository import GLib
-
-DBusGMainLoop(set_as_default=True)
-
-
-def set_nonblock(fd):
-    '''Set a file object to non-blocking'''
-    flags = fcntl.fcntl(fd, fcntl.F_GETFL)
-    fcntl.fcntl(fd, fcntl.F_SETFL, flags | os.O_NONBLOCK)
-
-def get_templates_dir():
-    return os.path.join(os.path.dirname(__file__), 'dbusmock-templates')
-
-def get_template_path(template_name):
-    return os.path.join(get_templates_dir(), template_name + '.py')
-
-class GccDBusTestCase(DBusTestCase):
-    @classmethod
-    def setUpClass(klass):
-        klass.mocks = OrderedDict()
-
-        # Start system bus
-        DBusTestCase.setUpClass()
-        klass.test_bus = Gio.TestDBus.new(Gio.TestDBusFlags.NONE)
-        klass.test_bus.up()
-        os.environ['DBUS_SYSTEM_BUS_ADDRESS'] = klass.test_bus.get_bus_address()
-
-        # Start session bus
-        klass.session_test_bus = Gio.TestDBus.new(Gio.TestDBusFlags.NONE)
-        klass.session_test_bus.up()
-        os.environ['DBUS_SESSION_BUS_ADDRESS'] = klass.session_test_bus.get_bus_address()
-
-        # process = subprocess.Popen(['gdbus', 'monitor', '--session', '--dest', 'org.gnome.SettingsDaemon.Rfkill'])
-        # process = subprocess.Popen(['gdbus', 'monitor', '--system', '--dest', 'org.bluez'])
-
-        # Start bluez and gsd-rfkill
-        klass.start_from_template('bluez5')
-        klass.start_from_local_template(
-            'gsd_rfkill', {'templates-dir': get_templates_dir()})
-
-        klass.system_bus = Gio.bus_get_sync(Gio.BusType.SYSTEM, None)
-
-    @classmethod
-    def tearDownClass(klass):
-        for (mock_server, mock_obj) in reversed(klass.mocks.values()):
-            mock_server.terminate()
-            mock_server.wait()
-
-        DBusTestCase.tearDownClass()
-
-    @classmethod
-    def start_from_template(klass, template, params={}):
-        mock_server, mock_obj = \
-            klass.spawn_server_template(template,
-                                        params,
-                                        stdout=subprocess.PIPE)
-        set_nonblock(mock_server.stdout)
-
-        mocks = (mock_server, mock_obj)
-        assert klass.mocks.setdefault(template, mocks) == mocks
-        return mocks
-
-    @classmethod
-    def start_from_local_template(klass, template_file_name, params={}):
-        template = get_template_path(template_file_name)
-        ret = klass.start_from_template(template, params)
-        klass.mocks.setdefault(template_file_name, ret)
-        return ret
-
-    def __init__(self):
-        self.devices = {}
-        self.rfkill = self.mocks['gsd_rfkill'][1]
-
-        self.bluez_mock = self.mocks['bluez5'][1]
-        self.hci0_powered = True
-        self.hci0_plugged_in = True
-        self.add_adapter()
-        bus = dbus.SystemBus()
-        self.hci0_props = dbus.Interface(bus.get_object('org.bluez', '/org/bluez/hci0'), 'org.freedesktop.DBus.Properties')
-
-    def adapter_exists(self):
-        try:
-            self.get_dbus(True).get_object('org.bluez', '/org/bluez/hci0').Get('org.bluez.Adapter1', 'Name')
-        except:
-            return False
-        return True
-
-    def add_adapter(self):
-        if self.adapter_exists():
-            return
-        self.bluez_mock.AddAdapter('hci0', 'hci0')
-        adapter = self.get_dbus(True).get_object('org.bluez', '/org/bluez/hci0')
-        adapter.AddProperties('org.bluez.Adapter1',
-                {'Blocked': dbus.Boolean(not self.hci0_powered, variant_level=1)})
-        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', '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')
-        self.add_device('hci0', '22:33:44:55:66:80', 'Ski-bi dibby dib yo da dub dub Yo da dub dub Ski-bi dibby dib yo da dub dub Yo da dub dub (I\'m the Scatman) Ski-bi dibby dib yo da dub dub Yo da dub dub Ski-bi dibby dib yo da dub dub Yo da dub dub Ba-da-ba-da-ba-be bop bop bodda bope Bop ba bodda bope Be bop ba bodda bope Bop ba bodda Ba-da-ba-da-ba-be bop ba bodda bope Bop ba bodda bope Be bop ba bodda bope Bop ba bodda bope', True, 0x80C, '')
-        self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'BluetoothHasAirplaneMode', dbus.Boolean(True))
-
-    def remove_adapter(self):
-        if not self.adapter_exists():
-            return
-        for dev in self.devices:
-            adapter = self.get_dbus(True).get_object('org.bluez', '/org/bluez/hci0')
-            adapter.RemoveDevice(dev)
-        self.devices = []
-        self.bluez_mock.RemoveAdapter('hci0')
-        if self.rfkill.Get('org.gnome.SettingsDaemon.Rfkill', 'BluetoothHardwareAirplaneMode') == 0:
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'BluetoothHasAirplaneMode', dbus.Boolean(False))
-
-    def add_device(self, adapter, address, name, paired, klass, icon):
-        dev_path = self.bluez_mock.AddDevice(adapter, address, name)
-        dev = self.get_dbus(True).get_object('org.bluez', str(dev_path))
-        dev.UpdateProperties('org.bluez.Device1',
-                {'Paired': dbus.Boolean(paired, variant_level=1),
-                 'Class': dbus.UInt32(klass, variant_level=1),
-                 'Icon': dbus.String(icon, variant_level=1)})
-        self.devices.append(dev)
-
-    def get_rfkill_prop(self, prop_name):
-        return self.rfkill.Get('org.gnome.SettingsDaemon.Rfkill', prop_name)
-
-    def toggle_hw_rfkill(self):
-        if self.rfkill.Get('org.gnome.SettingsDaemon.Rfkill', 'BluetoothHardwareAirplaneMode') == 0:
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'BluetoothHardwareAirplaneMode', dbus.Boolean(True))
-            if self.adapter_exists():
-                self.remove_adapter()
-        else:
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'BluetoothHardwareAirplaneMode', dbus.Boolean(False))
-            if not self.adapter_exists():
-                self.add_adapter()
-
-    def set_unpowered(self):
-        if self.hci0_powered:
-            print('hci0 will now default to unpowered')
-            self.hci0_powered = False
-        else:
-            print('hci0 will now default to powered')
-            self.hci0_powered = True
-
-    def unplug_default_adapter(self):
-        if self.hci0_plugged_in:
-            print('default adapter is unplugged')
-            self.hci0_plugged_in = False
-            self.remove_adapter()
-        else:
-            print('default adapter is plugged in')
-            self.hci0_plugged_in = True
-            self.add_adapter()
-
-    def toggle_airplane_mode(self):
-        if self.rfkill.Get('org.gnome.SettingsDaemon.Rfkill', 'AirplaneMode') == 0:
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'AirplaneMode', dbus.Boolean(True))
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'BluetoothAirplaneMode', dbus.Boolean(True))
-        else:
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'AirplaneMode', dbus.Boolean(False))
-            self.rfkill.Set('org.gnome.SettingsDaemon.Rfkill', 'BluetoothAirplaneMode', dbus.Boolean(False))
-
-    def start_menu(self):
-        menu = ConsoleMenu("Bluetooth Panel", "Scenario Tester", clear_screen = False)
-        function_item = FunctionItem("Toggle Bluetooth hardware rfkill", self.toggle_hw_rfkill)
-        menu.append_item(function_item)
-
-        function_item = FunctionItem("Toggle default adapter unpowered", self.set_unpowered)
-        menu.append_item(function_item)
-
-        function_item = FunctionItem("Unplug/plug default adapter", self.unplug_default_adapter)
-        menu.append_item(function_item)
-
-        function_item = FunctionItem("Toggle airplane mode", self.toggle_airplane_mode)
-        menu.append_item(function_item)
-
-        menu.start(show_exit_option=False)
-
-    def wrap_call(self):
-        os.environ['GSETTINGS_BACKEND'] = 'memory'
-
-        wrapper = os.environ.get('META_DBUS_RUNNER_WRAPPER')
-        args = ['gnome-control-center', '-v', 'bluetooth']
-        if wrapper == 'gdb':
-            args = ['gdb', '-ex', 'r', '-ex', 'bt full', '--args'] + args
-        elif wrapper:
-            args = wrapper.split(' ') + args
-
-        p = subprocess.Popen(args, env=os.environ)
-        p.wait()
-
-if __name__ == '__main__':
-    #if 'umockdev' not in os.environ.get('LD_PRELOAD', ''):
-    #    os.execvp('umockdev-wrapper', ['umockdev-wrapper'] + sys.argv)
-
-    GccDBusTestCase.setUpClass()
-    test_case = GccDBusTestCase()
-    test_case.start_menu()
-    try:
-        test_case.wrap_call()
-    finally:
-        GccDBusTestCase.tearDownClass()
--- a/panels/bluetooth/bluetooth.gresource.xml
+++ b/panels/bluetooth/bluetooth.gresource.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<gresources>
-  <gresource prefix="/org/gnome/control-center/bluetooth">
-    <file preprocess="xml-stripblanks">cc-bluetooth-panel.ui</file>
-  </gresource>
-</gresources>
--- a/panels/bluetooth/cc-bluetooth-panel.c
+++ b/panels/bluetooth/cc-bluetooth-panel.c
@@ -1,269 +0,0 @@
-/*
- *
- *  Copyright (C) 2013  Bastien Nocera <hadess@hadess.net>
- *
- *  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 2 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
-
-#include <adwaita.h>
-
-#include <shell/cc-shell.h>
-#include <shell/cc-object-storage.h>
-#include <bluetooth-settings-widget.h>
-
-#include "cc-bluetooth-panel.h"
-#include "cc-bluetooth-resources.h"
-
-struct _CcBluetoothPanel {
-	CcPanel                  parent_instance;
-
-	AdwStatusPage           *airplane_page;
-	AdwStatusPage           *disabled_page;
-	GtkSwitch               *enable_switch;
-	GtkBox                  *header_box;
-	AdwStatusPage           *hw_airplane_page;
-	AdwStatusPage           *no_devices_page;
-	BluetoothSettingsWidget *settings_widget;
-	GtkStack                *stack;
-
-	/* Killswitch */
-	GDBusProxy              *rfkill;
-	GDBusProxy              *properties;
-	gboolean                 airplane_mode;
-	gboolean                 bt_airplane_mode;
-	gboolean                 hardware_airplane_mode;
-	gboolean                 has_airplane_mode;
-};
-
-CC_PANEL_REGISTER (CcBluetoothPanel, cc_bluetooth_panel)
-
-static const char *
-cc_bluetooth_panel_get_help_uri (CcPanel *panel)
-{
-	return "help:gnome-help/bluetooth";
-}
-
-static void
-cc_bluetooth_panel_finalize (GObject *object)
-{
-	CcBluetoothPanel *self;
-
-	self = CC_BLUETOOTH_PANEL (object);
-
-	g_clear_object (&self->properties);
-	g_clear_object (&self->rfkill);
-
-	G_OBJECT_CLASS (cc_bluetooth_panel_parent_class)->finalize (object);
-}
-
-static void
-airplane_mode_changed_cb (GObject *source_object,
-			  GAsyncResult *res,
-			  gpointer user_data)
-{
-	g_autoptr(GVariant) ret = NULL;
-	g_autoptr(GError) error = NULL;
-	gboolean state = GPOINTER_TO_UINT (user_data);
-
-	if (!g_dbus_proxy_call_finish (G_DBUS_PROXY (source_object),
-				       res, &error)) {
-		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-			g_warning ("Failed to change Bluetooth killswitch state to %s: %s",
-				   state ? "on" : "off", error->message);
-	} else {
-		CcBluetoothPanel *self = user_data;
-
-		g_debug ("Changed Bluetooth killswitch state to %s",
-			 state ? "on" : "off");
-
-		if (!bluetooth_settings_widget_get_default_adapter_powered (self->settings_widget))
-			bluetooth_settings_widget_set_default_adapter_powered(self->settings_widget, TRUE);
-	}
-}
-
-static void
-enable_switch_state_set_cb (CcBluetoothPanel *self, gboolean state)
-{
-	g_debug ("Power switched to %s", state ? "on" : "off");
-	g_dbus_proxy_call (self->properties,
-			   "Set",
-			   g_variant_new_parsed ("('org.gnome.SettingsDaemon.Rfkill', 'BluetoothAirplaneMode', %v)",
-						 g_variant_new_boolean (!state)),
-			   G_DBUS_CALL_FLAGS_NONE,
-			   -1,
-			   cc_panel_get_cancellable (CC_PANEL (self)),
-			   airplane_mode_changed_cb, self);
-}
-
-static void
-adapter_status_changed_cb (CcBluetoothPanel *self)
-{
-	GtkAlign valign;
-	gboolean sensitive, powered;
-	GtkWidget *page;
-
-	g_debug ("Updating airplane mode: BluetoothHasAirplaneMode %d, BluetoothHardwareAirplaneMode %d, BluetoothAirplaneMode %d, AirplaneMode %d",
-		 self->has_airplane_mode, self->hardware_airplane_mode, self->bt_airplane_mode, self->airplane_mode);
-
-	valign = GTK_ALIGN_CENTER;
-
-	if (self->has_airplane_mode == FALSE) {
-		g_debug ("No Bluetooth available");
-		sensitive = FALSE;
-		powered = FALSE;
-		page = GTK_WIDGET (self->no_devices_page);
-	} else if (self->hardware_airplane_mode) {
-		g_debug ("Bluetooth is Hard blocked");
-		sensitive = FALSE;
-		powered = FALSE;
-		page = GTK_WIDGET (self->hw_airplane_page);
-	} else if (self->airplane_mode) {
-		g_debug ("Airplane mode is on, Wi-Fi and Bluetooth are disabled");
-		sensitive = FALSE;
-		powered = FALSE;
-		page = GTK_WIDGET (self->airplane_page);
-	} else if (self->bt_airplane_mode ||
-		   !bluetooth_settings_widget_get_default_adapter_powered (self->settings_widget)) {
-		g_debug ("Default adapter is unpowered");
-		sensitive = TRUE;
-		powered = FALSE;
-		page = GTK_WIDGET (self->disabled_page);
-	} else {
-		g_debug ("Bluetooth is available and powered");
-		sensitive = TRUE;
-		powered = TRUE;
-		page = GTK_WIDGET (self->settings_widget);
-		valign = GTK_ALIGN_FILL;
-	}
-
-	gtk_widget_set_valign (GTK_WIDGET (self->stack), valign);
-	gtk_widget_set_sensitive (GTK_WIDGET (self->header_box), sensitive);
-	g_signal_handlers_block_by_func (self->enable_switch, enable_switch_state_set_cb, self);
-	gtk_switch_set_state (self->enable_switch, powered);
-	g_signal_handlers_unblock_by_func (self->enable_switch, enable_switch_state_set_cb, self);
-
-	gtk_stack_set_visible_child (self->stack, page);
-}
-
-static void
-airplane_mode_changed (CcBluetoothPanel *self)
-{
-	g_autoptr(GVariant) airplane_mode = NULL;
-	g_autoptr(GVariant) bluetooth_airplane_mode = NULL;
-	g_autoptr(GVariant) bluetooth_hardware_airplane_mode = NULL;
-	g_autoptr(GVariant) bluetooth_has_airplane_mode = NULL;
-
-	airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "AirplaneMode");
-	self->airplane_mode = g_variant_get_boolean (airplane_mode);
-
-	bluetooth_airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothAirplaneMode");
-	self->bt_airplane_mode = g_variant_get_boolean (bluetooth_airplane_mode);
-
-	bluetooth_hardware_airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothHardwareAirplaneMode");
-	g_message ("BluetoothHardwareAirplaneMode: %d", self->hardware_airplane_mode);
-	self->hardware_airplane_mode = g_variant_get_boolean (bluetooth_hardware_airplane_mode);
-
-	bluetooth_has_airplane_mode = g_dbus_proxy_get_cached_property (self->rfkill, "BluetoothHasAirplaneMode");
-	self->has_airplane_mode = g_variant_get_boolean (bluetooth_has_airplane_mode);
-
-	adapter_status_changed_cb (self);
-}
-
-static void
-airplane_mode_off_button_clicked_cb (CcBluetoothPanel *self)
-{
-	g_debug ("Airplane Mode Off clicked, disabling airplane mode");
-	g_dbus_proxy_call (self->rfkill,
-			   "org.freedesktop.DBus.Properties.Set",
-			   g_variant_new_parsed ("('org.gnome.SettingsDaemon.Rfkill',"
-						 "'AirplaneMode', %v)",
-						 g_variant_new_boolean (FALSE)),
-			   G_DBUS_CALL_FLAGS_NONE,
-			   -1,
-			   cc_panel_get_cancellable (CC_PANEL (self)),
-			   NULL, NULL);
-}
-
-static void
-panel_changed_cb (CcBluetoothPanel *self,
-                  const char       *panel)
-{
-	CcShell *shell;
-	g_autoptr(GError) error = NULL;
-
-	shell = cc_panel_get_shell (CC_PANEL (self));
-	if (cc_shell_set_active_panel_from_id (shell, panel, NULL, &error) == FALSE)
-		g_warning ("Failed to activate '%s' panel: %s", panel, error->message);
-}
-
-static void
-cc_bluetooth_panel_class_init (CcBluetoothPanelClass *klass)
-{
-	GObjectClass *object_class = G_OBJECT_CLASS (klass);
-	GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-	CcPanelClass *panel_class = CC_PANEL_CLASS (klass);
-
-	object_class->finalize = cc_bluetooth_panel_finalize;
-
-	panel_class->get_help_uri = cc_bluetooth_panel_get_help_uri;
-
-	gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/bluetooth/cc-bluetooth-panel.ui");
-
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, airplane_page);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, disabled_page);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, enable_switch);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, header_box);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, no_devices_page);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, hw_airplane_page);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, settings_widget);
-	gtk_widget_class_bind_template_child (widget_class, CcBluetoothPanel, stack);
-
-	gtk_widget_class_bind_template_callback (widget_class, adapter_status_changed_cb);
-	gtk_widget_class_bind_template_callback (widget_class, airplane_mode_off_button_clicked_cb);
-	gtk_widget_class_bind_template_callback (widget_class, enable_switch_state_set_cb);
-	gtk_widget_class_bind_template_callback (widget_class, panel_changed_cb);
-}
-
-static void
-cc_bluetooth_panel_init (CcBluetoothPanel *self)
-{
-	bluetooth_settings_widget_get_type ();
-	g_resources_register (cc_bluetooth_get_resource ());
-
-	gtk_widget_init_template (GTK_WIDGET (self));
-
-	/* RFKill */
-	self->rfkill = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
-								 G_DBUS_PROXY_FLAGS_NONE,
-								 "org.gnome.SettingsDaemon.Rfkill",
-								 "/org/gnome/SettingsDaemon/Rfkill",
-								 "org.gnome.SettingsDaemon.Rfkill",
-								 NULL, NULL);
-	self->properties = cc_object_storage_create_dbus_proxy_sync (G_BUS_TYPE_SESSION,
-								     G_DBUS_PROXY_FLAGS_NONE,
-								     "org.gnome.SettingsDaemon.Rfkill",
-								     "/org/gnome/SettingsDaemon/Rfkill",
-								     "org.freedesktop.DBus.Properties",
-								     NULL, NULL);
-
-	airplane_mode_changed (self);
-	g_signal_connect_object (self->rfkill, "g-properties-changed",
-				 G_CALLBACK (airplane_mode_changed), self, G_CONNECT_SWAPPED);
-}
--- a/panels/bluetooth/cc-bluetooth-panel.h
+++ b/panels/bluetooth/cc-bluetooth-panel.h
@@ -1,34 +0,0 @@
-/*
- *
- *  BlueZ - Bluetooth protocol stack for Linux
- *
- *  Copyright (C) 2005-2008  Marcel Holtmann <marcel@holtmann.org>
- *  Copyright (C) 2006-2010  Bastien Nocera <hadess@hadess.net>
- *
- *
- *  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 2 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, write to the Free Software
- *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#pragma once
-
-#include <shell/cc-shell.h>
-
-G_BEGIN_DECLS
-
-#define CC_TYPE_BLUETOOTH_PANEL (cc_bluetooth_panel_get_type ())
-G_DECLARE_FINAL_TYPE (CcBluetoothPanel, cc_bluetooth_panel, CC, BLUETOOTH_PANEL, CcPanel)
-
-G_END_DECLS
--- a/panels/bluetooth/cc-bluetooth-panel.ui
+++ b/panels/bluetooth/cc-bluetooth-panel.ui
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="CcBluetoothPanel" parent="CcPanel">
-
-    <child type="titlebar-end">
-      <object class="GtkBox" id="header_box">
-        <child>
-          <object class="GtkSwitch" id="enable_switch">
-            <property name="valign">center</property>
-            <signal name="state-set" handler="enable_switch_state_set_cb" object="CcBluetoothPanel" swapped="yes"/>
-          </object>
-        </child>
-      </object>
-    </child>
-
-    <child type="content">
-      <object class="GtkStack" id="stack">
-        <child>
-          <object class="AdwStatusPage" id="no_devices_page">
-            <property name="icon-name">bluetooth-active-symbolic</property>
-            <property name="title" translatable="yes">No Bluetooth Found</property>
-            <property name="description" translatable="yes">Plug in a dongle to use Bluetooth.</property>
-          </object>
-        </child>
-        <child>
-          <object class="AdwStatusPage" id="disabled_page">
-            <property name="icon-name">bluetooth-active-symbolic</property>
-            <property name="title" translatable="yes">Bluetooth Turned Off</property>
-            <property name="description" translatable="yes">Turn on to connect devices and receive file transfers.</property>
-          </object>
-        </child>
-        <child>
-          <object class="AdwStatusPage" id="airplane_page">
-            <property name="icon-name">airplane-mode-symbolic</property>
-            <property name="title" translatable="yes">Airplane Mode is On</property>
-            <property name="description" translatable="yes">Bluetooth is disabled when airplane mode is on.</property>
-            <property name="child">
-              <object class="GtkButton">
-                <property name="label" translatable="yes">Turn Off Airplane Mode</property>
-                <property name="halign">center</property>
-                <property name="valign">center</property>
-                <signal name="clicked" handler="airplane_mode_off_button_clicked_cb" object="CcBluetoothPanel" swapped="yes"/>
-                <style>
-                  <class name="pill"/>
-                </style>
-              </object>
-            </property>
-          </object>
-        </child>
-        <child>
-          <object class="AdwStatusPage" id="hw_airplane_page">
-            <property name="icon-name">airplane-mode-symbolic</property>
-            <property name="title" translatable="yes">Hardware Airplane Mode is On</property>
-            <property name="description" translatable="yes">Turn off the Airplane mode switch to enable Bluetooth.</property>
-          </object>
-        </child>
-        <child>
-          <object class="BluetoothSettingsWidget" id="settings_widget">
-            <signal name="panel-changed" handler="panel_changed_cb" object="CcBluetoothPanel" swapped="yes"/>
-            <signal name="adapter-status-changed" handler="adapter_status_changed_cb" object="CcBluetoothPanel" swapped="yes"/>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>
--- a/panels/bluetooth/dbusmock-templates/gsd_rfkill.py
+++ b/panels/bluetooth/dbusmock-templates/gsd_rfkill.py
@@ -1,75 +0,0 @@
-'''gsd-rfkill mock template
-
-This creates the expected methods and properties of the main
-org.gnome.SettingsDaemon.Rfkill object.
-'''
-
-# This program is free software; you can redistribute it and/or modify it under
-# the terms of the GNU Lesser General Public License as published by the Free
-# Software Foundation; either version 3 of the License, or (at your option) any
-# later version.  See http://www.gnu.org/copyleft/lgpl.html for the full text
-# of the license.
-
-__author__ = 'Bastien Nocera'
-__copyright__ = '(c) 2022, Red Hat Inc.'
-
-import dbus
-import os
-from dbusmock import mockobject
-
-BUS_NAME = 'org.gnome.SettingsDaemon.Rfkill'
-MAIN_OBJ = '/org/gnome/SettingsDaemon/Rfkill'
-MAIN_IFACE = 'org.gnome.SettingsDaemon.Rfkill'
-SYSTEM_BUS = False
-
-ADAPTER_IFACE = 'org.bluez.Adapter1'
-
-def rfkill_changed(*args, **kwargs):
-    [iface, changed, _invalidated] = args
-
-    rfkill = mockobject.objects[MAIN_OBJ]
-    adapter = dbus.bus.BusConnection(os.environ['DBUS_SYSTEM_BUS_ADDRESS']).get_object('org.bluez', '/org/bluez/hci0')
-    try:
-        adapter.Get(ADAPTER_IFACE, 'Name')
-    except:
-        adapter = None
-
-    if 'BluetoothAirplaneMode' in changed:
-        if adapter and rfkill.props[MAIN_IFACE]['BluetoothAirplaneMode'] == 1:
-            adapter.UpdateProperties(ADAPTER_IFACE,
-                    {'Powered': dbus.Boolean(False),
-                     'Blocked': dbus.Boolean(True)})
-        elif adapter:
-            adapter.UpdateProperties(ADAPTER_IFACE,
-                    {'Blocked': dbus.Boolean(False)})
-    if 'BluetoothHardwareAirplaneMode' in changed:
-        if rfkill.props[MAIN_IFACE]['BluetoothAirplaneMode'] == 0:
-            rfkill.Set(MAIN_IFACE, 'BluetoothAirplaneMode', dbus.Boolean(False))
-
-def load(mock, parameters):
-    # Loaded!
-    mock.loaded = True
-
-    props = {
-        'AirplaneMode': parameters.get('AirplaneMode', dbus.Boolean(False)),
-        'HardwareAirplaneMode': parameters.get('HardwareAirplaneMode', dbus.Boolean(False)),
-        'HasAirplaneMode': parameters.get('HasAirplaneMode', dbus.Boolean(True)),
-        # True if not desktop, server, vm or container
-        'ShouldShowAirplaneMode': parameters.get('ShouldShowAirplaneMode', dbus.Boolean(True)),
-        'BluetoothAirplaneMode': parameters.get('BluetoothAirplaneMode', dbus.Boolean(False)),
-        'BluetoothHardwareAirplaneMode': parameters.get('BluetoothAirplaneMode', dbus.Boolean(False)),
-        'BluetoothHasAirplaneMode': parameters.get('BluetoothHasAirplaneMode', dbus.Boolean(True)),
-        'WwanAirplaneMode': parameters.get('WwanAirplaneMode', dbus.Boolean(False)),
-        'WwanHardwareAirplaneMode': parameters.get('WwanHardwareAirplaneMode', dbus.Boolean(False)),
-        'WwanHasAirplaneMode': parameters.get('WwanHasAirplaneMode', dbus.Boolean(False)),
-    }
-    mock.AddProperties(MAIN_IFACE, dbus.Dictionary(props, signature='sv'))
-
-    rfkill = mockobject.objects[MAIN_OBJ]
-    rfkill.hci0_power = True
-
-    session_bus = dbus.SessionBus()
-    session_bus.add_signal_receiver(rfkill_changed,
-            signal_name='PropertiesChanged',
-            path=MAIN_OBJ,
-            dbus_interface='org.freedesktop.DBus.Properties')
--- a/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
+++ b/panels/bluetooth/gnome-bluetooth-panel.desktop.in.in
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=Bluetooth
-Comment=Turn Bluetooth on and off and connect your devices
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-bluetooth-symbolic
-Exec=gnome-control-center bluetooth
-Terminal=false
-Type=Application
-NoDisplay=true
-Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;HardwareSettings;X-GNOME-Settings-Panel;X-GNOME-ConnectivitySettings;
-OnlyShowIn=GNOME;Unity;
-StartupNotify=true
-X-GNOME-Bugzilla-Bugzilla=GNOME
-X-GNOME-Bugzilla-Product=gnome-bluetooth
-X-GNOME-Bugzilla-Component=properties
-X-GNOME-Bugzilla-Version=@VERSION@
-# Translators: Search terms to find the Bluetooth panel. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
-Keywords=share;sharing;bluetooth;obex;
--- a/panels/bluetooth/icons/meson.build
+++ b/panels/bluetooth/icons/meson.build
@@ -1,4 +0,0 @@
-install_data(
-  'scalable/org.gnome.Settings-bluetooth-symbolic.svg',
-  install_dir: join_paths(control_center_icondir, 'hicolor', 'scalable', 'apps')
-)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Georges Basile Stavracas Neto	a7cb8295fe	EOL master	2022-04-26 15:46:10 -03:00
Anders Jonsson	f948a56f98	Update Swedish translation	2022-04-26 18:26:44 +00:00
Yuri Chornoivan	58f5ea715c	Update Ukrainian translation	2022-04-26 17:39:23 +00:00
Felipe Borges	5284a1d410	multitasking: Add some new keywords to desktop file While searching in the Shell, users might input the keywords "Hot Corner" and "Workspaces". Fixes #1784	2022-04-26 17:23:45 +00:00
Michael Catanzaro	46bc354cfb	sound: remove dog bark sound theme You're welcome, internet.	2022-04-26 17:17:41 +00:00
Georges Basile Stavracas Neto	0bfb1e8906	Post-branching version bump Mainline is open for business again	2022-04-26 14:16:07 -03:00
Georges Basile Stavracas Neto	a95f8ec974	Post-release version bump	2022-04-26 14:15:00 -03:00
Georges Basile Stavracas Neto	fdaecc3eac	42.1	2022-04-26 14:04:32 -03:00
Matej Urbančič	fd12b1b3f6	Update Slovenian translation	2022-04-25 19:13:27 +00:00
Danial Behzadi	f048803fb9	Update Persian translation	2022-04-25 13:57:20 +00:00
Marco Ciampa	804cf0b9b9	Update it.po	2022-04-25 13:16:30 +00:00
Zurab Kargareteli	e52fed7b4a	Update Georgian translation	2022-04-25 09:17:51 +00:00
Aleksandr Melman	e7cc472ec8	Update Russian translation	2022-04-24 16:36:32 +00:00
Marco Trevisan (Treviño)	f55639cabb	display: cleanup monitors list disposition	2022-04-24 12:21:14 +00:00
Marco Trevisan (Treviño)	c6da230052	display: Remove weak references on display disposition Weak references are added when logical monitors are created, however we don't remove them when destroying the display. This means that if a monitor survives to the display finalization (because may be referenced elsewhere) it will make g-c-c to crash during its finalization, as that will trigger the weak reference callback that will try to access to the already-finalized display.	2022-04-24 12:21:14 +00:00
Hu Jialun	8809dbc565	sharing/remote-desktop: handle gracefully when unable to get username getlogin() can fail for several reasons as detailed in the man page, and the current behaviour is a segmentation fault when it fails with NULL, such as due to an unset loginuid. * Check return value for error and act accordingly. * Change to getpwuid(getuid())->pw_name, which is less likely to error.	2022-04-24 12:15:56 +00:00
Jeremy Bicha	414d4537cd	sharing: Fix Remote Desktop on switch handling Previously, we were only checking if the gnome-remote-desktop user service was running but that service is always running as of https://gitlab.gnome.org/GNOME/gnome-remote-desktop/-/commit/7f4ef31fd38 We need to check the gsettings key too. Closes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1775	2022-04-24 12:10:49 +00:00
Felipe Borges	e8a046765f	wacom: Fix typo in UI file property name Fixes #1777	2022-04-24 12:04:38 +00:00
Zurab Kargareteli	43b6e4a928	Update Georgian translation	2022-04-23 16:56:05 +00:00
Piotr Drąg	2318fdb08c	Update Polish translation	2022-04-23 14:41:57 +02:00
Ngọc Quân Trần	f13d8641d7	Update Vietnamese translation	2022-04-23 01:13:43 +00:00
Luming Zh	f120537d78	Update Chinese (China) translation	2022-04-23 00:37:20 +00:00
Felipe Borges	633bf89537	sharing: Use GtkWindowControls to wrap the cert fingerprint dialog Instead of using a plain "flat" button positioned at the window corner, let's use GtkWindowControls to wrap the close button and get the default window control styling and alignment. Fixes #1737	2022-04-22 12:22:27 +00:00
Goran Vidović	b99a987c63	Update Croatian translation	2022-04-21 17:50:42 +00:00
Emin Tufan Çetin	58a1720109	Update Turkish translation	2022-04-21 07:50:25 +00:00
Jiri Grönroos	15a38273cb	Update Finnish translation	2022-04-21 07:15:54 +00:00
Rafael Fontenelle	2b1ff315db	Update Brazilian Portuguese translation	2022-04-21 01:24:47 +00:00
Hugo Carvalho	28bc160cff	Update Portuguese translation	2022-04-20 22:04:46 +00:00
Jordi Mas	f724267394	Update Catalan translation	2022-04-20 22:01:18 +02:00
Goran Vidović	903854d776	Update Croatian translation	2022-04-20 17:29:03 +00:00
Felipe Borges	c2f89ef7ba	wacom: Mark two more strings as translatable See `c5d0437c0f (note_1433556)`	2022-04-20 18:09:21 +02:00
Piotr Drąg	9495fea0ef	Update Polish translation	2022-04-20 18:03:19 +02:00
Sveinn í Felli	34e4314af7	Update Icelandic translation	2022-04-20 11:33:21 +00:00
Fran Dieguez	ba91ad00dc	Update Galician translation	2022-04-20 06:55:31 +00:00
Bastien Nocera	1e1fbd6891	online-accounts: Fix feature switches not doing anything Make sure to keep a reference to the GoaObject of the account around so that the GBinding that synchronises each switch widget and the account properties don't get finalized on startup. #0 0x00007ffff73c6a20 in g_binding_finalize () at /lib64/libgobject-2.0.so.0 #1 0x00007ffff73d3d22 in g_object_unref () at /lib64/libgobject-2.0.so.0 #2 0x00007ffff73c68e8 in weak_unbind () at /lib64/libgobject-2.0.so.0 #3 0x00007ffff73cf117 in weak_refs_notify () at /lib64/libgobject-2.0.so.0 #4 0x00007ffff72acd6c in g_data_set_internal () at /lib64/libglib-2.0.so.0 #5 0x00007ffff73d0195 in g_object_real_dispose.lto_priv () at /lib64/libgobject-2.0.so.0 #6 0x00007ffff73d3c44 in g_object_unref () at /lib64/libgobject-2.0.so.0 #7 0x00007ffff72b6793 in g_hash_table_remove_all_nodes.part () at /lib64/libglib-2.0.so.0 #8 0x00007ffff72ba723 in g_hash_table_unref () at /lib64/libglib-2.0.so.0 #9 0x00007ffff753403d in g_dbus_object_proxy_finalize () at /lib64/libgio-2.0.so.0 #10 0x00007ffff73d3d22 in g_object_unref () at /lib64/libgobject-2.0.so.0 #11 0x0000000000402d08 in glib_autoptr_clear_GoaObject (_ptr=0x5d59f0) at /usr/include/goa-1.0/goa/goa-generated.h:3265 #12 glib_autoptr_cleanup_GoaObject (_ptr=<synthetic pointer>) at /usr/include/goa-1.0/goa/goa-generated.h:3265 #13 on_application_activate_show_account_cb (application=0x49f2f0, argv=<optimized out>) at ../../../../Projects/jhbuild/gnome-control-center/panels/online-accounts/gnome-control-center-goa-helper.c:360 Closes: #1721	2022-04-19 23:19:54 +02:00
Alexandre Franke	37b70a230f	Update French translation	2022-04-19 20:57:09 +00:00
Alan Mortensen	9277e7573a	Update Danish translation	2022-04-19 17:59:02 +00:00
Anders Jonsson	5ec3417a2d	Update Swedish translation	2022-04-19 17:48:25 +00:00
Yuri Chornoivan	2896754417	Update Ukrainian translation	2022-04-19 17:15:43 +00:00
oscfdezdz	c5d0437c0f	wacom: mark some strings as translatable Some UI strings were not marked as translatable when the panel was ported to GTK4.	2022-04-19 16:46:59 +00:00
koko ng	322bddd971	user-accounts: Close password change dialog Fixes #1746	2022-04-19 15:08:49 +00:00
Hugo Carvalho	51faf7090e	Update Portuguese translation	2022-04-16 16:46:52 +00:00
Georges Basile Stavracas Neto	e5a49dcf7b	display: Return to main page after applying changes After applying a change, it is useful to see the new state of the monitors, so move back to the 'displays' page after applying.	2022-04-16 11:47:11 +00:00
Georges Basile Stavracas Neto	214dc277b5	display: Don't render background on selected monitors In the previous design of this panel, it made sense to show the currently selected monitor because all editing widgets were in the same page. With the new design, however, the monitor options were moved to a separate page, and that page already shows which monitor is being edited. Remove the colored background of selected monitors.	2022-04-16 11:47:11 +00:00
Georges Basile Stavracas Neto	ced1386fcd	display: Update header title when setting output Instead of updating the titlebar of the monitor preferences page in the row clicked callback, update it in set_current_output(). This ensures that the title of the page is always in sync with the monitor it's displaying.	2022-04-16 11:47:11 +00:00
Changwoo Ryu	3ffaed73a0	Update Korean translation	2022-04-15 19:28:30 +00:00
Simon McVittie	d27d3df268	appdata: Correct name of launchable Fixes: `acd59aec` "Rename app-id to org.gnome.Settings" Resolves: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1766 Signed-off-by: Simon McVittie <smcv@debian.org>	2022-04-15 10:50:05 +00:00
Bruce Cowan	4491e3d790	Update British English translation	2022-04-14 20:35:03 +00:00
Gun Chleoc	88277534a5	Update Scottish Gaelic translation	2022-04-12 12:11:16 +00:00
Jordi Mas	27b7832931	Update Catalan translation	2022-04-10 21:52:32 +02:00
Piotr Drąg	93cfdd464c	Update Polish translation	2022-04-10 12:41:50 +02:00
Aleksandr Melman	37ceaa25f7	Update Russian translation	2022-04-09 15:32:14 +00:00
Alexander Shopov	862ceacc73	Update Bulgarian translation	2022-04-09 08:01:45 +00:00
Sebastian Keller	b213fdc28a	lock: Fix wrong time shown in screen lock delay dropdown The time shown for the 5 minutes setting was 3 minutes.	2022-04-07 11:36:40 +00:00
Brandon Nielsen	7c5beecc97	printers: Use a GtkDropDown in PpOptionsDialog PpPpdOptionWidget and PpIppOptionWidget both use combo boxes for certain types of selections. With GTK4, combo boxes no longer support scrolling[0], which in turn causes problems setting some things in the PpOptionsDialog[1]. This replaces instances of GtkComboBox with GtkDropDown which do support scrolling. This change was applied to both PpIppOptionWidget and PpPpdOptionWidget as both are used in PpOptions dialog. Since the configuration values passed to CUPS can no longer be stored in a GtkTreeModel alongside the displayed values, some logic changes to update_widget_real in PpPpdOptionWidget to maintain the reference to the ppd_option_t so the selected index can be mapped to the configuration value. [0] - https://gitlab.gnome.org/GNOME/gtk/-/issues/3674 [1] - https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1704	2022-04-05 11:52:00 -03:00
Ngọc Quân Trần	7c6a41f807	Update Vietnamese translation	2022-04-05 09:18:20 +00:00
Jordi Mas	31338d4885	Update Catalan translation	2022-04-03 21:27:48 +02:00
Yuri Chornoivan	8ecdee3412	Update Ukrainian translation	2022-04-03 09:15:30 +00:00
Daniel Rusek	2b6b58f29d	Update Czech translation	2022-03-31 14:29:50 +00:00
Rūdolfs Mazurs	746ea1138a	Update Latvian translation	2022-03-29 20:34:56 +00:00
Jakub Steiner	d57446699c	Universal Access: don't depend on gnome-icon-theme-extra Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1713	2022-03-29 15:10:56 +00:00
Georges Basile Stavracas Neto	f42868e616	CI: Fix custom deps script	2022-03-29 11:07:53 -03:00
Georges Basile Stavracas Neto	6898ff58d2	CI: Build libgweather with soup2 It'll bite us in the future, but let's go with this for now.	2022-03-29 10:47:42 -03:00
Georges Basile Stavracas Neto	dd2adb77ec	CI: Cleanup gcr-devel from jobs gcr-devel is installed as part of the base image, we don't need to install it on every job run.	2022-03-29 10:38:53 -03:00
Gustavo Noronha Silva	de27ec8ba2	flatpak: update and fix openldap build openldap was failing to build on aarch64 due to an outdated config.guess, so update it to a more recent version.	2022-03-29 12:47:49 +00:00
Gustavo Noronha Silva	3d34b6ddba	flatpak: disable new ModemManager dependency	2022-03-29 12:47:49 +00:00
Gustavo Noronha Silva	9610c2e17b	flatpak: fix branches for a couple deps gweather and mobile-broadband-provider-info have moved to using main as their principal development branch.	2022-03-29 12:47:49 +00:00
Gustavo Noronha Silva	a294ceba18	flatpak: use https:// for github github discontinued the unauthenticated use of the git protocol for security reasons, see: https://github.blog/2021-09-01-improving-git-protocol-security-github/	2022-03-29 12:47:49 +00:00
Jan Tojnar	7fe322b9ce	online-accounts: Fix goa-helper on X11 The handle_str contains the “x11:” prefix so strtol would return 0. We need to pass it the numeric substring. Fixes: https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1651	2022-03-29 12:33:14 +00:00
Georges Basile Stavracas Neto	ebc54deb62	Ci: Build libgweather from main	2022-03-29 09:27:33 -03:00
Jordi Mas	3d54229d3d	Update Catalan translation	2022-03-28 23:16:30 +02:00
Goran Vidović	aba4c668ee	Update Croatian translation	2022-03-28 11:07:38 +00:00
Nathan Follens	c6d392727f	Update Dutch translation	2022-03-26 22:58:26 +00:00
Nathan Follens	a428799890	Update Dutch translation	2022-03-25 14:27:06 +00:00
Hugo Carvalho	00a7dbec18	Update Portuguese translation	2022-03-24 23:05:52 +00:00
Norbert Pfeiler	88e19f50c9	info-overview: Replace llvmpipe with “Software Rendering”	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	a57d31f0cf	info-overview: Add some commonly used trademarks Those are not always present in the device string. Guidance was taken from the usage on vendor websites. NVIDIA actually has the rights to GTX™ but doesn’t seem to use it, in contrast to RTX™.	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	16fc5a95f8	info-overview: Remove some rare @ x.yz GHz specification	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	4b17d9be8e	info-overview: Remove redundant/elaborate info Remove redundant/elaborate in strings like CPU, Core and Processor.	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	50ab1b0742	info-overview: Remove some junk info, like PCIe and SSE	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	02bbab7b8a	info-overview: Replace the trademark symbols in a more generic way	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	54b215e1e9	info-overview: Use a more generic regex to match the Mesa infos	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	827369fe94	info-overview: Always omit Gallium, not just for AMD	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	4b6786bd44	info-overview: If names are all caps, leave them be This made everything AMD lower case after the second word and is likely unintentional for something like EPYC™. e.g. was AMD Ryzen threadripper 1950x 16-core processor AMD Radeon rx 580 series	2022-03-23 09:36:24 +00:00
Norbert Pfeiler	68d67adf12	info-overview: There is no “AMD®” AMD doesn’t have a registered trademark for the string only.	2022-03-23 09:36:24 +00:00
Felipe Borges	52a8c998fb	sharing: Remove leftover remote_desktop_password_insert_text_cb This method is unused and was left behind after the rework in commit `0ae59467fb` Fixes #1703	2022-03-22 13:54:46 +00:00
Марко Костић	7bbf551cc1	Update Serbian translation	2022-03-19 07:38:01 +00:00
Alberts Muktupāvels	a581395221	display: fix monitor labels has-toplevel-focus property has been removed from GTK 4: `0ce9f26dc5` https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1697	2022-03-18 22:08:49 +00:00
Pauli Virtanen	8c84b9f0d3	subprojects: Update libgvc This update is necessary to fix a bug that can cause sound device profiles to be missing, possibly making some sound device ports unusable. See https://gitlab.gnome.org/GNOME/libgnome-volume-control/-/merge_requests/19 Fixes #1668	2022-03-18 21:49:36 +00:00
Jonathan Kang	ce93dbb3a0	network/connection-editor: always load all available VPN plugins Previously, when a list of VPN plugins was loaded once, it will not load again the next time you try to add a VPN connnection. This causes an issue that if you keep gnome-control-center open and install a new VPN plugin, the new VPN plugin won't show up in the VPN plugin list. Fix that by always load all avilable VPN plugins when showing the "Add VPN" dialog.	2022-03-18 21:37:48 +00:00
Jonathan Kang	6f1567f236	network/connection-editor: destroy the editor when closing If an user opens an connection editor and then closes it, repeat this multiple times causes lots of unused hidden editor windows. Fix that by destroying the connection editor instead of hiding them when closing.	2022-03-18 21:37:48 +00:00
				`@@ -1 +0,0 @@`
				`meson.add_install_script('meson/meson_post_install.py', control_center_datadir)`
				`@@ -1 +0,0 @@`
				`<svg width="16" height="16" viewBox="0 0 4.233 4.233" xmlns="http://www.w3.org/2000/svg"><path d="M3.843.627a.397.397 0 0 0-.56.034L1.45 2.73l-.775-.763a.397.397 0 0 0-.56.004.397.397 0 0 0 .003.562L1.191 3.59a.397.397 0 0 0 .576-.02l2.11-2.382a.397.397 0 0 0-.034-.56Z" style="fill:#3d3846"/></svg>`
				`@@ -1 +0,0 @@`
				`<svg width="16" height="16" xmlns="http://www.w3.org/2000/svg"><path d="M7.486.02A7.492 7.492 0 0 0 0 7.508a7.492 7.492 0 0 0 7.486 7.484 7.492 7.492 0 0 0 7.487-7.484A7.492 7.492 0 0 0 7.486.02zm0 1.972A5.508 5.508 0 0 1 13 7.508a5.508 5.508 0 0 1-5.514 5.512 5.508 5.508 0 0 1-5.513-5.512 5.508 5.508 0 0 1 5.513-5.516zm3.01 2.01a.5.5 0 0 0-.103.006.5.5 0 0 0-.25.154L7.486 6.818 5.83 5.162a.5.5 0 1 0-.687.688l2 2a.5.5 0 0 0 .687 0l3-3a.5.5 0 0 0-.334-.848z" style="fill:#000"/></svg>`