macos: Use shadow size from GdkToplevelSize

broadway: Use shadow size from GtkToplevelSize
win32: Use shadow size from GdkToplevelSize
2020-08-12 08:20:09 -04:00 · 2020-08-12 08:20:09 -04:00 · 2020-08-12 08:20:09 -04:00 · 2020-08-12 08:13:03 -04:00 · 2020-08-12 08:00:34 -04:00 · 2020-08-12 08:00:11 -04:00
1625 changed files with 64820 additions and 93989 deletions
@@ -16,11 +16,11 @@ stages:

 # Common variables
 variables:
-  COMMON_MESON_FLAGS: "--fatal-meson-warnings --werror"
+  COMMON_MESON_FLAGS: "--fatal-meson-warnings -Dgtk:werror=true"
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true -Dvulkan=yes"
  FEATURE_FLAGS: "-Dcloudproviders=true"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v20"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v22"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19"

@@ -68,9 +68,11 @@ style-check-diff:
 fedora-x86_64:
  extends: .build-fedora-default
  stage: build
+  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
  script:
+    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
            -Dprofiler=true
            _build
@@ -82,14 +84,38 @@ fedora-x86_64:
 release-build:
  extends: .build-fedora-default
  stage: build
+  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
+    - meson subprojects update
    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
            _build
    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build x11

+installed-tests:
+  extends: .build-fedora-default
+  stage: build
+  needs: []
+  variables:
+    EXTRA_MESON_FLAGS: "--prefix=/usr --libdir=/usr/lib64 -Dinstall-tests=true"
+  script:
+    - meson subprojects update
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+            _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:
  stage: build
  tags:
@@ -109,6 +135,7 @@ release-build:

 msys2-mingw64:
  extends: .mingw-defaults
+  needs: []
  variables:
    MSYSTEM: "MINGW64"
    CHERE_INVOKING: "yes"
@@ -139,37 +166,44 @@ msys2-mingw64:

 flatpak-manual:demo:
  extends: .flatpak-manual
+  needs: []
  variables:
    APPID: org.gtk.Demo4

 flatpak-master:demo:
  extends: .flatpak-master
+  needs: []
  variables:
    APPID: org.gtk.Demo4

 flatpak-manual:widget-factory:
  extends: .flatpak-manual
+  needs: []
  variables:
    APPID: org.gtk.WidgetFactory4

 flatpak-master:widget-factory:
  extends: .flatpak-master
+  needs: []
  variables:
    APPID: org.gtk.WidgetFactory4

 flatpak-manual:icon-browser:
  extends: .flatpak-manual
+  needs: []
  variables:
    APPID: org.gtk.IconBrowser4

 flatpak-master:icon-browser:
  extends: .flatpak-master
+  needs: []
  variables:
    APPID: org.gtk.IconBrowser4

 static-scan:
  image: $FEDORA_IMAGE
  stage: analysis
+  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug"
  script:
@@ -184,8 +218,9 @@ static-scan:
 # since it is incompatible with asan
 asan-build:
  image: $FEDORA_IMAGE
-  tags: [ privileged ]
+  tags: [ asan ]
  stage: analysis
+  needs: []
  variables:
  script:
    - CC=clang meson --buildtype=debugoptimized -Db_sanitize=address -Db_lundef=false -Dintrospection=false _build
@@ -199,6 +234,7 @@ asan-build:
 reference:
  image: $DOCS_IMAGE
  stage: docs
+  needs: []
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
  script:
@@ -214,6 +250,7 @@ reference:

 pages:
  stage: deploy
+  needs: ['reference']
  script:
    - mv _reference/ public/
  artifacts:
@@ -29,6 +29,7 @@ RUN dnf -y install \
    glib2-static \
    glibc-devel \
    glibc-headers \
+    gnome-desktop-testing \
    gobject-introspection-devel \
    graphene-devel \
    gstreamer1-devel \
@@ -75,7 +76,6 @@ RUN dnf -y install \
    python3-wheel \
    redhat-rpm-config \
    sassc \
-    sysprof-devel \
    systemtap-sdt-devel \
    vulkan-devel \
    wayland-devel \
@@ -1,8 +1,11 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v20
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v21
+
+# Enable sudo for wheel users
+RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
+RUN useradd -u $HOST_USER_ID -G wheel -ms /bin/bash user

 USER user
 WORKDIR /home/user
@@ -12,13 +12,12 @@ export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp

 case "${backend}" in
  x11)
-    xvfb-run -a -s "-screen 0 1024x768x24" \
+    xvfb-run -a -s "-screen 0 1024x768x24 -noreset" \
          meson test -C ${builddir} \
                --timeout-multiplier "${MESON_TEST_TIMEOUT_MULTIPLIER}" \
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=gtk:a11y \
                --no-suite=gsk-compare-broadway

    # Store the exit code for the CI run, but always
@@ -38,7 +37,6 @@ case "${backend}" in
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=gtk:a11y \
                --no-suite=gsk-compare-broadway

    exit_code=$?
@@ -57,7 +55,6 @@ case "${backend}" in
                --print-errorlogs \
                --setup=${backend} \
                --suite=gtk \
-                --no-suite=gtk:a11y \
                --no-suite=gsk-compare-opengl

    # don't let Broadway failures fail the run, for now
@@ -33,17 +33,29 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-gst-plugins-bad \
    mingw-w64-$MSYS2_ARCH-shared-mime-info

-# https://gitlab.gnome.org/GNOME/gtk/issues/2243
-wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
-pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
-
-# https://github.com/msys2/MINGW-packages/pull/6465
-pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
-
 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
 export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"

+# https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
+# https://gitlab.gnome.org/GNOME/gtk/-/issues/3002
+
+if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
+    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
+    meson setup _glib_build _glib
+    meson compile -C _glib_build
+    meson install -C _glib_build
+fi
+pkg-config --modversion glib-2.0
+
+if ! pkg-config --atleast-version=1.45.4 pango; then
+    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
+    meson setup _pango_build _pango
+    meson compile -C _pango_build
+    meson install -C _pango_build
+fi
+pkg-config --modversion pango
+
 # Build
 ccache --zero-stats
 ccache --show-stats
@@ -56,7 +68,7 @@ meson \
    -Dwin32-backend=true \
    -Dvulkan=no \
    -Dintrospection=false \
-    --werror \
+    -Dgtk:werror=true \
    _build
 unset CCACHE_DISABLE

@@ -1,7 +1,54 @@
+Overview of Changes in GTK 3.99.1
+=================================
+
+* GtkGridLayout: Rename left-/top-attach to column/row
+
+* Drop GtkAccelLabel - it is no longer used
+
+* GtkTextView:
+ - Fix redraw issues with selections
+ - Make insert-emoji replace the selection
+
+* GtkTreeView:
+ - Fix selection handling in cell editables
+
+* CSS:
+ - Hexadecimal colors can now specify alpha
+
+* Documentation:
+ - Refresh the widget gallery
+ - Add images for new widgets to the gallery
+ - Fix many cross-references
+
+* Demos:
+ - Numerous crash- and bug fixes
+
+* Fix build with cups < 2.3
+
+* win32:
+ - Default to the GL renderer when we can
+
+* Translation updates:
+  Catalan
+  Polish
+  Romanian
+  Spanish
+  Ukrainian
+
+
 Overview of Changes in GTK 3.99.0
 =================================

-* Add GtkEditableLabel
+* Remove the old accessibility implementation and
+  add the foundations for a new one that is based
+  on ARIA. The relevant widget api is GtkAccessible,
+  the backend implementations will use GtkATContext.
+  Currently, there is just a nascent test backend.
+
+* Update the GTK headers to use char *, int, float and
+  double instead of the corresponding GLib types.
+
+* Add GtkEditableLabel, a label that can be edited

 * Add GtkBookmarkList, a list model for bookmarks

@@ -35,6 +82,15 @@ Overview of Changes in GTK 3.99.0

 * GtkFilterListModel:
 - Add incremental filtering
+ - Add a boolean filter, GtkBoolFilter
+
+* GtkSortListModel:
+ - Use timsort
+ - Add various tweaks that massively speed up sorting
+ - Add incremental sorting
+
+* GtkWidget:
+ - Massively speed up action handling

 * GtkEntry:
 - Make entry completion work again
@@ -43,12 +99,18 @@ Overview of Changes in GTK 3.99.0
 * Inspector:
 - Improve list model support
 - Add direct navigation between objects
+ - Show accessibility information

 * GDK:
 - Compress scroll events
 - Keep a scroll history
 - Clean up GdkDevice api
+ - Drop the master/slave device split
+ - Move axes to GdkDeviceTool
+ - Change monitor workarea to be per-backend API
 - Improve frame clock accuracy
+ - Add a new macOS backend
+ - Add an ANGLE-based GLES renderer for Windows

 * GSK:
 - Use GL_ARB_framebuffer_object
@@ -56,7 +56,6 @@ building for:
  - [Pango](https://download.gnome.org/sources/pango)
  - [Epoxy](https://github.com/anholt/libepoxy)
  - [Graphene](https://github.com/ebassi/graphene)
-  - [ATK](https://download.gnome.org/sources/atk)
  - [Xkb-common](https://github.com/xkbcommon/libxkbcommon)

 If you are building the X11 backend, you will also need:
@@ -70,7 +69,6 @@ If you are building the X11 backend, you will also need:
    - xcursor
    - xdamage
    - xcomposite
-  - [atk-bridge-2.0](https://download.gnome.org/sources/at-spi2-atk)

 If you are building the Wayland backend, you will also need:

@@ -81,11 +81,11 @@ constraint_editor_application_activate (GApplication *app)
 static void
 constraint_editor_application_open (GApplication  *app,
                                    GFile        **files,
-                                    gint           n_files,
-                                    const gchar   *hint)
+                                    int            n_files,
+                                    const char    *hint)
 {
  ConstraintEditorWindow *win;
-  gint i;
+  int i;

  for (i = 0; i < n_files; i++)
    {
@@ -193,7 +193,7 @@ constraint_editor_window_load (ConstraintEditorWindow *self,

 static void
 open_response_cb (GtkNativeDialog        *dialog,
-                  gint                    response,
+                  int                     response,
                  ConstraintEditorWindow *self)
 {
  gtk_native_dialog_hide (dialog);
@@ -285,7 +285,7 @@ serialize_model (GListModel *list)

 static void
 save_response_cb (GtkNativeDialog        *dialog,
-                  gint                    response,
+                  int                     response,
                  ConstraintEditorWindow *self)
 {
  gtk_native_dialog_hide (dialog);
@@ -13,8 +13,8 @@
          <object class="GtkLabel">
            <property name="label">Target</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -23,8 +23,8 @@
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -32,8 +32,8 @@
          <object class="GtkComboBoxText" id="target_attr">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -41,8 +41,8 @@
          <object class="GtkLabel">
            <property name="label">Relation</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -50,8 +50,8 @@
          <object class="GtkComboBoxText" id="relation">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -59,8 +59,8 @@
          <object class="GtkLabel">
            <property name="label">Source</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -69,8 +69,8 @@
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="update_button" swapped="yes"/>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -79,8 +79,8 @@
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <signal name="changed" handler="source_attr_changed" swapped="yes"/>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -88,8 +88,8 @@
          <object class="GtkLabel">
            <property name="label">Multiplier</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
            </layout>
          </object>
        </child>
@@ -97,8 +97,8 @@
          <object class="GtkEntry" id="multiplier">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
            </layout>
          </object>
        </child>
@@ -106,8 +106,8 @@
          <object class="GtkLabel">
            <property name="label">Constant</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">5</property>
+              <property name="column">0</property>
+              <property name="row">5</property>
            </layout>
          </object>
        </child>
@@ -115,8 +115,8 @@
          <object class="GtkEntry" id="constant">
            <signal name="changed" handler="update_preview" swapped="yes"/>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">5</property>
+              <property name="column">1</property>
+              <property name="row">5</property>
            </layout>
          </object>
        </child>
@@ -124,16 +124,16 @@
          <object class="GtkLabel">
            <property name="label">Strength</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">6</property>
+              <property name="column">0</property>
+              <property name="row">6</property>
            </layout>
          </object>
        </child>
        <child>
          <object class="GtkComboBoxText" id="strength">
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">6</property>
+              <property name="column">1</property>
+              <property name="row">6</property>
            </layout>
          </object>
        </child>
@@ -141,8 +141,8 @@
          <object class="GtkLabel" id="preview">
            <property name="xalign">0</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">7</property>
+              <property name="column">1</property>
+              <property name="row">7</property>
              <property name="column-span">2</property>
            </layout>
            <attributes>
@@ -155,8 +155,8 @@
            <property name="label">Create</property>
            <signal name="clicked" handler="create_constraint"/>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">8</property>
+              <property name="column">2</property>
+              <property name="row">8</property>
            </layout>
          </object>
        </child>
@@ -174,28 +174,25 @@ constraint_view_init (ConstraintView *self)
  manager = gtk_constraint_layout_new ();
  gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);

-  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
-  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
  guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
+
+  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
-  g_object_unref (filter);
+
+  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
  children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
-  g_object_unref (filter);

  list = g_list_store_new (G_TYPE_LIST_MODEL);
  g_list_store_append (list, children);
  g_list_store_append (list, guides);
  g_list_store_append (list, constraints);
-  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));
  g_object_unref (children);
  g_object_unref (guides);
  g_object_unref (constraints);
-  g_object_unref (all_children);
-  g_object_unref (all_constraints);
-  g_object_unref (list);

+  self->model = G_LIST_MODEL (gtk_flatten_list_model_new (G_LIST_MODEL (list)));

  controller = (GtkEventController *)gtk_gesture_drag_new ();
  g_signal_connect (controller, "drag-begin", G_CALLBACK (drag_begin), self);
@@ -55,8 +55,8 @@
          <object class="GtkLabel">
            <property name="label">Name</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -64,8 +64,8 @@
          <object class="GtkEntry" id="name">
            <property name="max-width-chars">20</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -74,8 +74,8 @@
          <object class="GtkLabel">
            <property name="label">Min Size</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -84,8 +84,8 @@
            <property name="adjustment">min_width_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -94,8 +94,8 @@
            <property name="adjustment">min_height_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -103,8 +103,8 @@
          <object class="GtkLabel">
            <property name="label">Nat Size</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -113,8 +113,8 @@
            <property name="adjustment">nat_width_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -123,8 +123,8 @@
            <property name="adjustment">nat_height_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -132,8 +132,8 @@
          <object class="GtkLabel">
            <property name="label">Max Size</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -142,8 +142,8 @@
            <property name="adjustment">max_width_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -152,8 +152,8 @@
            <property name="adjustment">max_height_adj</property>
            <property name="max-width-chars">5</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -161,16 +161,16 @@
          <object class="GtkLabel">
            <property name="label">Strength</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
            </layout>
          </object>
        </child>
        <child>
          <object class="GtkComboBoxText" id="strength">
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -180,8 +180,8 @@
            <property name="label">Create</property>
            <signal name="clicked" handler="create_guide"/>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">5</property>
+              <property name="column">2</property>
+              <property name="row">5</property>
            </layout>
          </object>
        </child>
@@ -34,7 +34,7 @@ static void create_window (GApplication *app, const char *contents);
 static void
 show_action_dialog (GSimpleAction *action)
 {
-  const gchar *name;
+  const char *name;
  GtkWidget *dialog;

  name = g_action_get_name (G_ACTION (action));
@@ -58,9 +58,9 @@ show_action_infobar (GSimpleAction *action,
                     gpointer       data)
 {
  DemoApplicationWindow *window = data;
-  gchar *text;
-  const gchar *name;
-  const gchar *value;
+  char *text;
+  const char *name;
+  const char *value;

  name = g_action_get_name (G_ACTION (action));
  value = g_variant_get_string (parameter, NULL);
@@ -92,7 +92,7 @@ activate_new (GSimpleAction *action,

 static void
 open_response_cb (GtkNativeDialog *dialog,
-                  gint             response_id,
+                  int              response_id,
                  gpointer         user_data)
 {
  GtkFileChooserNative *native = user_data;
@@ -185,7 +185,7 @@ activate_about (GSimpleAction *action,
 {
  GtkWidget *window = user_data;

-  const gchar *authors[] = {
+  const char *authors[] = {
    "Peter Mattis",
    "Spencer Kimball",
    "Josh MacDonald",
@@ -193,7 +193,7 @@ activate_about (GSimpleAction *action,
    NULL
  };

-  const gchar *documentors[] = {
+  const char *documentors[] = {
    "Owen Taylor",
    "Tony Gale",
    "Matthias Clasen <mclasen@redhat.com>",
@@ -244,9 +244,9 @@ static void
 update_statusbar (GtkTextBuffer         *buffer,
                  DemoApplicationWindow *window)
 {
-  gchar *msg;
-  gint row, col;
-  gint count;
+  char *msg;
+  int row, col;
+  int count;
  GtkTextIter iter;

  /* clear any previous message, underflow is allowed */
@@ -31,8 +31,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -54,8 +54,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -70,8 +70,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -79,8 +79,8 @@
          <object class="GtkStatusbar" id="status">
            <property name="hexpand">1</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -16,8 +16,8 @@ static GtkWidget *placeholder;

 static void
 on_name_appeared (GDBusConnection *connection,
-                  const gchar     *name,
-                  const gchar     *name_owner,
+                  const char      *name,
+                  const char      *name_owner,
                  gpointer         user_data)
 {
  name_seen = TRUE;
@@ -25,7 +25,7 @@ on_name_appeared (GDBusConnection *connection,

 static void
 on_name_vanished (GDBusConnection *connection,
-                  const gchar     *name,
+                  const char      *name,
                  gpointer         user_data)
 {
  if (!name_seen)
@@ -55,7 +55,7 @@ do_application_demo (GtkWidget *toplevel)

  if (placeholder == NULL)
    {
-      const gchar *command;
+      const char *command;
      GError *error = NULL;

      if (g_file_test ("./gtk4-demo-application" APP_EXTENSION, G_FILE_TEST_IS_EXECUTABLE))
@@ -12,7 +12,7 @@ static GtkWidget *progress_bar = NULL;
 static gboolean
 apply_changes_gradually (gpointer data)
 {
-  gdouble fraction;
+  double fraction;

  /* Work, work, work... */
  fraction = gtk_progress_bar_get_fraction (GTK_PROGRESS_BAR (progress_bar));
@@ -47,8 +47,8 @@ on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 static void
 on_assistant_prepare (GtkWidget *widget, GtkWidget *page, gpointer data)
 {
-  gint current_page, n_pages;
-  gchar *title;
+  int current_page, n_pages;
+  char *title;

  current_page = gtk_assistant_get_current_page (GTK_ASSISTANT (widget));
  n_pages = gtk_assistant_get_n_pages (GTK_ASSISTANT (widget));
@@ -70,8 +70,8 @@ on_entry_changed (GtkWidget *widget, gpointer data)
 {
  GtkAssistant *assistant = GTK_ASSISTANT (data);
  GtkWidget *current_page;
-  gint page_number;
-  const gchar *text;
+  int page_number;
+  const char *text;

  page_number = gtk_assistant_get_current_page (assistant);
  current_page = gtk_assistant_get_nth_page (assistant, page_number);
@@ -18,8 +18,8 @@
              <class name="dim-label"/>
            </style>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -29,8 +29,8 @@
            <property name="has-frame">1</property>
            <property name="min-content-width">150</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -40,8 +40,8 @@
            <property name="hexpand">1</property>
            <property name="stack">stack</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -67,8 +67,8 @@
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Duck</property>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                        </layout>
                      </object>
                    </child>
@@ -76,8 +76,8 @@
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Background</property>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                        </layout>
                      </object>
                    </child>
@@ -87,8 +87,8 @@
                          <class name="duck"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                        </layout>
                      </object>
                    </child>
@@ -98,8 +98,8 @@
                          <class name="gradient"/>
                        </style>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                        </layout>
                      </object>
                    </child>
@@ -108,8 +108,8 @@
                        <property name="label" translatable="yes">
 Blended picture</property>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -121,8 +121,8 @@ Blended picture</property>
                          <class name="blend0"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -146,8 +146,8 @@ Blended picture</property>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Red</property>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                        </layout>
                      </object>
                    </child>
@@ -155,8 +155,8 @@ Blended picture</property>
                      <object class="GtkLabel">
                        <property name="label" translatable="yes">Blue</property>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                        </layout>
                      </object>
                    </child>
@@ -166,8 +166,8 @@ Blended picture</property>
                          <class name="red"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                        </layout>
                      </object>
                    </child>
@@ -177,8 +177,8 @@ Blended picture</property>
                          <class name="blue"/>
                        </style>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                        </layout>
                      </object>
                    </child>
@@ -187,8 +187,8 @@ Blended picture</property>
                        <property name="label" translatable="yes">
 Blended picture</property>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -200,8 +200,8 @@ Blended picture</property>
                          <class name="blend1"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                          <property name="column-span">2</property>
                        </layout>
                      </object>
@@ -228,8 +228,8 @@ Blended picture</property>
                          <class name="cyan"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">0</property>
+                          <property name="row">1</property>
                        </layout>
                      </object>
                    </child>
@@ -239,8 +239,8 @@ Blended picture</property>
                          <class name="magenta"/>
                        </style>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">1</property>
+                          <property name="column">1</property>
+                          <property name="row">1</property>
                        </layout>
                      </object>
                    </child>
@@ -250,8 +250,8 @@ Blended picture</property>
                          <class name="yellow"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">0</property>
+                          <property name="row">3</property>
                        </layout>
                      </object>
                    </child>
@@ -262,8 +262,8 @@ Blended picture</property>
                          <class name="blend2"/>
                        </style>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">3</property>
+                          <property name="column">1</property>
+                          <property name="row">3</property>
                        </layout>
                      </object>
                    </child>
@@ -275,8 +275,8 @@ Blended picture</property>
                          <class name="dim-label"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">0</property>
+                          <property name="row">0</property>
                        </layout>
                      </object>
                    </child>
@@ -288,8 +288,8 @@ Blended picture</property>
                          <class name="dim-label"/>
                        </style>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">0</property>
+                          <property name="column">1</property>
+                          <property name="row">0</property>
                        </layout>
                      </object>
                    </child>
@@ -301,8 +301,8 @@ Blended picture</property>
                          <class name="dim-label"/>
                        </style>
                        <layout>
-                          <property name="left-attach">0</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">0</property>
+                          <property name="row">2</property>
                        </layout>
                      </object>
                    </child>
@@ -314,8 +314,8 @@ Blended picture</property>
                          <attribute name="weight" value="bold"></attribute>
                        </attributes>
                        <layout>
-                          <property name="left-attach">1</property>
-                          <property name="top-attach">2</property>
+                          <property name="column">1</property>
+                          <property name="row">2</property>
                        </layout>
                      </object>
                    </child>
@@ -324,8 +324,8 @@ Blended picture</property>
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -38,7 +38,7 @@ create_icon_store (void)

  GtkTreeIter iter;
  GtkListStore *store;
-  gint i;
+  int i;

  store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);

@@ -77,7 +77,7 @@ set_sensitive (GtkCellLayout   *cell_layout,
               gpointer         data)
 {
  GtkTreePath *path;
-  gint *indices;
+  int *indices;
  gboolean sensitive;

  path = gtk_tree_model_get_path (tree_model, iter);
@@ -175,7 +175,7 @@ create_capital_store (void)

  GtkTreeIter iter, iter2;
  GtkTreeStore *store;
-  gint i;
+  int i;

  store = gtk_tree_store_new (1, G_TYPE_STRING);

@@ -38,14 +38,14 @@ struct {
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
 static void
 update_css_for_blend_mode (GtkCssProvider *provider,
-                           const gchar    *blend_mode)
+                           const char     *blend_mode)
 {
  GBytes *bytes;
-  gchar *css;
+  char *css;

  bytes = g_resources_lookup_data ("/css_blendmodes/css_blendmodes.css", 0, NULL);

-  css = g_strdup_printf ((gchar*) g_bytes_get_data (bytes, NULL),
+  css = g_strdup_printf ((char *) g_bytes_get_data (bytes, NULL),
                         blend_mode,
                         blend_mode,
                         blend_mode);
@@ -62,7 +62,7 @@ row_activated (GtkListBox     *listbox,
               GtkListBoxRow  *row,
               GtkCssProvider *provider)
 {
-  const gchar *blend_mode;
+  const char *blend_mode;

  blend_mode = blend_modes[gtk_list_box_row_get_index (row)].id;

@@ -75,7 +75,7 @@ setup_listbox (GtkBuilder       *builder,
 {
  GtkWidget *normal_row;
  GtkWidget *listbox;
-  gint i;
+  int i;

  normal_row = NULL;
  listbox = gtk_list_box_new ();
@@ -95,9 +95,6 @@
    <property name="program-name" translatable="yes">Builder demo</property>
    <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
    <property name="modal">True</property>
-    <accessibility>
-      <relation target="window1" type="subwindow-of"/>
-    </accessibility>
  </object>
  <object class="GtkWindow" id="window1">
    <property name="default-height">250</property>
@@ -113,11 +110,6 @@
        </child>
        <child>
          <object class="GtkBox" id="toolbar1">
-            <child internal-child="accessible">
-              <object class="AtkObject" id="a11y-toolbar">
-                <property name="AtkObject::accessible-name">The toolbar</property>
-              </object>
-            </child>
            <child>
              <object class="GtkButton">
                <property name="label" translatable="yes">New</property>
@@ -174,14 +166,6 @@
              <object class="GtkTreeView" id="treeview1">
                <property name="model">liststore1</property>
                <property name="tooltip-column">3</property>
-                <child internal-child="accessible">
-                  <object class="AtkObject" id="a11y-treeview">
-                    <property name="AtkObject::accessible-name">Name list</property>
-                    <property name="AtkObject::accessible-description">
-                                    A list of person with name, surname and age columns
-                                  </property>
-                  </object>
-                </child>
                <child>
                  <object class="GtkTreeViewColumn" id="column1">
                    <property name="title">Name</property>
@@ -17,7 +17,7 @@ G_DEFINE_TYPE(DemoImage, demo_image, GTK_TYPE_WIDGET)
 static GdkPaintable *
 get_image_paintable (GtkImage *image)
 {
-  const gchar *icon_name;
+  const char *icon_name;
  GtkIconTheme *icon_theme;
  GtkIconPaintable *icon;

@@ -23,14 +23,12 @@
 #include "demotaggedentry.h"

 #include <gtk/gtk.h>
-#include <gtk/gtk-a11y.h>

 struct _DemoTaggedEntry
 {
  GtkWidget parent_instance;

-  GtkWidget *box;
-  GtkWidget *entry;
+  GtkWidget *text;
 };

 struct _DemoTaggedEntryClass
@@ -46,15 +44,10 @@ G_DEFINE_TYPE_WITH_CODE (DemoTaggedEntry, demo_tagged_entry, GTK_TYPE_WIDGET,
 static void
 demo_tagged_entry_init (DemoTaggedEntry *entry)
 {
-  entry->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_set_parent (entry->box, GTK_WIDGET (entry));
-
-  entry->entry = gtk_text_new ();
-  gtk_widget_set_hexpand (entry->entry, TRUE);
-  gtk_widget_set_vexpand (entry->entry, TRUE);
-  gtk_widget_set_hexpand (entry->box, FALSE);
-  gtk_widget_set_vexpand (entry->box, FALSE);
-  gtk_box_append (GTK_BOX (entry->box), entry->entry);
+  entry->text = gtk_text_new ();
+  gtk_widget_set_hexpand (entry->text, TRUE);
+  gtk_widget_set_vexpand (entry->text, TRUE);
+  gtk_widget_set_parent (entry->text, GTK_WIDGET (entry));
  gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }

@@ -62,12 +55,15 @@ static void
 demo_tagged_entry_dispose (GObject *object)
 {
  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (object);
+  GtkWidget *child;

-  if (entry->entry)
+  if (entry->text)
    gtk_editable_finish_delegate (GTK_EDITABLE (entry));

-  g_clear_pointer (&entry->entry, gtk_widget_unparent);
-  g_clear_pointer (&entry->box, gtk_widget_unparent);
+  while ((child = gtk_widget_get_first_child (GTK_WIDGET (entry))))
+    gtk_widget_unparent (child);
+
+  entry->text = NULL;

  G_OBJECT_CLASS (demo_tagged_entry_parent_class)->dispose (object);
 }
@@ -101,7 +97,7 @@ demo_tagged_entry_grab_focus (GtkWidget *widget)
 {
  DemoTaggedEntry *entry = DEMO_TAGGED_ENTRY (widget);

-  return gtk_widget_grab_focus (entry->entry);
+  return gtk_widget_grab_focus (entry->text);
 }

 static void
@@ -118,15 +114,14 @@ demo_tagged_entry_class_init (DemoTaggedEntryClass *klass)

  gtk_editable_install_properties (object_class, 1);

-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
+  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
  gtk_widget_class_set_css_name (widget_class, "entry");
 }

 static GtkEditable *
 demo_tagged_entry_get_delegate (GtkEditable *editable)
 {
-  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->entry);
+  return GTK_EDITABLE (DEMO_TAGGED_ENTRY (editable)->text);
 }

 static void
@@ -147,7 +142,7 @@ demo_tagged_entry_add_tag (DemoTaggedEntry *entry,
 {
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_box_append (GTK_BOX (entry->box), tag);
+  gtk_widget_set_parent (tag, GTK_WIDGET (entry));
 }

 void
@@ -157,10 +152,7 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
 {
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  if (sibling == NULL)
-    gtk_box_append (GTK_BOX (entry->box), tag);
-  else
-    gtk_box_insert_child_after (GTK_BOX (entry->box), tag, sibling);
+  gtk_widget_insert_after (tag, GTK_WIDGET (entry), sibling);
 }

 void
@@ -169,7 +161,7 @@ demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,
 {
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_box_remove (GTK_BOX (entry->box), tag);
+  gtk_widget_unparent (tag);
 }

 struct _DemoTaggedEntryTag
@@ -16,7 +16,7 @@ message_dialog_clicked (GtkButton *button,
                        gpointer   user_data)
 {
  GtkWidget *dialog;
-  static gint i = 1;
+  static int i = 1;

  dialog = gtk_message_dialog_new (GTK_WINDOW (window),
                                   GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -64,8 +64,8 @@ scribble_draw (GtkDrawingArea *da,
 /* Draw a rectangle on the screen */
 static void
 draw_brush (GtkWidget *widget,
-            gdouble    x,
-            gdouble    y)
+            double     x,
+            double     y)
 {
  GdkRectangle update_rect;
  cairo_t *cr;
@@ -254,7 +254,7 @@ do_dropdown (GtkWidget *do_widget)
      gtk_widget_set_margin_bottom (box, 10);
      gtk_window_set_child (GTK_WINDOW (window), box);

-      button = gtk_drop_down_new ();
+      button = gtk_drop_down_new (NULL, NULL);

      model = G_LIST_MODEL (pango_cairo_font_map_get_default ());
      gtk_drop_down_set_model (GTK_DROP_DOWN (button), model);
@@ -16,9 +16,9 @@

 typedef struct
 {
-  gint   number;
-  gchar *product;
-  gint   yummy;
+  int    number;
+  char *product;
+  int    yummy;
 }
 Item;

@@ -74,7 +74,7 @@ add_items (void)
 static GtkTreeModel *
 create_items_model (void)
 {
-  gint i = 0;
+  int i = 0;
  GtkListStore *model;
  GtkTreeIter iter;

@@ -109,7 +109,7 @@ static GtkTreeModel *
 create_numbers_model (void)
 {
 #define N_NUMBERS 10
-  gint i = 0;
+  int i = 0;
  GtkListStore *model;
  GtkTreeIter iter;

@@ -192,7 +192,7 @@ remove_item (GtkWidget *widget, gpointer data)

  if (gtk_tree_selection_get_selected (selection, NULL, &iter))
    {
-      gint i;
+      int i;
      GtkTreePath *path;

      path = gtk_tree_model_get_path (model, &iter);
@@ -211,7 +211,7 @@ separator_row (GtkTreeModel *model,
               gpointer      data)
 {
  GtkTreePath *path;
-  gint idx;
+  int idx;

  path = gtk_tree_model_get_path (model, iter);
  idx = gtk_tree_path_get_indices (path)[0];
@@ -224,7 +224,7 @@ separator_row (GtkTreeModel *model,
 static void
 editing_started (GtkCellRenderer *cell,
                 GtkCellEditable *editable,
-                 const gchar     *path,
+                 const char      *path,
                 gpointer         data)
 {
  gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (editable),
@@ -233,15 +233,15 @@ editing_started (GtkCellRenderer *cell,

 static void
 cell_edited (GtkCellRendererText *cell,
-             const gchar         *path_string,
-             const gchar         *new_text,
+             const char          *path_string,
+             const char          *new_text,
             gpointer             data)
 {
  GtkTreeModel *model = (GtkTreeModel *)data;
  GtkTreePath *path = gtk_tree_path_new_from_string (path_string);
  GtkTreeIter iter;

-  gint column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));
+  int column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cell), "column"));

  gtk_tree_model_get_iter (model, &iter, path);

@@ -249,7 +249,7 @@ cell_edited (GtkCellRendererText *cell,
    {
    case COLUMN_ITEM_NUMBER:
      {
-        gint i;
+        int i;

        i = gtk_tree_path_get_indices (path)[0];
        g_array_index (articles, Item, i).number = atoi (new_text);
@@ -261,8 +261,8 @@ cell_edited (GtkCellRendererText *cell,

    case COLUMN_ITEM_PRODUCT:
      {
-        gint i;
-        gchar *old_text;
+        int i;
+        char *old_text;

        gtk_tree_model_get (model, &iter, column, &old_text, -1);
        g_free (old_text);
@@ -13,7 +13,7 @@
 static GtkWidget *window = NULL;

 static void
-response_cb (GtkDialog *dialog, gint response_id)
+response_cb (GtkDialog *dialog, int response_id)
 {
  gtk_window_destroy (GTK_WINDOW (window));
  window = NULL;
@@ -22,8 +22,8 @@ format_number (GtkTreeViewColumn *col,
               GtkTreeIter       *iter,
               gpointer           data)
 {
-  gint num;
-  gchar *text;
+  int num;
+  char *text;

  gtk_tree_model_get (model, iter, GPOINTER_TO_INT (data), &num, -1);
  text = g_strdup_printf ("%d", num);
@@ -35,11 +35,11 @@ static void
 filter_modify_func (GtkTreeModel *model,
                    GtkTreeIter  *iter,
                    GValue       *value,
-                    gint          column,
+                    int           column,
                    gpointer      data)
 {
  GtkTreeModelFilter *filter_model = GTK_TREE_MODEL_FILTER (model);
-  gint width, height;
+  int width, height;
  GtkTreeModel *child_model;
  GtkTreeIter child_iter;

@@ -75,7 +75,7 @@ visible_func (GtkTreeModel *model,
              GtkTreeIter  *iter,
              gpointer      data)
 {
-  gint width;
+  int width;

  gtk_tree_model_get (model, iter,
                      WIDTH_COLUMN, &width,
@@ -45,12 +45,9 @@
            <attributes>
              <attribute name="weight" value="bold"></attribute>
            </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview1"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -83,12 +80,9 @@
                </child>
              </object>
            </child>
-            <accessibility>
-              <relation type="labelled-by" target="label1"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -133,12 +127,9 @@
                </child>
              </object>
            </child>
-            <accessibility>
-              <relation type="labelled-by" target="label2"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -149,12 +140,9 @@
            <attributes>
              <attribute name="weight" value="bold"></attribute>
            </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview2"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -165,12 +153,9 @@
            <attributes>
              <attribute name="weight" value="bold"></attribute>
            </attributes>
-            <accessibility>
-              <relation type="label-for" target="treeview3"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -197,12 +182,9 @@
                </child>
              </object>
            </child>
-            <accessibility>
-              <relation type="labelled-by" target="label3"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -209,7 +209,7 @@ set_widget_type (GtkFishbowl *fishbowl,
                        widget_types[selected_widget_type].name);
 }

-void
+G_MODULE_EXPORT void
 fishbowl_next_button_clicked_cb (GtkButton *source,
                                 gpointer   user_data)
 {
@@ -224,7 +224,7 @@ fishbowl_next_button_clicked_cb (GtkButton *source,
  set_widget_type (fishbowl, new_index);
 }

-void
+G_MODULE_EXPORT void
 fishbowl_prev_button_clicked_cb (GtkButton *source,
                                 gpointer   user_data)
 {
@@ -239,7 +239,7 @@ fishbowl_prev_button_clicked_cb (GtkButton *source,
  set_widget_type (fishbowl, new_index);
 }

-void
+G_MODULE_EXPORT void
 fishbowl_changes_toggled_cb (GtkToggleButton *button,
                             gpointer         user_data)
 {
@@ -249,7 +249,7 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button,
    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
 }

-char *
+G_MODULE_EXPORT char *
 format_header_cb (GObject *object,
                  guint    count,
                  double   fps)
@@ -29,7 +29,7 @@ draw_color (GtkDrawingArea *drawingarea,
 }

 static GtkWidget *
-color_swatch_new (const gchar *color)
+color_swatch_new (const char *color)
 {
  GtkWidget *button, *area;

@@ -48,7 +48,7 @@ do_flowbox (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
  GtkWidget *scrolled, *flowbox;
-  const gchar *colors[] = {
+  const char *colors[] = {
    "AliceBlue",
    "AntiqueWhite",
    "AntiqueWhite1",
@@ -716,7 +716,7 @@ do_flowbox (GtkWidget *do_widget)
    "YellowGreen",
    NULL
  };
-  gint i;
+  int i;

  if (!window)
    {
@@ -130,6 +130,10 @@ static const char *
 get_feature_display_name (unsigned int tag)
 {
  int i;
+  static char buf[5] = { 0, };
+
+  if (tag == MAKE_TAG ('x', 'x', 'x', 'x'))
+    return _("Default");

  for (i = 0; i < G_N_ELEMENTS (open_type_layout_features); i++)
    {
@@ -137,7 +141,10 @@ get_feature_display_name (unsigned int tag)
        return g_dpgettext2 (NULL, "OpenType layout", open_type_layout_features[i].name);
    }

-  return NULL;
+  hb_tag_to_string (tag, buf);
+  g_warning ("unknown OpenType layout feature tag: %s", buf);
+
+  return buf;
 }

 static void update_display (void);
@@ -295,7 +302,7 @@ update_display (void)
  GList *l;
  PangoAttrList *attrs;
  PangoAttribute *attr;
-  gint ins, bound;
+  int ins, bound;
  guint start, end;
  PangoLanguage *lang;
  char *font_desc;
@@ -479,7 +486,7 @@ update_script_combo (void)
 {
  GtkListStore *store;
  hb_font_t *hb_font;
-  gint i, j, k;
+  int i, j, k;
  PangoFont *pango_font;
  GHashTable *tags;
  GHashTableIter iter;
@@ -593,7 +600,7 @@ update_script_combo (void)
 static void
 update_features (void)
 {
-  gint i, j;
+  int i, j;
  GtkTreeModel *model;
  GtkTreeIter iter;
  guint script_index, lang_index;
@@ -728,8 +735,8 @@ static void
 entry_activated (GtkEntry *entry,
                 GtkAdjustment *adjustment)
 {
-  gdouble value;
-  gchar *err = NULL;
+  double value;
+  char *err = NULL;

  value = g_strtod (gtk_editable_get_text (GTK_EDITABLE (entry)), &err);
  if (err != NULL)
@@ -939,7 +946,7 @@ instance_changed (GtkComboBox *combo)
    {
      Axis *axis;
      Axis akey;
-      gdouble value;
+      double value;

      value = coords[ai[i].axis_index];

@@ -1285,8 +1292,7 @@ do_font_features (GtkWidget *do_widget)
                                                                            "palt",
                                                                            "twid",
                                                                            "qwid", NULL });
-      add_check_group (feature_list, _("Alternative Stylistic Sets"), (const char *[]){ "ss00",
-                                                                                        "ss01",
+      add_check_group (feature_list, _("Alternative Stylistic Sets"), (const char *[]){ "ss01",
                                                                                        "ss02",
                                                                                        "ss03",
                                                                                        "ss04",
@@ -36,11 +36,11 @@ adjustment_get_normalized_value (GtkAdjustment *adj)

 static void
 val_to_xy (GtkFontPlane *plane,
-           gint          *x,
-           gint          *y)
+           int           *x,
+           int           *y)
 {
-  gdouble u, v;
-  gint width, height;
+  double u, v;
+  int width, height;

  width = gtk_widget_get_allocated_width (GTK_WIDGET (plane));
  height = gtk_widget_get_allocated_height (GTK_WIDGET (plane));
@@ -57,8 +57,8 @@ plane_snapshot (GtkWidget   *widget,
                GtkSnapshot *snapshot)
 {
  GtkFontPlane *plane = GTK_FONT_PLANE (widget);
-  gint x, y;
-  gint width, height;
+  int x, y;
+  int width, height;
  cairo_t *cr;

  val_to_xy (plane, &x, &y);
@@ -125,11 +125,11 @@ adjustment_set_normalized_value (GtkAdjustment *adj,

 static void
 update_value (GtkFontPlane *plane,
-              gint           x,
-              gint           y)
+              int            x,
+              int            y)
 {
  GtkWidget *widget = GTK_WIDGET (plane);
-  gdouble u, v;
+  double u, v;

  u = CLAMP (x * (1.0 / gtk_widget_get_allocated_width (widget)), 0, 1);
  v = CLAMP (1 - y * (1.0 / gtk_widget_get_allocated_height (widget)), 0, 1);
@@ -142,8 +142,8 @@ update_value (GtkFontPlane *plane,

 static void
 plane_drag_gesture_begin (GtkGestureDrag *gesture,
-                          gdouble         start_x,
-                          gdouble         start_y,
+                          double          start_x,
+                          double          start_y,
                          GtkFontPlane  *plane)
 {
  guint button;
@@ -164,11 +164,11 @@ plane_drag_gesture_begin (GtkGestureDrag *gesture,

 static void
 plane_drag_gesture_update (GtkGestureDrag *gesture,
-                           gdouble         offset_x,
-                           gdouble         offset_y,
+                           double          offset_x,
+                           double          offset_y,
                           GtkFontPlane  *plane)
 {
-  gdouble start_x, start_y;
+  double start_x, start_y;

  gtk_gesture_drag_get_start_point (GTK_GESTURE_DRAG (gesture),
                                    &start_x, &start_y);
@@ -177,8 +177,8 @@ plane_drag_gesture_update (GtkGestureDrag *gesture,

 static void
 plane_drag_gesture_end (GtkGestureDrag *gesture,
-                        gdouble         offset_x,
-                        gdouble         offset_y,
+                        double          offset_x,
+                        double          offset_y,
                        GtkFontPlane  *plane)
 {
  set_cross_cursor (GTK_WIDGET (plane), FALSE);
@@ -21,12 +21,6 @@ static PangoContext *context;

 static int scale = 10;

-static void
-on_destroy (gpointer data)
-{
-  window = NULL;
-}
-
 static void
 update_image (void)
 {
@@ -251,9 +245,7 @@ do_fontrendering (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (on_destroy), NULL);
-      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
      font_button = GTK_WIDGET (gtk_builder_get_object (builder, "font_button"));
      up_button = GTK_WIDGET (gtk_builder_get_object (builder, "up_button"));
      down_button = GTK_WIDGET (gtk_builder_get_object (builder, "down_button"));
@@ -276,6 +268,8 @@ do_fontrendering (GtkWidget *do_widget)
      g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);

      update_image ();
+
+      g_object_unref (builder);
    }

  if (!gtk_widget_get_visible (window))
@@ -28,7 +28,7 @@
          <object class="GtkEntry" id="entry">
            <property name="text">Fonts render</property>
            <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
            </layout>
          </object>
        </child>
@@ -41,16 +41,16 @@
              <class name="dim-label"/>
            </style>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
        <child>
          <object class="GtkFontButton" id="font_button">
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -62,7 +62,7 @@
              <class name="dim-label"/>
            </style>
            <layout>
-              <property name="left-attach">2</property>
+              <property name="column">2</property>
            </layout>
          </object>
        </child>
@@ -77,7 +77,7 @@
              <item translatable="yes" id="full">Full</item>
            </items>
            <layout>
-              <property name="left-attach">3</property>
+              <property name="column">3</property>
            </layout>
          </object>
        </child>
@@ -92,8 +92,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">1</property>
+              <property name="column">3</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -109,8 +109,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">0</property>
+              <property name="column">4</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -126,8 +126,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">1</property>
+              <property name="column">4</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -138,8 +138,8 @@
              <class name="circular"/>
            </style>
            <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">0</property>
+              <property name="column">5</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -150,8 +150,8 @@
              <class name="circular"/>
            </style>
            <layout>
-              <property name="left-attach">5</property>
-              <property name="top-attach">1</property>
+              <property name="column">5</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -159,7 +159,7 @@
          <object class="GtkLabel">
            <property name="hexpand">1</property>
            <layout>
-              <property name="left-attach">6</property>
+              <property name="column">6</property>
            </layout>
          </object>
        </child>
@@ -184,8 +184,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
              <property name="column-span">7</property>
            </layout>
          </object>
@@ -204,8 +204,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">4</property>
+              <property name="column">0</property>
+              <property name="row">4</property>
              <property name="column-span">7</property>
            </layout>
          </object>
@@ -9,8 +9,8 @@

 static GtkGesture *rotate = NULL;
 static GtkGesture *zoom = NULL;
-static gdouble swipe_x = 0;
-static gdouble swipe_y = 0;
+static double swipe_x = 0;
+static double swipe_y = 0;
 static gboolean long_pressed = FALSE;

 static gboolean
@@ -26,8 +26,8 @@ touchpad_swipe_gesture_begin (GtkGesture       *gesture,

 static void
 swipe_gesture_swept (GtkGestureSwipe *gesture,
-                     gdouble          velocity_x,
-                     gdouble          velocity_y,
+                     double           velocity_x,
+                     double           velocity_y,
                     GtkWidget       *widget)
 {
  swipe_x = velocity_x / 10;
@@ -37,8 +37,8 @@ swipe_gesture_swept (GtkGestureSwipe *gesture,

 static void
 long_press_gesture_pressed (GtkGestureLongPress *gesture,
-                            gdouble              x,
-                            gdouble              y,
+                            double               x,
+                            double               y,
                            GtkWidget           *widget)
 {
  long_pressed = TRUE;
@@ -56,8 +56,8 @@ long_press_gesture_end (GtkGesture       *gesture,

 static void
 rotation_angle_changed (GtkGestureRotate *gesture,
-                        gdouble           angle,
-                        gdouble           delta,
+                        double            angle,
+                        double            delta,
                        GtkWidget        *widget)
 {
  gtk_widget_queue_draw (widget);
@@ -65,7 +65,7 @@ rotation_angle_changed (GtkGestureRotate *gesture,

 static void
 zoom_scale_changed (GtkGestureZoom *gesture,
-                    gdouble         scale,
+                    double          scale,
                    GtkWidget      *widget)
 {
  gtk_widget_queue_draw (widget);
@@ -93,8 +93,8 @@ drawing_area_draw (GtkDrawingArea *area,
    {
      cairo_pattern_t *pat;
      cairo_matrix_t matrix;
-      gdouble angle, scale;
-      gdouble x_center, y_center;
+      double angle, scale;
+      double x_center, y_center;

      gtk_gesture_get_bounding_box_center (GTK_GESTURE (zoom), &x_center, &y_center);

@@ -1,7 +1,7 @@
 precision highp float;

 void main() {
-  float lerpVal = gl_FragCoord.y / 500.0f;
+  float lerpVal = gl_FragCoord.y / 500.0;

-  gl_FragColor = mix(vec4(1.0f, 0.85f, 0.35f, 1.0f), vec4(0.2f, 0.2f, 0.2f, 1.0f), lerpVal);
+  gl_FragColor = mix(vec4(1.0, 0.85, 0.35, 1.0), vec4(0.2, 0.2, 0.2, 1.0), lerpVal);
 }
@@ -98,7 +98,7 @@ gtk_fishbowl_measure (GtkWidget      *widget,
  GHashTableIter iter;
  gpointer key, value;
  GtkFishbowlChild *child;
-  gint child_min, child_nat;
+  int child_min, child_nat;

  *minimum = 0;
  *natural = 0;
@@ -18,7 +18,7 @@ static void
 insert_link (GtkTextBuffer *buffer,
             GtkTextIter   *iter,
             const char    *text,
-             gint           page)
+             int            page)
 {
  GtkTextTag *tag;

@@ -35,7 +35,7 @@ insert_link (GtkTextBuffer *buffer,
 */
 static void
 show_page (GtkTextBuffer *buffer,
-           gint           page)
+           int            page)
 {
  GtkTextIter iter;

@@ -91,7 +91,7 @@ follow_if_link (GtkWidget   *text_view,
  for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
    {
      GtkTextTag *tag = tagp->data;
-      gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+      int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));

      if (page != 0)
        {
@@ -134,14 +134,14 @@ key_pressed (GtkEventController *controller,
 }

 static void set_cursor_if_appropriate (GtkTextView *text_view,
-                                       gint         x,
-                                       gint         y);
+                                       int          x,
+                                       int          y);

 static void
 released_cb (GtkGestureClick *gesture,
             guint            n_press,
-             gdouble          x,
-             gdouble          y,
+             double           x,
+             double           y,
             GtkWidget       *text_view)
 {
  GtkTextIter start, end, iter;
@@ -168,8 +168,8 @@ released_cb (GtkGestureClick *gesture,

 static void
 motion_cb (GtkEventControllerMotion *controller,
-           gdouble                   x,
-           gdouble                   y,
+           double                    x,
+           double                    y,
           GtkTextView              *text_view)
 {
  set_cursor_if_appropriate (text_view, x, y);
@@ -183,8 +183,8 @@ static gboolean hovering_over_link = FALSE;
 */
 static void
 set_cursor_if_appropriate (GtkTextView    *text_view,
-                           gint            x,
-                           gint            y)
+                           int             x,
+                           int             y)
 {
  GSList *tags = NULL, *tagp = NULL;
  GtkTextIter iter;
@@ -196,7 +196,7 @@ set_cursor_if_appropriate (GtkTextView    *text_view,
      for (tagp = tags;  tagp != NULL;  tagp = tagp->next)
        {
          GtkTextTag *tag = tagp->data;
-          gint page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));
+          int page = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tag), "page"));

          if (page != 0)
            {
@@ -220,7 +220,7 @@ set_widget_type (int type)
  tick_cb = gtk_widget_add_tick_callback (window, scroll_cb, NULL, NULL);
 }

-void
+G_MODULE_EXPORT void
 iconscroll_next_clicked_cb (GtkButton *source,
                            gpointer   user_data)
 {
@@ -235,7 +235,7 @@ iconscroll_next_clicked_cb (GtkButton *source,
  set_widget_type (new_index);
 }

-void
+G_MODULE_EXPORT void
 iconscroll_prev_clicked_cb (GtkButton *source,
                            gpointer   user_data)
 {
@@ -249,7 +249,7 @@ iconscroll_prev_clicked_cb (GtkButton *source,
  set_widget_type (new_index);
 }

-GtkWidget *
+G_MODULE_EXPORT GtkWidget *
 do_iconscroll (GtkWidget *do_widget)
 {
  if (!window)
@@ -25,7 +25,7 @@ enum


 static GdkPixbuf *file_pixbuf, *folder_pixbuf;
-gchar *parent;
+char *parent;
 GtkWidget *up_button;

 /* Loads the images for the demo and returns whether the operation succeeded */
@@ -47,7 +47,7 @@ static void
 fill_store (GtkListStore *store)
 {
  GDir *dir;
-  const gchar *name;
+  const char *name;
  GtkTreeIter iter;

  /* First clear the store */
@@ -62,7 +62,7 @@ fill_store (GtkListStore *store)
  name = g_dir_read_name (dir);
  while (name != NULL)
    {
-      gchar *path, *display_name;
+      char *path, *display_name;
      gboolean is_dir;

      /* We ignore hidden files that start with a '.' */
@@ -90,14 +90,14 @@ fill_store (GtkListStore *store)
  g_dir_close (dir);
 }

-static gint
+static int
 sort_func (GtkTreeModel *model,
           GtkTreeIter  *a,
           GtkTreeIter  *b,
           gpointer      user_data)
 {
  gboolean is_dir_a, is_dir_b;
-  gchar *name_a, *name_b;
+  char *name_a, *name_b;
  int ret;

  /* We need this function because we want to sort
@@ -158,7 +158,7 @@ item_activated (GtkIconView *icon_view,
                gpointer     user_data)
 {
  GtkListStore *store;
-  gchar *path;
+  char *path;
  GtkTreeIter iter;
  gboolean is_dir;

@@ -192,7 +192,7 @@ up_clicked (GtkButton *item,
            gpointer   user_data)
 {
  GtkListStore *store;
-  gchar *dir_name;
+  char *dir_name;

  store = GTK_LIST_STORE (user_data);

@@ -19,8 +19,8 @@ static void
 fill_store (GtkListStore *store)
 {
  GtkTreeIter iter;
-  const gchar *text[] = { "Red", "Green", "Blue", "Yellow" };
-  gint i;
+  const char *text[] = { "Red", "Green", "Blue", "Yellow" };
+  int i;

  /* First clear the store */
  gtk_list_store_clear (store);
@@ -49,7 +49,7 @@ set_cell_color (GtkCellLayout   *cell_layout,
                GtkTreeIter     *iter,
                gpointer         data)
 {
-  gchar *text;
+  char *text;
  GdkRGBA color;
  guint32 pixel = 0;
  GdkPixbuf *pixbuf;
@@ -60,10 +60,10 @@ set_cell_color (GtkCellLayout   *cell_layout,

  if (gdk_rgba_parse (&color, text))
    pixel =
-      ((gint)(color.red * 255)) << 24 |
-      ((gint)(color.green * 255)) << 16 |
-      ((gint)(color.blue  * 255)) << 8 |
-      ((gint)(color.alpha * 255));
+      ((int)(color.red * 255)) << 24 |
+      ((int)(color.green * 255)) << 16 |
+      ((int)(color.blue  * 255)) << 8 |
+      ((int)(color.alpha * 255));

  g_free (text);

@@ -77,8 +77,8 @@ set_cell_color (GtkCellLayout   *cell_layout,

 static void
 edited (GtkCellRendererText *cell,
-        gchar               *path_string,
-        gchar               *text,
+        char                *path_string,
+        char                *text,
        gpointer             data)
 {
  GtkTreeModel *model;
@@ -43,10 +43,10 @@ progressive_prepared_callback (GdkPixbufLoader *loader,

 static void
 progressive_updated_callback (GdkPixbufLoader *loader,
-                              gint                 x,
-                              gint                 y,
-                              gint                 width,
-                              gint                 height,
+                              int                  x,
+                              int                  y,
+                              int                  width,
+                              int                  height,
                              gpointer     data)
 {
  GtkWidget *picture;
@@ -58,7 +58,7 @@ progressive_updated_callback (GdkPixbufLoader *loader,
  gtk_picture_set_pixbuf (GTK_PICTURE (picture), pixbuf);
 }

-static gint
+static int
 progressive_timeout (gpointer data)
 {
  GtkWidget *picture;
@@ -8,7 +8,7 @@

 static void
 on_bar_response (GtkInfoBar *info_bar,
-                 gint        response_id,
+                 int         response_id,
                 gpointer    user_data)
 {
  GtkWidget *dialog;
@@ -9,7 +9,7 @@

 static void
 response_cb (GtkWidget *dialog,
-             gint       response_id,
+             int        response_id,
             gpointer   data)
 {
  gtk_window_destroy (GTK_WINDOW (dialog));
@@ -17,7 +17,7 @@ response_cb (GtkWidget *dialog,

 static gboolean
 activate_link (GtkWidget   *label,
-               const gchar *uri,
+               const char *uri,
               gpointer     data)
 {
  if (g_strcmp0 (uri, "keynav") == 0)
@@ -81,7 +81,7 @@ spinner_timeout (gpointer data)
 static GtkTreeModel *
 create_model (void)
 {
-  gint i = 0;
+  int i = 0;
  GtkListStore *store;
  GtkTreeIter iter;

@@ -26,8 +26,8 @@
            <property name="margin-end">8</property>
            <property name="icon-name">image-missing</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
              <property name="row-span">5</property>
            </layout>
          </object>
@@ -71,8 +71,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -84,12 +84,9 @@
            <property name="yalign">0</property>
            <property name="label" translatable="0">Message</property>
            <property name="wrap">1</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -114,8 +111,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -168,8 +165,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -184,27 +181,17 @@
                    <property name="margin-bottom">2</property>
                    <property name="spacing">8</property>
                    <child>
-                      <object class="GtkFrame" id="frame1">
-                        <child>
-                          <object class="GtkLabel" id="n_reshares_label">
-                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
+                      <object class="GtkLabel" id="n_reshares_label">
+                        <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 Reshares</property>
-                            <property name="use-markup">1</property>
-                          </object>
-                        </child>
-                        <child type="label_item"/>
+                        <property name="use-markup">1</property>
                      </object>
                    </child>
                    <child>
-                      <object class="GtkFrame" id="frame2">
-                        <child>
-                          <object class="GtkLabel" id="n_favorites_label">
-                            <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
+                      <object class="GtkLabel" id="n_favorites_label">
+                        <property name="label" translatable="0">&lt;b&gt;2&lt;/b&gt;
 FAVORITES</property>
-                            <property name="use-markup">1</property>
-                          </object>
-                        </child>
-                        <child type="label_item"/>
+                        <property name="use-markup">1</property>
                      </object>
                    </child>
                  </object>
@@ -234,8 +221,8 @@ FAVORITES</property>
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">4</property>
+              <property name="column">1</property>
+              <property name="row">4</property>
            </layout>
          </object>
        </child>
@@ -166,14 +166,6 @@ do_listview_applauncher (GtkWidget *do_widget)
      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
      g_signal_connect (factory, "bind", G_CALLBACK (bind_listitem_cb), NULL);

-      /* Create the list widget here.
-       */
-      list = gtk_list_view_new_with_factory (factory);
-      /* We connect the activate signal here. It's the function we defined
-       * above for launching the selected application.
-       */
-      g_signal_connect (list, "activate", G_CALLBACK (activate_cb), NULL);
-
      /* And of course we need to set the data model. Here we call the function
       * we wrote above that gives us the list of applications. Then we set
       * it on the list widget.
@@ -181,8 +173,15 @@ do_listview_applauncher (GtkWidget *do_widget)
       * to create as many listitems as it needs to show itself to the user.
       */
      model = create_application_list ();
-      gtk_list_view_set_model (GTK_LIST_VIEW (list), model);
-      g_object_unref (model);
+
+      /* Create the list widget here.
+       */
+      list = gtk_list_view_new_with_factory (model, factory);
+
+      /* We connect the activate signal here. It's the function we defined
+       * above for launching the selected application.
+       */
+      g_signal_connect (list, "activate", G_CALLBACK (activate_cb), NULL);

      /* List widgets should always be contained in a #GtkScrolledWindow,
       * because otherwise they might get too large or they might not
@@ -463,7 +463,6 @@ do_listview_clocks (GtkWidget *do_widget)
      GtkWidget *gridview, *sw;
      GtkListItemFactory *factory;
      GListModel *model;
-      GtkNoSelection *selection;

      /* This is the normal window setup code every demo does */
      window = gtk_window_new ();
@@ -485,16 +484,12 @@ do_listview_clocks (GtkWidget *do_widget)
      factory = gtk_signal_list_item_factory_new ();
      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);

-      gridview = gtk_grid_view_new_with_factory (factory);
+      model = G_LIST_MODEL (gtk_no_selection_new (create_clocks_model ()));
+      gridview = gtk_grid_view_new_with_factory (model, factory);
      gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
      gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);

-      model = create_clocks_model ();
-      selection = gtk_no_selection_new (model);
-      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
-      g_object_unref (selection);
-      g_object_unref (model);
    }

  if (!gtk_widget_get_visible (window))
@@ -89,14 +89,14 @@ static GParamSpec *color_properties[N_COLOR_PROPS] = { NULL, };

 static void
 rgb_to_hsv (GdkRGBA *rgba,
-            gdouble *h_out,
-            gdouble *s_out,
-            gdouble *v_out)
+            double  *h_out,
+            double  *s_out,
+            double  *v_out)
 {
-  gdouble red, green, blue;
-  gdouble h, s, v;
-  gdouble min, max;
-  gdouble delta;
+  double red, green, blue;
+  double h, s, v;
+  double min, max;
+  double delta;

  red = rgba->red;
  green = rgba->green;
@@ -226,7 +226,7 @@ gtk_color_set_property (GObject      *object,
      break;

    case PROP_COLOR:
-      self->color = *(GdkRGBA *) g_value_dup_boxed (value);
+      self->color = *(GdkRGBA *) g_value_get_boxed (value);
      rgb_to_hsv (&self->color, &h, &s, &v);
      self->h = round (360 * h);
      self->s = round (100 * s);
@@ -662,9 +662,8 @@ create_color_grid (void)
 {
  GtkWidget *gridview;
  GtkListItemFactory *factory;
-  GListModel *model, *selection;

-  gridview = gtk_grid_view_new ();
+  gridview = gtk_grid_view_new (NULL);
  gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
  gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);

@@ -676,13 +675,6 @@ create_color_grid (void)
  gtk_grid_view_set_max_columns (GTK_GRID_VIEW (gridview), 24);
  gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);

-  model = G_LIST_MODEL (gtk_sort_list_model_new (gtk_color_list_new (0), NULL));
-
-  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
-  gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
-
  return gridview;
 }

@@ -835,6 +827,22 @@ update_selection_average (GListModel *model,
  g_object_unref (color);
 }

+static void
+update_progress_cb (GtkSortListModel *model,
+                    GParamSpec       *pspec,
+                    GtkProgressBar   *progress)
+{
+  guint total;
+  guint pending;
+
+  total = g_list_model_get_n_items (G_LIST_MODEL (model));
+  total = MAX (total, 1); /* avoid div by 0 below */
+  pending = gtk_sort_list_model_get_pending (model);
+
+  gtk_widget_set_visible (GTK_WIDGET (progress), pending != 0);
+  gtk_progress_bar_set_fraction (progress, (total - pending) / (double) total);
+}
+
 static GtkWidget *window = NULL;

 GtkWidget *
@@ -842,10 +850,11 @@ do_listview_colors (GtkWidget *do_widget)
 {
  if (window == NULL)
    {
-      GtkWidget *header, *gridview, *sw, *box, *dropdown;
+      GtkMultiSelection *selection;
+      GtkSortListModel *sort_model;
+      GtkWidget *header, *overlay, *gridview, *sw, *box, *dropdown;
      GtkListItemFactory *factory;
      GListStore *factories;
-      GListModel *model;
      GtkSorter *sorter;
      GtkSorter *multi_sorter;
      GListStore *sorters;
@@ -863,6 +872,7 @@ do_listview_colors (GtkWidget *do_widget)
      GtkWidget *selection_average_picture;
      GtkWidget *selection_info_toggle;
      GtkWidget *selection_info_revealer;
+      GtkWidget *progress;
      GtkCssProvider *provider;

      provider = gtk_css_provider_new ();
@@ -872,6 +882,10 @@ do_listview_colors (GtkWidget *do_widget)
                                                  800);
      g_object_unref (provider);

+      sort_model = gtk_sort_list_model_new (gtk_color_list_new (0), NULL);
+      gtk_sort_list_model_set_incremental (sort_model, TRUE);
+      selection = gtk_multi_selection_new (G_LIST_MODEL (sort_model));
+
      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Colors");
      header = gtk_header_bar_new ();
@@ -882,8 +896,17 @@ do_listview_colors (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window);

+      overlay = gtk_overlay_new ();
+      gtk_window_set_child (GTK_WINDOW (window), overlay);
+
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
+      gtk_overlay_set_child (GTK_OVERLAY (overlay), box);
+
+      progress = gtk_progress_bar_new ();
+      gtk_widget_set_hexpand (progress, TRUE);
+      gtk_widget_set_valign (progress, GTK_ALIGN_START);
+      g_signal_connect (sort_model, "notify::pending", G_CALLBACK (update_progress_cb), progress);
+      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), progress);

      selection_info_revealer = gtk_revealer_new ();
      gtk_box_append (GTK_BOX (box), selection_info_revealer);
@@ -927,7 +950,7 @@ do_listview_colors (GtkWidget *do_widget)

      factory = gtk_signal_list_item_factory_new ();
      g_signal_connect (factory, "setup", G_CALLBACK (setup_selection_listitem_cb), NULL);
-      selection_view = gtk_grid_view_new_with_factory (factory);
+      selection_view = gtk_grid_view_new_with_factory (NULL, factory);
      gtk_widget_add_css_class (selection_view, "compact");
      gtk_grid_view_set_max_columns (GTK_GRID_VIEW (selection_view), 200);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), selection_view);
@@ -936,23 +959,19 @@ do_listview_colors (GtkWidget *do_widget)
      gtk_box_append (GTK_BOX (box), sw);

      gridview = create_color_grid ();
+      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
      gtk_widget_set_hexpand (sw, TRUE);
      gtk_widget_set_vexpand (sw, TRUE);
-      model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));

-      selection_filter = G_LIST_MODEL (gtk_selection_filter_model_new (GTK_SELECTION_MODEL (model)));
+      selection_filter = G_LIST_MODEL (gtk_selection_filter_model_new (GTK_SELECTION_MODEL (selection)));
      g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_count), selection_size_label);
      g_signal_connect (selection_filter, "items-changed", G_CALLBACK (update_selection_average), selection_average_picture);

      no_selection = G_LIST_MODEL (gtk_no_selection_new (selection_filter));
      gtk_grid_view_set_model (GTK_GRID_VIEW (selection_view), no_selection);
-      g_object_unref (selection_filter);
      g_object_unref (no_selection);

-      model = gtk_multi_selection_get_model (GTK_MULTI_SELECTION (model));
-      g_object_ref (model);
-
      selection_info_toggle = gtk_toggle_button_new ();
      gtk_button_set_icon_name (GTK_BUTTON (selection_info_toggle), "emblem-important-symbolic");
      gtk_widget_set_tooltip_text (selection_info_toggle, "Show selection info");
@@ -965,7 +984,7 @@ do_listview_colors (GtkWidget *do_widget)
      button = gtk_button_new_with_mnemonic ("_Refill");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (refill),
-                        gtk_sort_list_model_get_model (GTK_SORT_LIST_MODEL (model)));
+                        gtk_sort_list_model_get_model (sort_model));

      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), button);

@@ -980,15 +999,13 @@ do_listview_colors (GtkWidget *do_widget)
      gtk_label_set_width_chars (GTK_LABEL (label), len + 2);
      gtk_label_set_xalign (GTK_LABEL (label), 1);

-      g_signal_connect (gtk_grid_view_get_model (GTK_GRID_VIEW (gridview)),
-                        "items-changed", G_CALLBACK (items_changed_cb), label);
+      g_signal_connect (selection, "items-changed", G_CALLBACK (items_changed_cb), label);
      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), label);

-      dropdown = gtk_drop_down_new ();
-      gtk_drop_down_set_from_strings (GTK_DROP_DOWN (dropdown), (const char *[]) { "8", "64", "512", "4096", "32768", "262144", "2097152", "16777216", NULL });
+      dropdown = gtk_drop_down_new_from_strings  ((const char * const[]) { "8", "64", "512", "4096", "32768", "262144", "2097152", "16777216", NULL });
      g_signal_connect (dropdown, "notify::selected",
                        G_CALLBACK (limit_changed_cb), 
-                        gtk_sort_list_model_get_model (GTK_SORT_LIST_MODEL (model)));
+                        gtk_sort_list_model_get_model (sort_model));
      g_signal_connect (dropdown, "notify::selected",
                        G_CALLBACK (limit_changed_cb2), 
                        label);
@@ -1063,24 +1080,19 @@ do_listview_colors (GtkWidget *do_widget)
      g_list_store_append (sorters, multi_sorter);
      g_object_unref (multi_sorter);

-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (box), gtk_label_new ("Sort by:"));
-      gtk_box_append (GTK_BOX (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
                                                NULL,
                                                0, NULL,
                                                (GCallback)get_title,
                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);

-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
-      g_object_unref (sorters);
+      dropdown = gtk_drop_down_new (G_LIST_MODEL (sorters), expression);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_box_append (GTK_BOX (box), gtk_label_new ("Sort by:"));
+      gtk_box_append (GTK_BOX (box), dropdown);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);

-      g_object_bind_property (dropdown, "selected-item", model, "sorter", G_BINDING_SYNC_CREATE);
+      g_object_bind_property (dropdown, "selected-item", sort_model, "sorter", G_BINDING_SYNC_CREATE);

      factories = g_list_store_new (GTK_TYPE_LIST_ITEM_FACTORY);

@@ -1094,25 +1106,20 @@ do_listview_colors (GtkWidget *do_widget)
      set_title (factory, "Everything");
      g_list_store_append (factories, factory);

-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (box), gtk_label_new ("Show:"));
-      gtk_box_append (GTK_BOX (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
                                                NULL,
                                                0, NULL,
                                                (GCallback)get_title,
                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
-      g_object_unref (factories);
+      dropdown = gtk_drop_down_new (G_LIST_MODEL (factories), expression);
+      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_box_append (GTK_BOX (box), gtk_label_new ("Show:"));
+      gtk_box_append (GTK_BOX (box), dropdown);
+      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);

      g_object_bind_property (dropdown, "selected-item", gridview, "factory", G_BINDING_SYNC_CREATE);
-      g_object_unref (model);
+
+      g_object_unref (selection);
    }

  if (!gtk_widget_get_visible (window))
@@ -214,7 +214,6 @@ transform_settings_to_keys (GBinding     *binding,
  GtkSortListModel *sort_model;
  GtkFilterListModel *filter_model;
  GtkFilter *filter;
-  GtkNoSelection *selection_model;
  char **keys;
  guint i;

@@ -242,21 +241,13 @@ transform_settings_to_keys (GBinding     *binding,
  g_object_unref (settings);

  sort_model = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
-  g_object_unref (store);
+                                        g_object_ref (gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data))));

  filter = gtk_string_filter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  g_object_unref (sort_model);
-
  g_set_object (&current_filter, filter);
+  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);

-  g_object_unref (filter);
-
-  selection_model = gtk_no_selection_new (G_LIST_MODEL (filter_model));
-  g_object_unref (filter_model);
-
-  g_value_take_object (to_value, selection_model);
+  g_value_take_object (to_value, gtk_no_selection_new (G_LIST_MODEL (filter_model)));

  return TRUE;
 }
@@ -367,6 +358,8 @@ do_listview_settings (GtkWidget *do_widget)

      builder = gtk_builder_new ();
      gtk_builder_set_scope (builder, scope);
+      g_object_unref (scope);
+
      gtk_builder_add_from_resource (builder, "/listview_settings/listview_settings.ui", NULL);

      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
@@ -403,8 +396,8 @@ do_listview_settings (GtkWidget *do_widget)
      g_object_unref (actions);

      model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (FALSE,
-                                           model,
+      treemodel = gtk_tree_list_model_new (model,
+                                           FALSE,
                                           TRUE,
                                           create_settings_model,
                                           NULL,
@@ -418,8 +411,6 @@ do_listview_settings (GtkWidget *do_widget)
                                   columnview, NULL);
      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
      g_object_unref (selection);
-      g_object_unref (treemodel);
-      g_object_unref (model);

      name_column = GTK_COLUMN_VIEW_COLUMN (gtk_builder_get_object (builder, "name_column"));
      sorter = gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
@@ -281,20 +281,16 @@ GtkWidget *
 create_weather_view (void)
 {
  GtkWidget *listview;
-  GListModel *model, *selection;
+  GListModel *model;
  GtkListItemFactory *factory;

  factory = gtk_signal_list_item_factory_new ();
  g_signal_connect (factory, "setup", G_CALLBACK (setup_widget), NULL);
  g_signal_connect (factory, "bind", G_CALLBACK (bind_widget), NULL);
-  listview = gtk_list_view_new_with_factory (factory);
+  model = G_LIST_MODEL (gtk_no_selection_new (create_weather_model ()));
+  listview = gtk_list_view_new_with_factory (model, factory);
  gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
  gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-  model = create_weather_model ();
-  selection = G_LIST_MODEL (gtk_no_selection_new (model));
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);

  return listview;
 }
@@ -65,6 +65,7 @@ read_lines_cb (GObject      *object,
    {
      g_print ("Could not read data: %s\n", error->message);
      g_clear_error (&error);
+      g_object_unref (stringlist);
      return;
    }

@@ -74,6 +75,7 @@ read_lines_cb (GObject      *object,
    {
      if (size)
        gtk_string_list_take (stringlist, g_utf8_make_valid (buffer, size));
+      g_object_unref (stringlist);
      return;
    }

@@ -121,6 +123,7 @@ file_is_open_cb (GObject      *file,
    {
      g_print ("Could not open file: %s\n", error->message);
      g_error_free (error);
+      g_object_unref (data);
      return;
    }

@@ -134,7 +137,7 @@ load_file (GtkStringList *list,
           GFile         *file)
 {
  gtk_string_list_splice (list, 0, g_list_model_get_n_items (G_LIST_MODEL (list)), NULL);
-  g_file_read_async (file, G_PRIORITY_HIGH_IDLE, NULL, file_is_open_cb, list);
+  g_file_read_async (file, G_PRIORITY_HIGH_IDLE, NULL, file_is_open_cb, g_object_ref (list));
 }

 static void
@@ -157,7 +160,6 @@ do_listview_words (GtkWidget *do_widget)
    {
      GtkWidget *header, *listview, *sw, *vbox, *search_entry, *open_button, *overlay;
      GtkFilterListModel *filter_model;
-      GtkNoSelection *selection;
      GtkStringList *stringlist;
      GtkFilter *filter;
      GFile *file;
@@ -175,6 +177,7 @@ do_listview_words (GtkWidget *do_widget)
          stringlist = gtk_string_list_new ((const char **) words);
          g_strfreev (words);
        }
+      g_object_unref (file);

      filter = gtk_string_filter_new (gtk_property_expression_new (GTK_TYPE_STRING_OBJECT, NULL, "string"));
      filter_model = gtk_filter_list_model_new (G_LIST_MODEL (stringlist), filter);
@@ -215,18 +218,15 @@ do_listview_words (GtkWidget *do_widget)
      gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);

      listview = gtk_list_view_new_with_factory (
+          G_LIST_MODEL (gtk_no_selection_new (G_LIST_MODEL (filter_model))),
          gtk_builder_list_item_factory_new_from_bytes (NULL,
              g_bytes_new_static (factory_text, strlen (factory_text))));
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-      selection = gtk_no_selection_new (G_LIST_MODEL (filter_model));
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-      g_object_unref (selection);

      g_signal_connect (filter_model, "items-changed", G_CALLBACK (update_title_cb), progress);
      g_signal_connect (filter_model, "notify::pending", G_CALLBACK (update_title_cb), progress);
      update_title_cb (filter_model);

-      g_object_unref (filter_model);
    }

  if (!gtk_widget_get_visible (window))
@@ -13,7 +13,7 @@
 static GtkWidget *info_view;
 static GtkWidget *source_view;

-static gchar *current_file = NULL;
+static char *current_file = NULL;

 static GtkWidget *notebook;
 static GtkSingleSelection *selection;
@@ -141,15 +141,21 @@ activate_about (GSimpleAction *action,
                gpointer       user_data)
 {
  GtkApplication *app = user_data;
-  const gchar *authors[] = {
+  const char *authors[] = {
    "The GTK Team",
    NULL
  };
  char *version;
+  char *os_name;
+  char *os_version;
  GString *s;

  s = g_string_new ("");

+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
  g_string_append (s, "System libraries\n");
  g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
                          glib_major_version,
@@ -184,6 +190,8 @@ activate_about (GSimpleAction *action,

  g_string_free (s, TRUE);
  g_free (version);
+  g_free (os_name);
+  g_free (os_version);
 }

 static void
@@ -226,377 +234,113 @@ activate_run (GSimpleAction *action,
  gtk_demo_run (demo, window);
 }

-/* Stupid syntax highlighting.
- *
- * No regex was used in the making of this highlighting.
- * It should only work for simple cases.  This is good, as
- * that's all we should have in the demos.
- */
-/* This code should not be used elsewhere, except perhaps as an example of how
- * to iterate through a text buffer.
- */
-enum {
-  STATE_NORMAL,
-  STATE_IN_COMMENT
-};
-
-static const char *tokens[] =
+static GBytes *
+fontify_text (const char *format,
+              const char *text)
 {
-  "/*",
-  "\"",
-  NULL
-};
+  GSubprocess *subprocess;
+  GBytes *stdin_buf;
+  GBytes *stdout_buf = NULL;
+  GBytes *stderr_buf = NULL;
+  GError *error = NULL;
+  char *format_arg;

-static const char *types[] =
-{
-  "static",
-  "const ",
-  "void",
-  "gint",
-  " int ",
-  " char ",
-  "gchar ",
-  "gfloat",
-  "float",
-  "double",
-  "gint8",
-  "gint16",
-  "gint32",
-  "guint",
-  "guint8",
-  "guint16",
-  "guint32",
-  "guchar",
-  "glong",
-  "gboolean" ,
-  "gshort",
-  "gushort",
-  "gulong",
-  "gdouble",
-  "gldouble",
-  "gpointer",
-  "NULL",
-  "GList",
-  "GSList",
-  "FALSE",
-  "TRUE",
-  "FILE ",
-  "GtkColorSelection ",
-  "GtkWidget ",
-  "GtkButton ",
-  "GdkColor ",
-  "GdkRectangle ",
-  "GdkEventExpose ",
-  "GdkGC ",
-  "GdkPixbufLoader ",
-  "GdkPixbuf ",
-  "GError",
-  "size_t",
-  "GtkAboutDialog ",
-  "GtkAction ",
-  "GtkActionEntry ",
-  "GtkRadioActionEntry ",
-  "GtkIconFactory ",
-  "GtkTextBuffer ",
-  "GtkStatusbar ",
-  "GtkTextIter ",
-  "GtkTextMark ",
-  "GdkEventWindowState ",
-  "GtkActionGroup ",
-  "GtkUIManager ",
-  "GtkRadioAction ",
-  "GtkActionClass ",
-  "GtkToggleActionEntry ",
-  "GtkAssistant ",
-  "GtkBuilder ",
-  "GtkSizeGroup ",
-  "GtkTreeModel ",
-  "GtkTreeSelection ",
-  "GdkDisplay ",
-  "GdkScreen ",
-  "GdkSurface ",
-  "GdkEventButton ",
-  "GdkCursor ",
-  "GtkTreeIter ",
-  "GtkTreeViewColumn ",
-  "GdkDisplayManager ",
-  "GdkClipboard ",
-  "GtkIconSize ",
-  "GtkImage ",
-  "GdkDragContext ",
-  "GtkSelectionData ",
-  "GtkDialog ",
-  "GtkMenuItem ",
-  "GtkListStore ",
-  "GtkCellLayout ",
-  "GtkCellRenderer ",
-  "GtkTreePath ",
-  "GtkTreeStore ",
-  "GtkEntry ",
-  "GtkEditable ",
-  "GtkEditableInterface ",
-  "GdkPixmap ",
-  "GdkEventConfigure ",
-  "GdkEventMotion ",
-  "GdkModifierType ",
-  "GtkEntryCompletion ",
-  "GtkToolItem ",
-  "GDir ",
-  "GtkIconView ",
-  "GtkCellRendererText ",
-  "GtkContainer ",
-  "GtkPaned ",
-  "GtkPrintOperation ",
-  "GtkPrintContext ",
-  "cairo_t ",
-  "PangoLayout "
-  "PangoFontDescription ",
-  "PangoRenderer ",
-  "PangoMatrix ",
-  "PangoContext ",
-  "PangoLayout ",
-  "GtkToggleButton ",
-  "GString ",
-  "GtkIconSize ",
-  "GtkTreeView ",
-  "GtkTextTag ",
-  "GdkEvent ",
-  "GdkEventKey ",
-  "GtkTextView ",
-  "GdkBitmap ",
-  "GtkTextChildAnchor ",
-  "GArray ",
-  "GtkCellEditable ",
-  "GtkCellRendererToggle ",
-  NULL
-};
+  format_arg = g_strconcat ("--syntax=", format, NULL);
+  subprocess = g_subprocess_new (G_SUBPROCESS_FLAGS_STDIN_PIPE |
+                                 G_SUBPROCESS_FLAGS_STDOUT_PIPE |
+                                 G_SUBPROCESS_FLAGS_STDERR_PIPE,
+                                 &error,
+                                 "highlight",
+                                 format_arg,
+                                 "--out-format=pango",
+                                 NULL);
+  g_free (format_arg);

-static const char *control[] =
-{
-  " if ",
-  " while ",
-  " else",
-  " do ",
-  " for ",
-  "?",
-  ":",
-  "return ",
-  "goto ",
-  NULL
-};
-void
-parse_chars (gchar       *text,
-             gchar      **end_ptr,
-             gint        *state,
-             const char **tag,
-             gboolean     start)
-{
-  gint i;
-  gchar *next_token;
-
-  /* Handle comments first */
-  if (*state == STATE_IN_COMMENT)
+  if (!subprocess)
    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
+      if (g_error_matches (error, G_SPAWN_ERROR, G_SPAWN_ERROR_NOENT))
        {
-          *end_ptr += 2;
-          *state = STATE_NORMAL;
-          *tag = "comment";
-        }
-      return;
-    }
+          static gboolean warned = FALSE;

-  *tag = NULL;
-  *end_ptr = NULL;
-
-  /* check for comment */
-  if (!strncmp (text, "/*", 2))
-    {
-      *end_ptr = strstr (text, "*/");
-      if (*end_ptr)
-        *end_ptr += 2;
-      else
-        *state = STATE_IN_COMMENT;
-      *tag = "comment";
-      return;
-    }
-
-  /* check for preprocessor defines */
-  if (*text == '#' && start)
-    {
-      *end_ptr = NULL;
-      *tag = "preprocessor";
-      return;
-    }
-
-  /* functions */
-  if (start && * text != '\t' && *text != ' ' && *text != '{' && *text != '}')
-    {
-      if (strstr (text, "("))
-        {
-          *end_ptr = strstr (text, "(");
-          *tag = "function";
-          return;
-        }
-    }
-  /* check for types */
-  for (i = 0; types[i] != NULL; i++)
-    if (!strncmp (text, types[i], strlen (types[i])) ||
-        (start && types[i][0] == ' ' && !strncmp (text, types[i] + 1, strlen (types[i]) - 1)))
-      {
-        *end_ptr = text + strlen (types[i]);
-        *tag = "type";
-        return;
-      }
-
-  /* check for control */
-  for (i = 0; control[i] != NULL; i++)
-    if (!strncmp (text, control[i], strlen (control[i])))
-      {
-        *end_ptr = text + strlen (control[i]);
-        *tag = "control";
-        return;
-      }
-
-  /* check for string */
-  if (text[0] == '"')
-    {
-      gint maybe_escape = FALSE;
-
-      *end_ptr = text + 1;
-      *tag = "string";
-      while (**end_ptr != '\000')
-        {
-          if (**end_ptr == '\"' && !maybe_escape)
+          if (!warned)
            {
-              *end_ptr += 1;
-              return;
+              warned = TRUE;
+              g_message ("For syntax highlighting, install the “highlight” program");
            }
-          if (**end_ptr == '\\')
-            maybe_escape = TRUE;
-          else
-            maybe_escape = FALSE;
-          *end_ptr += 1;
        }
-      return;
+      else
+        g_warning ("%s", error->message);
+
+      g_clear_error (&error);
+
+      return NULL;
    }

-  /* not at the start of a tag.  Find the next one. */
-  for (i = 0; tokens[i] != NULL; i++)
+  stdin_buf = g_bytes_new_static (text, strlen (text));
+
+  if (!g_subprocess_communicate (subprocess,
+                                 stdin_buf,
+                                 NULL,
+                                 &stdout_buf,
+                                 &stderr_buf,
+                                 &error))
    {
-      next_token = strstr (text, tokens[i]);
-      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+      g_clear_pointer (&stdin_buf, g_bytes_unref);
+      g_clear_pointer (&stdout_buf, g_bytes_unref);
+      g_clear_pointer (&stderr_buf, g_bytes_unref);
+
+      g_warning ("%s", error->message);
+      g_clear_error (&error);
+
+      return NULL;
    }

-  for (i = 0; types[i] != NULL; i++)
+  g_bytes_unref (stdin_buf);
+
+  if (g_subprocess_get_exit_status (subprocess) != 0)
    {
-      next_token = strstr (text, types[i]);
-      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
+      if (stderr_buf)
+        g_warning ("%s", (char *)g_bytes_get_data (stderr_buf, NULL));
+
+      g_clear_pointer (&stdout_buf, g_bytes_unref);
    }

-  for (i = 0; control[i] != NULL; i++)
-    {
-      next_token = strstr (text, control[i]);
-      if (next_token)
-        {
-          if (*end_ptr)
-            *end_ptr = (*end_ptr<next_token)?*end_ptr:next_token;
-          else
-            *end_ptr = next_token;
-        }
-    }
+  g_clear_pointer (&stderr_buf, g_bytes_unref);
+
+  g_object_unref (subprocess);
+
+  return stdout_buf;
 }

-/* While not as cool as c-mode, this will do as a quick attempt at highlighting */
 void
-fontify (GtkTextBuffer *source_buffer)
+fontify (const char    *format,
+         GtkTextBuffer *source_buffer)
 {
-  GtkTextIter start_iter, next_iter, tmp_iter;
-  gint state;
-  gchar *text;
-  gchar *start_ptr, *end_ptr;
-  const char *tag;
+  GtkTextIter start, end;
+  char *text;
+  GBytes *bytes;

-  gtk_text_buffer_create_tag (source_buffer, "source",
-                              "font", "monospace",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "comment",
-                              "foreground", "DodgerBlue",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "type",
-                              "foreground", "ForestGreen",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "string",
-                              "foreground", "RosyBrown",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "control",
-                              "foreground", "purple",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "preprocessor",
-                              "style", PANGO_STYLE_OBLIQUE,
-                              "foreground", "burlywood4",
-                              NULL);
-  gtk_text_buffer_create_tag (source_buffer, "function",
-                              "weight", PANGO_WEIGHT_BOLD,
-                              "foreground", "DarkGoldenrod4",
-                              NULL);
+  gtk_text_buffer_get_bounds (source_buffer, &start, &end);
+  text = gtk_text_buffer_get_text (source_buffer, &start, &end, TRUE);

-  gtk_text_buffer_get_bounds (source_buffer, &start_iter, &tmp_iter);
-  gtk_text_buffer_apply_tag_by_name (source_buffer, "source", &start_iter, &tmp_iter);
-
-  state = STATE_NORMAL;
-
-  gtk_text_buffer_get_iter_at_offset (source_buffer, &start_iter, 0);
-
-  next_iter = start_iter;
-  while (gtk_text_iter_forward_line (&next_iter))
+  bytes = fontify_text (format, text);
+  if (bytes)
    {
-      gboolean start = TRUE;
-      start_ptr = text = gtk_text_iter_get_text (&start_iter, &next_iter);
+      char *markup;
+      gsize len;

-      do
-        {
-          parse_chars (start_ptr, &end_ptr, &state, &tag, start);
-
-          start = FALSE;
-          if (end_ptr)
-            {
-              tmp_iter = start_iter;
-              gtk_text_iter_forward_chars (&tmp_iter, end_ptr - start_ptr);
-            }
-          else
-            {
-              tmp_iter = next_iter;
-            }
-          if (tag)
-            gtk_text_buffer_apply_tag_by_name (source_buffer, tag, &start_iter, &tmp_iter);
-
-          start_iter = tmp_iter;
-          start_ptr = end_ptr;
-        }
-      while (end_ptr);
-
-      g_free (text);
-      start_iter = next_iter;
+      markup = g_bytes_unref_to_data (bytes, &len);
+      gtk_text_buffer_delete (source_buffer, &start, &end);
+      gtk_text_buffer_insert_markup (source_buffer, &start, markup, len);
+      g_free (markup);
    }
+
+  g_free (text);
 }

 static GtkWidget *
-display_image (const char *resource)
+display_image (const char *format,
+               const char *resource)
 {
  GtkWidget *sw, *image;

@@ -610,7 +354,8 @@ display_image (const char *resource)
 }

 static GtkWidget *
-display_text (const char *resource)
+display_text (const char *format,
+              const char *resource)
 {
  GtkTextBuffer *buffer;
  GtkWidget *textview, *sw;
@@ -637,8 +382,10 @@ display_text (const char *resource)

  buffer = gtk_text_buffer_new (NULL);
  gtk_text_buffer_set_text (buffer, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes));
-  if (g_str_has_suffix (resource, ".c"))
-    fontify (buffer);
+
+  if (format)
+    fontify (format, buffer);
+
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);

  g_bytes_unref (bytes);
@@ -653,7 +400,8 @@ display_text (const char *resource)
 }

 static GtkWidget *
-display_video (const char *resource)
+display_video (const char *format,
+               const char *resource)
 {
  GtkWidget *video;

@@ -680,25 +428,27 @@ display_nothing (const char *resource)

 static struct {
  const char *extension;
-  GtkWidget * (* display_func) (const char *resource);
+  const char *format;
+  GtkWidget * (* display_func) (const char *format,
+                                const char *resource);
 } display_funcs[] = {
-  { ".gif", display_image },
-  { ".jpg", display_image },
-  { ".png", display_image },
-  { ".c", display_text },
-  { ".css", display_text },
-  { ".glsl", display_text },
-  { ".h", display_text },
-  { ".txt", display_text },
-  { ".ui", display_text },
-  { ".webm", display_video }
+  { ".gif", NULL, display_image },
+  { ".jpg", NULL, display_image },
+  { ".png", NULL, display_image },
+  { ".c", "c", display_text },
+  { ".css", "css", display_text },
+  { ".glsl", NULL, display_text },
+  { ".h", "c", display_text },
+  { ".txt", NULL, display_text },
+  { ".ui", "xml", display_text },
+  { ".webm", NULL, display_video }
 };

 static void
-add_data_tab (const gchar *demoname)
+add_data_tab (const char *demoname)
 {
-  gchar *resource_dir, *resource_name;
-  gchar **resources;
+  char *resource_dir, *resource_name;
+  char **resources;
  GtkWidget *widget, *label;
  guint i, j;

@@ -721,7 +471,7 @@ add_data_tab (const gchar *demoname)
        }

      if (j < G_N_ELEMENTS(display_funcs))
-        widget = display_funcs[j].display_func (resource_name);
+        widget = display_funcs[j].display_func (display_funcs[j].format, resource_name);
      else
        widget = display_nothing (resource_name);

@@ -742,15 +492,15 @@ add_data_tab (const gchar *demoname)
 static void
 remove_data_tabs (void)
 {
-  gint i;
+  int i;

  for (i = gtk_notebook_get_n_pages (GTK_NOTEBOOK (notebook)) - 1; i > 1; i--)
    gtk_notebook_remove_page (GTK_NOTEBOOK (notebook), i);
 }

 void
-load_file (const gchar *demoname,
-           const gchar *filename)
+load_file (const char *demoname,
+           const char *filename)
 {
  GtkTextBuffer *info_buffer, *source_buffer;
  GtkTextIter start, end;
@@ -758,9 +508,9 @@ load_file (const gchar *demoname,
  GError *err = NULL;
  int state = 0;
  gboolean in_para = 0;
-  gchar **lines;
+  char **lines;
  GBytes *bytes;
-  gint i;
+  int i;

  if (!g_strcmp0 (current_file, filename))
    return;
@@ -800,9 +550,9 @@ load_file (const gchar *demoname,
  gtk_text_buffer_get_iter_at_offset (info_buffer, &start, 0);
  for (i = 0; lines[i] != NULL; i++)
    {
-      gchar *p;
-      gchar *q;
-      gchar *r;
+      char *p;
+      char *q;
+      char *r;

      /* Make sure \r is stripped at the end for the poor windows people */
      lines[i] = g_strchomp (lines[i]);
@@ -916,7 +666,7 @@ load_file (const gchar *demoname,

  g_strfreev (lines);

-  fontify (source_buffer);
+  fontify ("c", source_buffer);

  gtk_text_buffer_end_irreversible_action (source_buffer);
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (source_view), source_buffer);
@@ -1140,8 +890,8 @@ activate (GApplication *app)
  g_signal_connect (search_bar, "notify::search-mode-enabled", G_CALLBACK (clear_search), NULL);

  listmodel = create_demo_model ();
-  treemodel = gtk_tree_list_model_new (FALSE,
-                                       G_LIST_MODEL (listmodel),
+  treemodel = gtk_tree_list_model_new (G_LIST_MODEL (listmodel),
+                                       FALSE,
                                       TRUE,
                                       get_child_model,
                                       NULL,
@@ -1149,6 +899,7 @@ activate (GApplication *app)
  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (treemodel), NULL);
  filter = gtk_custom_filter_new ((GtkCustomFilterFunc)demo_filter_by_name, filter_model, NULL);
  gtk_filter_list_model_set_filter (filter_model, filter);
+  g_object_unref (filter);
  search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
  g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);

@@ -1190,12 +941,12 @@ list_demos (void)
    }
 }

-static gint
+static int
 command_line (GApplication            *app,
              GApplicationCommandLine *cmdline)
 {
  GVariantDict *options;
-  const gchar *name = NULL;
+  const char *name = NULL;
  gboolean autoquit = FALSE;
  gboolean list = FALSE;
  DemoData *d, *c;
@@ -1298,8 +1049,8 @@ main (int argc, char **argv)
    { "inspector", activate_inspector, NULL, NULL, NULL },
  };
  struct {
-    const gchar *action_and_target;
-    const gchar *accelerators[2];
+    const char *action_and_target;
+    const char *accelerators[2];
  } accels[] = {
    { "app.about", { "F1", NULL } },
    { "app.quit", { "<Control>q", NULL } },
@@ -21,7 +21,7 @@ source_toggled (GtkToggleButton *button)
    {
      GtkTextBuffer *buffer;
      GtkTextIter start, end;
-      gchar *markup;
+      char *markup;

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view2));
      gtk_text_buffer_get_bounds (buffer, &start, &end);
@@ -50,7 +50,7 @@ do_markup (GtkWidget *do_widget)
      GtkTextBuffer *buffer;
      GtkTextIter iter;
      GBytes *bytes;
-      const gchar *markup;
+      const char *markup;
      GtkWidget *header;
      GtkWidget *show_source;

@@ -102,7 +102,7 @@ do_markup (GtkWidget *do_widget)
      gtk_stack_add_named (GTK_STACK (stack), sw, "source");

      bytes = g_resources_lookup_data ("/markup/markup.txt", 0, NULL);
-      markup = (const gchar *)g_bytes_get_data (bytes, NULL);
+      markup = (const char *)g_bytes_get_data (bytes, NULL);

      buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
      gtk_text_buffer_get_start_iter (buffer, &iter);
@@ -31,6 +31,11 @@
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
  <releases>
+    <release version="3.99.0" date="2020-07-30">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
    <release version="3.94.0" date="2018-06-25">
      <description>
        <p>A new developers snapshot towards GTK 4.0.</p>
@@ -12,9 +12,9 @@ static void
 margin_changed (GtkAdjustment *adjustment,
                GtkTextView   *text)
 {
-  gint value;
+  int value;

-  value = (gint)gtk_adjustment_get_value (adjustment);
+  value = (int)gtk_adjustment_get_value (adjustment);
  gtk_text_view_set_left_margin (GTK_TEXT_VIEW (text), value);
  g_object_set (tag, "pixels-above-lines", value, NULL);
 }
@@ -9,7 +9,7 @@
 #include <gtk/gtkunixprint.h>

 static void
-done_cb (GtkDialog *dialog, gint response, gpointer data)
+done_cb (GtkDialog *dialog, int response, gpointer data)
 {
  gtk_window_destroy (GTK_WINDOW (dialog));
 }
@@ -20,7 +20,7 @@ typedef struct
  cairo_t *cr;
  GdkRGBA draw_color;
  GtkPadController *pad_controller;
-  gdouble brush_size;
+  double brush_size;
 } DrawingArea;

 typedef struct
@@ -38,7 +38,7 @@ static GtkPadActionEntry pad_actions[] = {
  { GTK_PAD_ACTION_STRIP, -1, -1, N_("Brush size"), "pad.brush_size" },
 };

-static const gchar *pad_colors[] = {
+static const char *pad_colors[] = {
  "black",
  "pink",
  "green",
@@ -55,8 +55,8 @@ static void drawing_area_set_color (DrawingArea *area,

 static void
 drawing_area_ensure_surface (DrawingArea *area,
-                             gint         width,
-                             gint         height)
+                             int          width,
+                             int          height)
 {
  if (!area->surface ||
      cairo_image_surface_get_width (area->surface) != width ||
@@ -154,7 +154,7 @@ on_pad_button_activate (GSimpleAction *action,
                        GVariant      *parameter,
                        DrawingArea   *area)
 {
-  const gchar *color = g_object_get_data (G_OBJECT (action), "color");
+  const char *color = g_object_get_data (G_OBJECT (action), "color");
  GdkRGBA rgba;

  gdk_rgba_parse (&rgba, color);
@@ -166,7 +166,7 @@ on_pad_knob_change (GSimpleAction *action,
                    GVariant      *parameter,
                    DrawingArea   *area)
 {
-  gdouble value = g_variant_get_double (parameter);
+  double value = g_variant_get_double (parameter);

  area->brush_size = value;
 }
@@ -195,7 +195,7 @@ drawing_area_root (GtkWidget *widget)
  GSimpleActionGroup *action_group;
  GSimpleAction *action;
  GtkWidget *toplevel;
-  gint i;
+  int i;

  GTK_WIDGET_CLASS (drawing_area_parent_class)->root (widget);

@@ -255,9 +255,9 @@ drawing_area_class_init (DrawingAreaClass *klass)
 static void
 drawing_area_apply_stroke (DrawingArea   *area,
                           GdkDeviceTool *tool,
-                           gdouble        x,
-                           gdouble        y,
-                           gdouble        pressure)
+                           double         x,
+                           double         y,
+                           double         pressure)
 {
  if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
    {
@@ -281,8 +281,8 @@ drawing_area_apply_stroke (DrawingArea   *area,

 static void
 stylus_gesture_down (GtkGestureStylus *gesture,
-                     gdouble           x,
-                     gdouble           y,
+                     double            x,
+                     double            y,
                     DrawingArea      *area)
 {
  cairo_new_path (area->cr);
@@ -290,13 +290,13 @@ stylus_gesture_down (GtkGestureStylus *gesture,

 static void
 stylus_gesture_motion (GtkGestureStylus *gesture,
-                       gdouble           x,
-                       gdouble           y,
+                       double            x,
+                       double            y,
                       DrawingArea      *area)
 {
  GdkTimeCoord *backlog;
  GdkDeviceTool *tool;
-  gdouble pressure;
+  double pressure;
  guint n_items;

  tool = gtk_gesture_stylus_get_device_tool (gesture);
@@ -293,6 +293,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Nuclear MediaStream");
      gtk_window_set_default_size (GTK_WINDOW (window), 300, 200);
+      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      nuclear = gtk_nuclear_media_stream_new ();
      gtk_media_stream_set_loop (GTK_MEDIA_STREAM (nuclear), TRUE);
@@ -47,9 +47,9 @@ toggle_shrink (GtkWidget *widget,

 static GtkWidget *
 create_pane_options (GtkPaned    *paned,
-                     const gchar *frame_label,
-                     const gchar *label1,
-                     const gchar *label2)
+                     const char *frame_label,
+                     const char *label1,
+                     const char *label2)
 {
  GtkWidget *child1, *child2;
  GtkWidget *frame;
@@ -39,7 +39,7 @@ static GdkPixbuf *frame;

 /* Background image */
 static GdkPixbuf *background;
-static gint back_width, back_height;
+static int back_width, back_height;

 /* Images */
 static GdkPixbuf *images[N_IMAGES];
@@ -51,7 +51,7 @@ static GtkWidget *da;
 static gboolean
 load_pixbufs (GError **error)
 {
-  gint i;
+  int i;

  if (background)
    return TRUE; /* already loaded earlier */
@@ -14,13 +14,13 @@

 typedef struct
 {
-  gchar *resourcename;
-  gdouble font_size;
+  char *resourcename;
+  double font_size;

-  gint lines_per_page;
-  gchar **lines;
-  gint num_lines;
-  gint num_pages;
+  int lines_per_page;
+  char **lines;
+  int num_lines;
+  int num_pages;
 } PrintData;

 static void
@@ -55,17 +55,17 @@ begin_print (GtkPrintOperation *operation,
 static void
 draw_page (GtkPrintOperation *operation,
           GtkPrintContext   *context,
-           gint               page_nr,
+           int                page_nr,
           gpointer           user_data)
 {
  PrintData *data = (PrintData *)user_data;
  cairo_t *cr;
  PangoLayout *layout;
-  gint text_width, text_height;
-  gdouble width;
-  gint line, i;
+  int text_width, text_height;
+  double width;
+  int line, i;
  PangoFontDescription *desc;
-  gchar *page_str;
+  char *page_str;

  cr = gtk_print_context_get_cairo_context (context);
  width = gtk_print_context_get_width (context);
@@ -6,7 +6,7 @@

 #include <gtk/gtk.h>

-static gint count = 0;
+static int count = 0;
 static guint timeout = 0;

 static void
@@ -25,7 +25,7 @@ static gboolean
 reveal_one (gpointer data)
 {
  GtkWidget *window = data;
-  gchar *name;
+  char *name;
  GtkRevealer *revealer;

  name = g_strdup_printf ("revealer%d", count);
@@ -19,8 +19,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -35,8 +35,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -51,8 +51,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">3</property>
-              <property name="top-attach">2</property>
+              <property name="column">3</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -66,8 +66,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -82,8 +82,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -98,8 +98,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -114,8 +114,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">4</property>
-              <property name="top-attach">2</property>
+              <property name="column">4</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -129,8 +129,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">4</property>
+              <property name="column">2</property>
+              <property name="row">4</property>
            </layout>
          </object>
        </child>
@@ -145,8 +145,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -33,12 +33,9 @@
          <object class="GtkLabel" id="label_plain">
            <property name="label">Plain</property>
            <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_plain"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -48,12 +45,9 @@
            <property name="draw-value">0</property>
            <property name="adjustment">adjustment1</property>
            <property name="hexpand">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="label_plain"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -61,12 +55,9 @@
          <object class="GtkLabel" id="label_marks">
            <property name="label">Marks</property>
            <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_marks"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -83,12 +74,9 @@
              <mark value="3" position="bottom"></mark>
              <mark value="4" position="bottom"></mark>
            </marks>
-            <accessibility>
-              <relation type="labelled-by" target="label_marks"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -96,12 +84,9 @@
          <object class="GtkLabel" id="label_discrete">
            <property name="label">Discrete</property>
            <property name="xalign">0</property>
-            <accessibility>
-              <relation type="label-for" target="scale_discrete"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -112,9 +97,6 @@
            <property name="draw-value">0</property>
            <property name="adjustment">adjustment3</property>
            <property name="hexpand">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="label_discrete"/>
-            </accessibility>
            <marks>
              <mark value="0" position="bottom"></mark>
              <mark value="1" position="bottom"></mark>
@@ -123,8 +105,8 @@
              <mark value="4" position="bottom"></mark>
            </marks>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -37,6 +37,7 @@ static void
 search_progress_done (GtkEntry *entry)
 {
  gtk_entry_set_progress_fraction (entry, 0.0);
+  g_object_unref (entry);
 }

 static gboolean
@@ -54,9 +55,11 @@ finish_search (GtkButton *button)
 static gboolean
 start_search_feedback (gpointer data)
 {
+  gtk_entry_set_progress_fraction (GTK_ENTRY (data), 0.1);
  search_progress_id = g_timeout_add_full (G_PRIORITY_DEFAULT, 100,
-                                           (GSourceFunc)search_progress, data,
+                                           (GSourceFunc)search_progress, g_object_ref (data),
                                           (GDestroyNotify)search_progress_done);
+
  return G_SOURCE_REMOVE;
 }

@@ -123,7 +126,7 @@ set_search_by (GSimpleAction *action,

 static void
 icon_press_cb (GtkEntry       *entry,
-               gint            position,
+               int             position,
               gpointer        data)
 {
  if (position == GTK_ENTRY_ICON_PRIMARY)
@@ -162,7 +165,8 @@ activate_cb (GtkEntry  *entry,
 }

 static void
-search_entry_destroyed (GtkWidget *widget)
+search_entry_destroyed (gpointer  data,
+                        GObject  *widget)
 {
  if (finish_search_id != 0)
    {
@@ -261,8 +265,8 @@ do_search_entry (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Search Entry");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (search_entry_destroyed), &window);
+
+      g_object_weak_ref (G_OBJECT (window), search_entry_destroyed, &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -8,12 +8,12 @@

 static void
 show_shortcuts (GtkWidget   *window,
-                const gchar *id,
-                const gchar *view)
+                const char *id,
+                const char *view)
 {
  GtkBuilder *builder;
  GtkWidget *overlay;
-  gchar *path;
+  char *path;

  path = g_strdup_printf ("/shortcuts/%s.ui", id);
  builder = gtk_builder_new_from_resource (path);
@@ -18,7 +18,7 @@ do_sidebar (GtkWidget *do_widget)
  GtkWidget *box;
  GtkWidget *widget;
  GtkWidget *header;
-  const gchar* pages[] = {
+  const char * pages[] = {
    "Welcome to GTK",
    "GtkStackSidebar Widget",
    "Automatic navigation",
@@ -30,7 +30,7 @@ do_sidebar (GtkWidget *do_widget)
    "Page 9",
    NULL
  };
-  const gchar *c = NULL;
+  const char *c = NULL;
  guint i;

  if (!window)
@@ -272,7 +272,7 @@ start_puzzle (GdkPaintable *paintable)

  /* Create a new grid */
  grid = gtk_grid_new ();
-  gtk_widget_set_can_focus (grid, TRUE);
+  gtk_widget_set_focusable (grid, TRUE);
  gtk_aspect_frame_set_child (GTK_ASPECT_FRAME (frame), grid);
  aspect_ratio = gdk_paintable_get_intrinsic_aspect_ratio (paintable);
  if (aspect_ratio == 0.0)
@@ -284,7 +284,7 @@ start_puzzle (GdkPaintable *paintable)
   * keys to move the puzzle */
  controller = gtk_shortcut_controller_new ();
  gtk_shortcut_controller_set_scope (GTK_SHORTCUT_CONTROLLER (controller),
-                                     GTK_SHORTCUT_SCOPE_GLOBAL);
+                                     GTK_SHORTCUT_SCOPE_LOCAL);
  add_move_binding (GTK_SHORTCUT_CONTROLLER (controller),
                    GDK_KEY_Left, GDK_KEY_KP_Left,
                    -1, 0);
@@ -11,13 +11,13 @@
 #include <math.h>
 #include <stdlib.h>

-gint
+int
 spinbutton_hex_spin_input (GtkSpinButton *spin_button,
-                           gdouble       *new_val)
+                           double        *new_val)
 {
-  const gchar *buf;
-  gchar *err;
-  gdouble res;
+  const char *buf;
+  char *err;
+  double res;

  buf = gtk_editable_get_text (GTK_EDITABLE (spin_button));
  res = strtol (buf, &err, 16);
@@ -28,19 +28,19 @@ spinbutton_hex_spin_input (GtkSpinButton *spin_button,
    return TRUE;
 }

-gint
+int
 spinbutton_hex_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
-  gchar *buf;
-  gdouble val;
+  char *buf;
+  double val;

  adjustment = gtk_spin_button_get_adjustment (spin_button);
  val = gtk_adjustment_get_value (adjustment);
  if (fabs (val) < 1e-5)
    buf = g_strdup ("0x00");
  else
-    buf = g_strdup_printf ("0x%.2X", (gint) val);
+    buf = g_strdup_printf ("0x%.2X", (int) val);
  if (strcmp (buf, gtk_editable_get_text (GTK_EDITABLE (spin_button))))
    gtk_editable_set_text (GTK_EDITABLE (spin_button), buf);
  g_free (buf);
@@ -48,17 +48,17 @@ spinbutton_hex_spin_output (GtkSpinButton *spin_button)
  return TRUE;
 }

-gint
+int
 spinbutton_time_spin_input (GtkSpinButton *spin_button,
-                            gdouble       *new_val)
+                            double        *new_val)
 {
-  const gchar *text;
-  gchar **str;
+  const char *text;
+  char **str;
  gboolean found = FALSE;
-  gint hours;
-  gint minutes;
-  gchar *endh;
-  gchar *endm;
+  int hours;
+  int minutes;
+  char *endh;
+  char *endm;

  text = gtk_editable_get_text (GTK_EDITABLE (spin_button));
  str = g_strsplit (text, ":", 2);
@@ -87,13 +87,13 @@ spinbutton_time_spin_input (GtkSpinButton *spin_button,
  return TRUE;
 }

-gint
+int
 spinbutton_time_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
-  gchar *buf;
-  gdouble hours;
-  gdouble minutes;
+  char *buf;
+  double hours;
+  double minutes;

  adjustment = gtk_spin_button_get_adjustment (spin_button);
  hours = gtk_adjustment_get_value (adjustment) / 60.0;
@@ -121,12 +121,12 @@ static const char *month[12] = {
  "December"
 };

-gint
+int
 spinbutton_month_spin_input (GtkSpinButton *spin_button,
-                             gdouble       *new_val)
+                             double        *new_val)
 {
-  gint i;
-  gchar *tmp1, *tmp2;
+  int i;
+  char *tmp1, *tmp2;
  gboolean found = FALSE;

  for (i = 1; i <= 12; i++)
@@ -145,17 +145,17 @@ spinbutton_month_spin_input (GtkSpinButton *spin_button,
      *new_val = 0.0;
      return GTK_INPUT_ERROR;
    }
-  *new_val = (gdouble) i;
+  *new_val = (double) i;

  return TRUE;
 }

-gint
+int
 spinbutton_month_spin_output (GtkSpinButton *spin_button)
 {
  GtkAdjustment *adjustment;
-  gdouble value;
-  gint i;
+  double value;
+  int i;

  adjustment = gtk_spin_button_get_adjustment (spin_button);
  value = gtk_adjustment_get_value (adjustment);
@@ -40,8 +40,8 @@
            <property name="mnemonic-widget">basic_spin</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -54,8 +54,8 @@
            <property name="digits">2</property>
            <property name="numeric">1</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -64,8 +64,8 @@
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">0</property>
+              <property name="column">2</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -76,8 +76,8 @@
            <property name="mnemonic-widget">hex_spin</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -90,8 +90,8 @@
            <signal name="output" handler="spinbutton_hex_spin_output"/>
            <property name="wrap">1</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -100,8 +100,8 @@
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">1</property>
+              <property name="column">2</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -112,8 +112,8 @@
            <property name="mnemonic-widget">time_spin</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">2</property>
+              <property name="column">0</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -126,8 +126,8 @@
            <signal name="output" handler="spinbutton_time_spin_output"/>
            <property name="wrap">1</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -136,8 +136,8 @@
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">2</property>
+              <property name="column">2</property>
+              <property name="row">2</property>
            </layout>
          </object>
        </child>
@@ -148,8 +148,8 @@
            <property name="mnemonic-widget">month_spin</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">3</property>
+              <property name="column">0</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -163,8 +163,8 @@
            <property name="wrap">1</property>
            <property name="update-policy">if-valid</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -173,8 +173,8 @@
            <property name="width-chars">10</property>
            <property name="xalign">1</property>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -10,8 +10,8 @@
            <property name="stack">stack</property>
            <property name="halign">center</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -59,8 +59,8 @@
              </object>
            </child>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -14,7 +14,7 @@
 typedef struct _TreeItem TreeItem;
 struct _TreeItem
 {
-  const gchar    *label;
+  const char     *label;
  gboolean        alex;
  gboolean        havoc;
  gboolean        tim;
@@ -222,7 +222,7 @@ create_model (void)

 static void
 item_toggled (GtkCellRendererToggle *cell,
-              gchar                 *path_str,
+              char                  *path_str,
              gpointer               data)
 {
  GtkTreeModel *model = (GtkTreeModel *)data;
@@ -230,7 +230,7 @@ item_toggled (GtkCellRendererToggle *cell,
  GtkTreeIter iter;
  gboolean toggle_item;

-  gint *column;
+  int *column;

  column = g_object_get_data (G_OBJECT (cell), "column");

@@ -252,7 +252,7 @@ item_toggled (GtkCellRendererToggle *cell,
 static void
 add_columns (GtkTreeView *treeview)
 {
-  gint col_offset;
+  int col_offset;
  GtkCellRenderer *renderer;
  GtkTreeViewColumn *column;
  GtkTreeModel *model = gtk_tree_view_get_model (treeview);
@@ -272,7 +272,7 @@ add_columns (GtkTreeView *treeview)
  /* alex column */
  renderer = gtk_cell_renderer_toggle_new ();
  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)ALEX_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)ALEX_COLUMN);

  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

@@ -294,7 +294,7 @@ add_columns (GtkTreeView *treeview)
  /* havoc column */
  renderer = gtk_cell_renderer_toggle_new ();
  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)HAVOC_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)HAVOC_COLUMN);

  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

@@ -315,7 +315,7 @@ add_columns (GtkTreeView *treeview)
  /* tim column */
  renderer = gtk_cell_renderer_toggle_new ();
  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)TIM_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)TIM_COLUMN);

  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

@@ -337,7 +337,7 @@ add_columns (GtkTreeView *treeview)
  /* owen column */
  renderer = gtk_cell_renderer_toggle_new ();
  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)OWEN_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)OWEN_COLUMN);

  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

@@ -358,7 +358,7 @@ add_columns (GtkTreeView *treeview)
  /* dave column */
  renderer = gtk_cell_renderer_toggle_new ();
  g_object_set (renderer, "xalign", 0.0, NULL);
-  g_object_set_data (G_OBJECT (renderer), "column", (gint *)DAVE_COLUMN);
+  g_object_set_data (G_OBJECT (renderer), "column", (int *)DAVE_COLUMN);

  g_signal_connect (renderer, "toggled", G_CALLBACK (item_toggled), model);

@@ -43,13 +43,15 @@ about_activated (GSimpleAction *action,
                 gpointer       user_data)
 {
  GtkApplication *app = user_data;
-  const gchar *authors[] = {
+  const char *authors[] = {
    "The GTK Team",
    NULL
  };
  char *icon_theme;
  char *version;
  GString *s;
+  char *os_name;
+  char *os_version;

  g_object_get (gtk_settings_get_default (),
                "gtk-icon-theme-name", &icon_theme,
@@ -57,6 +59,10 @@ about_activated (GSimpleAction *action,

  s = g_string_new ("");

+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
  g_string_append (s, "System libraries\n");
  g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
                          glib_major_version,
@@ -91,6 +97,8 @@ about_activated (GSimpleAction *action,
  g_string_free (s, TRUE);
  g_free (version);
  g_free (icon_theme);
+  g_free (os_name);
+  g_free (os_version);
 }

 static GActionEntry app_entries[] =
@@ -103,7 +111,7 @@ static GActionEntry app_entries[] =
 static void
 icon_browser_app_startup (GApplication *app)
 {
-  const gchar *quit_accels[2] = { "<Ctrl>Q", NULL };
+  const char *quit_accels[2] = { "<Ctrl>Q", NULL };

  G_APPLICATION_CLASS (icon_browser_app_parent_class)->startup (app);

@@ -44,13 +44,13 @@ icon_browser_window_get_icon_theme (IconBrowserWindow *win)

 static void
 add_icon (IconBrowserWindow *win,
-          const gchar       *name,
-          const gchar       *description,
-          const gchar       *context)
+          const char        *name,
+          const char        *description,
+          const char        *context)
 {
  GtkIconTheme *icon_theme = icon_browser_window_get_icon_theme (win);
-  gchar *regular_name;
-  gchar *symbolic_name;
+  char *regular_name;
+  char *symbolic_name;
  IbIcon *icon;

  regular_name = g_strdup (name);
@@ -77,9 +77,9 @@ add_icon (IconBrowserWindow *win,

 static void
 add_context (IconBrowserWindow *win,
-             const gchar       *id,
-             const gchar       *name,
-             const gchar       *description)
+             const char        *id,
+             const char        *name,
+             const char        *description)
 {
  IbContext *context;

@@ -161,7 +161,7 @@ copy_to_clipboard (GtkButton         *button,
 }

 static void
-set_image (GtkWidget *image, const gchar *name, gint size)
+set_image (GtkWidget *image, const char *name, int size)
 {
  gtk_image_set_from_icon_name (GTK_IMAGE (image), name);
  gtk_image_set_pixel_size (GTK_IMAGE (image), size);
@@ -219,7 +219,7 @@ item_activated (GtkGridView       *view,
 static GdkPaintable *
 get_image_paintable (GtkImage *image)
 {
-  const gchar *icon_name;
+  const char *icon_name;
  GtkIconTheme *icon_theme;
  GtkIconPaintable *icon;
  int size;
@@ -18,3 +18,19 @@ executable('gtk4-icon-browser',
           gui_app: true,
           link_args: extra_demo_ldflags,
           install: true)
+
+# icons
+icontheme_dir = join_paths(gtk_datadir, 'icons/hicolor')
+
+foreach size: ['scalable', 'symbolic']
+  install_subdir('data/' + size,
+    install_dir: icontheme_dir
+  )
+endforeach
+
+# desktop file
+install_data('org.gtk.IconBrowser4.desktop', install_dir: gtk_applicationsdir)
+
+# appdata
+install_data('org.gtk.IconBrowser4.appdata.xml', install_dir: gtk_appdatadir)
+
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>org.gtk.IconBrowser4.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>LGPL-2.0+</project_license>
+  <name>GTK Icon Browser</name>
+  <summary>Program to browse themed icons</summary>
+  <description>
+    <p>
+      GTK Icon Browser is a simple application to show themed icons that
+      are available on the system.
+    </p>
+  </description>
+  <screenshots>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-icon-browser/gtk-icon-browser1.png</image>
+      <caption>Icon Browser</caption>
+    </screenshot>
+    <screenshot>
+      <image>https://static.gnome.org/appdata/gtk4-icon-browser/gtk-icon-browser2.png</image>
+      <caption>Search</caption>
+    </screenshot>
+  </screenshots>
+  <kudos>
+    <kudo>HiDpiIcon</kudo>
+    <kudo>ModernToolkit</kudo>
+  </kudos>
+  <url type="homepage">https://www.gtk.org</url>
+  <translation type="gettext">gtk-4.0</translation>
+  <update_contact>matthias.clasen_at_gmail.com</update_contact>
+  <developer_name>Matthias Clasen and others</developer_name>
+  <releases>
+    <release version="3.99.0" date="2020-07-30">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+    <release version="3.94.0" date="2018-06-25">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
+  </releases>
+</component>
@@ -245,12 +245,9 @@
              <object class="GtkImage" id="image1">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label1"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -258,12 +255,9 @@
             <object class="GtkImage" id="image2">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label2"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -271,12 +265,9 @@
              <object class="GtkImage" id="image3">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label3"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">2</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -284,12 +275,9 @@
              <object class="GtkImage" id="image4">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label4"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">3</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -297,12 +285,9 @@
              <object class="GtkImage" id="image5">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">4</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -310,12 +295,9 @@
              <object class="GtkImage" id="image6">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">5</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -323,12 +305,9 @@
              <object class="GtkImage" id="image7">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label5"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">6</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">6</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -336,12 +315,9 @@
              <object class="GtkImage" id="image8">
                <property name="halign">center</property>
                <property name="valign">end</property>
-                <accessibility>
-                  <relation type="labelled-by" target="label6"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">7</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">7</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -353,12 +329,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image1"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -370,12 +343,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image2"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -387,12 +357,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image3"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">2</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">2</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -404,12 +371,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image4"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">3</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">3</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -421,12 +385,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image5"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">4</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">4</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -438,12 +399,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image6"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">5</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">5</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -455,12 +413,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image7"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">6</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">6</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -472,12 +427,9 @@
                <style>
                  <class name="dim-label"/>
                </style>
-                <accessibility>
-                  <relation type="label-for" target="image8"/>
-                </accessibility>
                <layout>
-                  <property name="left-attach">7</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">7</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -199,11 +199,11 @@ node_editor_application_activate (GApplication *app)
 static void
 node_editor_application_open (GApplication  *app,
                              GFile        **files,
-                              gint           n_files,
-                              const gchar   *hint)
+                              int            n_files,
+                              const char    *hint)
 {
  NodeEditorWindow *win;
-  gint i;
+  int i;

  for (i = 0; i < n_files; i++)
    {
@@ -80,7 +80,7 @@ text_view_error_free (TextViewError *e)
  g_free (e->message);
 }

-static gchar *
+static char *
 get_current_text (GtkTextBuffer *buffer)
 {
  GtkTextIter start, end;
@@ -288,14 +288,14 @@ text_view_query_tooltip_cb (GtkWidget        *widget,

  if (keyboard_tip)
    {
-      gint offset;
+      int offset;

      g_object_get (self->text_buffer, "cursor-position", &offset, NULL);
      gtk_text_buffer_get_iter_at_offset (self->text_buffer, &iter, offset);
    }
  else
    {
-      gint bx, by, trailing;
+      int bx, by, trailing;

      gtk_text_view_window_to_buffer_coords (GTK_TEXT_VIEW (self->text_view), GTK_TEXT_WINDOW_TEXT,
                                             x, y, &bx, &by);
@@ -399,7 +399,7 @@ node_editor_window_load (NodeEditorWindow *self,

 static void
 open_response_cb (GtkWidget        *dialog,
-                  gint              response,
+                  int               response,
                  NodeEditorWindow *self)
 {
  gtk_widget_hide (dialog);
@@ -448,7 +448,7 @@ open_cb (GtkWidget        *button,

 static void
 save_response_cb (GtkWidget        *dialog,
-                  gint              response,
+                  int               response,
                  NodeEditorWindow *self)
 {
  gtk_widget_hide (dialog);
@@ -577,7 +577,7 @@ create_cairo_texture (NodeEditorWindow *self)

 static void
 export_image_response_cb (GtkWidget  *dialog,
-                          gint        response,
+                          int         response,
                          GdkTexture *texture)
 {
  gtk_widget_hide (dialog);
@@ -38,8 +38,8 @@
          <object class="GtkCheckButton" id="testcase_cairo_checkbutton">
            <property name="label">Render using Cairo renderer</property>
            <layout>
-              <property name="top-attach">1</property>
-              <property name="left-attach">0</property>
+              <property name="row">1</property>
+              <property name="column">0</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -52,8 +52,8 @@
            <property name="use-markup">1</property>
            <property name="max-width-chars">50</property>
            <layout>
-              <property name="top-attach">2</property>
-              <property name="left-attach">0</property>
+              <property name="row">2</property>
+              <property name="column">0</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -64,8 +64,8 @@
            <property name="wrap">1</property>
            <property name="xalign">0</property>
            <layout>
-              <property name="top-attach">3</property>
-              <property name="left-attach">0</property>
+              <property name="row">3</property>
+              <property name="column">0</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -83,8 +83,8 @@
              <class name="suggested-action" />
            </style>
            <layout>
-              <property name="top-attach">4</property>
-              <property name="left-attach">0</property>
+              <property name="row">4</property>
+              <property name="column">0</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -25,7 +25,7 @@
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
  <releases>
-    <release version="3.99.0" date="2020">
+    <release version="3.99.0" date="2020-07-30">
      <description>
        <p>A new developers snapshot towards GTK 4.0.</p>
      </description>
@@ -1,6 +1,7 @@
 #include <config.h>
 #include <math.h>
 #include <pango/pangocairo.h>
+#include <glib/gi18n.h>
 #include <gtk/gtk.h>

 static GtkWidget *main_window;
@@ -33,8 +34,8 @@ update_title (GtkWindow *window)
 static void
 update_statusbar (void)
 {
-  gchar *msg;
-  gint row, col;
+  char *msg;
+  int row, col;
  GtkTextIter iter;
  const char *print_str;

@@ -597,8 +598,24 @@ activate_about (GSimpleAction *action,
  char *setting;
  char **backends;
  int i;
+  char *os_name;
+  char *os_version;
+  const char *authors[] = {
+    "Alexander Larsson",
+    NULL
+  };
+  const char *maintainers[] = {
+    "The GTK Team",
+    NULL
+  };
+  GtkWidget *dialog;

-  sysinfo = g_string_new ("System libraries\n");
+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  sysinfo = g_string_new ("");
+  if (os_name && os_version)
+    g_string_append_printf (sysinfo, "OS\t%s %s\n\n", os_name, os_version);
+  g_string_append (sysinfo, "System libraries\n");
  g_string_append_printf (sysinfo, "\tGLib\t%d.%d.%d\n",
                          glib_major_version,
                          glib_minor_version,
@@ -614,8 +631,9 @@ activate_about (GSimpleAction *action,

  g_object_get (gtk_settings_get_default (), "gtk-print-backends", &setting, NULL);
  backends = g_strsplit (setting, ",", -1);
+  g_string_append (sysinfo, "\t");
  for (i = 0; backends[i]; i++)
-    g_string_append_printf (sysinfo, "\t%s\n", backends[i]);
+    g_string_append_printf (sysinfo, "%s ", backends[i]);
  g_strfreev (backends);
  g_free (setting);

@@ -625,18 +643,23 @@ activate_about (GSimpleAction *action,
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

-  gtk_show_about_dialog (GTK_WINDOW (main_window),
+  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                         "transient-for", main_window,
                         "program-name", "GTK Print Editor",
                         "version", version,
                         "copyright", "© 2006-2020 Red Hat, Inc",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
                         "comments", "Program to demonstrate GTK printing",
-                         "authors", (const char *[]){ "Alexander Larsson", NULL },
+                         "authors", authors,
                         "logo-icon-name", "org.gtk.PrintEditor4.Devel",
                         "title", "About GTK Print Editor",
                         "system-information", sysinfo->str,
                         NULL);
+  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
+                                       _("Maintained by"), maintainers);
+
+  gtk_window_present (GTK_WINDOW (dialog));

  g_string_free (sysinfo, TRUE);
  g_free (version);
@@ -675,7 +698,7 @@ static GActionEntry app_entries[] = {
  { "print", activate_print, NULL, NULL, NULL }
 };

-static const gchar ui_info[] =
+static const char ui_info[] =
  "<interface>"
  "  <menu id='menubar'>"
  "    <submenu>"
@@ -32,6 +32,11 @@
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
  <releases>
+    <release version="3.99.0" date="2020-07-30">
+      <description>
+        <p>A new developers snapshot towards GTK 4.0.</p>
+      </description>
+    </release>
    <release version="3.94.0" date="2018-06-25">
      <description>
        <p>A new developers snapshot towards GTK 4.0.</p>
@@ -139,9 +139,9 @@ get_busy (GSimpleAction *action,
  gtk_widget_set_sensitive (window, FALSE);
 }

-static gint current_page = 0;
+static int current_page = 0;
 static gboolean
-on_page (gint i)
+on_page (int i)
 {
  return current_page == i;
 }
@@ -250,16 +250,27 @@ activate_about (GSimpleAction *action,
                gpointer       user_data)
 {
  GtkApplication *app = user_data;
-  const gchar *authors[] = {
+  const char *authors[] = {
    "Andrea Cimitan",
    "Cosimo Cecchi",
    NULL
  };
-  gchar *version;
+  const char *maintainers[] = {
+    "The GTK Team",
+    NULL
+  };
+  char *version;
+  char *os_name;
+  char *os_version;
  GString *s;
+  GtkWidget *dialog;

  s = g_string_new ("");

+  os_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+  os_version = g_get_os_info (G_OS_INFO_KEY_VERSION_ID);
+  if (os_name && os_version)
+    g_string_append_printf (s, "OS\t%s %s\n\n", os_name, os_version);
  g_string_append (s, "System libraries\n");
  g_string_append_printf (s, "\tGLib\t%d.%d.%d\n",
                          glib_major_version,
@@ -279,7 +290,8 @@ activate_about (GSimpleAction *action,
                             gtk_get_minor_version (),
                             gtk_get_micro_version ());

-  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
+  dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
+                         "transient-for", gtk_application_get_active_window (app),
                         "program-name", "GTK Widget Factory",
                         "version", version,
                         "copyright", "© 1997—2020 The GTK Team",
@@ -292,8 +304,15 @@ activate_about (GSimpleAction *action,
                         "system-information", s->str,
                         NULL);

+  gtk_about_dialog_add_credit_section (GTK_ABOUT_DIALOG (dialog),
+                                       _("Maintained by"), maintainers);
+
+  gtk_window_present (GTK_WINDOW (dialog));
+
  g_string_free (s, TRUE);
  g_free (version);
+  g_free (os_name);
+  g_free (os_version);
 }

 static void
@@ -422,8 +441,8 @@ static void
 spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label)
 {
  GtkWidget *w;
-  gint v;
-  gchar *text;
+  int v;
+  char *text;

  v = (int)gtk_adjustment_get_value (adjustment);

@@ -454,8 +473,8 @@ spin_value_reset (GtkWidget *button, GtkAdjustment *adjustment)
  dismiss (button);
 }

-static gint pulse_time = 250;
-static gint pulse_entry_mode = 0;
+static int pulse_time = 250;
+static int pulse_entry_mode = 0;

 static void
 remove_pulse (gpointer pulse_id)
@@ -482,7 +501,7 @@ pulse_it (GtkWidget *widget)
 static void
 update_pulse_time (GtkAdjustment *adjustment, GtkWidget *widget)
 {
-  gdouble value;
+  double value;
  guint pulse_id;

  value = gtk_adjustment_get_value (adjustment);
@@ -537,12 +556,12 @@ on_entry_icon_release (GtkEntry            *entry,

 static void
 on_scale_button_value_changed (GtkScaleButton *button,
-                               gdouble         value,
+                               double          value,
                               gpointer        user_data)
 {
  GtkAdjustment *adjustment;
-  gdouble val;
-  gchar *str;
+  double val;
+  char *str;

  adjustment = gtk_scale_button_get_adjustment (button);
  val = gtk_scale_button_get_value (button);
@@ -557,15 +576,14 @@ on_scale_button_value_changed (GtkScaleButton *button,
    }
  else
    {
-      gint percent;
+      int percent;

-      percent = (gint) (100. * val / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) + .5);
+      percent = (int) (100. * val / (gtk_adjustment_get_upper (adjustment) - gtk_adjustment_get_lower (adjustment)) + .5);

      str = g_strdup_printf (C_("volume percentage", "%d %%"), percent);
    }

  gtk_widget_set_tooltip_text (GTK_WIDGET (button), str);
-  atk_object_set_description (gtk_widget_get_accessible (GTK_WIDGET (button)), str);

  g_free (str);
 }
@@ -627,7 +645,7 @@ static void
 on_range_from_changed (GtkSpinButton *from)
 {
  GtkSpinButton *to;
-  gint v1, v2;
+  int v1, v2;

  to = GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (from), "range_to_spin"));

@@ -642,7 +660,7 @@ static void
 on_range_to_changed (GtkSpinButton *to)
 {
  GtkSpinButton *from;
-  gint v1, v2;
+  int v1, v2;

  from = GTK_SPIN_BUTTON (g_object_get_data (G_OBJECT (to), "range_from_spin"));

@@ -654,7 +672,7 @@ on_range_to_changed (GtkSpinButton *to)
 }

 static void
-info_bar_response (GtkWidget *infobar, gint response_id)
+info_bar_response (GtkWidget *infobar, int response_id)
 {
  if (response_id == GTK_RESPONSE_CLOSE)
    gtk_widget_hide (infobar);
@@ -703,7 +721,7 @@ action_dialog_button_clicked (GtkButton *button, GtkWidget *page)
 static void
 page_changed_cb (GtkWidget *stack, GParamSpec *pspec, gpointer data)
 {
-  const gchar *name;
+  const char *name;
  GtkWidget *window;
  GtkWidget *page;

@@ -853,10 +871,10 @@ update_title_header (GtkListBoxRow *row,
                     gpointer       data)
 {
  GtkWidget *header;
-  gchar *title;
+  char *title;

  header = gtk_list_box_row_get_header (row);
-  title = (gchar *)g_object_get_data (G_OBJECT (row), "title");
+  title = (char *)g_object_get_data (G_OBJECT (row), "title");
  if (!header && title)
    {
      title = g_strdup_printf ("<b>%s</b>", title);
@@ -881,8 +899,8 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
 {
  GtkWidget *box, *row, *label, *swatch;
  GdkRGBA rgba;
-  const gchar *color;
-  gchar *text;
+  const char *color;
+  char *text;
  GtkWidget *silver;
  GtkWidget *gold;

@@ -983,7 +1001,7 @@ set_color (GtkListBox *box, GtkListBoxRow *row, GtkColorChooser *chooser)
 static void
 populate_colors (GtkWidget *widget, GtkWidget *chooser)
 {
-  struct { const gchar *name; const gchar *color; const gchar *title; } colors[] = {
+  struct { const char *name; const char *color; const char *title; } colors[] = {
    { "2.5", "#C8828C", "Red" },
    { "5", "#C98286", NULL },
    { "7.5", "#C9827F", NULL },
@@ -1025,7 +1043,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
    { "7.5", "#C48299", NULL },
    { "10", "#C68292", NULL }
  };
-  gint i;
+  int i;
  GtkWidget *row, *box, *label, *swatch;
  GtkWidget *sw;
  GdkRGBA rgba;
@@ -1081,7 +1099,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)

 typedef struct {
  GtkWidget *flowbox;
-  gchar *filename;
+  char *filename;
 } BackgroundData;

 static void
@@ -1127,11 +1145,11 @@ background_loaded_cb (GObject      *source,
 static void
 populate_flowbox (GtkWidget *flowbox)
 {
-  const gchar *location;
+  const char *location;
  GDir *dir;
  GError *error = NULL;
-  const gchar *name;
-  gchar *filename;
+  const char *name;
+  char *filename;
  GFile *file;
  GInputStream *stream;
  BackgroundData *bd;
@@ -1288,7 +1306,7 @@ my_text_view_class_init (MyTextViewClass *class)
 }

 static void
-my_text_view_set_background (MyTextView *tv, const gchar *filename, gboolean is_resource)
+my_text_view_set_background (MyTextView *tv, const char *filename, gboolean is_resource)
 {
  GError *error = NULL;
  GFile *file;
@@ -1331,12 +1349,12 @@ my_text_view_set_adjustment (MyTextView *tv, GtkAdjustment *adjustment)
 }

 static void
-close_selection_dialog (GtkWidget *dialog, gint response, GtkWidget *tv)
+close_selection_dialog (GtkWidget *dialog, int response, GtkWidget *tv)
 {
  GtkWidget *box;
  GtkWidget *child;
  GList *children;
-  const gchar *filename;
+  const char *filename;
  gboolean is_resource;

  gtk_widget_hide (dialog);
@@ -1352,7 +1370,7 @@ close_selection_dialog (GtkWidget *dialog, gint response, GtkWidget *tv)
    return;

  child = children->data;
-  filename = (const gchar *)g_object_get_data (G_OBJECT (child), "filename");
+  filename = (const char *)g_object_get_data (G_OBJECT (child), "filename");
  is_resource = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (child), "is-resource"));

  g_list_free (children);
@@ -1377,8 +1395,8 @@ static void
 handle_insert (GtkWidget *button, GtkWidget *textview)
 {
  GtkTextBuffer *buffer;
-  const gchar *id;
-  const gchar *text;
+  const char *id;
+  const char *text;

  id = gtk_buildable_get_name (GTK_BUILDABLE (button));

@@ -1402,7 +1420,7 @@ handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
 {
  GtkTextBuffer *buffer;
  GdkClipboard *clipboard;
-  const gchar *id;
+  const char *id;

  clipboard = gtk_widget_get_clipboard (textview);
  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
@@ -1421,7 +1439,7 @@ handle_cutcopypaste (GtkWidget *button, GtkWidget *textview)
 static void
 clipboard_formats_notify (GdkClipboard *clipboard, GdkEvent *event, GtkWidget *button)
 {
-  const gchar *id;
+  const char *id;
  gboolean has_text;

  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
@@ -1434,7 +1452,7 @@ clipboard_formats_notify (GdkClipboard *clipboard, GdkEvent *event, GtkWidget *b
 static void
 textbuffer_notify_selection (GObject *object, GParamSpec *pspec, GtkWidget *button)
 {
-  const gchar *id;
+  const char *id;
  gboolean has_selection;

  id = gtk_buildable_get_name (GTK_BUILDABLE (button));
@@ -1469,7 +1487,7 @@ page_combo_separator_func (GtkTreeModel *model,
                           GtkTreeIter  *iter,
                           gpointer      data)
 {
-  gchar *text;
+  char *text;
  gboolean res;

  gtk_tree_model_get (model, iter, 0, &text, -1);
@@ -1594,7 +1612,7 @@ text_view_add_to_context_menu (GtkTextView *text_view)
 static void
 open_popover_text_changed (GtkEntry *entry, GParamSpec *pspec, GtkWidget *button)
 {
-  const gchar *text;
+  const char *text;

  text = gtk_editable_get_text (GTK_EDITABLE (entry));
  gtk_widget_set_sensitive (button, strlen (text) > 0);
@@ -1864,8 +1882,8 @@ activate (GApplication *app)
    { "print", activate_print, NULL, NULL, NULL },
  };
  struct {
-    const gchar *action_and_target;
-    const gchar *accelerators[2];
+    const char *action_and_target;
+    const char *accelerators[2];
  } accels[] = {
    { "app.about", { "F1", NULL } },
    { "app.quit", { "<Control>q", NULL } },
@@ -1878,15 +1896,15 @@ activate (GApplication *app)
    { "win.lock", { "<Control>l", NULL } },
  };
  struct {
-    const gchar *action_and_target;
-    const gchar *accelerators[2];
+    const char *action_and_target;
+    const char *accelerators[2];
  } late_accels[] = {
    { "app.cut", { "<Control>x", NULL } },
    { "app.copy", { "<Control>c", NULL } },
    { "app.paste", { "<Control>v", NULL } },
    { "win.delete", { "Delete", NULL } },
  };
-  gint i;
+  int i;
  GPermission *permission;
  GAction *action;
  GError *error = NULL;
@@ -2282,7 +2300,7 @@ main (int argc, char *argv[])
    { "check-off-disabled", NULL, NULL, "false", NULL },
    { "radio-x-disabled", NULL, "s", "'x'", NULL },
  };
-  gint status;
+  int status;

  app = gtk_application_new ("org.gtk.WidgetFactory4", G_APPLICATION_NON_UNIQUE);

@@ -35,7 +35,7 @@
            <attribute name="target">highcontrast-inverse</attribute>
          </item>
        </section>
-      </submenu> 
+      </submenu>
      <item>
        <attribute name="label" translatable="yes">Transition Pages</attribute>
        <attribute name="action">win.transition</attribute>
@@ -639,8 +639,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                  <object class="GtkCheckButton" id="checkbutton2">
                                    <property name="label" translatable="yes">checkbutton</property>
                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="row">1</property>
                                    </layout>
                                  </object>
                                </child>
@@ -649,8 +649,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="label" translatable="yes">checkbutton</property>
                                    <property name="inconsistent">1</property>
                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">0</property>
+                                      <property name="row">2</property>
                                    </layout>
                                  </object>
                                </child>
@@ -660,8 +660,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="sensitive">0</property>
                                    <property name="active">1</property>
                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">0</property>
+                                      <property name="row">3</property>
                                    </layout>
                                  </object>
                                </child>
@@ -670,8 +670,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="label" translatable="yes">checkbutton</property>
                                    <property name="sensitive">0</property>
                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">0</property>
+                                      <property name="row">4</property>
                                    </layout>
                                  </object>
                                </child>
@@ -681,8 +681,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="sensitive">0</property>
                                    <property name="inconsistent">1</property>
                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">0</property>
+                                      <property name="row">5</property>
                                    </layout>
                                  </object>
                                </child>
@@ -691,8 +691,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="label" translatable="yes">radiobutton</property>
                                    <property name="active">1</property>
                                    <layout>
-                                      <property name="left-attach">0</property>
-                                      <property name="left-attach">1</property>
+                                      <property name="column">0</property>
+                                      <property name="column">1</property>
                                    </layout>
                                  </object>
                                </child>
@@ -701,8 +701,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="label" translatable="yes">radiobutton</property>
                                    <property name="group">radiobutton1</property>
                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">1</property>
+                                      <property name="row">1</property>
                                    </layout>
                                  </object>
                                </child>
@@ -712,8 +712,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="inconsistent">1</property>
                                    <property name="group">radiobutton1</property>
                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">2</property>
+                                      <property name="column">1</property>
+                                      <property name="row">2</property>
                                    </layout>
                                  </object>
                                </child>
@@ -722,8 +722,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="label" translatable="yes">radiobutton</property>
                                    <property name="sensitive">0</property>
                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">1</property>
+                                      <property name="row">3</property>
                                    </layout>
                                  </object>
                                </child>
@@ -733,8 +733,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="sensitive">0</property>
                                    <property name="group">radiobutton3</property>
                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">1</property>
+                                      <property name="row">4</property>
                                    </layout>
                                  </object>
                                </child>
@@ -745,8 +745,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="inconsistent">1</property>
                                    <property name="group">radiobutton3</property>
                                    <layout>
-                                      <property name="left-attach">1</property>
-                                      <property name="top-attach">5</property>
+                                      <property name="column">1</property>
+                                      <property name="row">5</property>
                                    </layout>
                                  </object>
                                </child>
@@ -754,15 +754,15 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                  <object class="GtkSpinner" id="spinner1">
                                    <property name="spinning">1</property>
                                    <layout>
-                                      <property name="left-attach">2</property>
+                                      <property name="column">2</property>
                                    </layout>
                                  </object>
                                </child>
                                <child>
                                  <object class="GtkSpinner" id="spinner2">
                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">1</property>
+                                      <property name="column">2</property>
+                                      <property name="row">1</property>
                                    </layout>
                                  </object>
                                </child>
@@ -771,8 +771,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                    <property name="spinning">1</property>
                                    <property name="sensitive">0</property>
                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">3</property>
+                                      <property name="column">2</property>
+                                      <property name="row">3</property>
                                    </layout>
                                  </object>
                                </child>
@@ -780,8 +780,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                  <object class="GtkSpinner" id="spinner4">
                                    <property name="sensitive">0</property>
                                    <layout>
-                                      <property name="left-attach">2</property>
-                                      <property name="top-attach">4</property>
+                                      <property name="column">2</property>
+                                      <property name="row">4</property>
                                    </layout>
                                  </object>
                                </child>
@@ -789,11 +789,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator1">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                        <child>
                          <object class="GtkBox" id="box19">
                            <property name="orientation">vertical</property>
@@ -889,11 +884,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator2">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                        <child>
                          <object class="GtkBox" id="box20">
                            <property name="orientation">vertical</property>
@@ -1042,11 +1032,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator3">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                        <child>
                          <object class="GtkBox" id="box26">
                            <property name="orientation">vertical</property>
@@ -1145,11 +1130,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator" id="separator4">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                        <child>
                          <object class="GtkBox" id="box4">
                            <property name="orientation">vertical</property>
@@ -1249,9 +1229,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                        </child>
                      </object>
                    </child>
-                    <child>
-                      <object class="GtkSeparator" id="separator5"/>
-                    </child>
                    <child>
                      <object class="GtkBox" id="box5">
                        <property name="spacing">10</property>
@@ -1542,8 +1519,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                        <property name="value">.5</property>
                                        <property name="halign">center</property>
                                        <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">0</property>
+                                          <property name="column">0</property>
+                                          <property name="row">0</property>
                                        </layout>
                                      </object>
                                    </child>
@@ -1559,8 +1536,8 @@ microphone-sensitivity-medium-symbolic</property>
                                        <property name="halign">center</property>
                                        <signal name="value-changed" handler="on_scale_button_value_changed" swapped="no"/>
                                        <layout>
-                                          <property name="left-attach">0</property>
-                                          <property name="top-attach">1</property>
+                                          <property name="column">0</property>
+                                          <property name="row">1</property>
                                        </layout>
                                      </object>
                                    </child>
@@ -1568,9 +1545,6 @@ microphone-sensitivity-medium-symbolic</property>
                                </child>
                              </object>
                            </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                            <child>
                              <object class="GtkFrame" id="page2frame1">
                                <child>
@@ -1639,9 +1613,6 @@ microphone-sensitivity-medium-symbolic</property>
                                </child>
                              </object>
                            </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                            <child>
                              <object class="GtkScrolledWindow">
                                <property name="has-frame">1</property>
@@ -1898,11 +1869,6 @@ microphone-sensitivity-medium-symbolic</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                        <child>
                          <object class="GtkBox">
                            <property name="orientation">vertical</property>
@@ -1979,9 +1945,6 @@ microphone-sensitivity-medium-symbolic</property>
                                        </child>
                                      </object>
                                    </child>
-                                    <child>
-                                      <object class="GtkSeparator"/>
-                                    </child>
                                    <child>
                                      <object class="GtkScrolledWindow">
                                        <property name="vexpand">1</property>
@@ -2006,9 +1969,6 @@ microphone-sensitivity-medium-symbolic</property>
                                </child>
                              </object>
                            </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                            <child>
                              <object class="GtkBox">
                                <child>
@@ -2069,11 +2029,6 @@ microphone-sensitivity-medium-symbolic</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator">
-                            <property name="orientation">vertical</property>
-                          </object>
-                        </child>
                        <child>
                          <object class="GtkBox" id="filler2">
                            <property name="orientation">vertical</property>
@@ -2083,9 +2038,6 @@ microphone-sensitivity-medium-symbolic</property>
                                <property name="halign">center</property>
                              </object>
                            </child>
-                            <child>
-                              <object class="GtkSeparator"/>
-                            </child>
                            <child>
                              <object class="GtkExpander" id="expander1">
                                <property name="expanded">1</property>
@@ -2260,9 +2212,6 @@ microphone-sensitivity-medium-symbolic</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
                        <child>
                          <object class="GtkScrolledWindow">
                            <property name="hscrollbar-policy">never</property>
@@ -2278,11 +2227,6 @@ microphone-sensitivity-medium-symbolic</property>
                        </child>
                      </object>
                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
                    <child>
                      <object class="GtkBox">
                        <property name="orientation">vertical</property>
@@ -2372,9 +2316,6 @@ microphone-sensitivity-medium-symbolic</property>
                            </child>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
                        <child>
                          <object class="GtkFrame">
                            <child>
@@ -2852,11 +2793,6 @@ microphone-sensitivity-medium-symbolic</property>
                        </child>
                      </object>
                    </child>
-                    <child>
-                      <object class="GtkSeparator">
-                        <property name="orientation">vertical</property>
-                      </object>
-                    </child>
                    <child>
                      <object class="GtkBox">
                        <property name="orientation">vertical</property>
@@ -2883,9 +2819,6 @@ microphone-sensitivity-medium-symbolic</property>
                            </style>
                          </object>
                        </child>
-                        <child>
-                          <object class="GtkSeparator"/>
-                        </child>
                        <child>
                          <object class="GtkNotebook">
                            <property name="scrollable">1</property>
@@ -3029,9 +2962,6 @@ bad things might happen.</property>
            <property name="margin-top">20</property>
            <property name="margin-bottom">20</property>
            <property name="label" translatable="yes">To free the princess, you have to slay the dragon.</property>
-            <accessibility>
-              <role type="static"/>
-            </accessibility>
          </object>
        </child>
      </object>
@@ -3081,8 +3011,8 @@ bad things might happen.</property>
                  <class name="dim-label"/>
                </style>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                </layout>
              </object>
            </child>
@@ -3090,8 +3020,8 @@ bad things might happen.</property>
              <object class="GtkEntry" id="details_entry">
                <property name="valign">baseline</property>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                </layout>
              </object>
            </child>
@@ -3106,8 +3036,8 @@ bad things might happen.</property>
                  <class name="dim-label"/>
                </style>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -3115,8 +3045,8 @@ bad things might happen.</property>
              <object class="GtkEntry" id="more_details_entry">
                <property name="valign">baseline</property>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -3131,8 +3061,8 @@ bad things might happen.</property>
                  <class name="dim-label"/>
                </style>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">0</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -3142,8 +3072,8 @@ bad things might happen.</property>
                <property name="draw-value">0</property>
                <property name="adjustment">adjustment1</property>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">2</property>
+                  <property name="column">1</property>
+                  <property name="row">2</property>
                </layout>
              </object>
            </child>
@@ -3158,8 +3088,8 @@ bad things might happen.</property>
                  <class name="dim-label"/>
                </style>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">0</property>
+                  <property name="row">3</property>
                </layout>
              </object>
            </child>
@@ -3168,8 +3098,8 @@ bad things might happen.</property>
                <property name="halign">start</property>
                <property name="valign">baseline</property>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">3</property>
+                  <property name="column">1</property>
+                  <property name="row">3</property>
                </layout>
              </object>
            </child>
@@ -3231,9 +3161,6 @@ bad things might happen.</property>
          <object class="GtkLabel" id="title_label">
            <property name="label">Title:</property>
            <property name="xalign">1</property>
-            <accessibility>
-              <relation type="label-for" target="open_popover_entry"/>
-            </accessibility>
          </object>
        </child>
        <child>
@@ -3241,11 +3168,8 @@ bad things might happen.</property>
            <property name="valign">start</property>
            <property name="label">Description:</property>
            <property name="xalign">1</property>
-            <accessibility>
-              <relation type="label-for" target="open_popover_textview"/>
-            </accessibility>
            <layout>
-              <property name="top-attach">1</property>
+              <property name="row">1</property>
            </layout>
          </object>
        </child>
@@ -3259,14 +3183,11 @@ bad things might happen.</property>
            <property name="max-content-width">100</property>
            <child>
              <object class="GtkTextView" id="open_popover_textview">
-                <accessibility>
-                  <relation type="labelled-by" target="description_label"/>
-                </accessibility>
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">1</property>
+              <property name="column">1</property>
+              <property name="row">1</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -3274,11 +3195,8 @@ bad things might happen.</property>
        <child>
          <object class="GtkEntry" id="open_popover_entry">
            <property name="activates-default">1</property>
-            <accessibility>
-              <relation type="labelled-by" target="title_label"/>
-            </accessibility>
            <layout>
-              <property name="left-attach">1</property>
+              <property name="column">1</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -3297,8 +3215,8 @@ bad things might happen.</property>
              </object>
            </child>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">2</property>
+              <property name="column">1</property>
+              <property name="row">2</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -3310,8 +3228,8 @@ bad things might happen.</property>
            <property name="menu-model">gear_menu</property>
            <property name="tooltip-text">This is a menu button</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">3</property>
+              <property name="column">1</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -3324,8 +3242,8 @@ bad things might happen.</property>
              <class name="suggested-action"/>
            </style>
            <layout>
-              <property name="left-attach">2</property>
-              <property name="top-attach">3</property>
+              <property name="column">2</property>
+              <property name="row">3</property>
            </layout>
          </object>
        </child>
@@ -3357,9 +3275,6 @@ bad things might happen.</property>
    <child>
      <object class="GtkLabel">
        <property name="label">No updates at this time</property>
-        <accessibility>
-          <role type="static"/>
-        </accessibility>
      </object>
    </child>
  </object>
@@ -3368,9 +3283,6 @@ bad things might happen.</property>
    <child>
      <object class="GtkLabel">
        <property name="label">You&apos;re in too deep!</property>
-        <accessibility>
-          <role type="static"/>
-        </accessibility>
      </object>
    </child>
  </object>
@@ -474,19 +474,19 @@ The maximum width of each column is given by the longest element in the
 column:

 ```c
-  void         gtk_type_set_property (GtkType      *type,
-                                      const gchar  *value,
-                                      GError      **error);
-  const gchar *gtk_type_get_property (GtkType      *type);
+  void        gtk_type_set_property (GtkType      *type,
+                                     const char   *value,
+                                     GError      **error);
+  const char *gtk_type_get_property (GtkType      *type);
 ```

 It is also possible to align the columns to the next tab:

 ```c
  void          gtk_type_set_prop           (GtkType *type,
-                                             gfloat   value);
-  gfloat        gtk_type_get_prop           (GtkType *type);
-  gint          gtk_type_update_foobar      (GtkType *type);
+                                             float    value);
+  float         gtk_type_get_prop           (GtkType *type);
+  int           gtk_type_update_foobar      (GtkType *type);
 ```

 Public headers should never be included directly:
@@ -33,6 +33,7 @@
    <xi:include href="xml/gdksurface.xml" />
    <xi:include href="xml/gdktoplevel.xml" />
    <xi:include href="xml/gdktoplevellayout.xml" />
+    <xi:include href="xml/gdktoplevelsize.xml" />
    <xi:include href="xml/gdkpopup.xml" />
    <xi:include href="xml/gdkpopuplayout.xml" />
    <xi:include href="xml/gdkframeclock.xml" />
@@ -81,7 +81,6 @@ gdk_display_close
 gdk_display_is_closed
 gdk_display_is_rgba
 gdk_display_is_composited
-gdk_display_get_default_group
 gdk_display_supports_input_shapes
 gdk_display_get_app_launch_context
 gdk_display_notify_startup_complete
@@ -190,9 +189,7 @@ gdk_surface_create_vulkan_context
 gdk_surface_create_cairo_context

 <SUBSECTION>
-gdk_surface_queue_expose
-gdk_surface_freeze_updates
-gdk_surface_thaw_updates
+gdk_surface_queue_render
 gdk_surface_get_frame_clock

 <SUBSECTION>
@@ -348,21 +345,14 @@ GdkAxisUse
 GdkAxisFlags
 GdkDeviceTool
 GdkDeviceToolType
-GdkDeviceType

 <SUBSECTION>
 gdk_device_get_name
 gdk_device_get_vendor_id
 gdk_device_get_product_id
 gdk_device_get_source
-gdk_device_get_axis_use
-gdk_device_get_associated_device
-gdk_device_list_physical_devices
-gdk_device_get_device_type
 gdk_device_get_display
 gdk_device_get_has_cursor
-gdk_device_get_n_axes
-gdk_device_get_axes
 gdk_device_get_seat
 gdk_device_get_num_touches
 gdk_device_get_device_tool
@@ -374,15 +364,14 @@ gdk_device_get_scroll_lock_state
 gdk_device_has_bidi_layouts

 <SUBSECTION>
-gdk_device_get_state
 gdk_device_get_surface_at_position
 GdkTimeCoord
-gdk_device_get_axis

 <SUBSECTION>
 gdk_device_tool_get_serial
 gdk_device_tool_get_tool_type
 gdk_device_tool_get_hardware_id
+gdk_device_tool_get_axes

 <SUBSECTION Standard>
 GDK_TYPE_AXIS_USE
@@ -438,7 +427,8 @@ gdk_seat_get_display
 gdk_seat_get_capabilities
 gdk_seat_get_pointer
 gdk_seat_get_keyboard
-gdk_seat_get_physical_devices
+gdk_seat_get_devices
+gdk_seat_get_tools

 <SUBSECTION Standard>
 GDK_SEAT
@@ -478,7 +468,6 @@ gdk_event_unref
 gdk_event_get_event_type
 gdk_event_get_surface
 gdk_event_get_device
-gdk_event_get_source_device
 gdk_event_get_device_tool
 gdk_event_get_time
 gdk_event_get_display
@@ -643,8 +632,6 @@ gdk_toplevel_layout_get_maximized
 gdk_toplevel_layout_set_fullscreen
 gdk_toplevel_layout_get_fullscreen
 gdk_toplevel_layout_get_fullscreen_monitor
-gdk_toplevel_layout_get_min_width
-gdk_toplevel_layout_get_min_height
 gdk_toplevel_layout_set_resizable
 gdk_toplevel_layout_get_resizable
 <SUBSECTION Standard>
@@ -652,6 +639,18 @@ GDK_TYPE_TOPLEVEL_LAYOUT
 gdk_toplevel_layout_get_type
 </SECTION>

+<SECTION>
+<FILE>gdktoplevelsize</FILE>
+<TITLE>GdkToplevelSize</TITLE>
+GdkToplevelSize
+gdk_toplevel_size_get_bounds
+gdk_toplevel_size_set_size
+gdk_toplevel_size_set_min_size
+<SUBSECTION Standard>
+GDK_TYPE_TOPLEVEL_SIZE
+gdk_toplevel_size_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gdktoplevel</FILE>
 <TITLE>GdkToplevel</TITLE>
@@ -684,6 +683,8 @@ gdk_toplevel_get_type
 <TITLE>Textures</TITLE>
 <FILE>textures</FILE>
 GdkTexture
+GdkMemoryTexture
+GdkGLTexture
 gdk_texture_new_for_pixbuf
 gdk_texture_new_from_resource
 gdk_texture_new_from_file
@@ -823,6 +824,7 @@ gdk_x11_display_get_xrootwindow
 gdk_x11_display_get_xcursor
 gdk_x11_display_grab
 gdk_x11_display_ungrab
+gdk_x11_display_get_default_group
 gdk_x11_display_error_trap_push
 gdk_x11_display_error_trap_pop
 gdk_x11_display_error_trap_pop_ignored
@@ -846,6 +848,8 @@ gdk_x11_surface_move_to_desktop
 gdk_x11_surface_get_desktop
 gdk_x11_surface_set_utf8_property
 gdk_x11_surface_set_frame_sync_enabled
+gdk_x11_surface_set_group
+gdk_x11_surface_get_group
 gdk_x11_keymap_get_group_for_state
 gdk_x11_keymap_key_is_modifier
 gdk_x11_visual_get_xvisual
@@ -1130,7 +1134,6 @@ GDK_TYPE_GL_PROFILE
 GdkMonitor
 gdk_monitor_get_display
 gdk_monitor_get_geometry
-gdk_monitor_get_workarea
 gdk_monitor_get_width_mm
 gdk_monitor_get_height_mm
 gdk_monitor_get_manufacturer
@@ -1290,4 +1293,3 @@ GDK_CONTENT_DESERIALIZER
 GDK_IS_CONTENT_DESERIALIZER
 gdk_content_deserializer_get_type
 </SECTION>
-
@@ -185,10 +185,9 @@ is to create a menu using a GMenu menu model. GMenu provides an
 abstract way to describe typical menus: nested groups of items
 where each item can have a label, and icon, and an action.

-Typical uses of GMenu inside GTK are to set up an application
-menu or menubar with gtk_application_set_app_menu() or
-gtk_application_set_menubar(). Another, maybe more common use
-is to create a popover for a menubutton, using
+A typical use of GMenu inside GTK is to set up an application
+menubar with gtk_application_set_menubar(). Another, maybe more
+common use is to create a popover for a menubutton, using
 gtk_menu_button_set_menu_model().

 Unlike traditional menus, those created from menu models don't
@@ -127,7 +127,7 @@ compilation flags needed for that library along with version number
 information.)

 Some of the libraries that GTK depends on are maintained by the
-GTK team: GLib, GdkPixbuf, Pango, ATK and GObject Introspection.
+GTK team: GLib, GdkPixbuf, Pango, and GObject Introspection.
 Other libraries are maintained separately.

 - The GLib library provides core non-graphical functionality
@@ -139,10 +139,6 @@ Other libraries are maintained separately.
  file formats. It is available [here](ttps://download.gnome.org/sources/gdk-pixbuf/).
 - [Pango](http://www.pango.org) is a library for internationalized
  text handling. It is available [here](https://download.gnome.org/sources/pango/).
- ATK is the Accessibility Toolkit. It provides a set of generic
-  interfaces allowing accessibility technologies such as
-  screen readers to interact with a graphical user interface.
-  It is available [here](https://download.gnome.org/sources/atk/).
 - [GObject Introspection](https://wiki.gnome.org/Projects/GObjectIntrospection)
  is a framework for making introspection data available to language
  bindings. It is available [here](https://download.gnome.org/sources/gobject-introspection/).
@@ -192,7 +188,7 @@ you'll have all of these installed already, or they will be easily
 accessible through your operating system package repositories.

 Then build and install the GTK libraries in the order:
-GLib, Cairo, Pango, ATK, then GTK. For each library, follow the
+GLib, Cairo, Pango, then GTK. For each library, follow the
 instructions they provide, and make sure to share common settings
 between them and the GTK build; if you are using a separate prefix
 for GTK, for instance, you will need to use the same prefix for
@@ -9,9 +9,9 @@ is used (the actual output on your system may be different):

 ```
 $ pkg-config --cflags gtk4
- -pthread -I/usr/include/gtk-4.0 -I/usr/lib64/gtk-4.0/include -I/usr/include/atk-1.0 -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
+ -pthread -I/usr/include/gtk-4.0 -I/usr/lib64/gtk-4.0/include -I/usr/include/cairo -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng12
 $ pkg-config --libs gtk4
- -pthread -lgtk-4 -lgdk-4 -latk-1.0 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
+ -pthread -lgtk-4 -lgdk-4 -lgio-2.0 -lpangoft2-1.0 -lgdk_pixbuf-2.0 -lpangocairo-1.0 -lcairo -lpango-1.0 -lfreetype -lfontconfig -lgobject-2.0 -lgmodule-2.0 -lgthread-2.0 -lrt -lglib-2.0
 ```
 The simplest way to compile a program is to use the "backticks"
 feature of the shell. If you enclose a command in backticks
@@ -426,8 +426,8 @@ draw_cb (GtkDrawingArea *drawing_area,
 /* Draw a rectangle on the surface at the given position */
 static void
 draw_brush (GtkWidget *widget,
-            gdouble    x,
-            gdouble    y)
+            double     x,
+            double     y)
 {
  cairo_t *cr;

@@ -649,8 +649,8 @@ Create a new file with the following content named `builder.ui`.
          <object id="button1" class="GtkButton">
            <property name="label">Button 1</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">0</property>
+              <property name="column">0</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -658,8 +658,8 @@ Create a new file with the following content named `builder.ui`.
          <object id="button2" class="GtkButton">
            <property name="label">Button 2</property>
            <layout>
-              <property name="left-attach">1</property>
-              <property name="top-attach">0</property>
+              <property name="column">1</property>
+              <property name="row">0</property>
            </layout>
          </object>
        </child>
@@ -667,8 +667,8 @@ Create a new file with the following content named `builder.ui`.
          <object id="quit" class="GtkButton">
            <property name="label">Quit</property>
            <layout>
-              <property name="left-attach">0</property>
-              <property name="top-attach">1</property>
+              <property name="column">0</property>
+              <property name="row">1</property>
              <property name="column-span">2</property>
            </layout>
          </object>
@@ -797,8 +797,8 @@ example_app_activate (GApplication *app)
 static void
 example_app_open (GApplication  *app,
                  GFile        **files,
-                  gint           n_files,
-                  const gchar   *hint)
+                  int            n_files,
+                  const char    *hint)
 {
  GList *windows;
  ExampleAppWindow *win;
@@ -1138,7 +1138,7 @@ example_app_startup (GApplication *app)
 {
  GtkBuilder *builder;
  GMenuModel *app_menu;
-  const gchar *quit_accels[2] = { "&lt;Ctrl&gt;Q", NULL };
+  const char *quit_accels[2] = { "&lt;Ctrl&gt;Q", NULL };

  G_APPLICATION_CLASS (example_app_parent_class)->startup (app);

@@ -1266,16 +1266,16 @@ Lets start with the template.
                <property name="mnemonic-widget">font</property>
                <property name="xalign">1</property>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">0</property>
+                  <property name="row">0</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkFontButton" id="font">
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">0</property>
+                  <property name="column">1</property>
+                  <property name="row">0</property>
                </layout>
              </object>
            </child>
@@ -1286,8 +1286,8 @@ Lets start with the template.
                <property name="mnemonic-widget">transition</property>
                <property name="xalign">1</property>
                <layout>
-                  <property name="left-attach">0</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">0</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -1299,8 +1299,8 @@ Lets start with the template.
                  <item translatable="yes" id="slide-left-right">Slide</item>
                </items>
                <layout>
-                  <property name="left-attach">1</property>
-                  <property name="top-attach">1</property>
+                  <property name="column">1</property>
+                  <property name="row">1</property>
                </layout>
              </object>
            </child>
@@ -1476,7 +1476,7 @@ static void
 search_text_changed (GtkEntry         *entry,
                     ExampleAppWindow *win)
 {
-  const gchar *text;
+  const char *text;
  GtkWidget *tab;
  GtkWidget *view;
  GtkTextBuffer *buffer;
@@ -12,6 +12,13 @@ import subprocess
 # The following code is taken from gtk-doc

 def ExpandAbbreviations(symbol, text):
+    # Hack!
+    # Strip xlink namespace from hrefs since pandoc insists on
+    # inserting them, and namespace setup doesn't transfer across
+    # xi:include.
+    # Yay for XML!
+    text = re.sub('xlink:href', 'href', text)
+
    # Convert '@param()'
    text = re.sub(r'(\A|[^\\])\@(\w+((\.|->)\w+)*)\s*\(\)', r'\1<parameter>\2()</parameter>', text)

@@ -173,7 +180,7 @@ def ConvertToDocbook(infile, outfile):
    else:
        division='chapter'
    input_format = "markdown" + "".join(MarkdownExtensions)
-    output_format = "docbook"
+    output_format = "docbook4"
    subprocess.check_call(["pandoc", infile, "-o", outfile,
                           "--from=" + input_format,
                           "--to=" + output_format,
@@ -55,6 +55,7 @@
        <xi:include href="xml/gtkfilter.xml" />
        <xi:include href="xml/gtkcustomfilter.xml" />
        <xi:include href="xml/gtkmultifilter.xml" />
+        <xi:include href="xml/gtkboolfilter.xml" />
        <xi:include href="xml/gtkstringfilter.xml" />
        <xi:include href="xml/gtkfilefilter.xml" />
      </section>
@@ -337,6 +338,13 @@
      <xi:include href="xml/gtkshortcutlabel.xml" />
    </chapter>

+    <chapter id="Accessibility">
+      <title>Accessibility</title>
+      <xi:include href="section-accessibility.xml"/>
+      <xi:include href="xml/gtkaccessible.xml" />
+      <xi:include href="xml/gtkatcontext.xml" />
+    </chapter>
+
    <chapter id="MiscObjects">
      <title>Miscellaneous</title>
      <xi:include href="xml/gtkadjustment.xml" />
@@ -88,25 +88,6 @@ GtkAccelLabelPrivate
 gtk_accel_label_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkaccessible</FILE>
-<TITLE>GtkAccessible</TITLE>
-GtkAccessible
-gtk_accessible_get_widget
-gtk_accessible_set_widget
-
-<SUBSECTION Standard>
-GTK_ACCESSIBLE
-GTK_TYPE_ACCESSIBLE
-GTK_ACCESSIBLE_CLASS
-GTK_ACCESSIBLE_GET_CLASS
-GTK_IS_ACCESSIBLE
-GTK_IS_ACCESSIBLE_CLASS
-<SUBSECTION Private>
-GtkAccessiblePrivate
-gtk_accessible_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkadjustment</FILE>
 <TITLE>GtkAdjustment</TITLE>
@@ -276,6 +257,7 @@ GtkListBoxUpdateHeaderFunc

 gtk_list_box_new
 gtk_list_box_prepend
+gtk_list_box_append
 gtk_list_box_insert
 gtk_list_box_remove
 gtk_list_box_select_row
@@ -449,7 +431,7 @@ gtk_single_selection_get_type

 <SECTION>
 <FILE>gtkmultiselection</FILE>
-<TITLE>GtkMultiSeledction</TITLE>
+<TITLE>GtkMultiSelection</TITLE>
 GtkMultiSelection
 gtk_multi_selection_new
 gtk_multi_selection_get_model
@@ -662,6 +644,7 @@ gtk_grid_view_get_type
 <FILE>gtkbuildable</FILE>
 GtkBuildable
 GtkBuildableIface
+GtkBuildableParser
 gtk_buildable_set_name
 gtk_buildable_get_name
 gtk_buildable_add_child
@@ -684,6 +667,10 @@ GTK_BUILDABLE_GET_IFACE
 <SECTION>
 <FILE>gtkbuilderscope</FILE>
 <TITLE>GtkBuilderScope</TITLE>
+GtkBuilderScope
+GtkBuilderClosureFlags
+GtkBuilderScopeInterface
+GtkBuilderCScope
 gtk_builder_cscope_new
 gtk_builder_cscope_add_callback_symbol
 gtk_builder_cscope_add_callback_symbols
@@ -881,7 +868,6 @@ gtk_combo_box_set_active_id
 gtk_combo_box_get_model
 gtk_combo_box_set_model
 gtk_combo_box_popdown
-gtk_combo_box_get_popup_accessible
 gtk_combo_box_get_row_separator_func
 gtk_combo_box_set_row_separator_func
 GtkSensitivityType
@@ -1223,9 +1209,6 @@ gtk_entry_completion_compute_prefix
 gtk_entry_completion_complete
 gtk_entry_completion_get_completion_prefix
 gtk_entry_completion_insert_prefix
-gtk_entry_completion_insert_action_text
-gtk_entry_completion_insert_action_markup
-gtk_entry_completion_delete_action
 gtk_entry_completion_set_text_column
 gtk_entry_completion_get_text_column
 gtk_entry_completion_set_inline_completion
@@ -2041,8 +2024,6 @@ gtk_menu_button_get_menu_model
 GtkArrowType
 gtk_menu_button_set_direction
 gtk_menu_button_get_direction
-gtk_menu_button_set_align_widget
-gtk_menu_button_get_align_widget
 gtk_menu_button_set_icon_name
 gtk_menu_button_get_icon_name
 gtk_menu_button_set_label
@@ -2832,6 +2813,9 @@ gtk_sort_list_model_set_sorter
 gtk_sort_list_model_get_sorter
 gtk_sort_list_model_set_model
 gtk_sort_list_model_get_model
+gtk_sort_list_model_set_incremental
+gtk_sort_list_model_get_incremental
+gtk_sort_list_model_get_pending
 <SUBSECTION Standard>
 GTK_SORT_LIST_MODEL
 GTK_IS_SORT_LIST_MODEL
@@ -4073,7 +4057,6 @@ GtkCellRendererState
 GtkCellRendererMode
 GtkCellRenderer
 GtkCellRendererClass
-gtk_cell_renderer_class_set_accessible_type
 gtk_cell_renderer_get_aligned_area
 gtk_cell_renderer_snapshot
 gtk_cell_renderer_activate
@@ -4428,7 +4411,6 @@ gtk_widget_paintable_get_type
 <TITLE>GtkWidget</TITLE>
 GtkWidget
 GtkWidgetClass
-GtkCallback
 GtkRequisition
 GtkAllocation
 gtk_widget_new
@@ -4486,9 +4468,7 @@ gtk_widget_get_cursor
 gtk_widget_set_cursor
 gtk_widget_set_cursor_from_name
 gtk_widget_mnemonic_activate
-gtk_widget_class_set_accessible_type
 gtk_widget_class_set_accessible_role
-gtk_widget_get_accessible
 gtk_widget_child_focus
 gtk_widget_get_child_visible
 gtk_widget_get_parent
@@ -6290,6 +6270,8 @@ gtk_popover_set_autohide
 gtk_popover_get_autohide
 gtk_popover_set_has_arrow
 gtk_popover_get_has_arrow
+gtk_popover_set_offset
+gtk_popover_get_offset
 gtk_popover_set_default_widget
 <SUBSECTION Standard>
 GTK_TYPE_POPOVER
@@ -7271,10 +7253,10 @@ gtk_grid_layout_get_baseline_row
 <SUBSECTION>
 GtkGridLayoutChild

-gtk_grid_layout_child_set_top_attach
-gtk_grid_layout_child_get_top_attach
-gtk_grid_layout_child_set_left_attach
-gtk_grid_layout_child_get_left_attach
+gtk_grid_layout_child_set_column
+gtk_grid_layout_child_get_column
+gtk_grid_layout_child_set_row
+gtk_grid_layout_child_get_row
 gtk_grid_layout_child_set_column_span
 gtk_grid_layout_child_get_column_span
 gtk_grid_layout_child_set_row_span
@@ -7570,6 +7552,19 @@ GTK_TYPE_EXPRESSION
 gtk_expression_get_type
 </SECTION>

+<SECTION>
+<FILE>gtkboolfilter</FILE>
+GtkBoolFilter
+gtk_bool_filter_new
+gtk_bool_filter_get_expression
+gtk_bool_filter_set_expression
+gtk_bool_filter_get_invert
+gtk_bool_filter_set_invert
+
+<SUBSECTION Private>
+gtk_bool_filter_get_type
+</SECTION>
+
 <SECTION>
 <FILE>gtkstringfilter</FILE>
 GtkStringFilter
@@ -7593,7 +7588,7 @@ gtk_string_filter_get_type
 <TITLE>GtkDropDown</TITLE>
 GtkDropDown
 gtk_drop_down_new
-gtk_drop_down_set_from_strings
+gtk_drop_down_new_from_strings
 gtk_drop_down_set_model
 gtk_drop_down_get_model
 gtk_drop_down_set_selected
@@ -7634,7 +7629,59 @@ gtk_string_object_get_string
 <TITLE>GtkSelectionFilterModel</TITLE>
 GtkSelectionFilterModel
 gtk_selection_filter_model_new
-gtk_selection_filter_model_new_for_type
 gtk_selection_filter_model_set_model
 gtk_selection_filter_model_get_model
 </SECTION>
+
+<SECTION>
+<FILE>gtkaccessible</FILE>
+GtkAccessible
+GtkAccessibleRole
+GtkAccessibleState
+GtkAccessibleProperty
+GtkAccessibleRelation
+GtkAccessibleTristate
+GtkAccessibleInvalidState
+GtkAccessibleAutocomplete
+GtkAccessibleSort
+gtk_accessible_get_accessible_role
+gtk_accessible_update_state
+gtk_accessible_update_state_value
+gtk_accessible_reset_state
+gtk_accessible_update_property
+gtk_accessible_update_property_value
+gtk_accessible_reset_property
+gtk_accessible_update_relation
+gtk_accessible_update_relation_value
+gtk_accessible_reset_relation
+
+<SUBSECTION Standard>
+GTK_TYPE_ACCESSIBLE
+GTK_TYPE_ACCESSIBLE_PROPERTY
+GTK_TYPE_ACCESSIBLE_ROLE
+GTK_TYPE_ACCESSIBLE_STATE
+GTK_ACCESSIBLE
+GTK_ACCESSIBLE_GET_IFACE
+GTK_IS_ACCESSIBLE
+<SUBSECTION Private>
+gtk_accessible_get_type
+</SECTION>
+
+<SECTION>
+<FILE>gtkatcontext</FILE>
+GtkATContext
+gtk_at_context_get_accessible
+gtk_at_context_get_accessible_role
+<SUBSECTION>
+gtk_at_context_create
+<SUBSECTION Standard>
+GTK_TYPE_AT_CONTEXT
+GTK_AT_CONTEXT
+GTK_AT_CONTEXT_CLASS
+GTK_AT_CONTEXT_GET_CLASS
+GTK_IS_AT_CONTEXT
+GTK_IS_AT_CONTEXT_CLASS
+<SUBSECTION Private>
+GtkATContextClass
+gtk_at_context_get_type
+</SECTION>
@@ -2,7 +2,6 @@
 #include <gtk/gtkunixprint.h>

 gtk_about_dialog_get_type
-gtk_accel_label_get_type
 gtk_accessible_get_type
 gtk_actionable_get_type
 gtk_action_bar_get_type
@@ -17,6 +16,7 @@ gtk_application_window_get_type
 gtk_aspect_frame_get_type
 gtk_assistant_get_type
 gtk_assistant_page_get_type
+gtk_at_context_get_type
 gtk_bin_layout_get_type
 gtk_bitset_get_type
 gtk_expression_get_type
@@ -90,6 +90,7 @@ gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
 gtk_file_chooser_get_type
+gtk_file_chooser_native_get_type
 gtk_file_chooser_widget_get_type
 gtk_file_filter_get_type
 gtk_filter_get_type
--- a/Show More
+++ b/Show More