window: Port to GtkMessageWindow

This is a private reimplementation of GtkMessageDialog.

.gitlab-ci.yml

@@ -22,46 +22,37 @@ stages:
 
 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "-Dwerror=true -Dcairo:werror=false -Dgi-docgen:werror=false -Dgraphene:werror=false -Dlibepoxy:werror=false -Dlibsass:werror=false -Dpango:werror=false -Dsassc:werror=false -Dgdk-pixbuf:werror=false -Dglib:werror=false -Dlibcloudproviders:werror=false -Dlibpng:werror=false -Dlibtiff:werror=false -Dsysprof:werror=false -Dwayland-protocols:werror=false -Dharfbuzz:werror=false -Dfreetype2:werror=false -Dfontconfig:werror=false -Dfribidi:werror=false -Dlibffi:werror=false -Dlibjpeg-turbo:werror=false -Dmutest:werror=false -Dpixman:werror=false -Dproxy-libintl:werror=false"
+  COMMON_MESON_FLAGS: "-Dwerror=true -Dglib:werror=false -Dpango:werror=false -Dgtk-doc:werror=false -Dwayland-protocols:werror=false -Dsysprof:werror=false -Dwayland:werror=false"
   BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
-  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
+  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
   MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v41"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v38"
+  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
 
-workflow:
+.only-default:
-  rules:
+  only:
-    - if: $CI_COMMIT_TAG
+    - branches
-    - if: $CI_COMMIT_BRANCH
+  except:
-
+    - tags
-default:
-  retry:
-    max: 2
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-  interruptible: true
 
 style-check-diff:
+  extends: .only-default
   image: $FEDORA_IMAGE
   stage: check
-  when: manual
+  allow_failure: true
   script:
     - .gitlab-ci/run-style-check-diff.sh
 
 .build-fedora-default:
+  extends: .only-default
   image: $FEDORA_IMAGE
   artifacts:
     when: always
     reports:
       junit:
         - "${CI_PROJECT_DIR}/_build/report-x11.xml"
-        - "${CI_PROJECT_DIR}/_build/report-x11_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland_unstable.xml"
         - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
-        - "${CI_PROJECT_DIR}/_build/report-broadway_unstable.xml"
     name: "gtk-${CI_COMMIT_REF_NAME}"
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
@@ -77,6 +68,11 @@ style-check-diff:
     key: "$CI_JOB_NAME"
     paths:
       - _ccache/
+      - subprojects/gdk-pixbuf/
+      - subprojects/glib/
+      - subprojects/graphene/
+      - subprojects/libepoxy/
+      - subprojects/pango/
 
 fedora-x86_64:
   extends: .build-fedora-default
@@ -86,17 +82,10 @@ fedora-x86_64:
     EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
+    - meson subprojects update
-    - pip3 install --user meson~=0.64
-    - meson subprojects download
-    - meson subprojects update --reset
     - mkdir _install
-    - meson setup
+    - meson --prefix=${CI_PROJECT_DIR}/_install
-            --prefix=${CI_PROJECT_DIR}/_install
+            ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
             _build
     - meson compile -C _build
     - meson install -C _build
@@ -115,17 +104,10 @@ release-build:
     EXTRA_MESON_FLAGS: "--buildtype=release"
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
+    - meson subprojects update
-    - pip3 install --user meson~=0.64
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-    - meson subprojects download
-    - meson subprojects update --reset
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            ${BACKEND_FLAGS}
-            ${FEATURE_FLAGS}
             _build
-    - meson compile -C _build
+    - ninja -C _build
     - .gitlab-ci/run-tests.sh _build x11
 
 fedora-mingw64:
@@ -146,26 +128,37 @@ fedora-mingw64:
             # mingw64-graphene (rawhide)
   script:
     - .gitlab-ci/show-info-linux.sh
-    - export PATH="$HOME/.local/bin:$PATH"
+    - meson subprojects update
-    - pip3 install --user meson~=0.64
+    - mkdir _build && cd _build
-    - meson subprojects download
+    - mingw64-meson -Dintrospection=disabled -Dgraphene:introspection=disabled
-    - meson subprojects update --reset
+    - ninja
-      # Test that mingw64-meson still fails. If it has stopped failing, the CI
+
-      # will fail and now you should remove the hack that follows this.
+installed-tests:
-    - FAILED=false
+  extends: .build-fedora-default
-    - mingw64-meson --version || FAILED=true
+  stage: build
-    - test $FAILED = false && echo "mingw64-meson works now, remove the hack" && exit 1
+  needs: []
-      # HACK: Running mingw64-meson directly fails on the CI with:
+  variables:
-      #  /usr/bin/mingw64-meson: line 92: fg: no job control
+    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
-      # Because rpm is not evaluating %__meson and it gets interpreted as a job
+    G_TEST_ACCESSIBLE: 1
-      # specifier. So we fix that and run it ourselves.
+  script:
-    - rpm --eval "%{mingw64_meson}" > mingw64-meson.sh
+    - .gitlab-ci/show-info-linux.sh
-    - sed -i -e 's/%__meson/meson/' mingw64-meson.sh
+    - meson subprojects update
-    - chmod +x mingw64-meson.sh
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
-    - ./mingw64-meson.sh -Dintrospection=disabled -Dgraphene:introspection=disabled _build
+            _build
     - ninja -C _build
+    - sudo ninja -C _build install
+    - dbus-run-session xvfb-run -a -s "-screen 0 1024x768x24"
+            gnome-desktop-testing-runner
+                   --report-directory=_build/installed-tests-report/failed/
+                   --parallel=0
+                   gtk-4.0
+  artifacts:
+    paths:
+      - "_build/installed-tests-report/"
+
 
 .mingw-defaults:
+  extends: .only-default
   stage: build
   tags:
     - win32-ps
@@ -195,23 +188,21 @@ msys2-mingw64:
       - "${CI_PROJECT_DIR}/_build/gtkdll.tar.gz"
 
 macos:
-  # Sadly, this fails regularly, and its failure is never enlightening
+  extends: .only-default
-  allow_failure: true
+  only:
-  rules:
+    - branches@GNOME/gtk
-    - if: $CI_PROJECT_NAMESPACE == "GNOME"
   stage: build
   tags:
     - macos
   needs: []
   before_script:
     - bash .gitlab-ci/show-info-osx.sh
-    - pip3 install --user meson~=0.64
+    - pip3 install --user meson==0.60.3
     - pip3 install --user ninja
     - export PATH=/Users/gitlabrunner/Library/Python/3.7/bin:$PATH
     - export MESON_FORCE_BACKTRACE=1
   script:
-    - meson setup ${COMMON_MESON_FLAGS}
+    - meson -Dx11-backend=false
-            -Dx11-backend=false
             -Dbroadway-backend=true
             -Dmacos-backend=true
             -Dmedia-gstreamer=disabled
@@ -219,21 +210,18 @@ macos:
             -Dcpp_std=c++11
             -Dpixman:tests=disabled
             -Dlibjpeg-turbo:simd=disabled
-            -Ddemos=false
-            -Dbuild-tests=false
-            -Dbuild-examples=false
-            -Dbuild-testsuite=false
             _build
-    - meson compile -C _build
+    - ninja -C _build
   artifacts:
     when: always
     paths:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 vs2017-x64:
+  extends: .only-default
   # TODO: Uncomment this when ready to merge.
-  # rules:
+  #only:
-  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  #  - branches@GNOME/gtk
   stage: build
   tags:
     - win32-ps
@@ -246,7 +234,7 @@ vs2017-x64:
       - "${CI_PROJECT_DIR}/_build/meson-logs"
 
 .flatpak-defaults:
-  image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  image: $FLATPAK_IMAGE
   stage: flatpak
   allow_failure: true
   tags:
@@ -256,67 +244,65 @@ vs2017-x64:
       - "${APPID}-dev.flatpak"
       - 'repo.tar'
     expire_in: 1 day
-  rules:
-    # Only build Flatpak bundles automatically on main
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH != "main"
-      when: "manual"
   script:
     - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"
 
-flatpak:demo:
+# Manual jobs, for branches and MRs
-  extends: '.flatpak-defaults'
+.flatpak-manual:
+  extends: .flatpak-defaults
+  when: manual
+
+# Only build Flatpak bundles automatically on main
+.flatpak-main:
+  extends: .flatpak-defaults
+  only:
+    - main
+
+flatpak-manual:demo:
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:demo:aarch64:
+flatpak-main:demo:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.Demo4
 
-flatpak:widget-factory:
+flatpak-manual:widget-factory:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:widget-factory:aarch64:
+flatpak-main:widget-factory:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.WidgetFactory4
 
-flatpak:icon-browser:
+flatpak-manual:icon-browser:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:icon-browser:aarch64:
+flatpak-main:icon-browser:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.IconBrowser4
 
-flatpak:node-editor:
+flatpak-manual:node-editor:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-manual
   needs: []
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
-flatpak:node-editor:aarch64:
+flatpak-main:node-editor:
-  extends: '.flatpak-defaults'
+  extends: .flatpak-main
   needs: []
-  tags:
-    - flatpak-aarch64
   variables:
     APPID: org.gtk.gtk4.NodeEditor
 
@@ -325,35 +311,23 @@ flatpak:node-editor:aarch64:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
     extends: '.publish_nightly'
-    needs: ['flatpak:demo']
+    dependencies: ['flatpak-main:demo']
-
+    needs: ['flatpak-main:demo']
-nightly demo aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:demo:aarch64']
 
 nightly factory:
     extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory']
+    dependencies: ['flatpak-main:widget-factory']
-
+    needs: ['flatpak-main:widget-factory']
-nightly factory aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory:aarch64']
 
 nightly icon-browser:
     extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser']
+    dependencies: ['flatpak-main:icon-browser']
-
+    needs: ['flatpak-main:icon-browser']
-nightly icon-browser aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser:aarch64']
 
 nightly node-editor:
     extends: '.publish_nightly'
-    needs: ['flatpak:node-editor']
+    dependencies: ['flatpak-main:node-editor']
-
+    needs: ['flatpak-main:node-editor']
-nightly node-editor aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:node-editor:aarch64']
 
 static-scan:
   image: $FEDORA_IMAGE
@@ -362,31 +336,23 @@ static-scan:
   variables:
     EXTRA_MESON_FLAGS: "--buildtype=debug"
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} _scan_build
-    - pip3 install --user meson~=0.64
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            ${EXTRA_MESON_FLAGS}
-            _scan_build
     - ninja -C _scan_build scan-build
   artifacts:
     paths:
       - _scan_build/meson-logs
   allow_failure: true
 
-# Run tests with the address sanitizer. We need to turn off introspection
+# Run tests with the address sanitizer. We need to turn off introspection,
-# and f16c, since they are incompatible with asan
+# since it is incompatible with asan
 asan-build:
   image: $FEDORA_IMAGE
   tags: [ asan ]
   stage: analysis
   needs: []
-  when: manual
   variables:
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
+    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled _build
-    - pip3 install --user meson~=0.64
-    - CC=clang meson setup --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=disabled -Df16c=disabled _build
     - ninja -C _build
     - .gitlab-ci/run-tests.sh _build wayland
   artifacts:
@@ -398,22 +364,10 @@ reference:
   image: $FEDORA_IMAGE
   stage: docs
   needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--buildtype=release --force-fallback-for=gdk-pixbuf,pango"
   script:
-    - export PATH="$HOME/.local/bin:$PATH"
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} -Dgtk_doc=true -Dgdk-pixbuf:gtk_doc=true -Dpango:gtk_doc=true _build
-    - pip3 install --user meson~=0.64
-    - meson setup
-            ${COMMON_MESON_FLAGS}
-            --buildtype=release
-            --force-fallback-for=gdk-pixbuf,pango
-            -Dintrospection=enabled
-            -Dgtk_doc=true
-            -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:gtk_doc=true
-            -Ddemos=false
-            -Dbuild-examples=false
-            -Dbuild-tests=false
-            -Dbuild-testsuite=false
-            _build
     - meson compile -C _build
     - mkdir -p _reference/
     - mv _build/docs/reference/gdk/gdk4/ _reference/gdk4/
@@ -436,9 +390,9 @@ reference:
 publish-docs:
   image: fedora:latest
   stage: publish
-  interruptible: false
   needs: ['reference']
   script:
     - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
-  rules:
+  only:
-    - if: $CI_COMMIT_REF_NAME == "main"
+    refs:
+      - main

.gitlab-ci/fedora.Dockerfile

@@ -1,4 +1,4 @@
-FROM fedora:37
+FROM fedora:36
 
 RUN dnf -y install \
     adwaita-icon-theme \
@@ -18,9 +18,7 @@ RUN dnf -y install \
     dejavu-sans-mono-fonts \
     desktop-file-utils \
     diffutils \
-    docbook-style-xsl \
     elfutils-libelf-devel \
-    expat-devel \
     fribidi-devel \
     gcc \
     gcc-c++ \
@@ -33,7 +31,6 @@ RUN dnf -y install \
     glibc-devel \
     glibc-headers \
     gnome-desktop-testing \
-    gnupg2 \
     gobject-introspection-devel \
     graphene-devel \
     graphviz \
@@ -73,6 +70,7 @@ RUN dnf -y install \
     mesa-dri-drivers \
     mesa-libEGL-devel \
     mesa-libGLES-devel \
+    meson \
     ninja-build \
     pango-devel \
     pcre-devel \
@@ -82,9 +80,9 @@ RUN dnf -y install \
     python3-gobject \
     python3-jinja2 \
     python3-markdown \
-    python3-packaging \
     python3-pip \
     python3-pygments \
+    python3-toml \
     python3-typogrify \
     python3-wheel \
     redhat-rpm-config \
@@ -96,6 +94,8 @@ RUN dnf -y install \
     weston-libs \
     which \
     xorg-x11-server-Xvfb \
+ && dnf install -y 'dnf-command(builddep)' \
+ && dnf builddep -y wayland \
  && dnf clean all
 
 # Enable sudo for wheel users

.gitlab-ci/run-docker.sh

@@ -23,7 +23,6 @@ push=0
 list=0
 print_help=0
 no_login=0
-no_cache=0
 
 while (($# > 0)); do
         case "${1%%=*}" in
@@ -35,7 +34,6 @@ while (($# > 0)); do
                 --base|-b) read_arg base "$@" || shift;;
                 --version|-v) read_arg base_version "$@" || shift;;
                 --no-login) no_login=1;;
-                --no-cache) no_cache=1;;
                 *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
         esac
         shift
@@ -105,21 +103,11 @@ TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"
 
 if [ $build == 1 ]; then
         echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        if [ $no_cache == 0 ]; then
+        ${CMD} build \
-                ${CMD} build \
+                ${format} \
-                        ${format} \
+                --build-arg HOST_USER_ID="$UID" \
-                        --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
-                        --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
-                        --file "${base}.Dockerfile" .
-        else
-                ${CMD} build \
-                        ${format} \
-                        --no-cache \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        fi
-
         exit $?
 fi
 

.gitlab-ci/run-tests.sh

@@ -8,7 +8,7 @@ builddir=$1
 backend=$2
 
 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0:verbosity=1:log_threads=1
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0
 export G_SLICE=always-malloc
 
 case "${backend}" in
@@ -19,21 +19,11 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
     # generate the reports
     exit_code=$?
-
-    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
-          meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
     ;;
 
   wayland)
@@ -48,18 +38,9 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                 --no-suite=gsk-compare-broadway
+
     exit_code=$?
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
-
     kill ${compositor}
     ;;
 
@@ -75,18 +56,9 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                 --no-suite=gsk-compare-broadway
+
     exit_code=$?
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
-
     kill ${compositor}
     ;;
 
@@ -102,20 +74,10 @@ case "${backend}" in
                 --print-errorlogs \
                 --setup=${backend} \
                 --suite=gtk \
-                --no-suite=failing \
-                --no-suite=flaky \
                 --no-suite=gsk-compare-opengl
 
     # don't let Broadway failures fail the run, for now
     exit_code=0
-
-    meson test -C ${builddir} \
-                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
-                --print-errorlogs \
-                --setup=${backend}_unstable \
-                --suite=flaky \
-                --suite=failing || true
-
     kill ${server}
     ;;
 
@@ -128,20 +90,18 @@ esac
 
 cd ${builddir}
 
-for suffix in "" "_unstable"; do
+$srcdir/.gitlab-ci/meson-junit-report.py \
-    $srcdir/.gitlab-ci/meson-junit-report.py \
+        --project-name=gtk \
-            --project-name=gtk \
+        --backend=${backend} \
-            --backend="${backend}${suffix}" \
+        --job-id="${CI_JOB_NAME}" \
-            --job-id="${CI_JOB_NAME}" \
+        --output=report-${backend}.xml \
-            --output="report-${backend}${suffix}.xml" \
+        meson-logs/testlog-${backend}.json
-            "meson-logs/testlog-${backend}${suffix}.json"
+$srcdir/.gitlab-ci/meson-html-report.py \
-    $srcdir/.gitlab-ci/meson-html-report.py \
+        --project-name=gtk \
-            --project-name=gtk \
+        --backend=${backend} \
-            --backend="${backend}${suffix}" \
+        --job-id="${CI_JOB_NAME}" \
-            --job-id="${CI_JOB_NAME}" \
+        --reftest-output-dir="testsuite/reftests/output/${backend}" \
-            --reftest-output-dir="testsuite/reftests/output/${backend}${suffix}" \
+        --output=report-${backend}.html \
-            --output="report-${backend}${suffix}.html" \
+        meson-logs/testlog-${backend}.json
-            "meson-logs/testlog-${backend}${suffix}.json"
-done
 
 exit $exit_code

.gitlab-ci/test-msvc.bat

@@ -5,7 +5,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar
 @echo on
 
 :: FIXME: make warnings fatal
-pip3 install --upgrade --user meson~=0.64 || goto :error
+pip3 install --upgrade --user meson==0.60.3 || goto :error
 meson -Ddebug=false -Dmedia-gstreamer=disabled _build || goto :error
 ninja -C _build || goto :error
 

CONTRIBUTING.md

@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:
 
- - the `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org)
+ - the `#gtk` IRC channel on irc.gnome.org
  - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
 
 You can also look at the GTK tag on [Stack
@@ -44,7 +44,6 @@ If you're reporting a bug make sure to list:
 
  0. which version of GTK are you using?
  0. which operating system are you using?
- 0. what display and graphics driver are you using?
  0. the necessary steps to reproduce the issue
  0. the expected outcome
  0. a description of the behavior; screenshots are also welcome

NEWS

@@ -1,182 +1,4 @@
-Overview of Changes in 4.9.5, xx-xx-xxxx
+Overview of Changes in 4.9.1, dd-mm-yyyy
-========================================
-
-Overview of Changes in 4.9.4, 12-02-2023
-========================================
-
-* Printing:
- - Add a CPDB backend
- - Drop the lpr backend
-
-* GtkFileDialog:
- - Robustness fixes
-
-* GtkScaleButton:
- - Add an 'active' property
-
-* GtkSearchEntry:
- - Add placeholder text
-
-* Fix conflicting type names between gtk and gio
-
-* Gsk:
- - Settable filtering for scaled textures
- - Add mask nodes
- - Some robustness and crash fixes
-
-* Wayland:
- - Handle dispatch failing in more places
-
-* Deprecations:
- - GtkVolumeButton
-
-* Translation updates:
- Belarusian
- Chinese (Taiwan)
- Georgian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.3, 04-02-2023
-========================================
-
-* Add GtkUriLauncher, as replacement for gtk_show_uri
-
-* Add GdkMonitor::description
-
-* Fix problems with tooltip sizing
-
-* Deprecations:
- - GtkStatusbar
- - GtkAssistant
- - GtkLockButton
- - gtk_gesture_set_sequence_state
-
-* GtkColumnView:
- - Only create widgets for visible columns
-
-* GtkFileDialog:
- - Drop shortcut folders API
-
-* GtkCalendar:
- - Make marked days work again
-
-* GtkSwitch:
- - Make state and active independently settable
-
-* GtkFileChooser:
- - Fix a crash with DND
- - Fix excessively wide sidebar
- - Make context menus work again
-
-* Accessibility:
- - Make GtkAccessible public, so it can be implemented outside GTK
- - Support accessible implementation for editables
-
-* CSS:
- - Fix randomly stopping CSS animations
-
-* GL:
- - Fix synchronization with GStreamer
- - Fix problems with 3rd party GL in the same thread
-
-* Wayland:
- - Fix startup notification with xdg_activation
-
-* Broadway:
- - Implement modal windows
-
-* macOS:
- - Make DND work
-
-* Build:
- - Require graphene 1.10
- - Require gobject-introspection 1.72
-
-* Translation updates
- Catalan
- Galician
- German
- Hebrew
- Indonesian
- Portuguese
- Russian
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.2, 26-12-2022
-========================================
-
-* GtkFileChooserWidget:
- - Add a grid view
-
-* GtkText, GtkTextView:
- - Fix activation of the on-screen keyboard
- - Prevent unexpected text direction changes
-
-* GtkCenterBox:
- - Add properties for children
-
-* GtkTreeExpander:
- - Add a hide-expander property
-
-* GtkStringList:
- - Add a construct-only strings property
-
-* GtkBuilder:
- - Support parsing Pango attributes in string form
-
-* GtkGestureStylus:
- - Add a stylus-only property
-
-* GtkFileLauncher:
- - New async-style api to replace gtk_show_uri
-
-* GtkColorDialog, GtkFontDialog, GtkFileDialog,
-  GtkAlertDialog:
- - APIs have seen some tweaks
- - Prefer portals when available
- - Fixes for cancellation
-
-* Add GDK_DEBUG=no-portals
-
-* Improve file DND with remote files
-
-* GtkInfoBar has been deprecated
-
-* gtk_widget_show/hide have been deprecated
-
-* gtk_show_uri has been deprecated
-
-* Wayland:
- - Fix button mask handling
- - Fix problems with cursor size on hi-dpi screens
- - Support newer versions of some protocols
- - Fix handling of surrounding text in input methods
-
-* X11:
- - Fix some ordering problems with surface destruction
-
-* Windows:
- - Improved system settings integration
- - Fix window resizing work with native decorations
- - Include a full hicolor index.theme file as a resource
-
-* Translation updates
- Croatian
- Dutch
- Hungarian
- Interlingua
- Persian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.1, 31-10-2022
 ========================================
 
 Note that deprecations are an early outlook at changes
@@ -226,8 +48,6 @@ feedback on our plans.
  - Make make debug options available in
    non-debug builds
 
-* Increase the memory limit for the jpeg loader to 1G
-
 * Translation updates:
  Abkhazian
  Basque

demos/constraint-editor/constraint-editor-window.c

@@ -228,9 +228,9 @@ open_cb (GtkWidget              *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Open file");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
-  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, open_response_cb, self);
+  gtk_file_dialog_open (dialog, GTK_WINDOW (self), NULL, NULL, open_response_cb, self);
   g_object_unref (dialog);
 }
 
@@ -337,10 +337,11 @@ save_cb (GtkWidget              *button,
   dialog = gtk_file_dialog_new ();
   gtk_file_dialog_set_title (dialog, "Save constraints");
   cwd = g_file_new_for_path (".");
-  gtk_file_dialog_set_initial_folder (dialog, cwd);
+  gtk_file_dialog_set_current_folder (dialog, cwd);
   g_object_unref (cwd);
   gtk_file_dialog_save (dialog,
                         GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (button))),
+                        NULL, NULL,
                         NULL,
                         save_response_cb, self);
   g_object_unref (dialog);
@@ -426,7 +427,7 @@ edit_constraint (ConstraintEditorWindow *win,
 
   g_signal_connect (editor, "done", G_CALLBACK (constraint_editor_done), win);
 
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 static void
@@ -459,7 +460,7 @@ edit_guide (ConstraintEditorWindow *win,
   gtk_window_set_child (GTK_WINDOW (window), GTK_WIDGET (editor));
 
   g_signal_connect (editor, "done", G_CALLBACK (guide_editor_done), win);
-  gtk_window_present (GTK_WINDOW (window));
+  gtk_widget_show (window);
 }
 
 static void

demos/gtk-demo/application.c

@@ -2,8 +2,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 typedef GtkApplication DemoApplication;
 typedef GtkApplicationClass DemoApplicationClass;
 
@@ -59,7 +57,7 @@ show_action_infobar (GSimpleAction *action,
   text = g_strdup_printf ("You activated radio action: \"%s\".\n"
                           "Current value: %s", name, value);
   gtk_label_set_text (GTK_LABEL (window->message), text);
-  gtk_widget_set_visible (window->infobar, TRUE);
+  gtk_widget_show (window->infobar);
   g_free (text);
 }
 
@@ -91,7 +89,7 @@ open_response_cb (GObject *source,
   GFile *file;
   GError *error = NULL;
 
-  file = gtk_file_dialog_open_finish (dialog, result, &error);
+  file = gtk_file_dialog_save_finish (dialog, result, &error);
   if (file)
     {
       char *contents;
@@ -101,16 +99,15 @@ open_response_cb (GObject *source,
           create_window (app, contents);
           g_free (contents);
         }
-    }
+      else
+        {
+          GtkAlertDialog *alert;
 
-  if (error)
+          alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
-    {
+          gtk_alert_dialog_show (alert, NULL);
-      GtkAlertDialog *alert;
+          g_object_unref (alert);
-
+          g_error_free (error);
-      alert = gtk_alert_dialog_new ("Error loading file: \"%s\"", error->message);
+        }
-      gtk_alert_dialog_show (alert, NULL);
-      g_object_unref (alert);
-      g_error_free (error);
     }
 
   g_object_unref (app);
@@ -126,7 +123,7 @@ activate_open (GSimpleAction *action,
   GtkFileDialog *dialog;
 
   dialog = gtk_file_dialog_new ();
-  gtk_file_dialog_open (dialog, NULL, NULL, open_response_cb, g_object_ref (app));
+  gtk_file_dialog_open (dialog, NULL, NULL, NULL, open_response_cb, g_object_ref (app));
   g_object_unref (dialog);
 }
 
@@ -297,7 +294,7 @@ static GActionEntry win_entries[] = {
 static void
 clicked_cb (GtkWidget *widget, DemoApplicationWindow *window)
 {
-  gtk_widget_set_visible (window->infobar, FALSE);
+  gtk_widget_hide (window->infobar);
 }
 
 static void

demos/gtk-demo/assistant.c

@@ -7,8 +7,6 @@
 
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static GtkWidget *progress_bar = NULL;
 
 static gboolean
@@ -142,6 +140,7 @@ create_page3 (GtkWidget *assistant)
 
   label = gtk_label_new ("This is a confirmation page, press 'Apply' to apply changes");
 
+  gtk_widget_show (label);
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), label);
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), label, GTK_ASSISTANT_PAGE_CONFIRM);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), label, TRUE);
@@ -158,6 +157,7 @@ create_page4 (GtkWidget *assistant)
   gtk_widget_set_margin_start (progress_bar, 40);
   gtk_widget_set_margin_end (progress_bar, 40);
 
+  gtk_widget_show (progress_bar);
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), progress_bar);
   gtk_assistant_set_page_type (GTK_ASSISTANT (assistant), progress_bar, GTK_ASSISTANT_PAGE_PROGRESS);
   gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), progress_bar, "Applying changes");
@@ -199,7 +199,7 @@ do_assistant (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (assistant))
-    gtk_widget_set_visible (assistant, TRUE);
+    gtk_widget_show (assistant);
   else
     gtk_window_destroy (GTK_WINDOW (assistant));
 

demos/gtk-demo/builder.c

@@ -37,8 +37,6 @@ remove_timeout (gpointer data)
   g_source_remove (id);
 }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static gboolean
 pop_status (gpointer data)
 {
@@ -59,8 +57,6 @@ status_message (GtkStatusbar *status,
   g_object_set_data_full (G_OBJECT (status), "timeout", GUINT_TO_POINTER (id), remove_timeout);
 }
 
-G_GNUC_END_IGNORE_DEPRECATIONS
-
 static void
 help_activate (GSimpleAction *action,
                GVariant      *parameter,
@@ -172,7 +168,7 @@ do_builder (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/clipboard.c

@@ -1,5 +1,4 @@
 /* Clipboard
- * #Keywords: drag-and-drop, dnd
  *
  * GdkClipboard is used for clipboard handling. This demo shows how to
  * copy and paste text, images, colors or files to and from the clipboard.
@@ -244,43 +243,8 @@ open_file_cb (GtkWidget *button)
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
                         NULL,
+                        NULL,
                         file_chooser_response, button);
-
-  g_object_unref (dialog);
-}
-
-static void
-folder_chooser_response (GObject *source,
-                         GAsyncResult *result,
-                         gpointer user_data)
-{
-  GtkFileDialog *dialog = GTK_FILE_DIALOG (source);
-  GtkButton *button = GTK_BUTTON (user_data);
-  GFile *file;
-
-  file = gtk_file_dialog_select_folder_finish (dialog, result, NULL);
-  if (file)
-    {
-      file_button_set_file (button, file);
-      g_object_unref (file);
-
-      update_copy_button_sensitivity (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_STACK));
-    }
-}
-
-static void
-open_folder_cb (GtkWidget *button)
-{
-  GtkFileDialog *dialog;
-
-  dialog = gtk_file_dialog_new ();
-
-  gtk_file_dialog_select_folder (dialog,
-                                 GTK_WINDOW (gtk_widget_get_ancestor (button, GTK_TYPE_WINDOW)),
-                                 NULL,
-                                 folder_chooser_response, button);
-
-  g_object_unref (dialog);
 }
 
 static void
@@ -381,7 +345,6 @@ do_clipboard (GtkWidget *do_widget)
       gtk_builder_cscope_add_callback (scope, source_changed_cb);
       gtk_builder_cscope_add_callback (scope, text_changed_cb);
       gtk_builder_cscope_add_callback (scope, open_file_cb);
-      gtk_builder_cscope_add_callback (scope, open_folder_cb);
       gtk_builder_cscope_add_callback (scope, on_drop);
       gtk_builder_cscope_add_callback (scope, drag_prepare);
       builder = gtk_builder_new ();
@@ -405,7 +368,7 @@ do_clipboard (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/clipboard.ui

@@ -32,7 +32,6 @@
                       <item>Color</item>
                       <item>Image</item>
                       <item>File</item>
-                      <item>Folder</item>
                     </items>
                   </object>
                 </property>
@@ -167,30 +166,6 @@
                     </property>
                   </object>
                 </child>
-                <child>
-                  <object class="GtkStackPage">
-                    <property name="name">Folder</property>
-                    <property name="child">
-                      <object class="GtkButton" id="source_folder">
-                        <child>
-                          <object class="GtkDragSource">
-                            <property name="propagation-phase">capture</property>
-                            <signal name="prepare" handler="drag_prepare"/>
-                          </object>
-                        </child>
-                        <property name="valign">center</property>
-                        <property name="child">
-                          <object class="GtkLabel">
-                            <property name="label">—</property>
-                            <property name="xalign">0</property>
-                            <property name="ellipsize">start</property>
-                          </object>
-                        </property>
-                        <signal name="clicked" handler="open_folder_cb"/>
-                      </object>
-                    </property>
-                  </object>
-                </child>
               </object>
             </child>
             <child>

demos/gtk-demo/combobox.c

@@ -449,7 +449,7 @@ do_combobox (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/constraints.c

@@ -277,7 +277,7 @@ do_constraints (GtkWidget *do_widget)
    }
 
  if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/constraints_builder.c

@@ -66,7 +66,7 @@ do_constraints_builder (GtkWidget *do_widget)
    }
 
  if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/constraints_interactive.c

@@ -229,7 +229,7 @@ do_constraints_interactive (GtkWidget *do_widget)
    }
 
  if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/constraints_vfl.c

@@ -152,7 +152,7 @@ do_constraints_vfl (GtkWidget *do_widget)
    }
 
  if (!gtk_widget_get_visible (window))
-   gtk_widget_set_visible (window, TRUE);
+   gtk_widget_show (window);
  else
    gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_accordion.c

@@ -68,7 +68,7 @@ do_css_accordion (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_basics.c

@@ -115,7 +115,7 @@ do_css_basics (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_blendmodes.c

@@ -139,7 +139,7 @@ do_css_blendmodes (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_multiplebgs.c

@@ -155,7 +155,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_pixbufs.c

@@ -124,7 +124,7 @@ do_css_pixbufs (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/css_shadows.c

@@ -142,7 +142,7 @@ do_css_shadows (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/cursors.c

@@ -33,7 +33,7 @@ do_cursors (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/demo.gresource.xml

@@ -215,12 +215,6 @@
     <file>demo3widget.h</file>
     <file>demo3widget.ui</file>
   </gresource>
-  <gresource prefix="/mask">
-    <file>demo4widget.c</file>
-    <file>demo4widget.h</file>
-    <file>hsla.h</file>
-    <file>hsla.c</file>
-  </gresource>
   <gresource prefix="/paintable_svg">
     <file>svgpaintable.h</file>
     <file>svgpaintable.c</file>
@@ -317,7 +311,6 @@
     <file>list_store.c</file>
     <file>main.c</file>
     <file>markup.c</file>
-    <file>mask.c</file>
     <file>menu.c</file>
     <file>overlay.c</file>
     <file>overlay_decorative.c</file>

demos/gtk-demo/demo3widget.c

@@ -3,8 +3,7 @@
 
 enum
 {
-  PROP_TEXTURE = 1,
+  PROP_PAINTABLE = 1,
-  PROP_FILTER,
   PROP_SCALE
 };
 
@@ -12,9 +11,8 @@ struct _Demo3Widget
 {
   GtkWidget parent_instance;
 
-  GdkTexture *texture;
+  GdkPaintable *paintable;
   float scale;
-  GskScalingFilter filter;
 
   GtkWidget *menu;
 };
@@ -30,7 +28,6 @@ static void
 demo3_widget_init (Demo3Widget *self)
 {
   self->scale = 1.f;
-  self->filter = GSK_SCALING_FILTER_LINEAR;
   gtk_widget_init_template (GTK_WIDGET (self));
 }
 
@@ -39,7 +36,7 @@ demo3_widget_dispose (GObject *object)
 {
   Demo3Widget *self = DEMO3_WIDGET (object);
 
-  g_clear_object (&self->texture);
+  g_clear_object (&self->paintable);
 
   gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);
 
@@ -53,13 +50,12 @@ demo3_widget_snapshot (GtkWidget   *widget,
   Demo3Widget *self = DEMO3_WIDGET (widget);
   int x, y, width, height;
   double w, h;
-  GskRenderNode *node;
 
   width = gtk_widget_get_width (widget);
   height = gtk_widget_get_height (widget);
 
-  w = self->scale * gdk_texture_get_width (self->texture);
+  w = self->scale * gdk_paintable_get_intrinsic_width (self->paintable);
-  h = self->scale * gdk_texture_get_height (self->texture);
+  h = self->scale * gdk_paintable_get_intrinsic_height (self->paintable);
 
   x = MAX (0, (width - ceil (w)) / 2);
   y = MAX (0, (height - ceil (h)) / 2);
@@ -67,11 +63,7 @@ demo3_widget_snapshot (GtkWidget   *widget,
   gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
   gtk_snapshot_save (snapshot);
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-  node = gsk_texture_scale_node_new (self->texture,
+  gdk_paintable_snapshot (self->paintable, snapshot, w, h);
-                                     &GRAPHENE_RECT_INIT (0, 0, w, h),
-                                     self->filter);
-  gtk_snapshot_append_node (snapshot, node);
-  gsk_render_node_unref (node);
   gtk_snapshot_restore (snapshot);
   gtk_snapshot_pop (snapshot);
 }
@@ -89,9 +81,9 @@ demo3_widget_measure (GtkWidget      *widget,
   int size;
 
   if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = gdk_texture_get_width (self->texture);
+    size = gdk_paintable_get_intrinsic_width (self->paintable);
   else
-    size = gdk_texture_get_height (self->texture);
+    size = gdk_paintable_get_intrinsic_height (self->paintable);
 
   *minimum = *natural = self->scale * size;
 }
@@ -121,9 +113,9 @@ demo3_widget_set_property (GObject      *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
+    case PROP_PAINTABLE:
-      g_clear_object (&self->texture);
+      g_clear_object (&self->paintable);
-      self->texture = g_value_dup_object (value);
+      self->paintable = g_value_dup_object (value);
       gtk_widget_queue_resize (GTK_WIDGET (object));
       break;
 
@@ -132,11 +124,6 @@ demo3_widget_set_property (GObject      *object,
       gtk_widget_queue_resize (GTK_WIDGET (object));
       break;
 
-    case PROP_FILTER:
-      self->filter = g_value_get_enum (value);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -153,18 +140,14 @@ demo3_widget_get_property (GObject     *object,
 
   switch (prop_id)
     {
-    case PROP_TEXTURE:
+    case PROP_PAINTABLE:
-      g_value_set_object (value, self->texture);
+      g_value_set_object (value, self->paintable);
       break;
 
     case PROP_SCALE:
       g_value_set_float (value, self->scale);
       break;
 
-    case PROP_FILTER:
-      g_value_set_enum (value, self->filter);
-      break;
-
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -222,21 +205,16 @@ demo3_widget_class_init (Demo3WidgetClass *class)
   widget_class->measure = demo3_widget_measure;
   widget_class->size_allocate = demo3_widget_size_allocate;
 
-  g_object_class_install_property (object_class, PROP_TEXTURE,
+  g_object_class_install_property (object_class, PROP_PAINTABLE,
-      g_param_spec_object ("texture", NULL, NULL,
+      g_param_spec_object ("paintable", "Paintable", "Paintable",
-                           GDK_TYPE_TEXTURE,
+                           GDK_TYPE_PAINTABLE,
                            G_PARAM_READWRITE));
 
   g_object_class_install_property (object_class, PROP_SCALE,
-      g_param_spec_float ("scale", NULL, NULL,
+      g_param_spec_float ("scale", "Scale", "Scale",
                           0.0, 10.0, 1.0,
                           G_PARAM_READWRITE));
 
-  g_object_class_install_property (object_class, PROP_FILTER,
-      g_param_spec_enum ("filter", NULL, NULL,
-                         GSK_TYPE_SCALING_FILTER, GSK_SCALING_FILTER_LINEAR,
-                         G_PARAM_READWRITE));
-
   /* These are the actions that we are using in the menu */
   gtk_widget_class_install_action (widget_class, "zoom.in", NULL, zoom_cb);
   gtk_widget_class_install_action (widget_class, "zoom.out", NULL, zoom_cb);
@@ -251,13 +229,16 @@ GtkWidget *
 demo3_widget_new (const char *resource)
 {
   Demo3Widget *self;
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+  GdkPaintable *paintable;
 
-  texture = gdk_texture_new_from_resource (resource);
+  pixbuf = gdk_pixbuf_new_from_resource (resource, NULL);
+  paintable = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));
 
-  self = g_object_new (DEMO3_TYPE_WIDGET, "texture", texture, NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "paintable", paintable, NULL);
 
-  g_object_unref (texture);
+  g_object_unref (pixbuf);
+  g_object_unref (paintable);
 
   return GTK_WIDGET (self);
 }

demos/gtk-demo/demo4widget.c

@@ -1,226 +0,0 @@
-#include <math.h>
-#include "demo4widget.h"
-#include "hsla.h"
-
-enum
-{
-  PROP_0,
-  PROP_PROGRESS,
-};
-
-struct _Demo4Widget
-{
-  GtkWidget parent_instance;
-  PangoLayout *layout;
-  GskColorStop stops[8];
-  gsize n_stops;
-  double progress;
-
-  guint tick;
-};
-
-struct _Demo4WidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (Demo4Widget, demo4_widget, GTK_TYPE_WIDGET)
-
-static void
-rotate_color (GdkRGBA *rgba)
-{
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, rgba);
-  hsla.hue -= 1;
-  _gdk_rgba_init_from_hsla (rgba, &hsla);
-}
-
-static gboolean
-rotate_colors (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       user_data)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-
-  for (unsigned int i = 0; i < self->n_stops; i++)
-    rotate_color (&self->stops[i].color);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-demo4_widget_init (Demo4Widget *self)
-{
-  PangoFontDescription *desc;
-
-  self->progress = 0.5;
-
-  self->n_stops = 8;
-  self->stops[0].offset = 0;
-  self->stops[0].color = (GdkRGBA) { 1, 0, 0, 1 };
-
-  for (unsigned int i = 1; i < self->n_stops; i++)
-    {
-      GdkHSLA hsla;
-
-      self->stops[i].offset = i / (double)(self->n_stops - 1);
-      _gdk_hsla_init_from_rgba (&hsla, &self->stops[i - 1].color);
-      hsla.hue += 360.0 / (double)(self->n_stops - 1);
-      _gdk_rgba_init_from_hsla (&self->stops[i].color, &hsla);
-    }
-
-  self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "123");
-  desc = pango_font_description_from_string ("Cantarell Bold 210");
-  pango_layout_set_font_description (self->layout, desc);
-  pango_font_description_free (desc);
-
-  self->tick = gtk_widget_add_tick_callback (GTK_WIDGET (self), rotate_colors, NULL, NULL);
-}
-
-static void
-demo4_widget_dispose (GObject *object)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  g_clear_object (&self->layout);
-  gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick);
-
-  G_OBJECT_CLASS (demo4_widget_parent_class)->dispose (object);
-}
-
-static void
-demo4_widget_snapshot_content (GtkWidget   *widget,
-                               GtkSnapshot *snapshot,
-                               GskMaskMode  mode)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height, layout_width, layout_height;
-  double scale;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, mode);
-  pango_layout_get_pixel_size (self->layout, &layout_width, &layout_height);
-  scale = MIN ((double) width / layout_width, (double) height / layout_height);
-  gtk_snapshot_translate (snapshot,
-                          &GRAPHENE_POINT_INIT ((width - scale * layout_width) / 2,
-                                                (height - scale * layout_height) / 2));
-  gtk_snapshot_scale (snapshot, scale, scale);
-  gtk_snapshot_append_layout (snapshot, self->layout, &(GdkRGBA) { 0, 0, 0, 1 });
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, height),
-                                       self->stops,
-                                       self->n_stops);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_INVERTED_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_INVERTED_ALPHA);
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_ALPHA);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      self->progress = g_value_get_double (value);
-      gtk_widget_queue_draw (GTK_WIDGET (object));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      g_value_set_double (value, self->progress);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_class_init (Demo4WidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo4_widget_dispose;
-  object_class->get_property = demo4_widget_get_property;
-  object_class->set_property = demo4_widget_set_property;
-
-  widget_class->snapshot = demo4_widget_snapshot;
-
-  g_object_class_install_property (object_class, PROP_PROGRESS,
-      g_param_spec_double ("progress", NULL, NULL,
-                           0.0, 1.0, 0.5,
-                           G_PARAM_READWRITE));
-}
-
-GtkWidget *
-demo4_widget_new (void)
-{
-  return g_object_new (DEMO4_TYPE_WIDGET, NULL);
-}
-

demos/gtk-demo/demo4widget.h

@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO4_TYPE_WIDGET (demo4_widget_get_type ())
-G_DECLARE_FINAL_TYPE (Demo4Widget, demo4_widget, DEMO4, WIDGET, GtkWidget)
-
-GtkWidget * demo4_widget_new (void);

demos/gtk-demo/dialog.c

@@ -18,19 +18,23 @@ static void
 message_dialog_clicked (GtkButton *button,
                         gpointer   user_data)
 {
-  GtkWidget *dialog;
+  GtkAlertDialog *dialog;
-  static int i = 1;
+  GtkWindow *parent;
+  static int count = 1;
+  char *detail;
 
-  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
+  parent = GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (button), GTK_TYPE_WINDOW));
-                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
+
-                                   GTK_MESSAGE_INFO,
+  dialog = gtk_alert_dialog_new ("Test message");
-                                   GTK_BUTTONS_OK_CANCEL,
+  detail = g_strdup_printf (ngettext ("Has been shown once", "Has been shown %d times", count), count);
-                                   "Test message");
+  gtk_alert_dialog_set_detail (dialog, detail);
-  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+  g_free (detail);
-                                            ngettext ("Has been shown once", "Has been shown %d times", i), i);
+  gtk_alert_dialog_set_buttons (dialog, (const char *[]) {"_Cancel", "_OK", NULL });
-  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+  gtk_alert_dialog_set_cancel_button (dialog, 0);
-  gtk_window_present (GTK_WINDOW (dialog));
+  gtk_alert_dialog_set_default_button (dialog, 1);
-  i++;
+
+  gtk_alert_dialog_show (dialog, parent);
+  count++;
 }
 
 typedef struct {
@@ -116,7 +120,7 @@ interactive_dialog_clicked (GtkButton *button,
                          data, (GClosureNotify) g_free,
                          0);
 
-  gtk_window_present (GTK_WINDOW (dialog));
+  gtk_widget_show (dialog);
 }
 
 GtkWidget *
@@ -186,7 +190,7 @@ do_dialog (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/dnd.c

@@ -356,10 +356,6 @@ canvas_item_start_editing (CanvasItem *item)
 
 }
 
-typedef struct {
-  double x, y;
-} Hotspot;
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
          double         x,
@@ -367,7 +363,6 @@ prepare (GtkDragSource *source,
 {
   GtkWidget *canvas;
   GtkWidget *item;
-  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -378,10 +373,6 @@ prepare (GtkDragSource *source,
 
   g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
 
-  hotspot = g_new (Hotspot, 1);
-  gtk_widget_translate_coordinates (canvas, item, x, y, &hotspot->x, &hotspot->y);
-  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
-
   return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }
 
@@ -392,14 +383,12 @@ drag_begin (GtkDragSource *source,
   GtkWidget *canvas;
   CanvasItem *item;
   GdkPaintable *paintable;
-  Hotspot *hotspot;
 
   canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
   item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
-  hotspot = (Hotspot *) g_object_get_data (G_OBJECT (canvas), "hotspot");
 
   paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
+  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
   g_object_unref (paintable);
 
   gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);
@@ -813,7 +802,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/drawingarea.c

@@ -362,7 +362,7 @@ do_drawingarea (GtkWidget *do_widget)
                         G_CALLBACK (scribble_resize), NULL);
 
       drag = gtk_gesture_drag_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), 0);
+      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (drag), GDK_BUTTON_PRIMARY);
       gtk_widget_add_controller (da, GTK_EVENT_CONTROLLER (drag));
 
       g_signal_connect (drag, "drag-begin", G_CALLBACK (drag_begin), da);
@@ -372,7 +372,7 @@ do_drawingarea (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-      gtk_widget_set_visible (window, TRUE);
+      gtk_widget_show (window);
   else
       gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/dropdown.c

@@ -164,14 +164,14 @@ strings_bind_item (GtkSignalListItemFactory *factory,
   popup = gtk_widget_get_ancestor (title, GTK_TYPE_POPOVER);
   if (popup && gtk_widget_is_ancestor (popup, GTK_WIDGET (dropdown)))
     {
-      gtk_widget_set_visible (checkmark, TRUE);
+      gtk_widget_show (checkmark);
       g_signal_connect (dropdown, "notify::selected-item",
                         G_CALLBACK (selected_item_changed), item);
       selected_item_changed (dropdown, NULL, item);
     }
   else
     {
-      gtk_widget_set_visible (checkmark, FALSE);
+      gtk_widget_hide (checkmark);
     }
 }
 
@@ -563,7 +563,7 @@ do_dropdown (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/editable_cells.c

@@ -409,7 +409,7 @@ do_editable_cells (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/entry_completion.c

@@ -115,7 +115,7 @@ do_entry_completion (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/entry_undo.c

@@ -46,7 +46,7 @@ do_entry_undo (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/errorstates.c

@@ -42,12 +42,12 @@ mode_switch_state_set (GtkSwitch *sw,
   if (!state ||
       (gtk_range_get_value (GTK_RANGE (scale)) > 50))
     {
-      gtk_widget_set_visible (label, FALSE);
+      gtk_widget_hide (label);
       gtk_switch_set_state (sw, state);
     }
   else
     {
-      gtk_widget_set_visible (label, TRUE);
+      gtk_widget_show (label);
     }
 
   return TRUE;
@@ -65,7 +65,7 @@ level_scale_value_changed (GtkRange *range,
       !gtk_switch_get_state (GTK_SWITCH (sw)) &&
       (gtk_range_get_value (range) > 50))
     {
-      gtk_widget_set_visible (label, FALSE);
+      gtk_widget_hide (label);
       gtk_switch_set_state (GTK_SWITCH (sw), TRUE);
     }
   else if (gtk_switch_get_state (GTK_SWITCH (sw)) &&
@@ -113,7 +113,7 @@ do_errorstates (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/expander.c

@@ -122,7 +122,7 @@ do_expander (GtkWidget *do_widget)
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/filtermodel.c

@@ -199,7 +199,7 @@ do_filtermodel (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/fishbowl.c

@@ -329,7 +329,7 @@ do_fishbowl (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/fixed.c

@@ -160,7 +160,7 @@ do_fixed (GtkWidget *do_widget)
     demo_window = create_demo_window (do_widget);
 
   if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
   else
     gtk_window_destroy (GTK_WINDOW (demo_window));
 

demos/gtk-demo/flowbox.c

@@ -742,7 +742,7 @@ do_flowbox (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/font_features.c

@@ -855,6 +855,11 @@ update_script_combo (void)
   pair->lang_tag = 0;
   g_hash_table_add (tags, pair);
 
+  pair = g_new (TagPair, 1);
+  pair->script_tag = HB_OT_TAG_DEFAULT_SCRIPT;
+  pair->lang_tag = HB_OT_TAG_DEFAULT_LANGUAGE;
+  g_hash_table_add (tags, pair);
+
   if (hb_font)
     {
       hb_tag_t tables[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
@@ -966,6 +971,9 @@ update_features (void)
 
   /* set feature presence checks from the font features */
 
+  if (gtk_drop_down_get_selected (GTK_DROP_DOWN (demo->script_lang)) == 0)
+    return;
+
   selected = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (demo->script_lang));
 
   if (selected->lang_tag == 0) /* None is selected */
@@ -973,8 +981,8 @@ update_features (void)
       for (l = demo->feature_items; l; l = l->next)
         {
           FeatureItem *item = l->data;
-          gtk_widget_set_visible (item->feat, TRUE);
+          gtk_widget_show (item->feat);
-          gtk_widget_set_visible (gtk_widget_get_parent (item->feat), TRUE);
+          gtk_widget_show (gtk_widget_get_parent (item->feat));
           if (strcmp (item->name, "xxxx") == 0)
             gtk_check_button_set_active (GTK_CHECK_BUTTON (item->feat), TRUE);
         }
@@ -985,8 +993,8 @@ update_features (void)
   for (l = demo->feature_items; l; l = l->next)
     {
       FeatureItem *item = l->data;
-      gtk_widget_set_visible (item->feat, FALSE);
+      gtk_widget_hide (item->feat);
-      gtk_widget_set_visible (gtk_widget_get_parent (item->feat), FALSE);
+      gtk_widget_hide (gtk_widget_get_parent (item->feat));
       if (strcmp (item->name, "xxxx") == 0)
         gtk_check_button_set_active (GTK_CHECK_BUTTON (item->feat), TRUE);
     }
@@ -994,8 +1002,6 @@ update_features (void)
   pango_font = get_pango_font ();
   hb_font = pango_font_get_hb_font (pango_font);
 
-  g_print ("language %s\n", selected->langname);
-
   if (hb_font)
     {
       hb_tag_t tables[2] = { HB_OT_TAG_GSUB, HB_OT_TAG_GPOS };
@@ -1022,6 +1028,9 @@ update_features (void)
               char buf[5];
               hb_tag_to_string (features[j], buf);
               buf[4] = 0;
+#if 0
+              g_print ("%s present in %s\n", buf, i == 0 ? "GSUB" : "GPOS");
+#endif
 
               if (g_str_has_prefix (buf, "ss") || g_str_has_prefix (buf, "cv"))
                 {
@@ -1071,15 +1080,15 @@ update_features (void)
 
                   if (item->tag == features[j])
                     {
-                      gtk_widget_set_visible (item->feat, TRUE);
+                      gtk_widget_show (item->feat);
-                      gtk_widget_set_visible (gtk_widget_get_parent (item->feat), TRUE);
+                      gtk_widget_show (gtk_widget_get_parent (item->feat));
                       if (GTK_IS_CHECK_BUTTON (item->feat))
                         {
                           GtkWidget *def = GTK_WIDGET (g_object_get_data (G_OBJECT (item->feat), "default"));
                           if (def)
                             {
-                              gtk_widget_set_visible (def, TRUE);
+                              gtk_widget_show (def);
-                              gtk_widget_set_visible (gtk_widget_get_parent (def), TRUE);
+                              gtk_widget_show (gtk_widget_get_parent (def));
                               gtk_check_button_set_active (GTK_CHECK_BUTTON (def), TRUE);
                             }
                           else
@@ -1413,7 +1422,10 @@ instance_changed (GtkDropDown *combo)
   ikey.name = (char *) text;
   instance = g_hash_table_lookup (demo->instances, &ikey);
   if (!instance)
-    goto out;
+    {
+      g_print ("did not find instance %s\n", text);
+      goto out;
+    }
 
   pango_font = get_pango_font ();
   hb_font = pango_font_get_hb_font (pango_font);

demos/gtk-demo/fontrendering.c

@@ -435,7 +435,7 @@ do_fontrendering (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/frames.c

@@ -157,7 +157,7 @@ do_frames (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/gears.c

@@ -54,6 +54,7 @@ create_axis_slider (GtkGears *gears,
 
   label = gtk_label_new (text);
   gtk_box_append (GTK_BOX (box), label);
+  gtk_widget_show (label);
 
   adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0);
   g_object_set_data (G_OBJECT (adj), "axis", GINT_TO_POINTER (axis));
@@ -64,6 +65,9 @@ create_axis_slider (GtkGears *gears,
   gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
   gtk_box_append (GTK_BOX (box), slider);
   gtk_widget_set_vexpand (slider, TRUE);
+  gtk_widget_show (slider);
+
+  gtk_widget_show (box);
 
   return box;
 }
@@ -125,7 +129,7 @@ do_gears (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/gestures.c

@@ -208,7 +208,7 @@ do_gestures (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/glarea.c

@@ -355,6 +355,7 @@ create_axis_slider (int axis)
 
   label = gtk_label_new (text);
   gtk_box_append (GTK_BOX (box), label);
+  gtk_widget_show (label);
 
   adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
   g_signal_connect (adj, "value-changed",
@@ -363,6 +364,9 @@ create_axis_slider (int axis)
   slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
   gtk_box_append (GTK_BOX (box), slider);
   gtk_widget_set_hexpand (slider, TRUE);
+  gtk_widget_show (slider);
+
+  gtk_widget_show (box);
 
   return box;
 }
@@ -436,7 +440,7 @@ do_glarea (GtkWidget *do_widget)
     demo_window = create_glarea_window (do_widget);
 
   if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
   else
     gtk_window_destroy (GTK_WINDOW (demo_window));
 

demos/gtk-demo/gltransition.c

@@ -33,7 +33,7 @@ static void
 text_changed (GtkTextBuffer *buffer,
               GtkWidget     *button)
 {
-  gtk_widget_set_visible (button, TRUE);
+  gtk_widget_show (button);
 }
 
 static void
@@ -58,7 +58,7 @@ apply_text (GtkWidget     *button,
   g_object_unref (shader);
   g_bytes_unref (bytes);
 
-  gtk_widget_set_visible (button, FALSE);
+  gtk_widget_hide (button);
 }
 
 static void
@@ -237,7 +237,7 @@ make_shader_stack (const char *name,
   gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
   gtk_widget_add_css_class (button, "small");
-  gtk_widget_set_visible (button, FALSE);
+  gtk_widget_hide (button);
   gtk_center_box_set_end_widget (GTK_CENTER_BOX (widget), button);
 
   gtk_box_append (GTK_BOX (vbox), widget);
@@ -354,7 +354,7 @@ do_gltransition (GtkWidget *do_widget)
     demo_window = create_gltransition_window (do_widget);
 
   if (!gtk_widget_get_visible (demo_window))
-    gtk_widget_set_visible (demo_window, TRUE);
+    gtk_widget_show (demo_window);
   else
     gtk_window_destroy (GTK_WINDOW (demo_window));
 

demos/gtk-demo/gtkgears.c

@@ -48,16 +48,14 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6
 
-static inline void
+#ifndef HAVE_SINCOS
-_sincos (double x, double *_sin, double *_cos)
+static void
+sincos (double x, double *_sin, double *_cos)
 {
-#ifdef HAVE_SINCOS
-  sincos (x, _sin, _cos);
-#else
   *_sin = sin (x);
   *_cos = cos (x);
-#endif
 }
+#endif
 
 /**
  * Struct describing the vertices in triangle strip
@@ -309,11 +307,11 @@ create_gear (GLfloat inner_radius,
     struct point p[7];
 
     /* Calculate needed sin/cos for various angles */
-    _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
 
     GEAR_POINT(p[0], r2, 1);
     GEAR_POINT(p[1], r2, 2);
@@ -522,7 +520,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
    identity(tmp);
 
    deltaZ = zFar - zNear;
-   _sincos(radians, &sine, &cosine);
+   sincos(radians, &sine, &cosine);
 
    if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
       return;

demos/gtk-demo/headerbar.c

@@ -50,7 +50,7 @@ do_headerbar (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/hsla.c

@@ -1,146 +0,0 @@
-#include <gdk/gdk.h>
-#include "hsla.h"
-
-void
-_gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
-                          const GdkRGBA *rgba)
-{
-  float min;
-  float max;
-  float red;
-  float green;
-  float blue;
-  float delta;
-
-  g_return_if_fail (hsla != NULL);
-  g_return_if_fail (rgba != NULL);
-
-  red = rgba->red;
-  green = rgba->green;
-  blue = rgba->blue;
-
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-
-  hsla->lightness = (max + min) / 2;
-  hsla->saturation = 0;
-  hsla->hue = 0;
-  hsla->alpha = rgba->alpha;
-
-  if (max != min)
-    {
-      if (hsla->lightness <= 0.5)
-        hsla->saturation = (max - min) / (max + min);
-      else
-        hsla->saturation = (max - min) / (2 - max - min);
-
-      delta = max -min;
-      if (red == max)
-        hsla->hue = (green - blue) / delta;
-      else if (green == max)
-        hsla->hue = 2 + (blue - red) / delta;
-      else if (blue == max)
-        hsla->hue = 4 + (red - green) / delta;
-
-      hsla->hue *= 60;
-      if (hsla->hue < 0.0)
-        hsla->hue += 360;
-    }
-}
-
-void
-_gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
-                          const GdkHSLA *hsla)
-{
-  float hue;
-  float lightness;
-  float saturation;
-  float m1, m2;
-
-  lightness = hsla->lightness;
-  saturation = hsla->saturation;
-
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-
-  rgba->alpha = hsla->alpha;
-
-  if (saturation == 0)
-    {
-      rgba->red = lightness;
-      rgba->green = lightness;
-      rgba->blue = lightness;
-    }
-  else
-    {
-      hue = hsla->hue + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->red = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->red = m2;
-      else if (hue < 240)
-        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->red = m1;
-
-      hue = hsla->hue;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->green = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->green = m2;
-      else if (hue < 240)
-        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->green = m1;
-
-      hue = hsla->hue - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->blue = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->blue = m2;
-      else if (hue < 240)
-        rgba->blue = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->blue = m1;
-    }
-}

demos/gtk-demo/hsla.h

@@ -1,15 +0,0 @@
-#pragma once
-
-typedef struct _GdkHSLA GdkHSLA;
-
-struct _GdkHSLA {
-  float hue;
-  float saturation;
-  float lightness;
-  float alpha;
-};
-
-void            _gdk_hsla_init_from_rgba    (GdkHSLA          *hsla,
-                                             const GdkRGBA    *rgba);
-void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
-                                             const GdkHSLA    *hsla);

demos/gtk-demo/hypertext.c

@@ -399,7 +399,7 @@ do_hypertext (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/iconscroll.c

@@ -378,7 +378,7 @@ do_iconscroll (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/iconview.c

@@ -320,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/iconview_edit.c

@@ -1,5 +1,4 @@
 /* Icon View/Editing and Drag-and-Drop
- * #Keywords: dnd
  *
  * The GtkIconView widget supports Editing and Drag-and-Drop.
  * This example also demonstrates using the generic GtkCellLayout
@@ -151,7 +150,7 @@ do_iconview_edit (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/images.c

@@ -422,7 +422,7 @@ do_images (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/infobar.c

@@ -7,8 +7,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-
 static void
 on_bar_response (GtkInfoBar *info_bar,
                  int         response_id,
@@ -140,7 +138,7 @@ do_infobar (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/language-names.c

@@ -311,12 +311,5 @@ get_language_name_for_tag (guint32 tag)
   lang = hb_ot_tag_to_language (tag);
   s = hb_language_to_string (lang);
 
-  if (strcmp (s, "und-fonipa") == 0)
-    return "International Phonetic Alphabet";
-  else if (strcmp (s, "und-fonnapa") == 0)
-    return "North-American Phonetic Alphabet";
-  else if (strcmp (s, "ro-md") == 0)
-    return "Moldavian";
-
   return get_language_name (pango_language_from_string (s));
 }

demos/gtk-demo/layoutmanager.c

@@ -54,7 +54,7 @@ do_layoutmanager (GtkWidget *parent)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/layoutmanager2.c

@@ -190,7 +190,7 @@ do_layoutmanager2 (GtkWidget *parent)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/links.c

@@ -63,10 +63,11 @@ do_links (GtkWidget *do_widget)
       gtk_widget_set_margin_top (label, 20);
       gtk_widget_set_margin_bottom (label, 20);
       gtk_window_set_child (GTK_WINDOW (window), label);
+      gtk_widget_show (label);
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/list_store.c

@@ -300,7 +300,7 @@ do_list_store (GtkWidget *do_widget)
 
   if (!gtk_widget_get_visible (window))
     {
-      gtk_widget_set_visible (window, TRUE);
+      gtk_widget_show (window);
       if (timeout == 0) {
         /* FIXME this should use the animation-duration instead */
         timeout = g_timeout_add (80, spinner_timeout, NULL);

demos/gtk-demo/listbox.c

@@ -380,6 +380,7 @@ do_listbox (GtkWidget *do_widget)
         {
           message = gtk_message_new (lines[i]);
           row = gtk_message_row_new (message);
+          gtk_widget_show (GTK_WIDGET (row));
           gtk_list_box_insert (GTK_LIST_BOX (listbox), GTK_WIDGET (row), -1);
         }
 
@@ -388,7 +389,7 @@ do_listbox (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listbox_controls.c

@@ -62,7 +62,7 @@ do_listbox_controls (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_applauncher.c

@@ -191,7 +191,7 @@ do_listview_applauncher (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_clocks.c

@@ -494,7 +494,7 @@ do_listview_clocks (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_colors.c

@@ -1124,7 +1124,7 @@ do_listview_colors (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_filebrowser.c

@@ -275,7 +275,7 @@ do_listview_filebrowser (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_minesweeper.c

@@ -485,7 +485,7 @@ do_listview_minesweeper (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_settings.c

@@ -430,7 +430,7 @@ do_listview_settings (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_ucd.c

@@ -383,7 +383,7 @@ do_listview_ucd (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_weather.c

@@ -317,7 +317,7 @@ do_listview_weather (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/listview_words.c

@@ -167,6 +167,7 @@ file_open_cb (GtkWidget     *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_response_cb, stringlist);
   g_object_unref (dialog);
 }
@@ -248,7 +249,7 @@ do_listview_words (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/main.c

@@ -463,6 +463,7 @@ add_data_tab (const char *demoname)
         widget = display_nothing (resource_name);
 
       label = gtk_label_new (label_string ? label_string : resources[i]);
+      gtk_widget_show (label);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), widget, label);
       g_object_set (gtk_notebook_get_page (GTK_NOTEBOOK (notebook), widget),
                     "tab-expand", FALSE,

demos/gtk-demo/markup.c

@@ -62,6 +62,7 @@ do_markup (GtkWidget *do_widget)
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
       stack = gtk_stack_new ();
+      gtk_widget_show (stack);
       gtk_window_set_child (GTK_WINDOW (window), stack);
 
       show_source = gtk_check_button_new_with_label ("Source");
@@ -117,10 +118,12 @@ do_markup (GtkWidget *do_widget)
       gtk_text_buffer_end_irreversible_action (buffer);
 
       g_bytes_unref (bytes);
+
+      gtk_widget_show (stack);
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/mask.c

@@ -1,53 +0,0 @@
-/* Masking
- *
- * Demonstrates mask nodes.
- *
- * This demo uses a text node as mask for
- * an animated linear gradient.
- */
-
-#include <gtk/gtk.h>
-#include "demo4widget.h"
-
-
-GtkWidget *
-do_mask (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *demo;
-      GtkWidget *scale;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Mask Nodes");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      demo = demo4_widget_new ();
-      gtk_widget_set_hexpand (demo, TRUE);
-      gtk_widget_set_vexpand (demo, TRUE);
-
-      gtk_box_append (GTK_BOX (box), demo);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 1, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 0.5);
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value", demo, "progress", 0);
-
-      gtk_box_append (GTK_BOX (box), scale);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}

demos/gtk-demo/menu.c

@@ -22,11 +22,9 @@ do_menu (GtkWidget *do_widget)
   if (!window)
     {
       GtkWidget *box;
-      GtkWidget *box2;
       GtkWidget *sw;
       GtkWidget *widget;
       GtkWidget *scale;
-      GtkWidget *dropdown;
 
       window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Menu");
@@ -45,26 +43,17 @@ do_menu (GtkWidget *do_widget)
       widget = demo3_widget_new ("/transparent/portland-rose.jpg");
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
 
-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
-
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
       gtk_range_set_value (GTK_RANGE (scale), 1.0);
-      gtk_widget_set_hexpand (scale, TRUE);
+      gtk_box_append (GTK_BOX (box), scale);
-      gtk_box_append (GTK_BOX (box2), scale);
 
-      dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
-      gtk_box_append (GTK_BOX (box2), dropdown);
-
-      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
- 
       g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
                               widget, "scale",
                               G_BINDING_BIDIRECTIONAL);
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/meson.build

@@ -46,7 +46,6 @@ demos = files([
   'links.c',
   'listbox.c',
   'listbox_controls.c',
-  'mask.c',
   'menu.c',
   'flowbox.c',
   'list_store.c',
@@ -115,7 +114,6 @@ extra_demo_sources = files([
   'gtkshadertoy.c',
   'gtkshaderstack.c',
   'gskshaderpaintable.c',
-  'hsla.c',
   'puzzlepiece.c',
   'bluroverlay.c',
   'demoimage.c',
@@ -128,7 +126,6 @@ extra_demo_sources = files([
   'four_point_transform.c',
   'demo2widget.c',
   'demo3widget.c',
-  'demo4widget.c',
   'pixbufpaintable.c',
   'script-names.c',
   'unicode-names.c',
@@ -159,7 +156,7 @@ demos_h = custom_target('gtk4 demo header',
 objcopy_supports_add_symbol = false
 objcopy = find_program('objcopy', required : false)
 if objcopy.found()
-  objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol')
+  objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol')
 endif
 
 ld = find_program('ld', required : false)

demos/gtk-demo/overlay.c

@@ -84,7 +84,7 @@ do_overlay (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/overlay_decorative.c

@@ -94,7 +94,7 @@ do_overlay_decorative (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/pagesetup.c

@@ -28,7 +28,7 @@ do_pagesetup (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/paint.c

@@ -412,7 +412,7 @@ do_paint (GtkWidget *toplevel)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/paintable.c

@@ -175,7 +175,7 @@ do_paintable (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/paintable_animated.c

@@ -214,7 +214,7 @@ do_paintable_animated (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/paintable_emblem.c

@@ -177,7 +177,7 @@ do_paintable_emblem (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/paintable_mediastream.c

@@ -307,7 +307,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/paintable_svg.c

@@ -55,6 +55,7 @@ show_file_open (GtkWidget  *button,
   gtk_file_dialog_open (dialog,
                         GTK_WINDOW (gtk_widget_get_root (button)),
                         NULL,
+                        NULL,
                         open_response_cb, picture);
 }
 

demos/gtk-demo/paintable_symbolic.c

@@ -200,7 +200,7 @@ do_paintable_symbolic (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/panes.c

@@ -82,7 +82,7 @@ do_panes (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/password_entry.c

@@ -90,7 +90,7 @@ do_password_entry (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/peg_solitaire.c

@@ -1,5 +1,5 @@
 /* Peg Solitaire
- * #Keywords: GtkGridView, game, drag-and-drop, dnd
+ * #Keywords: GtkGridView, game
  *
  * This demo demonstrates how to use drag-and-drop to implement peg solitaire.
  *
@@ -487,7 +487,7 @@ do_peg_solitaire (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/pickers.c

@@ -1,147 +1,60 @@
-/* Pickers and Launchers
+/* Pickers
- * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkFileLauncher, GtkUriLauncher
+ * #Keywords: GtkColorDialog, GtkFontDialog, GtkFileDialog, GtkColorDialogButton, GtkFontDialogButton, chooser, button
  *
- * The dialogs are mainly intended for use in preference dialogs.
+ * These widgets and async APIs are mainly intended for use in preference dialogs.
- * They allow to select colors, fonts and applications.
+ * They allow to select colors, fonts, files and applications.
- *
- * The launchers let you open files or URIs in applications that
- * can handle them.
  */
 
 #include <gtk/gtk.h>
 
-static GtkWidget *app_picker;
-
 static void
 file_opened (GObject *source,
              GAsyncResult *result,
              void *data)
 {
   GFile *file;
-  GError *error = NULL;
-  char *name;
 
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
+  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, NULL);
 
-  if (!file)
+  if (file)
     {
-      g_print ("%s\n", error->message);
+      char *name = g_file_get_basename (file);
-      g_error_free (error);
+      gtk_button_set_label (GTK_BUTTON (data), name);
-      gtk_widget_set_sensitive (app_picker, FALSE);
+      g_object_set_data_full (G_OBJECT (data), "file", file, g_object_unref);
-      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
+      g_free (name);
-      return;
+   }
-    }
-
-  name = g_file_get_basename (file);
-  gtk_label_set_label (GTK_LABEL (data), name);
-  g_free (name);
-
-  gtk_widget_set_sensitive (app_picker, TRUE);
-  g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
-}
-
-static gboolean
-abort_mission (gpointer data)
-{
-  GCancellable *cancellable = data;
-
-  g_cancellable_cancel (cancellable);
-
-  return G_SOURCE_REMOVE;
 }
 
 static void
-open_file (GtkButton *picker,
+open_file (GtkButton *picker)
-           GtkLabel  *label)
 {
   GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
   GtkFileDialog *dialog;
-  GCancellable *cancellable;
+  GFile *file;
 
   dialog = gtk_file_dialog_new ();
 
-  cancellable = g_cancellable_new ();
+  file = (GFile *) g_object_get_data (G_OBJECT (picker), "file");
 
-  g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
+  gtk_file_dialog_open (dialog, parent, file, NULL, file_opened, picker);
-                              20,
-                              abort_mission, g_object_ref (cancellable), g_object_unref);
 
-  gtk_file_dialog_open (dialog, parent, cancellable, file_opened, label);
-
-  g_object_unref (cancellable);
   g_object_unref (dialog);
 }
 
-static void
+#define COLOR(r,g,b) { r/255., g/255., b/255., 1.0 }
-open_app_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkFileLauncher *launcher = GTK_FILE_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_file_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-open_app (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkFileLauncher *launcher;
-  GFile *file;
-
-  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
-  launcher = gtk_file_launcher_new (file);
-
-  gtk_file_launcher_launch (launcher, parent, NULL, open_app_done, NULL);
-
-  g_object_unref (launcher);
-}
-
-static void
-open_uri_done (GObject      *source,
-               GAsyncResult *result,
-               gpointer      data)
-{
-  GtkUriLauncher *launcher = GTK_URI_LAUNCHER (source);
-  GError *error = NULL;
-
-  if (!gtk_uri_launcher_launch_finish (launcher, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-launch_uri (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkUriLauncher *launcher;
-
-  launcher = gtk_uri_launcher_new ("http://www.gtk.org");
-
-  gtk_uri_launcher_launch (launcher, parent, NULL, open_uri_done, NULL);
-
-  g_object_unref (launcher);
-}
 
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
   static GtkWidget *window = NULL;
-  GtkWidget *table, *label, *picker, *button;
+  GtkWidget *table, *label, *picker;
 
   if (!window)
   {
     window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
-    gtk_window_set_title (GTK_WINDOW (window), "Pickers and Launchers");
+    gtk_window_set_title (GTK_WINDOW (window), "Pickers");
     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
 
     table = gtk_grid_new ();
@@ -149,8 +62,8 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_margin_end (table, 20);
     gtk_widget_set_margin_top (table, 20);
     gtk_widget_set_margin_bottom (table, 20);
-    gtk_grid_set_row_spacing (GTK_GRID (table), 6);
+    gtk_grid_set_row_spacing (GTK_GRID (table), 3);
-    gtk_grid_set_column_spacing (GTK_GRID (table), 6);
+    gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_window_set_child (GTK_WINDOW (window), table);
 
     label = gtk_label_new ("Color:");
@@ -177,36 +90,28 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_hexpand (label, TRUE);
     gtk_grid_attach (GTK_GRID (table), label, 0, 2, 1, 1);
 
-    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+    picker = gtk_button_new_with_label ("None");
-    button = gtk_button_new_from_icon_name ("document-open-symbolic");
+    g_signal_connect (picker, "clicked", G_CALLBACK (open_file), NULL);
-    label = gtk_label_new ("None");
-    gtk_label_set_xalign (GTK_LABEL (label), 0.);
-    gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
-    gtk_widget_set_hexpand (label, TRUE);
-    g_signal_connect (button, "clicked", G_CALLBACK (open_file), label);
-    gtk_box_append (GTK_BOX (picker), label);
-    gtk_box_append (GTK_BOX (picker), button);
-    app_picker = gtk_button_new_from_icon_name ("emblem-system-symbolic");
-    gtk_widget_set_halign (app_picker, GTK_ALIGN_END);
-    gtk_widget_set_sensitive (app_picker, FALSE);
-    g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
-    gtk_box_append (GTK_BOX (picker), app_picker);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
+G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 
-    label = gtk_label_new ("URI:");
+    label = gtk_label_new ("Mail:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
     gtk_widget_set_hexpand (label, TRUE);
-    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
 
-    picker = gtk_button_new_with_label ("www.gtk.org");
+    picker = gtk_app_chooser_button_new ("x-scheme-handler/mailto");
-    g_signal_connect (picker, "clicked", G_CALLBACK (launch_uri), NULL);
+    gtk_app_chooser_button_set_show_dialog_item (GTK_APP_CHOOSER_BUTTON (picker), TRUE);
+
+G_GNUC_END_IGNORE_DEPRECATIONS
+
+    gtk_grid_attach (GTK_GRID (table), label, 0, 3, 1, 1);
     gtk_grid_attach (GTK_GRID (table), picker, 1, 3, 1, 1);
   }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/read_more.c

@@ -231,7 +231,7 @@ do_read_more (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/revealer.c

@@ -90,7 +90,7 @@ do_revealer (GtkWidget *do_widget)
     {
       count = 0;
       timeout = g_timeout_add (690, reveal_one, window);
-      gtk_widget_set_visible (window, TRUE);
+      gtk_widget_show (window);
     }
   else
     {

demos/gtk-demo/rotated_text.c

@@ -210,7 +210,7 @@ do_rotated_text (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/scale.c

@@ -27,7 +27,7 @@ do_scale (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));
 

demos/gtk-demo/search_entry.c

@@ -294,11 +294,13 @@ do_search_entry (GtkWidget *do_widget)
       g_signal_connect (find_button, "clicked",
                         G_CALLBACK (start_search), entry);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), find_button, NULL);
+      gtk_widget_show (find_button);
 
       cancel_button = gtk_button_new_with_label ("Cancel");
       g_signal_connect (cancel_button, "clicked",
                         G_CALLBACK (stop_search), NULL);
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), cancel_button, NULL);
+      gtk_widget_show (cancel_button);
 
       /* Set up the search icon */
       gtk_entry_set_icon_activatable (GTK_ENTRY (entry), GTK_ENTRY_ICON_PRIMARY, TRUE);
@@ -312,7 +314,7 @@ do_search_entry (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     {
       g_clear_object (&actions);

demos/gtk-demo/search_entry2.c

@@ -91,7 +91,7 @@ do_search_entry2 (GtkWidget *do_widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
+    gtk_widget_show (window);
   else
     gtk_window_destroy (GTK_WINDOW (window));