quartz: Add monitor support

This is a backport of a patch by Tom Schoonjans, https://bugzilla.gnome.org/show_bug.cgi?id=779184
2017-03-10 08:48:36 -05:00
1000 changed files with 122253 additions and 303899 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,51 +0,0 @@
-image: registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2
-
-stages:
-  - build
-
-cache:
-  paths:
-    - _ccache/
-
-fedora-autotools:
-  stage: build
-  script:
-   - bash -x ./.gitlab-ci/test-docker-autotools.sh
-
-fedora-meson:
-  stage: build
-  script:
-   - bash -x ./.gitlab-ci/test-docker-meson.sh
-  artifacts:
-    when: always
-    name: "gtk3-${CI_JOB_NAME}-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "_build/meson-logs"
-
-msys2-mingw32-meson:
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  stage: build
-  tags:
-    - win32
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-meson.sh"
-  artifacts:
-    when: always
-    name: "gtk3-%CI_JOB_NAME%-%CI_COMMIT_REF_NAME%"
-    paths:
-      - "_build/meson-logs"
-
-msys2-mingw32-autotools:
-  when: manual
-  variables:
-    MSYSTEM: "MINGW32"
-    CHERE_INVOKING: "yes"
-  stage: build
-  tags:
-    - win32
-  script:
-    - C:\msys64\usr\bin\pacman --noconfirm -Syyuu
-    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2-autotools.sh"
--- a/.gitlab-ci/Dockerfile
+++ b/.gitlab-ci/Dockerfile
@@ -1,70 +0,0 @@
-FROM fedora:29
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    colord-devel \
-    cups-devel \
-    dbus-x11 \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    gettext-devel \
-    git \
-    glib2-devel \
-    gobject-introspection-devel \
-    graphene-devel \
-    gtk-doc \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    libcloudproviders-devel \
-    libepoxy-devel \
-    libmount-devel \
-    librsvg2 \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    make \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    meson \
-    ninja-build \
-    pango-devel \
-    python3 \
-    python3-pip \
-    python3-wheel \
-    redhat-rpm-config \
-    rest-devel \
-    sassc \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    xorg-x11-server-Xvfb \
-    && dnf clean all
-
-ARG HOST_USER_ID=5555
-ENV HOST_USER_ID ${HOST_USER_ID}
-RUN useradd -u $HOST_USER_ID -ms /bin/bash user
-
-USER user
-WORKDIR /home/user
-
-ENV LANG C.utf8
-ENV PATH="/usr/lib64/ccache:${PATH}"
--- a/.gitlab-ci/run-docker.sh
+++ b/.gitlab-ci/run-docker.sh
@@ -1,19 +0,0 @@
-#!/bin/bash
-#
-# This script builds an image from the Dockerfile, starts a container with
-# the parent directory mounted as working directory and start a bash session
-# there so you can test things.
-# Once you are happy you can push it to the docker hub:
-#     sudo docker push "${TAG}"
-
-set -e
-
-TAG="registry.gitlab.gnome.org/gnome/gtk/gtk-3-24:v2"
-
-# HOST_USER_ID gets used to create a user with the same ID so that files
-# created in the mounted volume have the same owner
-sudo docker build \
-    --build-arg HOST_USER_ID="$UID" --tag "${TAG}" --file "Dockerfile" .
-sudo docker run --security-opt label=disable \
-    --rm --volume "$(pwd)/..:/home/user/app" --workdir "/home/user/app" \
-    --tty --interactive "${TAG}" bash
--- a/.gitlab-ci/test-docker-autotools.sh
+++ b/.gitlab-ci/test-docker-autotools.sh
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-mkdir _build
-cd _build
-../autogen.sh \
-    --enable-cloudproviders \
-    --enable-broadway-backend \
-    --enable-xinerama \
-    --enable-gtk-doc
-make -j8
--- a/.gitlab-ci/test-docker-meson.sh
+++ b/.gitlab-ci/test-docker-meson.sh
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-set -e
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-export PATH="${HOME}/.local/bin:${PATH}"
-python3 -m pip install --user meson==0.49.2
-
-meson \
-    -Dgtk_doc=true \
-    -Dman=true \
-    -Dbroadway_backend=true \
-    -Dxinerama=yes \
-    -Dprint_backends="file,lpr,test,cloudprint,cups" \
-    _build
-
-cd _build
-ninja
-
-xvfb-run -a -s "-screen 0 1024x768x24" \
-    meson test \
-        --timeout-multiplier 4 \
-        --print-errorlogs \
-        --suite=gtk+-3.0 \
-
-ninja gail-libgail-util3-doc gdk3-doc gtk3-doc
--- a/.gitlab-ci/test-msys2-autotools.sh
+++ b/.gitlab-ci/test-msys2-autotools.sh
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
-# Update everything
-pacman --noconfirm -Suy
-
-# Install the required packages
-pacman --noconfirm -S --needed \
-    base-devel \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection \
-    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
-    mingw-w64-$MSYS2_ARCH-atk \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
-    mingw-w64-$MSYS2_ARCH-glib2 \
-    mingw-w64-$MSYS2_ARCH-json-glib \
-    mingw-w64-$MSYS2_ARCH-libepoxy \
-    mingw-w64-$MSYS2_ARCH-pango \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-gtk-doc
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-export CC="ccache gcc"
-
-# Build
-ccache --zero-stats
-ccache --show-stats
-
-./autogen.sh
-make -j4
-
-ccache --show-stats
--- a/.gitlab-ci/test-msys2-meson.sh
+++ b/.gitlab-ci/test-msys2-meson.sh
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if [[ "$MSYSTEM" == "MINGW32" ]]; then
-    export MSYS2_ARCH="i686"
-else
-    export MSYS2_ARCH="x86_64"
-fi
-
-# Update everything
-pacman --noconfirm -Suy
-
-# Install the required packages
-pacman --noconfirm -S --needed \
-    mingw-w64-$MSYS2_ARCH-toolchain \
-    mingw-w64-$MSYS2_ARCH-ccache \
-    mingw-w64-$MSYS2_ARCH-pkg-config \
-    mingw-w64-$MSYS2_ARCH-gobject-introspection \
-    mingw-w64-$MSYS2_ARCH-adwaita-icon-theme \
-    mingw-w64-$MSYS2_ARCH-atk \
-    mingw-w64-$MSYS2_ARCH-cairo \
-    mingw-w64-$MSYS2_ARCH-gdk-pixbuf2 \
-    mingw-w64-$MSYS2_ARCH-glib2 \
-    mingw-w64-$MSYS2_ARCH-json-glib \
-    mingw-w64-$MSYS2_ARCH-libepoxy \
-    mingw-w64-$MSYS2_ARCH-pango \
-    mingw-w64-$MSYS2_ARCH-shared-mime-info \
-    mingw-w64-$MSYS2_ARCH-meson \
-    mingw-w64-$MSYS2_ARCH-ninja \
-    mingw-w64-$MSYS2_ARCH-gtk-doc \
-    mingw-w64-$MSYS2_ARCH-sassc
-
-mkdir -p _ccache
-export CCACHE_BASEDIR="$(pwd)"
-export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
-
-# Build
-ccache --zero-stats
-ccache --show-stats
-
-meson \
-    -Dman=true \
-    -Dbroadway_backend=true \
-    _build
-
-ninja -C _build
-
-ccache --show-stats
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,13 +22,7 @@ EXTRA_DIST +=			\
 	sanitize-la.sh		\
 	po/README.translators	\
 	po/po2tbl.sed.in	\
-	make-pot	\
-	meson_options.txt	\
-	meson.build	\
-	po/meson.build	\
-	po-properties/meson.build	\
-	build-aux/meson/post-install.py	\
-	config.h.meson
+	make-pot

 MAINTAINERCLEANFILES = \
 	$(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
--- a/1038
+++ b/1038
--- a/README.win32
+++ b/README.win32
@@ -156,14 +156,11 @@ Use the Microsoft compiler, cl and Make, nmake. Say nmake -f
 makefile.msc in gdk and gtk. Be prepared to manually edit various
 makefile.msc files, and the makefile snippets in build/win32.

-There are also VS 2008~2017 solution and project files to build GTK+, which
+There are also VS 2008/2010 solution and project files to build GTK+, which
 are maintained by Chun-wei Fan.  They should build GTK+ out of the box,
 provided that the afore-mentioned dependencies are installed.  They will
 build GDK with the Win32 backend, GTK+ itself (with GAIL/a11y built in),
-the GAIL-Util library and the gtk-demo program.  Please also refer to the
-README file(s) that reside in build/win32 on how to enable additional features
-that are not enabled by default, such as EGL support via libANGLE, which
-emulate the GL/EGL calls using Direct3D 9/11.
+the GAIL-Util library and the gtk-demo program.

 Please refer to the following GNOME Live! page for a more detailed ouline
 on the process of building the GTK+ stack and its dependencies with Visual
@@ -181,96 +178,6 @@ instance the makefile.msc files might not produce identically named
 DLLs and import libraries as the "autoconfiscated" makefiles and
 libtool do. If this bothers you, you will have to fix the makefiles.

-3) Using Meson (for Visual Studio and MinGW builds)
---
-
-Meson can now be used to build GTK+-3.x with either MinGW or Visual Studio.
-You will need the following items in addition to all the dependencies
-listed above:
-
- Python 3.5 or later
- Meson build system, 0.48.0 or later
- Ninja (if not using the Visual Studio project generator for
-         Visual Studio 2010, 2015, 2017, 2019)
- CMake (optional, used for dependency searching)
- pkg-config (optional, or some compatible tool, highly recommended)
-
-For all Windows builds, note that unless -Dbuiltin_immodules=no is specified,
-the input modules (immodules) are built directly into the GTK DLL.
-
-For building with Meson using Visual Studio, do the following:
-
-Create an empty build directory somewhere that is on the same drive
-as the source tree, and launch the Visual Studio command prompt that
-matches the build configuration (Visual Studio version and architecture),
-and run the following:
-
- Ensure that both the installation directory of Python and its script
-  directory is in your PATH, as well as the Ninja, CMake and pkg-config
-  executables (if used).  If a pkg-config compatible drop-in replacement
-  tool is being used, ensure that PKG_CONFIG is set to point to the
-  executable of that tool as well.
-
- For non-GNOME dependencies (such as Cairo and Harfbuzz), where pkg-config
-  files or CMake files could not be properly located, set INCLUDE and LIB
-  to ensure that their header files and .lib files can be found respectively.
-  The DLLs of those dependencies should also be in the PATH during the build
-  as well, especially if introspection files are to be built.
-
- For GNOME dependencies, the pkg-config files for those dependencies should
-  be searchable by pkg-config (or a compatible tool).  Verify this by running
-  $(PKG_CONFIG) --modversion <dependency>.
-
- Run the following:
-  meson <path_to_directory_of_this_file> --buildtype=... --prefix=...,
-  where buildtype can be release, debugoptimized, debug or plain.  Please
-  refer to the Meson documentation for more details.  You may also wish to
-  pass in -Dbroadway_backend=true if building the Broadway GDK backend is
-  desired, and/or pass in -Dbuiltin_immodules=no to build the immodules as
-  standalone DLLs that can be loaded by GTK dynamically.  For Visual Studio
-  2010, 2015, 2017 and 2019 builds, you may pass in --backend=vs to generate
-  Visual Studio project files to be used to carry out the builds.
-
-If you are building with Visual Studio 2008, note the following items as well:
-
- For x64 builds, the compiler may hang when building the certain files, due
-  to optimization issues in the compiler.  If this happens, use the Windows
-  Task Manager and terminate all cl.exe processes, and the build will fail
-  with the source files that did not finish compiling due to the hang.
-  Look for them in build.ninja in the build directory, and change their compiler
-  flag "/O2" to "/O1", and the compilation and linking should proceed normally.
-  At this time of writing, the following files are known to cause this hang:
-
-    gtk\gtkfilechoosernativewin32.c
-    gtk\gtkfilesystemmodel.c
-    gtk\gtktextsegment.c
-    gtk\gtktextbtree.c
-    gtk\gtkrbtree.c
-    testsuite\gtk\treemodel.c
-    testsuite\gtk\textbuffer.c
-    testsuite\gtk\rbtree.c
-    testsuite\gtk\icontheme.c
-
- Upon running install (via "ninja install"), it is likely that
-  gtk-query-immodules-3.0.exe will fail to run as it cannot find msvcr90.dll or
-  msvcr90D.dll.  You can ignore this if you did not specify -Dbuiltin_immodules=no
-  when configuring via Meson.  If -Dbuiltin_immodules=no is specified, you need to
-  run the following after   embedding the manifests as outlined in the next point:
-
-    <gtk_install_prefix>\bin\gtk-query-immodules-3.0.exe > <gtk_install_prefix>\lib\gtk-3.0\3.0.0\immodules.cache
-
- You will need to run the following upon completing install, from the build
-  directory in the Visual Studio 2008/SDK 6.0 command prompt (third line is not
-  needed unless -Dbuiltin_immodules=no is specified) so that the built binaries
-  can run:
-
-    for /r %f in (*.dll.manifest) do if exist <gtk_install_prefix>\bin\%~nf mt /manifest %f /outputresource:<gtk_install_prefix>\bin\%~nf;2
-    for /r %f in (*.exe.manifest) do if exist <gtk_install_prefix>\bin\%~nf mt /manifest %f /outputresource:<gtk_install_prefix>\bin\%~nf;1
-    for /r %f in (*.dll.manifest) do if exist <gtk_install_prefix>\lib\gtk-3.0\3.0.0\immodules\%~nf mt /manifest %f /outputresource:<gtk_install_prefix>\lib\gtk-3.0\3.0.0\immodules\%~nf;2
-
- The more modern visual style for the print dialog is not applied for Visual
-  Studio 2008 builds.  Any solutions to this is really appreciated.
-
 Using GTK+ on Win32
 ===================

--- a/build-aux/flatpak/org.gtk.WidgetFactory.json
+++ b/build-aux/flatpak/org.gtk.WidgetFactory.json
@@ -1,45 +0,0 @@
-{
-    "app-id": "org.gtk.WidgetFactory",
-    "runtime": "org.gnome.Platform",
-    "runtime-version": "master",
-    "sdk": "org.gnome.Sdk",
-    "command": "gtk3-widget-factory",
-    "tags": ["devel", "development", "nightly"],
-    "rename-desktop-file": "gtk3-widget-factory.desktop",
-    "rename-icon": "gtk3-widget-factory",
-    "finish-args": [
-        "--device=dri",
-        "--share=ipc",
-        "--socket=x11",
-        "--socket=wayland",
-        "--talk-name=org.gtk.vfs", "--talk-name=org.gtk.vfs.*",
-        "--talk-name=ca.desrt.conf", "--env=DCONF_USER_CONFIG_DIR=.config/dconf"
-    ],
-    "cleanup": [
-        "/include",
-        "/lib/pkgconfig", "/share/pkgconfig",
-        "/share/aclocal",
-        "/man", "/share/man", "/share/gtk-doc",
-        "*.la", ".a",
-        "/lib/girepository-1.0",
-        "/share/gir-1.0",
-        "/share/doc"
-    ],
-    "modules": [
-        {
-            "name": "gtk",
-            "buildsystem": "autotools",
-            "builddir": true,
-            "config-opts": [
-                "--libdir=/app/lib"
-            ],
-            "sources": [
-                {
-                    "type": "git",
-                    "branch": "gtk-3-24",
-                    "url": "https://gitlab.gnome.org/GNOME/gtk.git"
-                }
-            ]
-        }
-    ]
-}
--- a/build-aux/meson/post-install.py
+++ b/build-aux/meson/post-install.py
@@ -1,45 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import shutil
-import sys
-import subprocess
-
-if 'DESTDIR' not in os.environ:
-    gtk_api_version = sys.argv[1]
-    gtk_abi_version = sys.argv[2]
-    gtk_bindir = sys.argv[3]
-    gtk_libdir = sys.argv[4]
-    gtk_datadir = sys.argv[5]
-    gtk_query_immodules = os.path.join(gtk_bindir, 'gtk-query-immodules-' + gtk_api_version)
-
-    gtk_moduledir = os.path.join(gtk_libdir, 'gtk-' + gtk_api_version, gtk_abi_version)
-    gtk_immodule_dir = os.path.join(gtk_moduledir, 'immodules')
-    gtk_printmodule_dir = os.path.join(gtk_moduledir, 'printbackends')
-
-    if os.name == 'nt':
-        for lib in ['gdk', 'gtk', 'gailutil']:
-            # Make copy for MSVC-built .lib files, e.g. xxx-3.lib->xxx-3.0.lib
-            installed_lib = os.path.join(gtk_libdir, lib + '-' + gtk_api_version.split('.')[0] + '.lib')
-            installed_lib_dst = os.path.join(gtk_libdir, lib + '-' + gtk_api_version + '.lib')
-            if os.path.isfile(installed_lib):
-                shutil.copyfile(installed_lib, installed_lib_dst)
-
-    print('Compiling GSettings schemas...')
-    subprocess.call(['glib-compile-schemas',
-                    os.path.join(gtk_datadir, 'glib-2.0', 'schemas')])
-
-    print('Updating icon cache...')
-    subprocess.call(['gtk-update-icon-cache', '-q', '-t' ,'-f',
-                    os.path.join(gtk_datadir, 'icons', 'hicolor')])
-
-    print('Updating module cache for input methods...')
-    os.makedirs(gtk_immodule_dir, exist_ok=True)
-    immodule_cache_file = open(os.path.join(gtk_moduledir, 'immodules.cache'), 'w')
-    subprocess.call([gtk_query_immodules], stdout=immodule_cache_file)
-    immodule_cache_file.close()
-
-    # Untested!
-    print('Updating module cache for print backends...')
-    os.makedirs(gtk_printmodule_dir, exist_ok=True)
-    subprocess.call(['gio-querymodules', gtk_printmodule_dir])
--- a/build/Makefile.msvc-introspection
+++ b/build/Makefile.msvc-introspection
@@ -79,7 +79,7 @@ $(if $(or $(findstring --header-only,$($(_gir_name)_MSVC_SCANNERFLAGS)),
          $($(_gir_name)_MSVC_PROGRAM)),,
    $(error Need to define $(_gir_name)_MSVC_LIBS or $(_gir_name)_MSVC_PROGRAM))

-$(top_builddir)/build/win32/$(_gir_name)_list: Makefile
+$(top_builddir)/build/win32/$(_gir_name)_list:
 	for F in $(_gir_files_msvc); do \
 		case $$$$F in \
 		*.c|*.cpp|*.cc|*.cxx|*.h|*.hpp|*.hh|*.hxx) \
@@ -88,11 +88,11 @@ $(top_builddir)/build/win32/$(_gir_name)_list: Makefile
 		esac; \
 	done

-$(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
+$(top_builddir)/build/win32/$(1).msvc.introspect:
 	-$(RM) $(top_builddir)/build/win32/$(1).msvc.introspect

 # Assemble the Command to Run g-ir-scanner
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo $(1)': '$(_gir_name)'_list '$($(_gir_name)_MSVC_GIR_DEPS)>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	@-echo Generating $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	$$$$(PYTHON) $$$$(G_IR_SCANNER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	--verbose -no-libtool	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
@@ -101,7 +101,6 @@ $(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
 	echo '	'$(_gir_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	'$(_gir_libraries_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	'$(_gir_program_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--add-include-path=./vs$$$$(VSVER)/$$$$(CFG)/$$$$(PLAT)/bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	--add-include-path=$$$$(G_IR_INCLUDEDIR)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	'$(_gir_includes_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	'$(_gir_export_packages_msvc)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
@@ -110,16 +109,15 @@ $(top_builddir)/build/win32/$(1).msvc.introspect: Makefile
 	echo '	--cflags-end	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	'$($(_gir_name)_MSVC_SCANNERFLAGS)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	--filelist='$(_gir_name)'_list	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	-L.\vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect

 # Finally Assemble the Command to Compile the generated .gir
-	echo 'vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\$(_typelib_basename_msvc).typelib: vs$$$$(VSVER)\$$$$(CFG)\$$$$(PLAT)\bin\'$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '$(_typelib_basename_msvc).typelib: '$(_typelib_basename_msvc)'.gir'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	@-echo Compiling $$$$@...'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	$$$$(G_IR_COMPILER)	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	--includedir=$$$$(@D:\=/) --debug --verbose	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
-	echo '	$$$$(@R:\=/).gir	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	--includedir=. --debug --verbose	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
+	echo '	'$(1)'	\'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '	-o $$$$@'>>$(top_builddir)/build/win32/$(1).msvc.introspect
 	echo '' >>$(top_builddir)/build/win32/$(1).msvc.introspect
 endef
--- a/build/win32/Makefile.am
+++ b/build/win32/Makefile.am
@@ -36,13 +36,11 @@ SUBDIRS =	\

 EXTRA_DIST +=	\
 	detectenv-msvc.mak		\
-	gentypefuncs.py			\
-	gtk-introspection-msvc.mak	\
 	introspection-msvc.mak		\
+	gtk-introspection-msvc.mak	\
 	replace.py			\
 	pc_base.py			\
 	gtkpc.py			\
-	README_EGL_MSVC.txt		\
 	$(GENERATED_ITEMS)

 -include $(top_srcdir)/git.mk
--- a/build/win32/README_EGL_MSVC.txt
+++ b/build/win32/README_EGL_MSVC.txt
@@ -1,29 +0,0 @@
-Notes on enabling EGL (ANGLE/D3D support) for Windows/Visual Studio builds
-==========================================================================
-There is now support in the GL context creation code for Windows in GDK for
-creating and using EGL (OpenGL ES 3) contexts, which can be used instead of
-the existing OpenGL (Desktop) support, especially when the graphics drivers
-do not support OpenGL adequately.
-
-This support is not enabled by default in the project files.  In order to do
-so, please do the following:
-
-Obtain or compile a build of recent version of ANGLE.  The one that comes
- with QT 5.10.x is sufficiently recent, but not the one that comes with QT-
- 5.6.x.  Note that Visual Studio 2013 or later is required for building
- ANGLE from QT-5.10.x, but the Visual Studio 2013-built ANGLE DLLs does work
- without problems with GTK+ built with Visual Studio 2008~2013.  You may
- need to obtain D3Dcompiler_[47|43|42].dll if it does not come with the
- system (which is part of the DirectX runtimes).  Its headers and .lib
- needs to be set to be found by the compiler and linker respectively before
- building libepoxy.
-Build libepoxy with EGL support, which has to be enabled explicitly on
- Windows builds.  Pass in -Degl=yes when building libepoxy using Meson.
- Build and install, making sure the headers and .lib can be located by the
- compiler and linker respectively.
-Open the vsX/gtk+.sln, and open the project properties in the "gdk3-win32"
- project.  Under "C/C++", add GDK_WIN32_ENABLE_EGL in the "Preprocessor
- Definitions" to the existing definitions in there for the configuration
- that is being built.  Then build the solution.
-To force the use of the EGL code, set the envvar GDK_GL=(...,)gles , where (...,)
- are the other GDK_GL options desired.
--- a/build/win32/detectenv-msvc.mak
+++ b/build/win32/detectenv-msvc.mak
@@ -40,10 +40,8 @@ VSVER = 10
 VSVER = 11
 !elseif $(VCVERSION) > 1799 && $(VCVERSION) < 1900
 VSVER = 12
-!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 1910
+!elseif $(VCVERSION) > 1899 && $(VCVERSION) < 2000
 VSVER = 14
-!elseif $(VCVERSION) > 1909 && $(VCVERSION) < 2000
-VSVER = 15
 !else
 VSVER = 0
 !endif
--- a/build/win32/gentypefuncs.py
+++ b/build/win32/gentypefuncs.py
@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import sys
-import re
-import os
-
-debug = os.getenv('GTK_GENTYPEFUNCS_DEBUG') is not None
-
-out_file = sys.argv[1]
-in_file = sys.argv[2]
-
-funcs = []
-
-
-if debug: print ('Output file: ', out_file)
-
-# if debug: print (len(in_files), 'input files')
-
-def open_file(filename, mode):
-    if sys.version_info[0] < 3:
-        return open(filename, mode=mode)
-    else:
-        return open(filename, mode=mode, encoding='utf-8')
-
-with open(in_file, 'r') as f:
-  for line in f:
-    line = line.rstrip('\n').rstrip('\r')
-    # print line
-    match = re.search(r'\bg[td]k_[a-zA-Z0-9_]*_get_type\b', line)
-    if match:
-      func = match.group(0)
-      if not func in funcs:
-        funcs.append(func)
-        if debug: print ('Found ', func)
-
-file_output = 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS\n'
-
-funcs = sorted(funcs)
-
-for f in funcs:
-  if f.startswith('gdk_x11') or f.startswith('gtk_socket') or f.startswith('gtk_plug'):
-    file_output += '#ifdef GDK_WINDOWING_X11\n'
-    file_output += '*tp++ = {0}();\n'.format(f)
-    file_output += '#endif\n'
-  else:
-    file_output += '*tp++ = {0}();\n'.format(f)
-
-if debug: print (len(funcs), 'functions')
-
-ofile = open(out_file, "w")
-ofile.write(file_output)
-ofile.close()
--- a/build/win32/gtk-introspection-msvc.mak
+++ b/build/win32/gtk-introspection-msvc.mak
@@ -6,15 +6,8 @@ APIVERSION = 3.0

 CHECK_PACKAGE = gdk-pixbuf-2.0 atk pangocairo gio-2.0

-built_install_girs =	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).gir	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).gir	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).gir
-
-built_install_typelibs =	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gdk-$(APIVERSION).typelib	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\GdkWin32-$(APIVERSION).typelib	\
-	vs$(VSVER)\$(CFG)\$(PLAT)\bin\Gtk-$(APIVERSION).typelib
+built_install_girs = Gdk-$(APIVERSION).gir GdkWin32-$(APIVERSION).gir Gtk-$(APIVERSION).gir
+built_install_typelibs = Gdk-$(APIVERSION).typelib GdkWin32-$(APIVERSION).typelib Gtk-$(APIVERSION).typelib

 !include introspection-msvc.mak

@@ -36,9 +29,9 @@ setgirbuildenv:

 !include introspection.body.mak

-install-introspection: all
-	@-copy vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir "$(G_IR_INCLUDEDIR)"
-	@-copy /b vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib "$(G_IR_TYPELIBDIR)"
+install-introspection: all 
+	@-copy *.gir $(G_IR_INCLUDEDIR)
+	@-copy /b *.typelib $(G_IR_TYPELIBDIR)

 !else
 all:
@@ -46,5 +39,5 @@ all:
 !endif

 clean:
-	@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.typelib
-	@-del /f/q vs$(VSVER)\$(CFG)\$(PLAT)\bin\*.gir
+	@-del /f/q *.typelib
+	@-del /f/q *.gir
--- a/build/win32/gtkpc.py
+++ b/build/win32/gtkpc.py
@@ -31,9 +31,9 @@ def main(argv):
    cairo_min_ver = '1.14.0'
    gdk_pixbuf_min_ver = '2.30.0'
    gdk_win32_sys_libs = '-lgdi32 -limm32 -lshell32 -lole32 -lwinmm -ldwmapi'
-    cairo_libs = '-lcairo-gobject -lcairo '
    glib_min_ver = '2.45.8'

+    cairo_backends = 'cairo-win32'
    gdk_backends = 'win32'
    gio_package = 'gio-2.0 >= ' + glib_min_ver
    broadway_extra_libs = ''
@@ -43,17 +43,20 @@ def main(argv):
        # On Visual Studio, we link to zlib1.lib
        broadway_extra_libs = ' -lzlib1'
        gdk_backends += ' broadway'
+        cairo_backends += ' cairo'

    pkg_replace_items = {'@GTK_API_VERSION@': '3.0',
                         '@GDK_BACKENDS@': gdk_backends}

-    pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver
+    pkg_required_packages = 'gdk-pixbuf-2.0 >= ' + gdk_pixbuf_min_ver + ' ' + \
+                            'cairo >= ' + cairo_min_ver + ' ' + \
+                            'cairo-gobject >= ' + cairo_min_ver

    gdk_pc_replace_items = {'@GDK_PACKAGES@': gio_package + ' ' + \
                                              'pangowin32 pangocairo' + ' ' + \
                                              pkg_required_packages,
-                            '@GDK_PRIVATE_PACKAGES@': gio_package,
-                            '@GDK_EXTRA_LIBS@': cairo_libs + gdk_win32_sys_libs + broadway_extra_libs,
+                            '@GDK_PRIVATE_PACKAGES@': gio_package + ' ' + cairo_backends,
+                            '@GDK_EXTRA_LIBS@': gdk_win32_sys_libs + broadway_extra_libs,
                            '@GDK_EXTRA_CFLAGS@': '',
                            'gdk-3': 'gdk-3.0'}

--- a/build/win32/replace.py
+++ b/build/win32/replace.py
@@ -21,15 +21,9 @@ valid_actions = ['remove-prefix',
                 'replace-str',
                 'remove-str']

-def open_file(filename, mode):
-    if sys.version_info[0] < 3:
-        return open(filename, mode=mode)
-    else:
-        return open(filename, mode=mode, encoding='utf-8')
-
 def replace_multi(src, dest, replace_items):
-    with open_file(src, 'r') as s:
-        with open_file(dest, 'w') as d:
+    with open(src, 'r') as s:
+        with open(dest, 'w') as d:
            for line in s:
                replace_dict = dict((re.escape(key), value) \
                               for key, value in replace_items.items())
--- a/build/win32/vs10/Makefile.am
+++ b/build/win32/vs10/Makefile.am
@@ -62,7 +62,6 @@ EXTRA_DIST += \
 	gailutil-3.vcxproj.filtersin		\
 	gtk3-install.vcxproj			\
 	gtk3-install.vcxproj.filters		\
-	gtk3-introspect.vcxproj			\
 	gtk3-build-defines.props		\
 	gtk3-copy-gdk-broadway.props		\
 	gtk3-gen-srcs.props			\
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@ -24,8 +24,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
 either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonDir in gtk-version-paths.props.
-If you happen to change the PythonDir setting in gtk-version-paths.props after
+can be found in the path specified by PythonPath in gtk-version-paths.props.
+If you happen to change the PythonPath setting in gtk-version-paths.props after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.sdf, *.suo and *.user files before re-attempting the build.

@@ -81,21 +81,6 @@ built DLLs go into <root>\vs10\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.

-There is now a "gtk3-introspect" project that is used to build the
-introspection files.  In order for this to work, check that the paths for
-PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your
-system.  Note that it must be the same Python installation that was used to
-build GObject-Introspection (G-I), and a complete G-I build/installation
-needs to be found in <root>\vs10\<PlatformName>\, with the introspection files
-for ATK, Pango and GDK-Pixbuf.  Note also that this is not built by default,
-so you will need to right-click on the project to build it, which will build
-and "install" the other projects that are normally built, if those were not yet
-built.  The introspection files that are built will be "installed" to
-<root>\vs10\<PlatformName>\share\gir-1.0 (the .gir file(s)) and
-<root>\vs10\<PlatformName>\lib\girepository-1.0 (the .typelib files(s)) upon
-successful build.  for building this in a different configuration, therefore,
-you will need to clean this project specifically and then rebuild.
-
 Please note, as GTK+ uses the Adwaita theme for all platforms by default,
 most icons used are not included with GTK+ (which *are* needed), so please see
 https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the
--- a/build/win32/vs10/gtk+.sln
+++ b/build/win32/vs10/gtk+.sln
@@ -30,8 +30,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk-query-settings", "gtk-q
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-install.vcxproj", "{23BBF35F-78AF-4E8C-983F-7B90448CD7DF}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcxproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -276,14 +274,6 @@ Global
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs10/gtk-3.vcxproj.filtersin
+++ b/build/win32/vs10/gtk-3.vcxproj.filtersin
@@ -21,7 +21,6 @@
    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml"><Filter>Resource Files</Filter></CustomBuild>
    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body"><Filter>Resource Files</Filter></CustomBuild>
    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in"><Filter>Resource Files</Filter></CustomBuild>
-    <CustomBuild Include="..\gentypefuncs.py"><Filter>Resource Files</Filter></CustomBuild>
  </ItemGroup>
  <ItemGroup>
 #include "gtk-3.vs10.sourcefiles.filters"
--- a/build/win32/vs10/gtk-3.vcxprojin
+++ b/build/win32/vs10/gtk-3.vcxprojin
@@ -164,24 +164,46 @@
  </ItemDefinitionGroup>
  <ItemGroup>
    <CustomBuild Include="..\..\..\gtk\gtkdbusinterfaces.xml">
-      <Message>Generating GTK+ DBus Sources...</Message>
-      <Command>$(GenerateGtkDbusBuiltSources)</Command>
-      <Outputs>..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkDbusBuiltSources)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ DBus Sources...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkDbusBuiltSourcesX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtkdbusgenerated.c;..\..\..\gtk\gtkdbusgenerated.h;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\..\..\gtk\gtk-win32.rc.body">
-      <Message>Copying GTK+ Win32 Version Resource...</Message>
-      <Command>$(CopyGtkWin32RC)</Command>
-      <Outputs>..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying GTK+ Win32 Version Resource...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGtkWin32RC)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\gtk-win32.rc;%(Outputs)</Outputs>
    </CustomBuild>
    <CustomBuild Include="..\..\..\gtk\libgtk3.manifest.in">
-      <Message>Generating GTK+ Win32 Manifest...</Message>
-      <Command>$(GenerateGtkWin32Manifest)</Command>
-      <Outputs>..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\gentypefuncs.py">
-      <Message>Generating ..\..\..\gtk\gtktypefuncs.c</Message>
-      <Command>$(GenerateTypeFuncs)</Command>
-      <Outputs>..\..\..\gtk\gtktypefuncs.c</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating GTK+ Win32 Manifest...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenerateGtkWin32Manifest)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\gtk\libgtk3.manifest;%(Outputs)</Outputs>
    </CustomBuild>
  </ItemGroup>
  <ItemGroup>
--- a/build/win32/vs10/gtk3-build-defines.props
+++ b/build/win32/vs10/gtk3-build-defines.props
@@ -10,14 +10,10 @@
    <GdkDefines>GDK_COMPILATION;G_LOG_DOMAIN="Gdk"</GdkDefines>
    <GtkIncludedImmodulesDefines>INCLUDE_IM_am_et;INCLUDE_IM_cedilla;INCLUDE_IM_cyrillic_translit;INCLUDE_IM_ime;INCLUDE_IM_inuktitut;INCLUDE_IM_ipa;INCLUDE_IM_multipress;INCLUDE_IM_thai;INCLUDE_IM_ti_er;INCLUDE_IM_ti_et;INCLUDE_IM_viqr</GtkIncludedImmodulesDefines>
    <GtkDefines>GTK_COMPILATION;G_LOG_DOMAIN="Gtk";GTK_HOST="i686-pc-vs$(VSVer)";GTK_PRINT_BACKENDS="file";GTK_PRINT_BACKEND_ENABLE_UNSUPPORTED;$(GtkIncludedImmodulesDefines);GTK_LIBDIR="$(GtkDummyPrefix)/lib";GTK_DATADIR="$(GtkDummyPrefix)/share";GTK_DATA_PREFIX="$(GtkDummyPrefix)";GTK_SYSCONFDIR="$(GtkDummyPrefix)/etc";MULTIPRESS_CONFDIR="$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)";MULTIPRESS_LOCALEDIR="$(GtkDummyPrefix)/share/locale";GTK_VERSION="$(GtkVersion)/etc";GTK_BINARY_VERSION="$(GtkBinaryVersion)/etc";GDK_DISABLE_DEPRECATED;ISOLATION_AWARE_ENABLED</GtkDefines>
-    <GtkGdkCommonLibs>pangowin32-1.0.lib;fribidi.lib;imm32.lib</GtkGdkCommonLibs>
+    <GtkGdkCommonLibs>imm32.lib</GtkGdkCommonLibs>
    <GdkAdditionalLibs>winmm.lib;dwmapi.lib;setupapi.lib;$(GtkGdkCommonLibs)</GdkAdditionalLibs>
    <GdkBroadwayAdditionalLibs>ws2_32.lib</GdkBroadwayAdditionalLibs>
-    <GtkAdditionalLibs>atk-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
-    <GtkIntrospectNMakeCmd>cd ..
-set VCInstallDir=$(VCInstallDir)
-nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstallRoot)</GtkIntrospectNMakeCmd>
-    <GtkIntrospectBuiltFiles>$(BinDir)\Gtk-3.0.gir;$(BinDir)\Gtk-3.0.typelib</GtkIntrospectBuiltFiles>
+    <GtkAdditionalLibs>atk-1.0.lib;pangowin32-1.0.lib;winspool.lib;comctl32.lib;$(GtkGdkCommonLibs)</GtkAdditionalLibs>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtk3builddefinesprops</_PropertySheetDisplayName>
@@ -26,7 +22,7 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
  </PropertyGroup>
  <ItemDefinitionGroup>
    <ClCompile>
-      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
      <PreprocessorDefinitions>HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
      <ForcedIncludeFiles>msvc_recommended_pragmas.h;%(ForcedIncludeFiles)</ForcedIncludeFiles>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
@@ -35,10 +31,6 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
    <Link>
      <AdditionalDependencies>pangocairo-1.0.lib;cairo.lib;cairo-gobject.lib;pango-1.0.lib;gdk_pixbuf-2.0.lib;gio-2.0.lib;gmodule-2.0.lib;gobject-2.0.lib;glib-2.0.lib;intl.lib;epoxy.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <AdditionalLibraryDirectories>$(GlibEtcInstallRoot)\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='11.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='12.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='14.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
-      <AdditionalOptions Condition="'$(VisualStudioVersion)|$(Platform)'=='15.0|x64'">/HIGHENTROPYVA %(AdditionalOptions)</AdditionalOptions>
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
@@ -72,11 +64,5 @@ nmake -f gtk-introspection-msvc.mak CFG=$(Configuration) PREFIX=$(GlibEtcInstall
    <BuildMacro Include="GtkAdditionalLibs">
      <Value>$(GtkAdditionalLibs)</Value>
    </BuildMacro>
-    <BuildMacro Include="GtkIntrospectNMakeCmd">
-      <Value>$(GtkIntrospectNMakeCmd)</Value>
-    </BuildMacro>
-    <BuildMacro Include="GtkIntrospectBuiltFiles">
-      <Value>$(GtkIntrospectBuiltFiles)</Value>
-    </BuildMacro>
  </ItemGroup>
 </Project>
--- a/build/win32/vs10/gtk3-demo.vcxprojin
+++ b/build/win32/vs10/gtk3-demo.vcxprojin
@@ -90,6 +90,7 @@
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
@@ -113,6 +114,7 @@
      <FunctionLevelLinking>false</FunctionLevelLinking>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX86</TargetMachine>
@@ -136,6 +138,7 @@
      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX64</TargetMachine>
@@ -159,6 +162,7 @@
      <FunctionLevelLinking>false</FunctionLevelLinking>
      <OptimizeReferences>true</OptimizeReferences>
      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>false</RandomizedBaseAddress>
      <DataExecutionPrevention>
      </DataExecutionPrevention>
      <TargetMachine>MachineX64</TargetMachine>
--- a/build/win32/vs10/gtk3-gen-srcs.props
+++ b/build/win32/vs10/gtk3-gen-srcs.props
@@ -39,17 +39,11 @@ echo $(Configuration) &gt; ..\..\..\MSVC_$(Configuration)_Broadway
 :DONE_GDKCONFIG_H
    </GenGdkConfigHBroadway>
    <GDbusCodeGenCmd>$(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml</GDbusCodeGenCmd>
-    <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSources>
+    <GenerateGtkDbusBuiltSources>cd ..\..\..\gtk &amp; $(PythonPath)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSources>
+    <GenerateGtkDbusBuiltSourcesX64>cd ..\..\..\gtk &amp; $(PythonPathX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)</GenerateGtkDbusBuiltSourcesX64>
    <CopyGtkWin32RC>copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc</CopyGtkWin32RC>
-    <GenerateGtkWin32Manifest>$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
+    <GenerateGtkWin32Manifest>$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*</GenerateGtkWin32Manifest>
    <CopyDemosH>copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h</CopyDemosH>
-    <GenerateTypeFuncs>
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c
-echo #include "gtkx.h" &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\"Gtk\" /DGTK_HOST=\"i686-pc-vs$(VSVer)\" /DGTK_PRINT_BACKENDS=\"file\" /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\"$(GtkDummyPrefix)/lib\" /DGTK_DATADIR=\"$(GtkDummyPrefix)/share\" /DGTK_DATA_PREFIX=\"$(GtkDummyPrefix)\" /DGTK_SYSCONFDIR=\"$(GtkDummyPrefix)/etc\" /DMULTIPRESS_CONFDIR=\"$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\" /DMULTIPRESS_LOCALEDIR=\"$(GtkDummyPrefix)/share/locale\" /DGTK_VERSION=\"$(GtkVersion)\" /DGTK_BINARY_VERSION=\"$(GtkBinaryVersion)\" /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c
-$(PythonDir)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
-    </GenerateTypeFuncs>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtk3gensrcsprops</_PropertySheetDisplayName>
@@ -70,6 +64,9 @@ del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
    <BuildMacro Include="GenerateGtkDbusBuiltSources">
      <Value>$(GenerateGtkDbusBuiltSources)</Value>
    </BuildMacro>
+    <BuildMacro Include="GenerateGtkDbusBuiltSourcesX64">
+      <Value>$(GenerateGtkDbusBuiltSourcesX64)</Value>
+    </BuildMacro>
    <BuildMacro Include="CopyGtkWin32RC">
      <Value>$(CopyGtkWin32RC)</Value>
    </BuildMacro>
@@ -79,8 +76,5 @@ del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c
    <BuildMacro Include="CopyDemosH">
      <Value>$(CopyDemosH)</Value>
    </BuildMacro>
-    <BuildMacro Include="GenerateTypeFuncs">
-      <Value>$(GenerateTypeFuncs)</Value>
-    </BuildMacro>
  </ItemGroup>
 </Project>
--- a/build/win32/vs10/gtk3-install.propsin
+++ b/build/win32/vs10/gtk3-install.propsin
@@ -7,9 +7,7 @@
    <BinDir>$(SolutionDir)$(Configuration)\$(Platform)\bin</BinDir>
    <GtkDoInstallBin>
 mkdir $(CopyDir)\bin
-mkdir $(CopyDir)\share\gir-1.0
 mkdir $(CopyDir)\lib\pkgconfig
-mkdir $(CopyDir)\lib\girepository-1.0

 copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll" $(CopyDir)\bin
 copy "$(BinDir)\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb" $(CopyDir)\bin
@@ -37,12 +35,6 @@ copy "$(BinDir)\gtk-query-settings.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk-query-settings.pdb" $(CopyDir)\bin
 copy "$(BinDir)\gtk-builder-tool.exe" $(CopyDir)\bin
 copy "$(BinDir)\gtk-builder-tool.pdb" $(CopyDir)\bin
-if exist $(BinDir)\Gdk-3.0.gir copy "$(BinDir)\Gdk-3.0.gir" $(CopyDir)\share\gir-1.0
-if exist $(BinDir)\GdkWin32-3.0.gir copy "$(BinDir)\GdkWin32-3.0.gir" $(CopyDir)\share\gir-1.0
-if exist $(BinDir)\Gtk-3.0.gir copy "$(BinDir)\Gtk-3.0.gir" $(CopyDir)\share\gir-1.0
-if exist $(BinDir)\Gdk-3.0.typelib copy "$(BinDir)\Gdk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
-if exist $(BinDir)\GdkWin32-3.0.typelib copy "$(BinDir)\GdkWin32-3.0.typelib" $(CopyDir)\lib\girepository-1.0
-if exist $(BinDir)\Gtk-3.0.typelib copy "$(BinDir)\Gtk-3.0.typelib" $(CopyDir)\lib\girepository-1.0
 goto DONE_BIN

 :DO_BROADWAY_BIN
@@ -72,12 +64,6 @@ copy .\Release\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
 copy .\Release\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
-if exist .\Release\$(Platform)\bin\Gdk-3.0.gir copy .\Release\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Release\$(Platform)\bin\GdkWin32-3.0.gir copy .\Release\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Release\$(Platform)\bin\Gtk-3.0.gir copy .\Release\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Release\$(Platform)\bin\Gdk-3.0.typelib copy .\Release\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Release\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Release\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Release\$(Platform)\bin\Gtk-3.0.typelib copy .\Release\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

 goto DONE_BIN

@@ -102,12 +88,6 @@ copy .\Debug\$(Platform)\bin\gtk-query-settings.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-query-settings.pdb $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-builder-tool.exe $(CopyDir)\bin
 copy .\Debug\$(Platform)\bin\gtk-builder-tool.pdb $(CopyDir)\bin
-if exist .\Debug\$(Platform)\bin\Gdk-3.0.gir copy .\Debug\$(Platform)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.gir copy .\Debug\$(Platform)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Debug\$(Platform)\bin\Gtk-3.0.gir copy .\Debug\$(Platform)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0
-if exist .\Debug\$(Platform)\bin\Gdk-3.0.typelib copy .\Debug\$(Platform)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib copy .\Debug\$(Platform)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0
-if exist .\Debug\$(Platform)\bin\Gtk-3.0.typelib copy .\Debug\$(Platform)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0

 :DONE_BIN

@@ -136,10 +116,9 @@ mkdir $(CopyDir)\include\gail-$(ApiVersion)\libgail-util
 for &#37;&#37;s in (16 22 24 32 48 256) do ((mkdir $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps) &amp; (copy /b ..\..\..\demos\gtk-demo\data\&#37;&#37;sx&#37;&#37;s\gtk3-demo.png $(CopyDir)\share\icons\hicolor\&#37;&#37;sx&#37;&#37;s\apps))

 mkdir $(CopyDir)\share\glib-2.0\schemas
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas
    </GtkDoInstall>
    <GtkDoInstallBroadwayHeaders>
@@ -154,8 +133,8 @@ $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\sch
 echo "Generating icon cache......"
 $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor"
    </GtkPostInstall>
-    <GenerateGtkPC>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
-    <GenerateGtkPCX64>$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
+    <GenerateGtkPC>$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)</GenerateGtkPC>
+    <GenerateGtkPCX64>$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)</GenerateGtkPCX64>
    <GtkPCFiles>..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc</GtkPCFiles>
  </PropertyGroup>
  <PropertyGroup>
--- a/build/win32/vs10/gtk3-introspect.vcxproj
+++ b/build/win32/vs10/gtk3-introspect.vcxproj
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="Debug|Win32">
-      <Configuration>Debug</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|Win32">
-      <Configuration>Release</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Debug|x64">
-      <Configuration>Debug</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="Release|x64">
-      <Configuration>Release</Configuration>
-      <Platform>x64</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectGuid>{A8092C4E-0A21-4B1D-AC82-16764E418D1F}</ProjectGuid>
-    <RootNamespace>gtk3introspect</RootNamespace>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>true</UseDebugLibraries>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <UseDebugLibraries>false</UseDebugLibraries>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Makefile</ConfigurationType>
-    <CharacterSet>MultiByte</CharacterSet>
-    <WholeProgramOptimization>true</WholeProgramOptimization>
-    <PlatformToolset>v100</PlatformToolset>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="gtk3-build-defines.props" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <NMakeBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)</NMakeBuildCommandLine>
-    <NMakeReBuildCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all</NMakeReBuildCommandLine>
-    <NMakeCleanCommandLine>$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean</NMakeCleanCommandLine>
-    <NMakeOutput>$(GtkIntrospectBuiltFiles)</NMakeOutput>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="gdk-3.vcxproj">
-      <Project>{5ae8f5ce-9103-4951-aede-ea2f3b573be8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-    <ProjectReference Include="gtk-3.vcxproj">
-      <Project>{95a4b53d-2773-4406-a2c1-8fd2840bbad8}</Project>
-      <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
-</Project>
--- a/build/win32/vs10/gtk3-version-paths.props.in
+++ b/build/win32/vs10/gtk3-version-paths.props.in
@@ -12,17 +12,8 @@
    <GtkSeparateVSDllSuffix>-vs$(VSVer)</GtkSeparateVSDllSuffix>
    <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
    <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|Win32'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|Win32'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|Win32'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|Win32'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|Win32'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|x64'">c:\python34.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|x64'">c:\python34.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|x64'">c:\python34.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|x64'">c:\python36.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|x64'">c:\python36.x64</PythonDir>
-    <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
+    <PythonPath>c:\python34</PythonPath>
+    <PythonPathX64>$(PythonPath).x64</PythonPathX64>
  </PropertyGroup>
  <PropertyGroup>
    <_PropertySheetDisplayName>gtk3versionpathsprops</_PropertySheetDisplayName>
@@ -61,11 +52,11 @@
    <BuildMacro Include="GtkDllSuffix">
      <Value>$(GtkDllSuffix)</Value>
    </BuildMacro>
-    <BuildMacro Include="PythonDir">
-      <Value>$(PythonDir)</Value>
+    <BuildMacro Include="PythonPath">
+      <Value>$(PythonPath)</Value>
    </BuildMacro>
-    <BuildMacro Include="IntrospectPythonParam">
-      <Value>$(IntrospectPythonParam)</Value>
+    <BuildMacro Include="PythonPathX64">
+      <Value>$(PythonPathX64)</Value>
    </BuildMacro>
  </ItemGroup>
 </Project>
--- a/build/win32/vs11/Makefile.am
+++ b/build/win32/vs11/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
 	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\
--- a/build/win32/vs12/Makefile.am
+++ b/build/win32/vs12/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
 	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\
--- a/build/win32/vs14/Makefile.am
+++ b/build/win32/vs14/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
 	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\
--- a/build/win32/vs15/Makefile.am
+++ b/build/win32/vs15/Makefile.am
@@ -29,7 +29,6 @@ EXTRA_DIST +=	\
 	gailutil-3.vcxproj.filters	\
 	gtk3-install.vcxproj	\
 	gtk3-install.vcxproj.filters	\
-	gtk3-introspect.vcxproj		\
 	broadwayd.vcxproj	\
 	broadwayd.vcxproj.filters	\
 	gdk3-broadway.vcxproj	\
--- a/build/win32/vs9/Makefile.am
+++ b/build/win32/vs9/Makefile.am
@@ -36,7 +36,6 @@ EXTRA_DIST += \
 	gtk3-icon-browser.vcprojin	\
 	gailutil-3.vcprojin		\
 	gtk3-install.vcproj		\
-	gtk3-introspect.vcproj		\
 	broadwayd.vcprojin		\
 	gdk3-broadway.vcprojin		\
 	gtk3-build-defines.vsprops	\
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@ -23,8 +23,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system,
 which can be obtained from the official installers available from
 http://www.python.org.  Please note that the Python interpretor (python.exe)
 either needs to be in your PATH before attempting the build of GTK+, or it
-can be found in the path specified by PythonDir in gtk-version-paths.vsprops.
-If you happen to change the PythonDir setting in gtk-version-paths.vsprops after
+can be found in the path specified by PythonPath in gtk-version-paths.vsprops.
+If you happen to change the PythonPath setting in gtk-version-paths.vsprops after
 opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution,
 delete all the *.ncb, *.suo and *.user files before re-attempting the build.

@@ -80,21 +80,6 @@ built DLLs go into <root>\vs9\<PlatformName>\bin, built LIBs into
 project files higher in the stack are supposed to look for them, not
 from a specific GLib source tree.

-There is now a "gtk3-introspect" project that is used to build the
-introspection files.  In order for this to work, check that the paths for
-PythonDir (32-bit builds) and PythonDirX64 (x64 builds) are correct for your
-system.  Note that it must be the same Python installation that was used to
-build GObject-Introspection (G-I), and a complete G-I build/installation
-needs to be found in <root>\vs9\<PlatformName>\, with the introspection files
-for ATK, Pango and GDK-Pixbuf.  Note also that this is not built by default,
-so you will need to right-click on the project to build it, which will build
-and "install" the other projects that are normally built, if those were not yet
-built.  The introspection files that are built will be "installed" to
-<root>\vs9\<PlatformName>\share\gir-1.0 (the .gir file(s)) and
-<root>\vs9\<PlatformName>\lib\girepository-1.0 (the .typelib files(s)) upon
-successful build.  for building this in a different configuration, therefore,
-you will need to clean this project specifically and then rebuild.
-
 Please note, as GTK+ uses the Adwaita theme for all platforms by default,
 most icons used are not included with GTK+ (which *are* needed), so please see
 https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack (under the
--- a/build/win32/vs9/gtk+.sln
+++ b/build/win32/vs9/gtk+.sln
@@ -89,12 +89,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-install", "gtk3-instal
 		{9F22107A-3EF7-4B52-B269-747B65307F36} = {9F22107A-3EF7-4B52-B269-747B65307F36}
 	EndProjectSection
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gtk3-introspect", "gtk3-introspect.vcproj", "{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-	ProjectSection(ProjectDependencies) = postProject
-		{5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8} = {5AE8F5CE-9103-4951-AEDE-EA2F3B573BE8}
-		{95A4B53D-2773-4406-A2C1-8FD2840BBAD8} = {95A4B53D-2773-4406-A2C1-8FD2840BBAD8}
-	EndProjectSection
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Win32 = Debug|Win32
@@ -331,14 +325,6 @@ Global
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|Win32.Build.0 = Release|Win32
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.ActiveCfg = Release|x64
 		{9F22107A-3EF7-4B52-B269-747B65307F36}.Release_Broadway|x64.Build.0 = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release|x64.ActiveCfg = Release|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|Win32.ActiveCfg = Debug|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Debug_Broadway|x64.ActiveCfg = Debug|x64
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|Win32.ActiveCfg = Release|Win32
-		{A8092C4E-0A21-4B1D-AC82-16764E418D1F}.Release_Broadway|x64.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/build/win32/vs9/gtk-3.vcprojin
+++ b/build/win32/vs9/gtk-3.vcprojin
@@ -252,36 +252,6 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File RelativePath="..\gentypefuncs.py">
-				<FileConfiguration Name="Debug|Win32">
-				<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncs)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncs)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncsX64)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool Name="VCCustomBuildTool"
-						Description="Generating ..\..\..\gtk\gtktypefuncs.c..."
-						CommandLine="$(GenerateTypeFuncsX64)"
-						Outputs="..\..\..\gtk\gtktypefuncs.c"
-					/>
-				</FileConfiguration>
-			</File>
 			<File RelativePath="..\..\..\gtk\gtk-win32.rc" />
 			<File RelativePath="..\..\..\gtk\libgtk3.manifest" />
 		</Filter>
--- a/build/win32/vs9/gtk3-build-defines.vsprops
+++ b/build/win32/vs9/gtk3-build-defines.vsprops
@@ -9,7 +9,7 @@
 	>
 	<Tool
 		Name="VCCLCompilerTool"
-		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include\fribidi;$(GlibEtcInstallRoot)\include"
+		AdditionalIncludeDirectories="..\..\..;$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0;$(GlibEtcInstallRoot)\include\pango-1.0;$(GlibEtcInstallRoot)\include\atk-1.0;$(GlibEtcInstallRoot)\include\cairo;$(GlibEtcInstallRoot)\include\gio-win32-2.0;$(GlibEtcInstallRoot)\include\glib-2.0;$(GlibEtcInstallRoot)\lib\glib-2.0\include;$(GlibEtcInstallRoot)\include"
 		PreprocessorDefinitions="HAVE_CONFIG_H;G_DISABLE_SINGLE_INCLUDES;ATK_DISABLE_SINGLE_INCLUDES;GDK_PIXBUF_DISABLE_SINGLE_INCLUDES;GTK_DISABLE_SINGLE_INCLUDES;_USE_MATH_DEFINES"
 		ForcedIncludeFiles="msvc_recommended_pragmas.h"
 		AdditionalOptions="/MP"
@@ -45,7 +45,7 @@
 	/>
 	<UserMacro
 		Name="GtkGdkCommonLibs"
-		Value="pangowin32-1.0.lib fribidi.lib imm32.lib"
+		Value="imm32.lib"
 	/>
 	<UserMacro
 		Name="GdkBroadwayAdditionalLibs"
@@ -57,14 +57,6 @@
 	/>
 	<UserMacro
 		Name="GtkAdditionalLibs"
-		Value="atk-1.0.lib winspool.lib comctl32.lib $(GtkGdkCommonLibs)"
-	/>
-	<UserMacro
-		Name="GtkIntrospectNMakeCmd"
-		Value="cd ..&#x0D;&#x0A;set VCInstallDir=$(VCInstallDir)&#x0D;&#x0A;nmake -f gtk-introspection-msvc.mak CFG=$(ConfigurationName) PREFIX=$(GlibEtcInstallRoot)"
-	/>
-	<UserMacro
-		Name="GtkIntrospectBuiltFiles"
-		Value="$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir;$(SolutionDir)\$(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib"
+		Value="atk-1.0.lib pangowin32-1.0.lib winspool.lib comctl32.lib $(GtkGdkCommonLibs)"
 	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk3-demo.vcprojin
+++ b/build/win32/vs9/gtk3-demo.vcprojin
@@ -47,6 +47,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
@@ -79,6 +80,7 @@
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
 				SubSystem="1"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
@@ -111,6 +113,7 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="1"
 			/>
@@ -143,6 +146,7 @@
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
 				DataExecutionPrevention="0"
 				TargetMachine="17"
 			/>
--- a/build/win32/vs9/gtk3-gen-srcs.vsprops
+++ b/build/win32/vs9/gtk3-gen-srcs.vsprops
@@ -60,11 +60,11 @@ echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;
 	/>
 	<UserMacro
 		Name="GenerateGtkDbusBuiltSources"
-		Value="cd ..\..\..\gtk &amp; $(PythonDir)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
+		Value="cd ..\..\..\gtk &amp; $(PythonPath)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
 	/>
 	<UserMacro
 		Name="GenerateGtkDbusBuiltSourcesX64"
-		Value="cd ..\..\..\gtk &amp; $(PythonDirX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
+		Value="cd ..\..\..\gtk &amp; $(PythonPathX64)\python $(GDbusCodeGenCmd) &amp; cd $(SolutionDir)"
 	/>
 	<UserMacro
 		Name="CopyGtkWin32RC"
@@ -72,30 +72,10 @@ echo $(ConfigurationName) &gt; ..\..\..\MSVC_$(ConfigurationName)_Broadway&#x0D;
 	/>
 	<UserMacro
 		Name="GenerateGtkWin32Manifest"
-		Value="$(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
+		Value="$(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=*"
 	/>
 	<UserMacro
 		Name="CopyDemosH"
 		Value="copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h"
 	/>
-	<UserMacro
-		Name="GenerateTypeFuncs"
-		Value="
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-echo #include &quot;gtkx.h&quot; &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\&quot;Gtk\&quot; /DGTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot; /DGTK_PRINT_BACKENDS=\&quot;file\&quot; /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot; /DGTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot; /DGTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot; /DGTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot; /DMULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot; /DMULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot; /DGTK_VERSION=\&quot;$(GtkVersion)\&quot; /DGTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot; /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-$(PythonDir)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-		      "
-	/>
-	<UserMacro
-		Name="GenerateTypeFuncsX64"
-		Value="
-echo #undef GTK_COMPILATION &gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-echo #include &quot;gtkx.h&quot; &gt;&gt; ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-cl /EP /I..\..\..\gtk /I..\..\..\gdk /I..\..\..\gdk\win32 /I..\..\.. /I$(GlibEtcInstallRoot)\include\gdk-pixbuf-2.0 /I$(GlibEtcInstallRoot)\include\pango-1.0 /I$(GlibEtcInstallRoot)\include\atk-1.0 /I$(GlibEtcInstallRoot)\include\cairo /I$(GlibEtcInstallRoot)\include\gio-win32-2.0 /I$(GlibEtcInstallRoot)\include\glib-2.0 /I$(GlibEtcInstallRoot)\lib\glib-2.0\include /I$(GlibEtcInstallRoot)\include /DHAVE_CONFIG_H /DG_DISABLE_SINGLE_INCLUDES /DATK_DISABLE_SINGLE_INCLUDES /DGDK_PIXBUF_DISABLE_SINGLE_INCLUDES /DGTK_DISABLE_SINGLE_INCLUDES /D_USE_MATH_DEFINES /DINCLUDE_IM_am_et /DINCLUDE_IM_cedilla /DINCLUDE_IM_cyrillic_translit /DINCLUDE_IM_ime /DINCLUDE_IM_inuktitut /DINCLUDE_IM_ipa /DINCLUDE_IM_multipress /DINCLUDE_IM_thai /DINCLUDE_IM_ti_er /DINCLUDE_IM_ti_et /DINCLUDE_IM_viqr /DGTK_COMPILATION /DG_LOG_DOMAIN=\&quot;Gtk\&quot; /DGTK_HOST=\&quot;i686-pc-vs$(VSVer)\&quot; /DGTK_PRINT_BACKENDS=\&quot;file\&quot; /DGTK_PRINT_BACKEND_ENABLE_UNSUPPORTED /D$(GtkIncludedImmodulesDefines) /DGTK_LIBDIR=\&quot;$(GtkDummyPrefix)/lib\&quot; /DGTK_DATADIR=\&quot;$(GtkDummyPrefix)/share\&quot; /DGTK_DATA_PREFIX=\&quot;$(GtkDummyPrefix)\&quot; /DGTK_SYSCONFDIR=\&quot;$(GtkDummyPrefix)/etc\&quot; /DMULTIPRESS_CONFDIR=\&quot;$(GtkDummyPrefix)/etc/gtk-$(ApiVersion)\&quot; /DMULTIPRESS_LOCALEDIR=\&quot;$(GtkDummyPrefix)/share/locale\&quot; /DGTK_VERSION=\&quot;$(GtkVersion)\&quot; /DGTK_BINARY_VERSION=\&quot;$(GtkBinaryVersion)\&quot; /DGDK_DISABLE_DEPRECATED /DISOLATION_AWARE_ENABLED ..\..\..\gtk\gtktypefuncs.preproc.c &gt; ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-$(PythonDirX64)\python ..\gentypefuncs.py ..\..\..\gtk\gtktypefuncs.c ..\..\..\gtk\gtktypefuncs.combined.c&#x0D;&#x0A;
-del ..\..\..\gtk\gtktypefuncs.combined.c ..\..\..\gtk\gtktypefuncs.preproc.c&#x0D;&#x0A;
-		      "
-	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk3-install.vspropsin
+++ b/build/win32/vs9/gtk3-install.vspropsin
@@ -9,9 +9,7 @@
 		Name="GtkDoInstallBin"
 		Value="
 mkdir $(CopyDir)\bin&#x0D;&#x0A;
-mkdir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
 mkdir $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
-mkdir $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;

 copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).dll $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\$(GtkDllPrefix)gdk-3$(GtkDllSuffix).pdb $(CopyDir)\bin&#x0D;&#x0A;
@@ -39,12 +37,6 @@ copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy $(ConfigurationName)\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib copy $(ConfigurationName)\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 goto DONE_BIN&#x0D;&#x0A;

 :DO_BROADWAY_BIN&#x0D;&#x0A;
@@ -74,12 +66,6 @@ copy .\Release\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#
 copy .\Release\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Release\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Release\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gdk-3.0.gir copy .\Release\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gtk-3.0.gir copy .\Release\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Release\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Release\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Release\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 goto DONE_BIN&#x0D;&#x0A;

 :DO_BROADWAY_DEBUG&#x0D;&#x0A;
@@ -103,12 +89,6 @@ copy .\Debug\$(PlatformName)\bin\gtk-query-settings.exe $(CopyDir)\bin&#x0D;&#x0
 copy .\Debug\$(PlatformName)\bin\gtk-query-settings.pdb $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.exe $(CopyDir)\bin&#x0D;&#x0A;
 copy .\Debug\$(PlatformName)\bin\gtk-builder-tool.pdb $(CopyDir)\bin&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gdk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.gir copy .\Debug\$(PlatformName)\bin\Gtk-3.0.gir $(CopyDir)\share\gir-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gdk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib copy .\Debug\$(PlatformName)\bin\GdkWin32-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
-if exist .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib copy .\Debug\$(PlatformName)\bin\Gtk-3.0.typelib $(CopyDir)\lib\girepository-1.0&#x0D;&#x0A;
 :DONE_BIN&#x0D;&#x0A;

 copy ..\gdk-3.0.pc $(CopyDir)\lib\pkgconfig&#x0D;&#x0A;
@@ -150,10 +130,9 @@ mkdir $(CopyDir)\share\icons\hicolor\256x256\apps&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\data\256x256\gtk3-demo.png $(CopyDir)\share\icons\hicolor\256x256\apps\&#x0D;&#x0A;

 mkdir $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
+copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.ColorChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\gtk\org.gtk.Settings.Debug.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.EmojiChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
-copy ..\..\..\gtk\org.gtk.Settings.FileChooser.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 copy ..\..\..\demos\gtk-demo\org.gtk.Demo.gschema.xml $(CopyDir)\share\glib-2.0\schemas&#x0D;&#x0A;
 		      "
 	/>
@@ -177,10 +156,10 @@ mkdir $(CopyDir)\include\gtk-$(ApiVersion)\gdk\broadway&#x0D;&#x0A;
 	/>
 	<UserMacro
 		Name="GenerateGtkPC"
-		Value="$(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
+		Value="$(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer)"
 	/>
 	<UserMacro
 		Name="GenerateGtkPCX64"
-		Value="$(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
+		Value="$(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer)"
 	/>
 </VisualStudioPropertySheet>
--- a/build/win32/vs9/gtk3-introspect.vcproj
+++ b/build/win32/vs9/gtk3-introspect.vcproj
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
-	Name="gtk3-introspect"
-	ProjectGUID="{A8092C4E-0A21-4B1D-AC82-16764E418D1F}"
-	Keyword="MakeFileProj"
-	TargetFrameworkVersion="196613"
-	>
-	<Platforms>
-		<Platform
-			Name="Win32"
-		/>
-		<Platform
-			Name="x64"
-		/>
-	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
-	<Configurations>
-		<Configuration
-			Name="Debug|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Debug|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|Win32"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			CharacterSet="2"
-			DeleteExtensionsOnClean=""
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParam) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-		<Configuration
-			Name="Release|x64"
-			ConfigurationType="0"
-			InheritedPropertySheets=".\gtk3-build-defines.vsprops"
-			>
-			<Tool
-				Name="VCNMakeTool"
-				BuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64)"
-				ReBuildCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean all"
-				CleanCommandLine="$(GtkIntrospectNMakeCmd) $(IntrospectPythonParamX64) clean"
-				Output="$(GtkIntrospectBuiltFiles)"
-			/>
-		</Configuration>
-	</Configurations>
-</VisualStudioProject>
--- a/build/win32/vs9/gtk3-version-paths.vsprops.in
+++ b/build/win32/vs9/gtk3-version-paths.vsprops.in
@@ -51,19 +51,11 @@
 		Value="$(GtkSeparateVSDllSuffix)"
 	/>
 	<UserMacro
-		Name="PythonDir"
+		Name="PythonPath"
 		Value="c:\python27"
 	/>
 	<UserMacro
-		Name="PythonDirX64"
-		Value="$(PythonDir).x64"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParam"
-		Value="PYTHON=$(PythonDir)\python.exe"
-	/>
-	<UserMacro
-		Name="IntrospectPythonParamX64"
-		Value="PYTHON=$(PythonDirX64)\python.exe"
+		Name="PythonPathX64"
+		Value="$(PythonPath).x64"
 	/>
 </VisualStudioPropertySheet>
--- a/config.h.meson
+++ b/config.h.meson
@@ -1,292 +0,0 @@
-/* config.h.  Generated from config.h.in by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if translation of program messages to the user's native
-   language is requested. */
-#mesondefine ENABLE_NLS
-
-/* The prefix for our gettext translation domains. */
-#mesondefine GETTEXT_PACKAGE
-
-/* Disable deprecation warnings from glib */
-#mesondefine GLIB_DISABLE_DEPRECATION_WARNINGS
-
-/* Define to 1 if you have the `bind_textdomain_codeset' function. */
-#mesondefine HAVE_BIND_TEXTDOMAIN_CODESET
-
-/* Define if libcloudproviders is available */
-#mesondefine HAVE_CLOUDPROVIDERS
-
-/* define if we have colord */
-#mesondefine HAVE_COLORD
-
-/* Define to 1 if you have the <crt_externs.h> header file. */
-#mesondefine HAVE_CRT_EXTERNS_H
-
-/* Define if the GNU dcgettext() function is already present or preinstalled.
-   */
-#mesondefine HAVE_DCGETTEXT
-
-/* Define to 1 if you have the declaration of `isinf', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISINF
-
-/* Define to 1 if you have the declaration of `isnan', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISNAN
-
-/* Define to 1 if you have the <dev/evdev/input.h> header file. */
-#mesondefine HAVE_DEV_EVDEV_INPUT_H
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#mesondefine HAVE_DLFCN_H
-
-/* Define to 1 if you have the `exp2' function. */
-#mesondefine HAVE_EXP2
-
-/* Define to 1 if you have the `flockfile' function. */
-#mesondefine HAVE_FLOCKFILE
-
-/* Define to 1 if you have the <ftw.h> header file. */
-#mesondefine HAVE_FTW_H
-
-/* Define to 1 if you have the `getpagesize' function. */
-#mesondefine HAVE_GETPAGESIZE
-
-/* Define to 1 if you have the `getresuid' function. */
-#mesondefine HAVE_GETRESUID
-
-/* Define if gio-unix is available */
-#mesondefine HAVE_GIO_UNIX
-
-/* defines whether we have HarfBuzz */
-#mesondefine HAVE_HARFBUZZ
-
-/* Define to 1 if you have the `httpGetAuthString' function. */
-#mesondefine HAVE_HTTPGETAUTHSTRING
-
-/* Define if cups http_t authstring field is accessible */
-#mesondefine HAVE_HTTP_AUTHSTRING
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#mesondefine HAVE_INTTYPES_H
-
-/* Define to 1 if the system has the type `IPrintDialogCallback'. */
-#mesondefine HAVE_IPRINTDIALOGCALLBACK
-
-/* Define to 1 if you have the <linux/input.h> header file. */
-#mesondefine HAVE_LINUX_INPUT_H
-
-/* Define to 1 if you have the <linux/memfd.h> header file. */
-#mesondefine HAVE_LINUX_MEMFD_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#mesondefine HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the `log2' function. */
-#mesondefine HAVE_LOG2
-
-/* Define to 1 if you have the `lstat' function. */
-#mesondefine HAVE_LSTAT
-
-/* Define to 1 if you have the `mallinfo' function. */
-#mesondefine HAVE_MALLINFO
-
-/* Define to 1 if you have the <memory.h> header file. */
-#mesondefine HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkstemp' function. */
-#mesondefine HAVE_MKSTEMP
-
-/* Define to 1 if you have a working `mmap' system call. */
-#mesondefine HAVE_MMAP
-
-/* Define to 1 if you have the `nearbyint' function. */
-#mesondefine HAVE_NEARBYINT
-
-/* defines whether we have pangoft2 */
-#mesondefine HAVE_PANGOFT
-
-/* Define to 1 if libpapi available */
-#mesondefine HAVE_PAPI
-
-/* Define to 1 if you have the `posix_fallocate' function. */
-#mesondefine HAVE_POSIX_FALLOCATE
-
-/* Have the Xrandr extension library */
-#mesondefine HAVE_RANDR
-
-/* Have the Xrandr 1.5 extension library */
-#mesondefine HAVE_RANDR15
-
-/* Define to 1 if you have the `rint' function. */
-#mesondefine HAVE_RINT
-
-/* Define to 1 if you have the `round' function. */
-#mesondefine HAVE_ROUND
-
-/* Define to 1 if you have the `sincos' function. */
-#mesondefine HAVE_SINCOS
-
-/* Define to 1 if solaris xinerama is available */
-#mesondefine HAVE_SOLARIS_XINERAMA
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#mesondefine HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#mesondefine HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#mesondefine HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#mesondefine HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/mman.h> header file. */
-#mesondefine HAVE_SYS_MMAN_H
-
-/* Define to 1 if you have the <sys/param.h> header file. */
-#mesondefine HAVE_SYS_PARAM_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#mesondefine HAVE_SYS_STAT_H
-
-/* Define to 1 if sys/sysinfo.h is available */
-#mesondefine HAVE_SYS_SYSINFO_H
-
-/* Define to 1 if sys/systeminfo.h is available */
-#mesondefine HAVE_SYS_SYSTEMINFO_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#mesondefine HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#mesondefine HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the `trunc' function. */
-#mesondefine HAVE_TRUNC
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#mesondefine HAVE_UNISTD_H
-
-/* Have the XCOMPOSITE X extension */
-#mesondefine HAVE_XCOMPOSITE
-
-/* Have the Xcursor library */
-#mesondefine HAVE_XCURSOR
-
-/* Have the XDAMAGE X extension */
-#mesondefine HAVE_XDAMAGE
-
-/* Have the XFIXES X extension */
-#mesondefine HAVE_XFIXES
-
-/* Define to 1 if XFree Xinerama is available */
-#mesondefine HAVE_XFREE_XINERAMA
-
-/* Have XGenericEvent */
-#mesondefine HAVE_XGENERICEVENTS
-
-/* Define to 1 if xinerama is available */
-#mesondefine HAVE_XINERAMA
-
-/* Define to use XKB extension */
-#mesondefine HAVE_XKB
-
-/* Have the SYNC extension library */
-#mesondefine HAVE_XSYNC
-
-/* Define to 1 if you have the `_lock_file' function. */
-#mesondefine HAVE__LOCK_FILE
-
-/* Define if _NL_MEASUREMENT_MEASUREMENT is available */
-#mesondefine HAVE__NL_MEASUREMENT_MEASUREMENT
-
-/* Define if _NL_PAPER_HEIGHT is available */
-#mesondefine HAVE__NL_PAPER_HEIGHT
-
-/* Define if _NL_PAPER_WIDTH is available */
-#mesondefine HAVE__NL_PAPER_WIDTH
-
-/* Define if _NL_TIME_FIRST_WEEKDAY is available */
-#mesondefine HAVE__NL_TIME_FIRST_WEEKDAY
-
-/* Define to 1 if you have the `_NSGetEnviron' function. */
-#mesondefine HAVE__NSGETENVIRON
-
-/* Define if <X11/extensions/XIproto.h> needed for xReply */
-#mesondefine NEED_XIPROTO_H_FOR_XREPLY
-
-/* Define to the address where bug reports for this package should be sent. */
-#mesondefine PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#mesondefine PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#mesondefine PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#mesondefine PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#mesondefine PACKAGE_URL
-
-/* Define to the version of this package. */
-#mesondefine PACKAGE_VERSION
-
-/* Use NSBundle functions to determine load paths for libraries, translations,
-   etc. */
-#mesondefine QUARTZ_RELOCATION
-
-/* The size of `DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY', as computed by sizeof.
-   */
-#mesondefine SIZEOF_DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY
-
-/* Define to 1 if XInput 2.0 is available */
-#mesondefine XINPUT_2
-
-/* Define to 1 if XInput 2.2 is available */
-#mesondefine XINPUT_2_2
-
-/* Enable large inode numbers on Mac OS X 10.5.  */
-#ifndef _DARWIN_USE_64_BIT_INODE
-# define _DARWIN_USE_64_BIT_INODE 1
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#mesondefine _FILE_OFFSET_BITS
-
-/* defines how to decorate public symbols while building */
-#mesondefine _GDK_EXTERN
-
-/* Define for large files, on AIX-style hosts. */
-#mesondefine _LARGE_FILES
-
-/* Define to 1 if on MINIX. */
-#mesondefine _MINIX
-
-/* Define to 2 if the system does not provide POSIX.1 features except with
-   this defined. */
-#mesondefine _POSIX_1_SOURCE
-
-/* Define to 1 if you need to in order for `stat' and other things to work. */
-#mesondefine _POSIX_SOURCE
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#mesondefine gid_t
-
-/* Define to `int' if <sys/types.h> doesn't define. */
-#mesondefine uid_t
-
-#mesondefine GTK_DATADIR
-
-#mesondefine GTK_LIBDIR
-
-#mesondefine GTK_PRINT_BACKENDS
-
-/* Define the location where the catalogs will be installed */
-#mesondefine GTK_LOCALEDIR
-
-#mesondefine ISO_CODES_PREFIX
--- a/config.h.win32.in
+++ b/config.h.win32.in
@@ -29,6 +29,9 @@
 /* Define to 1 if you have the <crt_externs.h> header file. */
 /* #undef HAVE_CRT_EXTERNS_H */

+/* Define to 1 if CUPS 1.2 API is available */
+/* #undef HAVE_CUPS_API_1_2 */
+
 /* Define to 1 if you have the `dcgettext' function. */
 #define HAVE_DCGETTEXT 1

@@ -74,6 +77,9 @@
 /* Define if gio-unix is available */
 /* #undef HAVE_GIO_UNIX */

+/* Have GNU ftw */
+/* #undef HAVE_GNU_FTW */
+
 /* Define to 1 if you have the `httpGetAuthString' function. */
 /* #undef HAVE_HTTPGETAUTHSTRING */

@@ -151,6 +157,9 @@
 /* Define to 1 if sincos() is available */
 /* #undef HAVE_SINCOS */

+/* Have the sockaddr_un.sun_len member */
+/* #undef HAVE_SOCKADDR_UN_SUN_LEN */
+
 /* Define to 1 if solaris xinerama is available */
 /* #undef HAVE_SOLARIS_XINERAMA */

@@ -200,11 +209,6 @@
 /* Define to 1 if you have the <sys/types.h> header file. */
 #define HAVE_SYS_TYPES_H 1

-/* Define to 1 if trunc() is available */
-#if !defined (_MSC_VER) || (_MSC_VER >= 1800)
-# define HAVE_TRUNC 1
-#endif
-
 /* Define to 1 if you have the <unistd.h> header file. */
 #ifndef _MSC_VER
 #define HAVE_UNISTD_H 1
--- a/configure.ac
+++ b/configure.ac
@@ -9,9 +9,9 @@
 # set GTK_BINARY_AGE and GTK_INTERFACE_AGE to 0.

 m4_define([gtk_major_version], [3])
-m4_define([gtk_minor_version], [24])
-m4_define([gtk_micro_version], [8])
-m4_define([gtk_interface_age], [4])
+m4_define([gtk_minor_version], [22])
+m4_define([gtk_micro_version], [9])
+m4_define([gtk_interface_age], [9])
 m4_define([gtk_binary_age],
          [m4_eval(100 * gtk_minor_version + gtk_micro_version)])
 m4_define([gtk_version],
@@ -42,7 +42,7 @@ m4_define([gtk_binary_version], [3.0.0])

 # required versions of other packages
 m4_define([glib_required_major], [2])
-m4_define([glib_required_minor], [53])
+m4_define([glib_required_minor], [49])
 m4_define([glib_required_micro], [4])
 m4_define([glib_required_version],
          [glib_required_major.glib_required_minor.glib_required_micro])
@@ -54,18 +54,16 @@ m4_define([glib_min_required_version], m4_join([_], [GLIB_VERSION], glib_require
 m4_define([glib_max_allowed_version], m4_join([_], [GLIB_VERSION], glib_required_major, glib_max_allowed_minor))
 GLIB_VERSION_CFLAGS="-DGLIB_MIN_REQUIRED_VERSION=glib_min_required_version -DGLIB_MAX_ALLOWED_VERSION=glib_max_allowed_version"

-m4_define([pango_required_version], [1.41.0])
-m4_define([fribidi_required_version], [0.19.7])
+m4_define([pango_required_version], [1.37.3])
 m4_define([atk_required_version], [2.15.1])
 m4_define([cairo_required_version], [1.14.0])
 m4_define([gdk_pixbuf_required_version], [2.30.0])
 m4_define([introspection_required_version], [1.39.0])
 m4_define([wayland_required_version], [1.9.91])
-m4_define([wayland_protocols_required_version], [1.12])
+m4_define([wayland_protocols_required_version], [1.7])
 m4_define([mirclient_required_version], [0.22.0])
 m4_define([mircookie_required_version], [0.17.0])
-m4_define([epoxy_required_version], [1.4])
-m4_define([cloudproviders_required_version], [0.2.5])
+m4_define([epoxy_required_version], [1.0])
 GLIB_REQUIRED_VERSION=glib_required_version
 PANGO_REQUIRED_VERSION=pango_required_version
 ATK_REQUIRED_VERSION=atk_required_version
@@ -83,7 +81,7 @@ AC_SUBST(INTROSPECTION_REQUIRED_VERSION)
 # Save this value here, since automake will set cflags later
 cflags_set=${CFLAGS+set}

-AM_INIT_AUTOMAKE([1.11 -Wall subdir-objects no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([1.11 -Wall no-define -Wno-portability tar-ustar no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE([enable])

 # Support silent build rules. Disable
@@ -348,11 +346,6 @@ AC_ARG_ENABLE(mir-backend,
                              [enable the Mir gdk backend])],
 			      [backend_set=yes])

-AC_ARG_ENABLE(cloudproviders,
-              [AS_HELP_STRING([--enable-cloudproviders],
-                              [enable libcloudproviders integration])],
-                              [cloudproviders_set=yes])
-
 if test -z "$backend_set"; then
  if test "$platform_win32" = yes; then
    enable_win32_backend=yes
@@ -410,7 +403,7 @@ if test "x$enable_quartz_backend" = xyes; then
  backend_immodules="$backend_immodules,quartz"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_QUARTZ"
-  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -Wl,-framework,Cocoa"
+  GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -framework Cocoa"
  DISABLE_ON_QUARTZ='%'
  AM_CONDITIONAL(USE_QUARTZ, true)
  if test "x$quartz_relocation" = xyes; then
@@ -460,11 +453,10 @@ if test "$enable_wayland_backend" = "yes"; then
  GDK_BACKENDS="$GDK_BACKENDS wayland"
  GDK_WINDOWING="$GDK_WINDOWING
 #define GDK_WINDOWING_WAYLAND"
-  backend_immodules="$backend_immodules,wayland"
  WAYLAND_PACKAGES="$WAYLAND_DEPENDENCIES"
  AC_PATH_PROG([WAYLAND_SCANNER],[wayland-scanner],[no])
  AS_IF([test "x$WAYLAND_SCANNER" = "xno"],
-    [AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols])])
+    AC_MSG_ERROR([Could not find wayland-scanner in your PATH, required for parsing wayland extension protocols]))
  AC_SUBST([WAYLAND_SCANNER])

  AM_CONDITIONAL(USE_WAYLAND, true)
@@ -586,7 +578,6 @@ PKG_CHECK_MODULES(BASE_DEPENDENCIES,
  [glib-2.0 >= glib_required_version dnl
   atk >= atk_required_version dnl
   pango >= pango_required_version dnl
-   fribidi >= fribidi_required_version dnl
   cairo >= cairo_required_version dnl
   cairo-gobject >= cairo_required_version dnl
   gdk-pixbuf-2.0 >= gdk_pixbuf_required_version])
@@ -751,6 +742,32 @@ AS_CASE([$host_os],
      [AC_MSG_ERROR([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is unavailable])],
      [AC_MSG_RESULT([DISPLAYCONFIG_VIDEO_OUTPUT_TECHNOLOGY is not OK])]
    )
+    AC_MSG_CHECKING([for SetupDiGetDevicePropertyW])
+    gtk_save_LIBS="$LIBS"
+    LIBS="-lsetupapi $LIBS"
+    AC_TRY_LINK(
+      [
+#define _WIN32_WINNT 0x0600
+#include <windows.h>
+#include <devpropdef.h>
+#include <setupapi.h>
+      ],
+      [return SetupDiGetDevicePropertyW(NULL, NULL, NULL, NULL, NULL, 0, NULL, 0);],
+      [have_SetupDiGetDevicePropertyW=yes],
+      [have_SetupDiGetDevicePropertyW=no]
+    )
+    AS_IF(
+      [test x$have_SetupDiGetDevicePropertyW = xyes],
+      [
+       AC_DEFINE(
+         [HAVE_SETUP_DI_GET_DEVICE_PROPERTY_W],
+         [1],
+         [Define to 1 if SetupDiGetDevicePropertyW() is available]
+       )
+      ]
+    )
+    AC_MSG_RESULT([$have_SetupDiGetDevicePropertyW])
+    LIBS="$gtk_save_LIBS"
  ],
  []
 )
@@ -795,13 +812,7 @@ LIBS=$gtk_save_LIBS

 AC_CHECK_HEADERS(linux/memfd.h,
                 AC_DEFINE(HAVE_LINUX_MEMFD_H, 1,
-                           [Define to 1 if linux/memfd.h is available]))
-AC_CHECK_HEADERS(linux/input.h,
-                 AC_DEFINE(HAVE_LINUX_INPUT_H, 1,
-                           [Define to 1 if linux/input.h is available]))
-AC_CHECK_HEADERS(dev/evdev/input.h,
-                 AC_DEFINE(HAVE_DEV_EVDEV_INPUT_H, 1,
-                           [Define to 1 if dev/evdev/input.h is available]))
+                           [Define to 1 if memfd.h is available]))
 AC_CHECK_HEADERS(sys/mman.h,
                 AC_DEFINE(HAVE_SYS_MMAN_H, 1,
                           [Define to 1 if mman.h is available]))
@@ -815,6 +826,19 @@ AC_CHECK_HEADERS(ftw.h,
                 AC_DEFINE(HAVE_FTW_H, 1,
                           [Define to 1 if ftw.h is available]))

+AC_MSG_CHECKING([for GNU ftw extensions])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#define _XOPEN_SOURCE 500
+                                     #define _GNU_SOURCE
+                                     #include <ftw.h>]],
+                                   [[int flags = FTW_ACTIONRETVAL;]])],
+                  [gtk_ok=yes],[gtk_ok=no])
+if test $gtk_ok = yes; then
+    AC_MSG_RESULT([yes])
+    AC_DEFINE(HAVE_GNU_FTW, 1, [Have GNU ftw])
+else
+    AC_MSG_RESULT([no])
+fi
+
 #
 # Disable deprecation checks for all libraries we depend on on stable branches.
 # This is so newer versions of those libraries don't cause more warnings with
@@ -839,10 +863,9 @@ AC_CHECK_FUNCS(mallinfo)
 AC_CHECK_FUNCS(getresuid)
 AC_TYPE_UID_T

-# Check for round(), rint(), isnan() and isinf()
-# Check for log2(), exp2(), nearbyint() and trunc()
+# Check for round(), rint(), isnan(), isinf() and nearbyint()
 AC_CHECK_LIB(m,round,,)
-AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2 trunc)
+AC_CHECK_FUNCS(round rint nearbyint sincos exp2 log2)
 AC_CHECK_DECLS([isnan, isinf], [], [], [[#include <math.h>]])

 # Checks for gdkspawn
@@ -961,7 +984,6 @@ AM_CONDITIONAL(INCLUDE_IM_TI_ER, [test x"$INCLUDE_ti_er" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_TI_ET, [test x"$INCLUDE_ti_et" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_VIQR, [test x"$INCLUDE_viqr" = xyes])
 AM_CONDITIONAL(INCLUDE_IM_XIM, [test x"$INCLUDE_xim" = xyes])
-AM_CONDITIONAL(INCLUDE_IM_WAYLAND, [test x"$INCLUDE_wayland" = xyes])

 # Checks to see whether we should include mediaLib
 # support.
@@ -1319,26 +1341,11 @@ else
        LIBS="$gtk_save_LIBS"
 fi

-# Check for libcloudproviders
-
-CLOUDPROVIDER_PACKAGES=""
-if test "x$cloudproviders_set" = "xyes"; then
-  CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
-  if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
-    AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
-              [Define if libcloudproviders is available]
-              )
-  else
-    AC_MSG_ERROR([
-*** libcloudproviders not found.])
-  fi
-fi
-
 CFLAGS="$saved_cflags"
 LDFLAGS="$saved_ldflags"

 GDK_PACKAGES="$PANGO_PACKAGES gdk-pixbuf-2.0 >= gdk_pixbuf_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version"
-GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version $CLOUDPROVIDER_PACKAGES fribidi >= fribidi_required_version"
+GDK_PRIVATE_PACKAGES="$GDK_GIO_PACKAGE $X_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES $cairo_backends epoxy >= epoxy_required_version"

 PKG_CHECK_MODULES(GDK_DEP, $GDK_PACKAGES $GDK_PRIVATE_PACKAGES)
 GDK_DEP_LIBS="$GDK_EXTRA_LIBS $GDK_DEP_LIBS $MATH_LIB"
@@ -1372,7 +1379,7 @@ fi
 PKG_CHECK_MODULES(ATK, $ATK_PACKAGES)

 GTK_PACKAGES="atk >= atk_required_version cairo >= cairo_required_version cairo-gobject >= cairo_required_version gdk-pixbuf-2.0 >= gdk_pixbuf_required_version gio-2.0 >= glib_required_version"
-GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version fribidi >= fribidi_required_version"
+GTK_PRIVATE_PACKAGES="$ATK_PACKAGES $WAYLAND_PACKAGES $MIR_PACKAGES epoxy >= epoxy_required_version"
 if test "x$enable_x11_backend" = xyes -o "x$enable_wayland_backend" = xyes; then
  GTK_PRIVATE_PACKAGES="$GTK_PRIVATE_PACKAGES pangoft2"
 fi
@@ -1390,22 +1397,6 @@ if test x"$os_win32" = xyes; then
  GTK_EXTRA_CFLAGS="$msnative_struct"
 fi

-##################################################
-# Check for harfbuzz and pangoft2
-##################################################
-
-PKG_CHECK_MODULES(GTK_FONT_CHOOSER_WIDGET,
-                  harfbuzz >= 0.9 pangoft2,
-                  build_font_demo=yes,
-                  build_font_demo=no)
-AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ])
-if test "x$build_font_demo" = xyes; then
-  AC_DEFINE([HAVE_HARFBUZZ], 1, [defines whether we have HarfBuzz])
-  AC_DEFINE([HAVE_PANGOFT], 1, [defines whether we have pangoft2])
-  GTK_DEP_CFLAGS="$GTK_DEP_CFLAGS $GTK_FONT_CHOOSER_WIDGET_CFLAGS"
-  GTK_DEP_LIBS="$GTK_DEP_LIBS $GTK_FONT_CHOOSER_WIDGET_LIBS"
-fi
-
 if $PKG_CONFIG --exists x11; then
  X11_PREFIX="`$PKG_CONFIG --variable=prefix x11`"
 elif test x"$prefix" != xNONE; then
@@ -1414,48 +1405,10 @@ else
  X11_PREFIX="$ac_default_prefix"
 fi

-AC_ARG_ENABLE(win32-gles,
-              [AS_HELP_STRING([--enable-win32-gles],
-                              [enable OpenGL ES rendering in Win32 backend, disabled by default])],
-                              [win32_gles=yes],
-                              [win32_gles=no])
-
-if test x"$enable_win32_backend" = xyes; then
-  AC_MSG_CHECKING(WGL support in epoxy)
-  WGL_SUPPORT="`$PKG_CONFIG --variable=epoxy_has_wgl epoxy`"
-  if test x"$WGL_SUPPORT" = x1; then
-    AC_MSG_RESULT([supported])
-  else
-    AC_MSG_ERROR([
-*** epoxy was not built with WGL support or epoxy version is too old.
-*** WGL support in epoxy is enabled by default for all Windows builds,
-*** and is used by GTK+ uncondititonally. If it is not there, then
-*** something is very wrong.
-])
-  fi
-  if test x"$win32_gles" = xyes; then
-    AC_MSG_CHECKING(EGL support in epoxy)
-    EGL_SUPPORT="`$PKG_CONFIG --variable=epoxy_has_egl epoxy`"
-    if test x"$EGL_SUPPORT" = x1; then
-      AC_MSG_RESULT([supported])
-    else
-      AC_MSG_ERROR([
-*** epoxy was not built with EGL support or epoxy version is too old.
-*** EGL support in epoxy is disabled by default in Windows builds,
-*** you might need to rebuild epoxy with explicit --enable-egl=yes.
-*** EGL support is needed for OpenGL ES rendering.
-])
-    fi
-  fi
-fi
-
-AM_CONDITIONAL(WIN32_GLES, test x"$platform_win32" = xyes -a x"$win32_gles" = xyes)
-
 GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
 ATK_PREFIX="`$PKG_CONFIG --variable=prefix atk`"
 PANGO_PREFIX="`$PKG_CONFIG --variable=prefix pango`"
 CAIRO_PREFIX="`$PKG_CONFIG --variable=prefix cairo`"
-ISO_CODES_PREFIX="`$PKG_CONFIG --variable=prefix iso-codes`"

 AC_SUBST(GTK_PACKAGES)
 AC_SUBST(GTK_PRIVATE_PACKAGES)
@@ -1469,7 +1422,6 @@ AC_SUBST(GLIB_PREFIX)
 AC_SUBST(ATK_PREFIX)
 AC_SUBST(PANGO_PREFIX)
 AC_SUBST(CAIRO_PREFIX)
-AC_SUBST(ISO_CODES_PREFIX)

 AC_SUBST(GTK_DEBUG_FLAGS)
 AC_SUBST(GTK_XIM_FLAGS)
@@ -1477,6 +1429,37 @@ AC_SUBST(GTK_XIM_FLAGS)
 GDK_PIXBUF_LIBS=`$PKG_CONFIG --libs gdk-pixbuf-2.0`
 AC_SUBST(GDK_PIXBUF_LIBS)

+########################
+# Checks needed for gail
+########################
+
+old_LIBS="$LIBS"
+dnl Checks for inet libraries:
+AC_SEARCH_LIBS(gethostent, nsl)
+AC_SEARCH_LIBS(setsockopt, socket)
+AC_SEARCH_LIBS(connect, inet)
+
+dnl check for the sockaddr_un.sun_len member
+AC_CHECK_MEMBER([struct sockaddr_un.sun_len],
+		[struct_sockaddr_un_sun_len=true],
+		[struct_sockaddr_un_suin_len=false],
+		[#include <sys/types.h>
+		 #include <sys/un.h>]
+		)
+case $struct_sockaddr_un_sun_len in
+	true)
+		AC_DEFINE_UNQUOTED(HAVE_SOCKADDR_UN_SUN_LEN, 1,
+		                   [Have the sockaddr_un.sun_len member])
+		;;
+	*)
+		;;
+esac
+
+GAIL_INET_LIBS="$LIBS"
+AC_SUBST([GAIL_INET_LIBS])
+
+LIBS="$old_LIBS"
+
 ################################################################
 # Printing system checks
 ################################################################
@@ -1508,8 +1491,15 @@ else
    CUPS_API_MAJOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $1}'`
    CUPS_API_MINOR=`echo $ECHO_N $CUPS_API_VERSION | awk -F. '{print $2}'`

-    if test $CUPS_API_MAJOR -lt 2; then
-      AC_MSG_ERROR([CUPS >= 2.0 not found])
+    if test $CUPS_API_MAJOR -lt 1 -o \
+            $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -lt 2; then
+      AC_MSG_ERROR([CUPS >= 1.2 not found])
+    fi
+    if test $CUPS_API_MAJOR -gt 1 -o \
+	    $CUPS_API_MAJOR -eq 1 -a $CUPS_API_MINOR -ge 6; then
+      AC_DEFINE(HAVE_CUPS_API_1_6, 1,
+                [Define to 1 if CUPS 1.6 API is available])
+      have_cups_api_1_6=yes
    fi

    AC_SUBST(CUPS_API_MAJOR)
@@ -1719,6 +1709,15 @@ if test "$have_colord" = "yes"; then
 fi
 AM_CONDITIONAL(HAVE_COLORD, test "x$have_colord" = "xyes")

+##################################################
+# Check for harfbuzz and pangoft2
+##################################################
+
+PKG_CHECK_MODULES(FONTDEMO, harfbuzz >= 0.9 pangoft2, build_font_demo=yes, build_font_demo=no)
+AC_SUBST(FONTDEMO_CFLAGS)
+AC_SUBST(FONTDEMO_LIBS)
+AM_CONDITIONAL(BUILD_FONT_DEMO, [ test "x$build_font_demo" = xyes ])
+
 ##################################################
 # Checks for gtk-doc and docbook-tools
 ##################################################
@@ -1800,7 +1799,7 @@ case "$host" in
    SAVED_CFLAGS="${CFLAGS}"
    CFLAGS="-fvisibility=hidden"
    AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
-    AC_TRY_COMPILE([], [return 0],
+    AC_TRY_COMPILE([], [int main (void) { return 0; }],
                   AC_MSG_RESULT(yes)
                   enable_fvisibility_hidden=yes,
                   AC_MSG_RESULT(no)
@@ -1816,14 +1815,6 @@ case "$host" in
 esac
 AC_SUBST(GDK_HIDDEN_VISIBILITY_CFLAGS)

-##################################################
-# Theming
-##################################################
-
-AC_PATH_PROG([SASSC], [sassc])
-AC_ARG_VAR(SASSC)
-AM_CONDITIONAL([REBUILD_SCSS], [test "x$SASSC" != x])
-
 ##################################################
 # Output commands
 ##################################################
@@ -1881,7 +1872,8 @@ AC_ARG_ENABLE(Bsymbolic,
              [SAVED_LDFLAGS="${LDFLAGS}"
               AC_MSG_CHECKING([for -Bsymbolic-functions linker flag])
               LDFLAGS=-Wl,-Bsymbolic-functions
-               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[return 0]])],
+               AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],
+                                               [[int main (void) { return 0; }]])],
                              [AC_MSG_RESULT(yes)
                               enable_Bsymbolic=yes],
                              [AC_MSG_RESULT(no)
@@ -1950,7 +1942,6 @@ docs/reference/gdk/version.xml
 docs/reference/gtk/Makefile
 docs/reference/gtk/gtk3.types
 docs/reference/gtk/version.xml
-docs/reference/gtk/getting_started.xml
 docs/reference/libgail-util/Makefile
 docs/reference/libgail-util/version.xml
 docs/tools/Makefile
--- a/demos/Makefile.am
+++ b/demos/Makefile.am
@@ -3,7 +3,4 @@ include $(top_srcdir)/Makefile.decl

 SUBDIRS = gtk-demo widget-factory icon-browser

-EXTRA_DIST = \
-	meson.build
-
 -include $(top_srcdir)/git.mk
--- a/demos/gtk-demo/Makefile.am
+++ b/demos/gtk-demo/Makefile.am
@@ -48,7 +48,6 @@ demos_base =					\
 	offscreen_window2.c			\
 	overlay.c				\
 	overlay2.c				\
-	paint.c					\
 	panes.c					\
 	pickers.c				\
 	pixbufs.c				\
@@ -104,6 +103,11 @@ LDADDS = \
 	$(GDK_DEP_LIBS)				\
 	-lm

+if BUILD_FONT_DEMO
+AM_CPPFLAGS += $(FONTDEMO_CFLAGS)
+LDADDS += $(FONTDEMO_LIBS)
+endif
+
 bin_PROGRAMS = gtk3-demo gtk3-demo-application

 desktopdir = $(datadir)/applications
@@ -117,9 +121,7 @@ EXTRA_DIST += 				\
 	demo.gresource.xml		\
 	$(resource_files)		\
 	org.gtk.Demo.gschema.xml	\
-	demos.h.win32	\
-	meson.build	\
-	geninclude.py
+	demos.h.win32

 gsettings_SCHEMAS = \
 	org.gtk.Demo.gschema.xml
@@ -151,7 +153,7 @@ gtk3_demo_application_SOURCES = \

 gtk3_demo_application_LDADD = $(LDADDS)

-resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(srcdir)/demo.gresource.xml)
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir) --generate-dependencies $(builddir)/demo.gresource.xml)

 demo_resources.c: demo.gresource.xml $(resource_files)
 	$(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate-source $(srcdir)/demo.gresource.xml
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -151,7 +151,7 @@ query_for_toplevel (GdkScreen  *screen,

  g_object_unref (cursor);
  gtk_widget_destroy (popup);
-  gdk_display_flush (display);                 /* Really release the grab */
+  gdk_flush ();                 /* Really release the grab */

  return toplevel;
 }
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -144,7 +144,7 @@ create_capital_store (void)
    { NULL, "Jackson" },
    { NULL, "Jefferson City" },
    { NULL, "Juneau" },
-    { "K - O", NULL },
+    { "K - O" },
    { NULL, "Lansing" },
    { NULL, "Lincoln" },
    { NULL, "Little Rock" },
@@ -154,7 +154,7 @@ create_capital_store (void)
    { NULL, "Nashville" },
    { NULL, "Oklahoma City" },
    { NULL, "Olympia" },
-    { "P - S", NULL },
+    { NULL, "P - S" },
    { NULL, "Phoenix" },
    { NULL, "Pierre" },
    { NULL, "Providence" },
--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -177,7 +177,6 @@
    <file>offscreen_window2.c</file>
    <file>overlay.c</file>
    <file>overlay2.c</file>
-    <file>paint.c</file>
    <file>pagesetup.c</file>
    <file>panes.c</file>
    <file>pickers.c</file>
--- a/demos/gtk-demo/fishbowl.c
+++ b/demos/gtk-demo/fishbowl.c
@@ -9,254 +9,163 @@

 #include "gtkfishbowl.h"

-const char *const css =
-".blurred-button {"
-"  box-shadow: 0px 0px 5px 10px rgba(0, 0, 0, 0.5);"
-"}"
-"";
+GtkWidget *allow_changes;

-char **icon_names = NULL;
-gsize n_icon_names = 0;
+#define N_STATS 5

-static void
-init_icon_names (GtkIconTheme *theme)
-{
-  GPtrArray *icons;
-  GList *l, *icon_list;
+#define STATS_UPDATE_TIME G_USEC_PER_SEC

-  if (icon_names)
-    return;
+typedef struct _Stats Stats;
+struct _Stats {
+  gint64 last_stats;
+  gint64 last_frame;
+  gint last_suggestion;
+  guint frame_counter_max;

-  icon_list = gtk_icon_theme_list_icons (theme, NULL);
-  icons = g_ptr_array_new ();
-
-  for (l = icon_list; l; l = l->next)
-    {
-      if (g_str_has_suffix (l->data, "symbolic"))
-        continue;
-
-      g_ptr_array_add (icons, g_strdup (l->data));
-    }
-
-  n_icon_names = icons->len;
-  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
-  icon_names = (char **) g_ptr_array_free (icons, FALSE);
-
-  /* don't free strings, we assigned them to the array */
-  g_list_free_full (icon_list, g_free);
-}
-
-static const char *
-get_random_icon_name (GtkIconTheme *theme)
-{
-  init_icon_names (theme);
-
-  return icon_names[g_random_int_range(0, n_icon_names)];
-}
-
-GtkWidget *
-create_icon (void)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()), GTK_ICON_SIZE_DND);
-
-  return image;
-}
-
-static GtkWidget *
-create_button (void)
-{
-  return gtk_button_new_with_label ("Button");
-}
-
-static GtkWidget *
-create_blurred_button (void)
-{
-  GtkWidget *w = gtk_button_new ();
-
-  gtk_style_context_add_class (gtk_widget_get_style_context (w), "blurred-button");
-
-  return w;
-}
-
-static GtkWidget *
-create_font_button (void)
-{
-  return gtk_font_button_new ();
-}
-
-static GtkWidget *
-create_level_bar (void)
-{
-  GtkWidget *w = gtk_level_bar_new_for_interval (0, 100);
-
-  gtk_level_bar_set_value (GTK_LEVEL_BAR (w), 50);
-
-  /* Force them to be a bit larger */
-  gtk_widget_set_size_request (w, 200, -1);
-
-  return w;
-}
-
-static GtkWidget *
-create_spinner (void)
-{
-  GtkWidget *w = gtk_spinner_new ();
-
-  gtk_spinner_start (GTK_SPINNER (w));
-
-  return w;
-}
-
-static GtkWidget *
-create_spinbutton (void)
-{
-  GtkWidget *w = gtk_spin_button_new_with_range (0, 10, 1);
-
-  return w;
-}
-
-static GtkWidget *
-create_label (void)
-{
-  GtkWidget *w = gtk_label_new ("pLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua.");
-
-  gtk_label_set_line_wrap (GTK_LABEL (w), TRUE);
-  gtk_label_set_max_width_chars (GTK_LABEL (w), 100);
-
-  return w;
-}
-
-#if 0
-static GtkWidget *
-create_gears (void)
-{
-  GtkWidget *w = gtk_gears_new ();
-
-  gtk_widget_set_size_request (w, 100, 100);
-
-  return w;
-}
-#endif
-
-static GtkWidget *
-create_switch (void)
-{
-  GtkWidget *w = gtk_switch_new ();
-
-  gtk_switch_set_state (GTK_SWITCH (w), TRUE);
-
-  return w;
-}
-
-static const struct {
-  const char *name;
-  GtkWidget * (*create_func) (void);
-} widget_types[] = {
-  { "Icon",       create_icon           },
-  { "Button",     create_button         },
-  { "Blurbutton", create_blurred_button },
-  { "Fontbutton", create_font_button    },
-  { "Levelbar",   create_level_bar      },
-  { "Label",      create_label          },
-  { "Spinner",    create_spinner        },
-  { "Spinbutton", create_spinbutton     },
- // { "Gears",      create_gears          },
-  { "Switch",     create_switch         },
+  guint stats_index;
+  guint frame_counter[N_STATS];
+  guint item_counter[N_STATS];
 };

-static int selected_widget_type = -1;
-static const int N_WIDGET_TYPES = G_N_ELEMENTS (widget_types);
+static Stats *
+get_stats (GtkWidget *widget)
+{
+  static GQuark stats_quark = 0;
+  Stats *stats;
+
+  if (G_UNLIKELY (stats_quark == 0))
+    stats_quark = g_quark_from_static_string ("stats");
+
+  stats = g_object_get_qdata (G_OBJECT (widget), stats_quark);
+  if (stats == NULL)
+    {
+      stats = g_new0 (Stats, 1);
+      g_object_set_qdata_full (G_OBJECT (widget), stats_quark, stats, g_free);
+      stats->last_frame = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
+      stats->last_stats = stats->last_frame;
+    }
+
+  return stats;
+}

 static void
-set_widget_type (GtkFishbowl *fishbowl,
-                 int          widget_type_index)
+do_stats (GtkWidget *widget,
+          GtkWidget *info_label,
+          gint      *suggested_change)
 {
-  GtkWidget *window, *headerbar;
+  Stats *stats;
+  gint64 frame_time;

-  if (widget_type_index == selected_widget_type)
-    return;
+  stats = get_stats (widget);
+  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));

-  selected_widget_type = widget_type_index;
+  if (stats->last_stats + STATS_UPDATE_TIME < frame_time)
+    {
+      char *new_label;
+      guint i, n_frames;

-  gtk_fishbowl_set_creation_func (fishbowl,
-                                  widget_types[selected_widget_type].create_func);
+      n_frames = 0;
+      for (i = 0; i < N_STATS; i++)
+        {
+          n_frames += stats->frame_counter[i];
+        }
+      
+      new_label = g_strdup_printf ("icons - %.1f fps",
+                                   (double) G_USEC_PER_SEC * n_frames
+                                       / (N_STATS * STATS_UPDATE_TIME));
+      gtk_label_set_label (GTK_LABEL (info_label), new_label);
+      g_free (new_label);

-  window = gtk_widget_get_toplevel (GTK_WIDGET (fishbowl));
-  headerbar = gtk_window_get_titlebar (GTK_WINDOW (window));
-  gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar),
-                            widget_types[selected_widget_type].name);
-}
+      if (stats->frame_counter[stats->stats_index] >= 19 * stats->frame_counter_max / 20)
+        {
+          if (stats->last_suggestion > 0)
+            stats->last_suggestion *= 2;
+          else
+            stats->last_suggestion = 1;
+        }
+      else
+        {
+          if (stats->last_suggestion < 0)
+            stats->last_suggestion--;
+          else
+            stats->last_suggestion = -1;
+          stats->last_suggestion = MAX (stats->last_suggestion, 1 - (int) stats->item_counter[stats->stats_index]);
+        }

-void
-next_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
-{
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
-
-  if (selected_widget_type + 1 >= N_WIDGET_TYPES)
-    new_index = 0;
+      stats->stats_index = (stats->stats_index + 1) % N_STATS;
+      stats->frame_counter[stats->stats_index] = 0;
+      stats->item_counter[stats->stats_index] = stats->item_counter[(stats->stats_index + N_STATS - 1) % N_STATS];
+      stats->last_stats = frame_time;
+      
+      if (suggested_change)
+        *suggested_change = stats->last_suggestion;
+      else
+        stats->last_suggestion = 0;
+    }
  else
-    new_index = selected_widget_type + 1;
+    {
+      if (suggested_change)
+        *suggested_change = 0;
+    }

-  set_widget_type (fishbowl, new_index);
+  stats->last_frame = frame_time;
+  stats->frame_counter[stats->stats_index]++;
+  stats->frame_counter_max = MAX (stats->frame_counter_max, stats->frame_counter[stats->stats_index]);
 }

-void
-prev_button_clicked_cb (GtkButton *source,
-                        gpointer   user_data)
+static void
+stats_update (GtkWidget *widget)
 {
-  GtkFishbowl *fishbowl = user_data;
-  int new_index;
+  Stats *stats;

-  if (selected_widget_type - 1 < 0)
-    new_index = N_WIDGET_TYPES - 1;
-  else
-    new_index = selected_widget_type - 1;
+  stats = get_stats (widget);

-  set_widget_type (fishbowl, new_index);
+  stats->item_counter[stats->stats_index] = gtk_fishbowl_get_count (GTK_FISHBOWL (widget));
 }

+static gboolean
+move_fish (GtkWidget     *bowl,
+           GdkFrameClock *frame_clock,
+           gpointer       info_label)
+{
+  gint suggested_change = 0;
+  
+  do_stats (bowl,
+            info_label,
+            !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (allow_changes)) ? &suggested_change : NULL);
+
+  gtk_fishbowl_set_count (GTK_FISHBOWL (bowl),
+                          gtk_fishbowl_get_count (GTK_FISHBOWL (bowl)) + suggested_change);
+  stats_update (bowl);
+
+  return G_SOURCE_CONTINUE;
+}

 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
-  static GtkCssProvider *provider = NULL;
-
-  if (provider == NULL)
-    {
-      provider = gtk_css_provider_new ();
-      gtk_css_provider_load_from_data (provider, css, -1, NULL);
-      gtk_style_context_add_provider_for_screen (gdk_screen_get_default (),
-                                                 GTK_STYLE_PROVIDER (provider),
-                                                 GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    }

  if (!window)
    {
      GtkBuilder *builder;
-      GtkWidget *bowl;
+      GtkWidget *bowl, *info_label;

      g_type_ensure (GTK_TYPE_FISHBOWL);

      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
-      gtk_builder_add_callback_symbols (builder,
-                                        "next_button_clicked_cb", G_CALLBACK (next_button_clicked_cb),
-                                        "prev_button_clicked_cb", G_CALLBACK (prev_button_clicked_cb),
-                                        NULL);
      gtk_builder_connect_signals (builder, NULL);
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
-      set_widget_type (GTK_FISHBOWL (bowl), 0);
+      info_label = GTK_WIDGET (gtk_builder_get_object (builder, "info_label"));
+      allow_changes = GTK_WIDGET (gtk_builder_get_object (builder, "changes_allow"));
      gtk_window_set_screen (GTK_WINDOW (window),
                             gtk_widget_get_screen (do_widget));
      g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_widget_realize (window);
+      gtk_widget_add_tick_callback (bowl, move_fish, info_label, NULL);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/fishbowl.ui
+++ b/demos/gtk-demo/fishbowl.ui
@@ -8,76 +8,27 @@
        <property name="visible">True</property>
        <property name="show-close-button">True</property>
        <child>
-          <object class="GtkBox">
+          <object class="GtkLabel" id="info_label">
            <property name="visible">True</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">pan-start-symbolic</property>
-                    <property name="visible">True</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="prev_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-            <child>
-              <object class="GtkButton">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage">
-                    <property name="icon-name">pan-end-symbolic</property>
-                    <property name="visible">True</property>
-                  </object>
-                </child>
-                <signal name="clicked" handler="next_button_clicked_cb" object="bowl" swapped="no"/>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label">fps</property>
+            <property name="label">icons - 0 fps</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
        <child>
          <object class="GtkLabel">
            <property name="visible">True</property>
-            <property name="label" bind-source="bowl" bind-property="framerate"/>
+            <property name="label" bind-source="bowl" bind-property="count">0</property>
          </object>
          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label">Icons, </property>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="visible">True</property>
-            <property name="label" bind-source="bowl" bind-property="count"/>
-          </object>
-          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
        <child>
          <object class="GtkToggleButton" id="changes_allow">
-            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean"/>
+            <property name="active">False</property>
+            <property name="visible" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
            <property name="relief">none</property>
            <child>
              <object class="GtkImage">
@@ -87,7 +38,7 @@
            </child>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
        <child>
@@ -103,7 +54,7 @@
            </child>
          </object>
          <packing>
-            <property name="pack-type">end</property>
+            <property name="pack_type">end</property>
          </packing>
        </child>
      </object>
@@ -112,7 +63,6 @@
      <object class="GtkFishbowl" id="bowl">
        <property name="visible">True</property>
        <property name="animating">True</property>
-        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean">True</property>
      </object>
    </child>
  </object>
--- a/demos/gtk-demo/geninclude.py
+++ b/demos/gtk-demo/geninclude.py
@@ -1,108 +0,0 @@
-#!/usr/bin/env python3
-# -*- coding: utf-8 -*-
-
-import sys
-import re
-import os
-from collections import *
-
-out_file = sys.argv[1]
-in_files = sys.argv[2:]
-
-
-file_output = """
-typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);
-
-typedef struct _Demo Demo;
-
-struct _Demo
-{
-  gchar *name;
-  gchar *title;
-  gchar *filename;
-  GDoDemoFunc func;
-  Demo *children;
-};
-
-"""
-
-# Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
-
-demos = []
-
-for demo_file in in_files:
-    filename =  demo_file[demo_file.rfind('/')+1:]
-    demo_name = filename.replace(".c", "")
-    with open(demo_file, 'r') as f:
-        title = f.readline().replace("/*", "").strip()
-
-
-    file_output += "GtkWidget *do_" + demo_name + " (GtkWidget *do_widget);\n"
-    # demos += Demo(name = demo_name,
-                  # title = title,
-                  # file = demo_file,
-                  # func = "do_" + title)
-    demos.append((demo_name, title, filename, "do_" + demo_name, -1))
-
-# Generate a List of "Parent names"
-parents = []
-parent_ids = []
-parent_index = 0
-for demo in demos:
-    if "/" in demo[1]:
-        slash_index = demo[1].index('/')
-        parent_name = demo[1][:slash_index]
-        do_break = False
-
-        # Check for duplicates
-        if not parent_name in parents:
-            parents.append(parent_name)
-            parent_ids.append(parent_index)
-            demos.append(("NULL", parent_name, "NULL", "NULL", parent_index))
-
-        parent_index = parent_index + 1
-
-
-# For every child with a parent, generate a list of child demos
-i = 0
-for parent in parents:
-    id = parent_ids[i]
-    file_output += "\nDemo child" + str(id) + "[] = {\n"
-    # iterate over all demos and check if the name starts with the given parent name
-    for child in demos:
-        if child[1].startswith(parent + "/"):
-            title = child[1][child[1].rfind('/') + 1:]
-            file_output += "  { \"" + child[0] + "\", \"" + title + "\", \"" + child[2] + "\", " + child[3] + ", NULL },\n"
-
-
-    file_output += "  { NULL }\n};\n"
-    i = i + 1
-
-
-# Sort demos by title
-demos = sorted(demos, key=lambda x: x[1])
-
-file_output += "\nDemo gtk_demos[] = {\n"
-for demo in demos:
-    # Do not generate one of these for demos with a parent demo
-    if "/" not in demo[1]:
-        child_array = "NULL"
-        name = demo[0];
-        title = demo[1];
-        file = demo[2]
-        if name != "NULL":
-            name = "\"" + name + "\""
-        if title != "NULL":
-            title = "\"" + title + "\""
-        if file != "NULL":
-            file = "\"" + file + "\""
-
-        if demo[4] != -1:
-            child_array = "child" + str(demo[4])
-        file_output += "  { " + name + ", " + title + ", " + file + ", " + demo[3] + ", " + child_array + " },\n"
-
-file_output += "  { NULL }\n};\n"
-
-ofile = open(out_file, "w")
-ofile.write(file_output)
-ofile.close()
--- a/demos/gtk-demo/gtkfishbowl.c
+++ b/demos/gtk-demo/gtkfishbowl.c
@@ -26,18 +26,11 @@ typedef struct _GtkFishbowlChild         GtkFishbowlChild;

 struct _GtkFishbowlPrivate
 {
-  GtkFishCreationFunc creation_func;
  GList *children;
  guint count;

  gint64 last_frame_time;
-  gint64 update_delay;
  guint tick_id;
-
-  double framerate;
-  int last_benchmark_change;
-
-  guint benchmark : 1;
 };

 struct _GtkFishbowlChild
@@ -52,10 +45,7 @@ struct _GtkFishbowlChild
 enum {
   PROP_0,
   PROP_ANIMATING,
-   PROP_BENCHMARK,
   PROP_COUNT,
-   PROP_FRAMERATE,
-   PROP_UPDATE_DELAY,
   NUM_PROPERTIES
 };

@@ -66,11 +56,7 @@ G_DEFINE_TYPE_WITH_PRIVATE (GtkFishbowl, gtk_fishbowl, GTK_TYPE_CONTAINER)
 static void
 gtk_fishbowl_init (GtkFishbowl *fishbowl)
 {
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
  gtk_widget_set_has_window (GTK_WIDGET (fishbowl), FALSE);
-
-  priv->update_delay = G_USEC_PER_SEC;
 }

 /**
@@ -87,9 +73,48 @@ gtk_fishbowl_new (void)
 }

 static void
-gtk_fishbowl_get_preferred_width (GtkWidget *widget,
-                                  int       *minimum,
-                                  int       *natural)
+gtk_widget_measure (GtkWidget      *widget,
+                    GtkOrientation  orientation,
+                    gint            size,
+                    gint           *minimum,
+                    gint           *natural,
+                    gint           *minimum_baseline,
+                    gint           *natural_baseline)
+{
+  g_return_if_fail (GTK_IS_WIDGET (widget));
+  g_return_if_fail (size >= -1);
+
+  if (orientation == GTK_ORIENTATION_HORIZONTAL)
+    {
+      if (size < 0)
+        gtk_widget_get_preferred_width (widget, minimum, natural);
+      else
+        gtk_widget_get_preferred_width_for_height (widget, size, minimum, natural);
+
+      if (minimum_baseline)
+        *minimum_baseline = -1;
+      if (natural_baseline)
+        *natural_baseline = -1;
+    }
+  else
+    {
+      gtk_widget_get_preferred_height_and_baseline_for_width (widget,
+                                                              size,
+                                                              minimum,
+                                                              natural,
+                                                              minimum_baseline,
+                                                              natural_baseline);
+    }
+}
+
+static void
+gtk_fishbowl_measure (GtkWidget      *widget,
+                      GtkOrientation  orientation,
+                      int             for_size,
+                      int            *minimum,
+                      int            *natural,
+                      int            *minimum_baseline,
+                      int            *natural_baseline)
 {
  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
@@ -107,42 +132,47 @@ gtk_fishbowl_get_preferred_width (GtkWidget *widget,
      if (!gtk_widget_get_visible (child->widget))
        continue;

-      gtk_widget_get_preferred_width (child->widget, &child_min, &child_nat);
+      gtk_widget_measure (child->widget, orientation, -1, &child_min, &child_nat, NULL, NULL);

      *minimum = MAX (*minimum, child_min);
      *natural = MAX (*natural, child_nat);
    }
 }

+static void
+gtk_fishbowl_get_preferred_width (GtkWidget *widget,
+                                  int       *minimum,
+                                  int       *natural)
+{
+  gtk_fishbowl_measure (widget, GTK_ORIENTATION_HORIZONTAL, -1, minimum, natural, NULL, NULL);
+}
+
 static void
 gtk_fishbowl_get_preferred_height (GtkWidget *widget,
                                   int       *minimum,
                                   int       *natural)
 {
-  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GtkFishbowlChild *child;
-  GList *children;
-  gint child_min, child_nat;
+  gtk_fishbowl_measure (widget, GTK_ORIENTATION_VERTICAL, -1, minimum, natural, NULL, NULL);
+}

-  *minimum = 0;
-  *natural = 0;
+static void
+gtk_fishbowl_get_preferred_width_for_height (GtkWidget *widget,
+                                             int        for_size,
+                                             int       *minimum,
+                                             int       *natural)
+{
+  gtk_fishbowl_measure (widget, GTK_ORIENTATION_HORIZONTAL, for_size, minimum, natural, NULL, NULL);
+}

-  for (children = priv->children; children; children = children->next)
-    {
-      int min_width;
-
-      child = children->data;
-
-      if (!gtk_widget_get_visible (child->widget))
-        continue;
-
-      gtk_widget_get_preferred_width (child->widget, &min_width, NULL);
-      gtk_widget_get_preferred_height_for_width (child->widget, min_width, &child_min, &child_nat);
-
-      *minimum = MAX (*minimum, child_min);
-      *natural = MAX (*natural, child_nat);
-    }
+static void
+gtk_fishbowl_get_preferred_height_and_baseline_for_width (GtkWidget *widget,
+                                                          int        for_size,
+                                                          int       *minimum,
+                                                          int       *natural,
+                                                          int       *minimum_baseline,
+                                                          int       *natural_baseline)
+{
+  gtk_fishbowl_measure (widget, GTK_ORIENTATION_VERTICAL, for_size, minimum, natural, minimum_baseline, natural_baseline);
 }

 static void
@@ -156,6 +186,8 @@ gtk_fishbowl_size_allocate (GtkWidget     *widget,
  GtkRequisition child_requisition;
  GList *children;

+  gtk_widget_set_allocation (widget, allocation);
+
  for (children = priv->children; children; children = children->next)
    {
      child = children->data;
@@ -212,7 +244,7 @@ gtk_fishbowl_remove (GtkContainer *container,
  GtkFishbowl *fishbowl = GTK_FISHBOWL (container);
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
  GtkFishbowlChild *child;
-  GtkWidget *widget_bowl = GTK_WIDGET (fishbowl);
+  GtkWidget *widget_container = GTK_WIDGET (container);
  GList *children;

  for (children = priv->children; children; children = children->next)
@@ -229,8 +261,8 @@ gtk_fishbowl_remove (GtkContainer *container,
          g_list_free (children);
          g_free (child);

-          if (was_visible && gtk_widget_get_visible (widget_bowl))
-            gtk_widget_queue_resize (widget_bowl);
+          if (was_visible && gtk_widget_get_visible (widget_container))
+            gtk_widget_queue_resize (widget_container);

          priv->count--;
          g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_COUNT]);
@@ -239,7 +271,6 @@ gtk_fishbowl_remove (GtkContainer *container,
    }
 }

-
 static void
 gtk_fishbowl_forall (GtkContainer *container,
                     gboolean      include_internals,
@@ -264,6 +295,29 @@ gtk_fishbowl_forall (GtkContainer *container,
    }
 }

+static gboolean
+gtk_fishbowl_draw (GtkWidget *widget,
+                   cairo_t   *cr)
+{
+  GtkFishbowl *fishbowl = GTK_FISHBOWL (widget);
+  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
+  GtkFishbowlChild *child;
+  GList *list;
+
+  for (list = priv->children;
+       list;
+       list = list->next)
+    {
+      child = list->data;
+
+      gtk_container_propagate_draw (GTK_CONTAINER (fishbowl),
+                                    child->widget,
+                                    cr);
+    }
+
+  return FALSE;
+}
+
 static void
 gtk_fishbowl_dispose (GObject *object)
 {
@@ -289,18 +343,10 @@ gtk_fishbowl_set_property (GObject         *object,
      gtk_fishbowl_set_animating (fishbowl, g_value_get_boolean (value));
      break;

-    case PROP_BENCHMARK:
-      gtk_fishbowl_set_benchmark (fishbowl, g_value_get_boolean (value));
-      break;
-
    case PROP_COUNT:
      gtk_fishbowl_set_count (fishbowl, g_value_get_uint (value));
      break;

-    case PROP_UPDATE_DELAY:
-      gtk_fishbowl_set_update_delay (fishbowl, g_value_get_int64 (value));
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -321,22 +367,10 @@ gtk_fishbowl_get_property (GObject         *object,
      g_value_set_boolean (value, gtk_fishbowl_get_animating (fishbowl));
      break;

-    case PROP_BENCHMARK:
-      g_value_set_boolean (value, gtk_fishbowl_get_benchmark (fishbowl));
-      break;
-
    case PROP_COUNT:
      g_value_set_uint (value, gtk_fishbowl_get_count (fishbowl));
      break;

-    case PROP_FRAMERATE:
-      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
-      break;
-
-    case PROP_UPDATE_DELAY:
-      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -356,7 +390,10 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)

  widget_class->get_preferred_width = gtk_fishbowl_get_preferred_width;
  widget_class->get_preferred_height = gtk_fishbowl_get_preferred_height;
+  widget_class->get_preferred_width_for_height = gtk_fishbowl_get_preferred_width_for_height;
+  widget_class->get_preferred_height_and_baseline_for_width = gtk_fishbowl_get_preferred_height_and_baseline_for_width;
  widget_class->size_allocate = gtk_fishbowl_size_allocate;
+  widget_class->draw = gtk_fishbowl_draw;

  container_class->add = gtk_fishbowl_add;
  container_class->remove = gtk_fishbowl_remove;
@@ -369,36 +406,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                            FALSE,
                            G_PARAM_READWRITE);

-  props[PROP_BENCHMARK] =
-      g_param_spec_boolean ("benchmark",
-                            "Benchmark",
-                            "Adapt the count property to hit the maximum framerate",
-                            FALSE,
-                            G_PARAM_READWRITE);
-
  props[PROP_COUNT] =
      g_param_spec_uint ("count",
                         "Count",
                         "Number of widgets",
                         0, G_MAXUINT,
                         0,
-                         G_PARAM_READWRITE);
-
-  props[PROP_FRAMERATE] =
-      g_param_spec_double ("framerate",
-                           "Framerate",
-                           "Framerate of this widget in frames per second",
-                           0, G_MAXDOUBLE,
-                           0,
-                           G_PARAM_READABLE);
-
-  props[PROP_UPDATE_DELAY] =
-      g_param_spec_int64 ("update-delay",
-                          "Update delay",
-                          "Number of usecs between updates",
-                          0, G_MAXINT64,
-                          G_USEC_PER_SEC,
-                          G_PARAM_READWRITE);
+                         G_PARAM_READABLE);

  g_object_class_install_properties (object_class, NUM_PROPERTIES, props);
 }
@@ -411,60 +425,72 @@ gtk_fishbowl_get_count (GtkFishbowl *fishbowl)
  return priv->count;
 }

+char **icon_names = NULL;
+gsize n_icon_names = 0;
+
+static void
+init_icon_names (GtkIconTheme *theme)
+{
+  GPtrArray *icons;
+  GList *l, *icon_list;
+
+  if (icon_names)
+    return;
+
+  icon_list = gtk_icon_theme_list_icons (theme, NULL);
+  icons = g_ptr_array_new ();
+
+  for (l = icon_list; l; l = l->next)
+    {
+      if (g_str_has_suffix (l->data, "symbolic"))
+        continue;
+
+      g_ptr_array_add (icons, g_strdup (l->data));
+    }
+
+  n_icon_names = icons->len;
+  g_ptr_array_add (icons, NULL); /* NULL-terminate the array */
+  icon_names = (char **) g_ptr_array_free (icons, FALSE);
+
+  /* don't free strings, we assigned them to the array */
+  g_list_free_full (icon_list, g_free);
+}
+
+static const char *
+get_random_icon_name (GtkIconTheme *theme)
+{
+  init_icon_names (theme);
+
+  return icon_names[g_random_int_range(0, n_icon_names)];
+}
+
 void
 gtk_fishbowl_set_count (GtkFishbowl *fishbowl,
                        guint        count)
 {
  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);

-  if (priv->count == count)
-    return;
-
  g_object_freeze_notify (G_OBJECT (fishbowl));

  while (priv->count > count)
    {
-      gtk_fishbowl_remove (GTK_CONTAINER (fishbowl), ((GtkFishbowlChild *) priv->children->data)->widget);
+      gtk_container_remove (GTK_CONTAINER (fishbowl),
+                            ((GtkFishbowlChild *) priv->children->data)->widget);
    }

  while (priv->count < count)
    {
      GtkWidget *new_widget;
-
-      new_widget = priv->creation_func ();
-
+        
+      new_widget = gtk_image_new_from_icon_name (get_random_icon_name (gtk_icon_theme_get_default ()),
+                                                 GTK_ICON_SIZE_DIALOG);
      gtk_widget_show (new_widget);
-
-      gtk_fishbowl_add (GTK_CONTAINER (fishbowl), new_widget);
+      gtk_container_add (GTK_CONTAINER (fishbowl), new_widget);
    }

  g_object_thaw_notify (G_OBJECT (fishbowl));
 }

-gboolean
-gtk_fishbowl_get_benchmark (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->benchmark;
-}
-
-void
-gtk_fishbowl_set_benchmark (GtkFishbowl *fishbowl,
-                            gboolean     benchmark)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->benchmark == benchmark)
-    return;
-
-  priv->benchmark = benchmark;
-  if (!benchmark)
-    priv->last_benchmark_change = 0;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_BENCHMARK]);
-}
-
 gboolean
 gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
 {
@@ -473,111 +499,6 @@ gtk_fishbowl_get_animating (GtkFishbowl *fishbowl)
  return priv->tick_id != 0;
 }

-static gint64
-guess_refresh_interval (GdkFrameClock *frame_clock)
-{
-  gint64 interval;
-  gint64 i;
-
-  interval = G_MAXINT64;
-
-  for (i = gdk_frame_clock_get_history_start (frame_clock);
-       i < gdk_frame_clock_get_frame_counter (frame_clock);
-       i++)
-    {
-      GdkFrameTimings *t, *before;
-      gint64 ts, before_ts;
-
-      t = gdk_frame_clock_get_timings (frame_clock, i);
-      before = gdk_frame_clock_get_timings (frame_clock, i - 1);
-      if (t == NULL || before == NULL)
-        continue;
-
-      ts = gdk_frame_timings_get_frame_time (t);
-      before_ts = gdk_frame_timings_get_frame_time (before);
-      if (ts == 0 || before_ts == 0)
-        continue;
-
-      interval = MIN (interval, ts - before_ts);
-    }
-
-  if (interval == G_MAXINT64)
-    return 0;
-
-  return interval;
-}
-
-static void
-gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-  GdkFrameClock *frame_clock;
-  GdkFrameTimings *start, *end;
-  gint64 start_counter, end_counter;
-  gint64 n_frames, expected_frames;
-  gint64 start_timestamp, end_timestamp;
-  gint64 interval;
-
-  frame_clock = gtk_widget_get_frame_clock (GTK_WIDGET (fishbowl));
-  if (frame_clock == NULL)
-    return;
-
-  start_counter = gdk_frame_clock_get_history_start (frame_clock);
-  end_counter = gdk_frame_clock_get_frame_counter (frame_clock);
-  start = gdk_frame_clock_get_timings (frame_clock, start_counter);
-  for (end = gdk_frame_clock_get_timings (frame_clock, end_counter);
-       end_counter > start_counter && end != NULL && !gdk_frame_timings_get_complete (end);
-       end = gdk_frame_clock_get_timings (frame_clock, end_counter))
-    end_counter--;
-  if (end_counter - start_counter < 4)
-    return;
-
-  start_timestamp = gdk_frame_timings_get_presentation_time (start);
-  end_timestamp = gdk_frame_timings_get_presentation_time (end);
-  if (start_timestamp == 0 || end_timestamp == 0)
-    {
-      start_timestamp = gdk_frame_timings_get_frame_time (start);
-      end_timestamp = gdk_frame_timings_get_frame_time (end);
-    }
-
-  n_frames = end_counter - start_counter;
-  priv->framerate = ((double) n_frames) * G_USEC_PER_SEC / (end_timestamp - start_timestamp);
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
-
-  if (!priv->benchmark)
-    return;
-
-  interval = gdk_frame_timings_get_refresh_interval (end);
-  if (interval == 0)
-    {
-      interval = guess_refresh_interval (frame_clock);
-      if (interval == 0)
-        return;
-    }
-  expected_frames = round ((double) (end_timestamp - start_timestamp) / interval);
-
-  if (n_frames >= expected_frames)
-    {
-      if (priv->last_benchmark_change > 0)
-        priv->last_benchmark_change *= 2;
-      else
-        priv->last_benchmark_change = 1;
-    }
-  else if (n_frames + 1 < expected_frames)
-    {
-      if (priv->last_benchmark_change < 0)
-        priv->last_benchmark_change--;
-      else
-        priv->last_benchmark_change = -1;
-    }
-  else
-    {
-      priv->last_benchmark_change = 0;
-    }
-
-  gtk_fishbowl_set_count (fishbowl, MAX (1, (int) priv->count + priv->last_benchmark_change));
-}
-
 static gboolean
 gtk_fishbowl_tick (GtkWidget     *widget,
                   GdkFrameClock *frame_clock,
@@ -588,11 +509,9 @@ gtk_fishbowl_tick (GtkWidget     *widget,
  GtkFishbowlChild *child;
  GList *l;
  gint64 frame_time, elapsed;
-  gboolean do_update;

  frame_time = gdk_frame_clock_get_frame_time (gtk_widget_get_frame_clock (widget));
  elapsed = frame_time - priv->last_frame_time;
-  do_update = frame_time / priv->update_delay != priv->last_frame_time / priv->update_delay;
  priv->last_frame_time = frame_time;

  /* last frame was 0, so we're just starting to animate */
@@ -631,9 +550,6 @@ gtk_fishbowl_tick (GtkWidget     *widget,

  gtk_widget_queue_allocate (widget);

-  if (do_update)
-    gtk_fishbowl_do_update (fishbowl);
-
  return G_SOURCE_CONTINUE;
 }

@@ -658,57 +574,8 @@ gtk_fishbowl_set_animating (GtkFishbowl *fishbowl,
      priv->last_frame_time = 0;
      gtk_widget_remove_tick_callback (GTK_WIDGET (fishbowl), priv->tick_id);
      priv->tick_id = 0;
-      priv->framerate = 0;
-      g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
    }

  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_ANIMATING]);
 }

-double
-gtk_fishbowl_get_framerate (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->framerate;
-}
-
-gint64
-gtk_fishbowl_get_update_delay (GtkFishbowl *fishbowl)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  return priv->update_delay;
-}
-
-void
-gtk_fishbowl_set_update_delay (GtkFishbowl *fishbowl,
-                               gint64       update_delay)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  if (priv->update_delay == update_delay)
-    return;
-
-  priv->update_delay = update_delay;
-
-  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_UPDATE_DELAY]);
-}
-
-void
-gtk_fishbowl_set_creation_func (GtkFishbowl         *fishbowl,
-                                GtkFishCreationFunc  creation_func)
-{
-  GtkFishbowlPrivate *priv = gtk_fishbowl_get_instance_private (fishbowl);
-
-  g_object_freeze_notify (G_OBJECT (fishbowl));
-
-  gtk_fishbowl_set_count (fishbowl, 0);
-  priv->last_benchmark_change = 0;
-
-  priv->creation_func = creation_func;
-
-  gtk_fishbowl_set_count (fishbowl, 1);
-
-  g_object_thaw_notify (G_OBJECT (fishbowl));
-}
--- a/demos/gtk-demo/gtkfishbowl.h
+++ b/demos/gtk-demo/gtkfishbowl.h
@@ -32,11 +32,9 @@ G_BEGIN_DECLS
 typedef struct _GtkFishbowl              GtkFishbowl;
 typedef struct _GtkFishbowlClass         GtkFishbowlClass;

-typedef GtkWidget * (* GtkFishCreationFunc) (void);
-
 struct _GtkFishbowl
 {
-  GtkContainer parent;
+  GtkContainer container;
 };

 struct _GtkFishbowlClass
@@ -54,15 +52,6 @@ void       gtk_fishbowl_set_count         (GtkFishbowl       *fishbowl,
 gboolean   gtk_fishbowl_get_animating     (GtkFishbowl       *fishbowl);
 void       gtk_fishbowl_set_animating     (GtkFishbowl       *fishbowl,
                                           gboolean           animating);
-gboolean   gtk_fishbowl_get_benchmark     (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_benchmark     (GtkFishbowl       *fishbowl,
-                                           gboolean           animating);
-double     gtk_fishbowl_get_framerate     (GtkFishbowl       *fishbowl);
-gint64     gtk_fishbowl_get_update_delay  (GtkFishbowl       *fishbowl);
-void       gtk_fishbowl_set_update_delay  (GtkFishbowl       *fishbowl,
-                                           gint64             update_delay);
-void       gtk_fishbowl_set_creation_func (GtkFishbowl       *fishbowl,
-                                           GtkFishCreationFunc creation_func);

 G_END_DECLS

--- a/demos/gtk-demo/main.c
+++ b/demos/gtk-demo/main.c
@@ -762,14 +762,15 @@ load_file (const gchar *demoname,
          /* Skipping blank lines */
          while (g_ascii_isspace (*p))
            p++;
-
-          if (!*p)
+          if (*p)
+            {
+              p = lines[i];
+              state++;
+              /* Fall through */
+            }
+          else
            break;

-          p = lines[i];
-          state++;
-          /* Fall through */
-
        case 3:
          /* Reading program body */
          gtk_text_buffer_insert (source_buffer, &start, p, -1);
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -1,148 +0,0 @@
-
-## These should be in the order you want them to appear in the
-## demo app, which means alphabetized by demo title, not filename
-demos = files([
-  'application_demo.c',
-  'assistant.c',
-  'builder.c',
-  'button_box.c',
-  'changedisplay.c',
-  'clipboard.c',
-  'colorsel.c',
-  'combobox.c',
-  'css_accordion.c',
-  'css_basics.c',
-  'css_blendmodes.c',
-  'css_multiplebgs.c',
-  'css_pixbufs.c',
-  'css_shadows.c',
-  'cursors.c',
-  'dialog.c',
-  'drawingarea.c',
-  'editable_cells.c',
-  'entry_buffer.c',
-  'entry_completion.c',
-  'event_axes.c',
-  'expander.c',
-  'filtermodel.c',
-  'fishbowl.c',
-  'foreigndrawing.c',
-  'gestures.c',
-  'glarea.c',
-  'headerbar.c',
-  'hypertext.c',
-  'iconview.c',
-  'iconview_edit.c',
-  'images.c',
-  'infobar.c',
-  'links.c',
-  'listbox.c',
-  'flowbox.c',
-  'list_store.c',
-  'markup.c',
-  'menus.c',
-  'modelbutton.c',
-  'offscreen_window.c',
-  'offscreen_window2.c',
-  'overlay.c',
-  'overlay2.c',
-  'paint.c',
-  'panes.c',
-  'pickers.c',
-  'pixbufs.c',
-  'popover.c',
-  'printing.c',
-  'revealer.c',
-  'rotated_text.c',
-  'scale.c',
-  'search_entry.c',
-  'search_entry2.c',
-  'shortcuts.c',
-  'sidebar.c',
-  'sizegroup.c',
-  'spinbutton.c',
-  'spinner.c',
-  'stack.c',
-  'tabs.c',
-  'textmask.c',
-  'textview.c',
-  'textscroll.c',
-  'theming_style_classes.c',
-  'toolpalette.c',
-  'transparent.c',
-  'tree_store.c',
-])
-
-
-gtkdemo_deps = [libgtk_dep]
-
-if harfbuzz_dep.found() and pangoft_dep.found()
-  demos += files('font_features.c')
-  gtkdemo_deps += [harfbuzz_dep, pangoft_dep]
-endif
-
-if os_unix
-  demos += files('pagesetup.c')
-endif
-
-gtkdemo_sources = demos + files([
-  'gtkfishbowl.c',
-  'gtkfishbowl.h',
-  'main.c',
-])
-
-
-geninclude = find_program('geninclude.py')
-demos_h = custom_target(
-  'gtk3 demo header',
-  output  : 'demos.h',
-  input   : demos,
-  command : [geninclude, '@OUTPUT@', '@INPUT@'],
-)
-
-gtkdemo_resources = gnome.compile_resources(
-  'gtkdemo_resources',
-  'demo.gresource.xml',
-  source_dir: '.'
-)
-
-gtkdemo = executable(
-  'gtk3-demo',
-  gtkdemo_sources,
-  demos_h,
-  gtkdemo_resources,
-  dependencies: gtkdemo_deps,
-  include_directories : confinc,
-  install: true
-)
-
-gtkapplicationdemo = executable(
-  'gtk3-demo-application',
-  'application.c',
-  demos_h,
-  gtkdemo_resources,
-  dependencies: gtkdemo_deps,
-  include_directories : confinc,
-  install: true
-)
-
-gtk_settings_schemas = [
-  'org.gtk.Settings.FileChooser.gschema.xml',
-  'org.gtk.Settings.ColorChooser.gschema.xml',
-  'org.gtk.Settings.EmojiChooser.gschema.xml',
-  'org.gtk.Settings.Debug.gschema.xml',
-]
-
-foreach s: [ '16', '22', '24', '32', '48', '256']
-  icon_destdir = join_paths(gtk_datadir, 'icons', 'hicolor', '@0@x@0@'.format(s), 'apps')
-  icons = [join_paths('data', '@0@x@0@'.format(s), 'gtk3-demo.png'),
-           join_paths('data', '@0@x@0@'.format(s), 'gtk3-demo-symbolic.symbolic.png')]
-  install_data(icons, install_dir: icon_destdir)
-endforeach
-
-# desktop file
-install_data('gtk3-demo.desktop', install_dir: gtk_applicationsdir)
-
-# GSettings
-install_data('org.gtk.Demo.gschema.xml', install_dir: gtk_schemasdir)
-gnome.compile_schemas(depend_files: files(['org.gtk.Demo.gschema.xml']))
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -1,257 +0,0 @@
-/* Paint
- *
- * Demonstrates practical handling of drawing tablets in a real world
- * usecase.
- */
-#include <gtk/gtk.h>
-
-typedef struct
-{
-  GtkEventBox parent_instance;
-  cairo_surface_t *surface;
-  cairo_t *cr;
-  GdkRGBA draw_color;
-
-  GtkGesture *stylus_gesture;
-} DrawingArea;
-
-typedef struct
-{
-  GtkEventBoxClass parent_class;
-} DrawingAreaClass;
-
-G_DEFINE_TYPE (DrawingArea, drawing_area, GTK_TYPE_EVENT_BOX)
-
-static void
-drawing_area_ensure_surface (DrawingArea *area,
-                             gint         width,
-                             gint         height)
-{
-  if (!area->surface ||
-      cairo_image_surface_get_width (area->surface) != width ||
-      cairo_image_surface_get_height (area->surface) != height)
-    {
-      cairo_surface_t *surface;
-
-      surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                            width, height);
-      if (area->surface)
-        {
-          cairo_t *cr;
-
-          cr = cairo_create (surface);
-          cairo_set_source_surface (cr, area->surface, 0, 0);
-          cairo_paint (cr);
-
-          cairo_surface_destroy (area->surface);
-          cairo_destroy (area->cr);
-          cairo_destroy (cr);
-        }
-
-      area->surface = surface;
-      area->cr = cairo_create (surface);
-    }
-}
-
-static void
-drawing_area_size_allocate (GtkWidget     *widget,
-                            GtkAllocation *allocation)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-
-  drawing_area_ensure_surface (area, allocation->width, allocation->height);
-
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->size_allocate (widget, allocation);
-}
-
-static void
-drawing_area_map (GtkWidget *widget)
-{
-  GtkAllocation allocation;
-
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->map (widget);
-
-  gdk_window_set_event_compression (gtk_widget_get_window (widget), TRUE);
-
-  gtk_widget_get_allocation (widget, &allocation);
-  drawing_area_ensure_surface ((DrawingArea *) widget,
-                               allocation.width, allocation.height);
-}
-
-static void
-drawing_area_unmap (GtkWidget *widget)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-
-  g_clear_pointer (&area->cr, cairo_destroy);
-  g_clear_pointer (&area->surface, cairo_surface_destroy);
-
-  GTK_WIDGET_CLASS (drawing_area_parent_class)->unmap (widget);
-}
-
-static gboolean
-drawing_area_draw (GtkWidget *widget,
-		   cairo_t   *cr)
-{
-  DrawingArea *area = (DrawingArea *) widget;
-  GtkAllocation allocation;
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  cairo_set_source_rgb (cr, 1, 1, 1);
-  cairo_paint (cr);
-
-  cairo_set_source_surface (cr, area->surface, 0, 0);
-  cairo_paint (cr);
-
-  cairo_set_source_rgb (cr, 0.6, 0.6, 0.6);
-  cairo_rectangle (cr, 0, 0, allocation.width, allocation.height);
-  cairo_stroke (cr);
-
-  return TRUE;
-}
-
-static void
-drawing_area_class_init (DrawingAreaClass *klass)
-{
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  widget_class->size_allocate = drawing_area_size_allocate;
-  widget_class->draw = drawing_area_draw;
-  widget_class->map = drawing_area_map;
-  widget_class->unmap = drawing_area_unmap;
-}
-
-static void
-drawing_area_apply_stroke (DrawingArea   *area,
-                           GdkDeviceTool *tool,
-                           gdouble        x,
-                           gdouble        y,
-                           gdouble        pressure)
-{
-  if (gdk_device_tool_get_tool_type (tool) == GDK_DEVICE_TOOL_TYPE_ERASER)
-    {
-      cairo_set_line_width (area->cr, 10 * pressure);
-      cairo_set_operator (area->cr, CAIRO_OPERATOR_DEST_OUT);
-    }
-  else
-    {
-      cairo_set_line_width (area->cr, 4 * pressure);
-      cairo_set_operator (area->cr, CAIRO_OPERATOR_SATURATE);
-    }
-
-  cairo_set_source_rgba (area->cr, area->draw_color.red,
-                         area->draw_color.green, area->draw_color.blue,
-                         area->draw_color.alpha * pressure);
-
-  //cairo_set_source_rgba (area->cr, 0, 0, 0, pressure);
-
-  cairo_line_to (area->cr, x, y);
-  cairo_stroke (area->cr);
-  cairo_move_to (area->cr, x, y);
-}
-
-static void
-stylus_gesture_down (GtkGestureStylus *gesture,
-                     gdouble           x,
-                     gdouble           y,
-                     DrawingArea      *area)
-{
-  cairo_new_path (area->cr);
-}
-
-static void
-stylus_gesture_motion (GtkGestureStylus *gesture,
-                       gdouble           x,
-                       gdouble           y,
-                       DrawingArea      *area)
-{
-  GdkDeviceTool *tool;
-  gdouble pressure;
-
-  tool = gtk_gesture_stylus_get_device_tool (gesture);
-
-  if (!gtk_gesture_stylus_get_axis (gesture, GDK_AXIS_PRESSURE, &pressure))
-    pressure = 1;
-
-  drawing_area_apply_stroke (area, tool, x, y, pressure);
-  gtk_widget_queue_draw (GTK_WIDGET (area));
-}
-
-static void
-drawing_area_init (DrawingArea *area)
-{
-  const GdkRGBA draw_rgba = { 0, 0, 0, 1 };
-  gtk_event_box_set_visible_window (GTK_EVENT_BOX (area), TRUE);
-
-  area->stylus_gesture = gtk_gesture_stylus_new (GTK_WIDGET (area));
-  g_signal_connect (area->stylus_gesture, "down",
-                    G_CALLBACK (stylus_gesture_down), area);
-  g_signal_connect (area->stylus_gesture, "motion",
-                    G_CALLBACK (stylus_gesture_motion), area);
-
-  area->draw_color = draw_rgba;
-}
-
-GtkWidget *
-drawing_area_new (void)
-{
-  return g_object_new (drawing_area_get_type (), NULL);
-}
-
-void
-drawing_area_set_color (DrawingArea *area,
-                        GdkRGBA     *color)
-{
-  area->draw_color = *color;
-}
-
-static void
-color_button_color_set (GtkColorButton *button,
-                        DrawingArea    *draw_area)
-{
-  GdkRGBA color;
-
-  gtk_color_chooser_get_rgba (GTK_COLOR_CHOOSER (button), &color);
-  drawing_area_set_color (draw_area, &color);
-}
-
-GtkWidget *
-do_paint (GtkWidget *toplevel)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *draw_area, *headerbar, *colorbutton;
-      const GdkRGBA draw_rgba = { 0, 0, 0, 1 };
-
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-      draw_area = drawing_area_new ();
-      gtk_container_add (GTK_CONTAINER (window), draw_area);
-
-      headerbar = gtk_header_bar_new ();
-      gtk_header_bar_set_title (GTK_HEADER_BAR (headerbar), "Paint");
-      gtk_header_bar_set_show_close_button (GTK_HEADER_BAR (headerbar), TRUE);
-
-      colorbutton = gtk_color_button_new ();
-      g_signal_connect (colorbutton, "color-set",
-                        G_CALLBACK (color_button_color_set), draw_area);
-      gtk_color_chooser_set_rgba (GTK_COLOR_CHOOSER (colorbutton),
-                                  &draw_rgba);
-
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
-      gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
-
-      g_signal_connect (window, "destroy",
-                        G_CALLBACK (gtk_widget_destroyed), &window);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show_all (window);
-  else
-    gtk_widget_destroy (window);
-
-  return window;
-}
--- a/demos/gtk-demo/theming.ui
+++ b/demos/gtk-demo/theming.ui
@@ -61,7 +61,7 @@
            <property name="label" translatable="yes">Raised</property>
            <property name="use_underline">1</property>
            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="icon_name">edit-find-symbolic</property>
            <style>
              <class name="raised"/>
            </style>
@@ -77,7 +77,7 @@
            <property name="label" translatable="yes">Raised Active</property>
            <property name="use_underline">1</property>
            <property name="is_important">1</property>
-            <property name="icon_name">edit-find</property>
+            <property name="icon_name">edit-find-symbolic</property>
            <property name="active">1</property>
            <style>
              <class name="raised"/>
--- a/demos/icon-browser/Makefile.am
+++ b/demos/icon-browser/Makefile.am
@@ -33,9 +33,7 @@ resources.c: iconbrowser.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc
 EXTRA_DIST = \
 	menus.ui \
 	iconbrowser.gresource.xml \
-	window.ui \
-	icon.list \
-	meson.build
+	window.ui

 # ------------------- MSVC Build Items ----------------
 MSVCPROJS = gtk3-icon-browser
--- a/demos/icon-browser/icon.list
+++ b/demos/icon-browser/icon.list
@@ -1,515 +0,0 @@
-[volume]
-Name=Volume
-Description=Icons related to audio input and output volume
-
-audio-volume-high=The icon used to indicate high audio volume
-audio-volume-low=The icon used to indicate low audio volume
-audio-volume-medium=The icon used to indicate medium audio volume
-audio-volume-muted=The icon used to indicate the muted state for audio playback
-microphone-sensitivity-high=The icon used to indicate high microphone sensitivity
-microphone-sensitivity-low=The icon used to indicate low microphone sensitivity
-microphone-sensitivity-medium=The icon used to indicate medium microphone sensitivity
-microphone-sensitivity-muted=The icon used to indicate that a microphone is muted
-
-[multimedia]
-Name=Multimedia
-Description=Icons related to playback of media
-
-media-playlist-repeat=The icon for the repeat mode of a media player
-media-playlist-repeat-song=The icon for repeating a song in a media player
-media-playlist-shuffle=The icon for the shuffle mode of a media player
-media-playlist-consecutive=The icon for consecutive mode of a media player
-media-skip-backward=The icon for the skip backward action of a media player
-media-seek-backward=The icon for the seek backward action of a media player
-media-playback-start=The icon for the start playback action of a media player
-media-seek-forward=The icon for the seek forward action of a media player
-media-skip-forward=The icon for the skip forward action of a media player
-media-playback-stop=The icon for the stop action of a media player
-media-playback-pause=The icon for the pause action of a media player
-media-eject=The icon for the eject action of a media player or file manager
-media-record=The icon for the record action of a media application
-media-view-subtitles=The icon used to show subtitles in a media player
-
-[network]
-Name=Network
-Description=Icons related to network status");
-
-network-transmit-receive=The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network
-network-transmit=The icon used when data is being transmitted, while the computing device is connected to a network
-network-receive=The icon used when data is being received, while the computing device is connected to a network
-network-idle=The icon used when no data is being transmitted or received, while the computing device is connected to a network
-network-error=The icon used when an error occurs trying to intialize the network connection of the computing device
-network-offline=The icon used when the computing device is disconnected from the network
-
-[weather]
-Name=Weather
-Description=Icons about weather conditions
-
-weather-clear=The icon used while the weather for a region is “clear skies”
-weather-clear-night=The icon used while the weather for a region is “clear skies” during the night
-weather-few-clouds=The icon used while the weather for a region is “partly cloudy”
-weather-few-clouds-night=The icon used while the weather for a region is “partly cloudy” during the night
-weather-fog=The icon used while the weather for a region is “foggy”
-weather-overcast=The icon used while the weather for a region is “overcast”
-weather-severe-alert=The icon used while a sever weather alert is in effect for a region
-weather-showers=The icon used while rain showers are occurring in a region
-weather-showers-scattered=The icon used while scattered rain showers are occurring in a region
-weather-snow=The icon used while snow showers are occurring in a region
-weather-storm=The icon used while storms are occurring in a region
-weather-windy=The icon used while the weather is windy
-
-[navigation]
-Name=Navigation
-Description=Icons for navigation in the user interface of a program
-
-go-first=The icon for the go to the first item in a list
-go-previous=The icon for the go to the previous item in a list
-go-next=The icon for the go to the next item in a list
-go-last=The icon for the go to the last item in a list
-go-bottom=The icon for the go to bottom of a list
-go-down=The icon for the go down in a list
-go-up=The icon for the go up in a list
-go-top=The icon for the go to the top of a list
-go-home=The icon for the go to home location
-go-jump=The icon for the jump to action
-
-[editing]
-Name=Editing
-Description=Icons related to editing a document
-format-indent-less=The icon for the decrease indent formatting action
-format-indent-more=The icon for the increase indent formatting action
-format-justify-center=The icon for the center justification formatting action
-format-justify-fill=The icon for the fill justification formatting action
-format-justify-left=The icon for the left justification formatting action
-format-justify-right=The icon for the right justification action
-format-text-direction-ltr=The icon for the left-to-right text formatting action
-format-text-direction-rtl=The icon for the right-to-left formatting action
-format-text-bold=The icon for the bold text formatting action
-format-text-italic=The icon for the italic text formatting action
-format-text-underline=The icon for the underlined text formatting action
-format-text-strikethrough=The icon for the strikethrough text formatting action
-edit-clear=The icon for the clear action
-edit-clear-all=
-edit-copy=The icon for the copy action
-edit-cut=The icon for the cut action
-edit-delete=The icon for the delete action
-edit-find-replace=The icon for the find and replace action
-edit-paste=The icon for the paste action
-edit-redo=The icon for the redo action
-edit-select-all=The icon for the select all action
-edit-select=
-edit-undo=The icon for the undo action
-error-correct=
-document-properties=The icon for the action to view the properties of a document in an application
-document-new=The icon used for the action to create a new document
-document-open=The icon used for the action to open a document
-document-open-recent=The icon used for the action to open a document that was recently opened
-document-save=The icon for the save action. Should be an arrow pointing down and toward a hard disk
-document-save-as=The icon for the save as action
-document-send=The icon for the send action. Should be an arrow pointing up and away from a hard disk
-document-page-setup=The icon for the page setup action of a document editor
-document-edit=The icon for the action to edit a document
-object-flip-horizontal=The icon for the action to flip an object horizontally
-object-flip-vertical=The icon for the action to flip an object vertically
-object-rotate-left=The icon for the rotate left action performed on an object
-object-rotate-right=The icon for the rotate rigt action performed on an object
-insert-image=The icon for the insert image action of an application
-insert-link=The icon for the insert link action of an application
-insert-object=The icon for the insert object action of an application
-insert-text=The icon for the insert text action of an application
-accessories-text-editor=The icon used for the desktop's text editing accessory program
-
-[view]
-Name=View Controls
-Description=Icons for view controls in a user interface
-
-view-list=The icon used for “List“ view mode
-view-grid=The icon used for “Grid“ view mode (as opposed to “List“)
-view-fullscreen=The icon used for the “Fullscreen” item in the application's “View” menu
-view-restore=The icon used by an application for leaving the fullscreen view, and returning to a normal windowed view
-zoom-fit-best=The icon used for the “Best Fit” item in the application's “View” menu
-zoom-in=The icon used for the “Zoom in” item in the application's “View” menu
-zoom-out=The icon used for the “Zoom Out” item in the application's “View” menu
-zoom-original=The icon used for the “Original Size” item in the application's “View” menu
-view-continuous=The icon used for a continuous view mode
-view-paged=The icon used for a paged view mode (as opposed to continuous)
-view-dual=The icon used for a side-by-side view of paginated content
-view-wrapped=The icon used to indicate a wrap-around to the beginning
-view-pin=The icon used for 'pin a view'
-
-[calendar]
-Name=Calendar, Tasks and Alarms
-Description=Icons related to calendars, tasks and alarms
-
-task-due=The icon used when a task is due soon
-task-past-due=The icon used when a task that was due, has been left incomplete
-appointment-soon=The icon used when an appointment will occur soon
-appointment-missed=The icon used when an appointment was missed
-alarm=The icon used for alarms when a task or appointment is due
-
-[communication]
-Name=Communication
-Description=Icons related email, phone calls, IM and other forms of communication
-
-mail-unread=The icon used for an electronic mail that is unread
-mail-read=The icon used for an electronic mail that is read
-mail-replied=The icon used for an electronic mail that has been replied to
-mail-attachment=The icon used for an electronic mail that contains attachments
-mail-mark-important=The icon for the mark as important action of an electronic mail application
-mail-send=The icon for the send action of an electronic mail application
-mail-send-receive=The icon for the send and receive action of an electronic mail application
-call-start=The icon used for initiating or accepting a call
-call-stop=The icon used for stopping a current call
-call-missed=The icon used to show a missed call
-user-available=The icon used when a user on a chat network is available to initiate a conversation with
-user-offline=The icon used when a user on a chat network is not available
-user-idle=The icon used when a user on a chat network has not been an active participant in any chats on the network, for an extended period of time
-user-invisible=The icon used when a user is on a chat network, but is invisible to others
-user-busy=The icon used when a user is on a chat network, and has marked himself as busy
-user-away=The icon used when a user on a chat network is away from their keyboard and the chat program
-user-status-pending=The icon used when the current user status on a chat network is not known
-
-[devices]
-Name=Devices and Media
-Description=Icons for devices and media
-
-audio-input-microphone=The icon used for the microphone audio input device
-camera-web=The fallback icon for web cameras
-camera-photo=The icon used for a digital still camera devices
-input-keyboard=The icon used for the keyboard input device
-printer=The icon used for a printer device
-video-display=The icon used for the monitor that video gets displayed to
-computer=The icon used for the computing device as a whole
-media-optical=The icon used for physical optical media such as CD and DVD
-phone=The icon used for phone devices which support connectivity to the PC, such as VoIP, cellular, or possibly landline phones
-input-dialpad=The icon used for dialpad input devices
-input-touchpad=The icon used for touchpad input devices
-scanner=The icon used for a scanner device
-audio-card=The icon used for the audio rendering device
-input-gaming=The icon used for the gaming input device
-input-mouse=The icon used for the mousing input device
-multimedia-player=The icon used for generic multimedia playing devices
-audio-headphones=The icon used for headphones
-audio-headset=The icon used for headsets
-display-projector=The icon used for projectors
-media-removable=The icon used for generic removable media
-printer-network=The icon used for printers which are connected via the network
-audio-speakers=The icon used for speakers
-camera-video=The fallback icon for video cameras
-drive-optical=The icon used for optical media drives such as CD and DVD
-drive-removable-media=The icon used for removable media drives
-input-tablet=The icon used for graphics tablet input devices
-network-wireless=The icon used for wireless network connections
-network-wired=The icon used for wired network connections
-media-floppy=The icon used for physical floppy disk media
-media-flash=The fallback icon used for flash media, such as memory stick and SD
-
-[contenttypes]
-Name=Content Types
-Description=Icons for different types of data, such as audio or image files
-
-application-certificate=
-application-rss+xml=
-application-x-appliance=
-audio-x-generic=The icon used for generic audio file types
-folder=The standard folder icon used to represent directories on local filesystems, mail folders, and other hierarchical groups
-text-x-generic=The icon used for generic text file types
-video-x-generic=The icon used for generic video file types
-x-office-calendar=The icon used for generic calendar file types
-
-[emotes]
-Name=Emotes
-Description=Icons for emotions that are expressed through text chat applications such as :-) or :-P in IRC or instant messengers
-
-face-angel=The icon used for the 0:-) emote
-face-angry=The icon used for the X-( emote
-face-cool=The icon used for the B-) emote
-face-crying=The icon used for the :'( emote
-face-devilish=The icon used for the >:-) emote
-face-embarrassed=The icon used for the :-[ emote
-face-kiss=The icon used for the :-* emote
-face-laugh=The icon used for the :-)) emote
-face-monkey=The icon used for the :-(|) emote
-face-plain=The icon used for the :-| emote
-face-raspberry=The icon used for the :-P emote
-face-sad=The icon used for the :-( emote
-face-shutmouth=The 'shut mouth' emote
-face-sick=The icon used for the :-& emote
-face-smile=The icon used for the :-) emote
-face-smile-big=The icon used for the :-D emote
-face-smirk=The icon used for the :-! emote
-face-surprise=The icon used for the :-0 emote
-face-tired=The icon used for the |-) emote
-face-uncertain=The icon used for the :-/ emote
-face-wink=The icon used for the ;-) emote
-face-worried=The icon used for the :-S emote
-face-yawn=
-
-[general]
-Name=General
-Description=Generally useful icons that don't fit in a particular category
-
-edit-find=The icon for generic search actions
-content-loading=The icon used to indicate that content is loading
-open-menu=The icon used for a menu button in the header bar
-view-more=The icon used for a  “View More“ action
-tab-new=The icon used for a “New Tab“ action
-bookmark-new=The icon used for creating a new bookmark
-mark-location=The icon used to mark a location on a map
-find-location=The icon used for a  “Search location“ action
-send-to=The icon used for a  “Send to“ action
-object-select=The icon used for generic selection actions
-window-close=The icon used for actions that close a view, such as window or tab close button
-view-refresh=The icon used for the “Refresh” item in the application's “View” menu
-process-stop=The icon used for the “Stop” action in applications with actions that may take a while to process, such as web page loading in a browser
-action-unavailable=The icon used to indicate that an action is currently unavailable, such as “Pause“ when no media is playing
-document-print=The icon for the print action of an application
-printer-printing=The icon used while a print job is successfully being spooled to a printing device
-printer-warning=The icon used when a recoverable problem occurs while attempting to printing
-printer-error=The icon used when an error occurs while attempting to print
-dialog-information=The icon used when a dialog is opened to give information to the user that may be pertinent to the requested action
-dialog-question=The icon used when a dialog is opened to ask a simple question of the user
-dialog-warning=The icon used when a dialog is opened to warn the user of impending issues with the requested action
-dialog-password=The icon used when a dialog requesting the authentication credentials for a user is opened
-dialog-error=The icon used when a dialog is opened to explain an error condition to the user
-list-add=The icon for the add to list action
-list-remove=The icon for the remove from list action
-non-starred=The icon used to indicate that an object is not 'starred'
-semi-starred=The icon used to indicate that an object has is 'half-starred'
-starred=The icon used to indicate that an object is 'starred'
-star-new=The used for the “New Star“ action
-security-low=The icon used to indicate that the security level of a connection is presumed to be insecure, either by using weak encryption, or by using a certificate that the could not be automatically verified, and which the user has not chosent to trust
-security-medium=The icon used to indicate that the security level of a connection is presumed to be secure, using strong encryption, and a certificate that could not be automatically verified, but which the user has chosen to trust
-security-high=The icon used to indicate that the security level of a connection is known to be secure, using strong encryption and a valid certificate
-user-trash=The icon for the user's “Trash” place in the file system
-user-trash-full=The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery
-emblem-system=The icon used as an emblem for directories that contain system libraries, settings, and data
-avatar-default=The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar
-emblem-synchronizing=The icon used as an emblem to indicate that a a synchronizing operation is in process
-emblem-shared=The icon used as an emblem for files and directories that are shared to other users
-help-browser=The icon used for the desktop's help browsing application
-
-[other]
-Name=Other
-Description=Icons which have may be too specialized and not of general interest
-
-changes-allow=
-changes-prevent=
-view-sort-ascending=The icon used for the “Sort Ascending” item in the application's “View” menu, or in a button for changing the sort method for a list
-view-sort-descending=The icon used for the “Sort Descending” item in the application's “View” menu, or in a button for changing the sort method for a list
-document-revert=The icon for the action of reverting to a previous version of a document
-address-book-new=The icon used for the action to create a new address book
-application-exit=The icon used for exiting an application. Typically this is seen in the application's menus as File->Quit
-appointment-new=The icon used for the action to create a new appointment in a calendaring application
-contact-new=The icon used for the action to create a new contact in an address book application
-document-print-preview=The icon for the print preview action of an application
-folder-new=The icon for creating a new folder
-help-about=The icon for the About item in the Help menu
-help-contents=The icon for Contents item in the Help menu
-help-faq=The icon for the FAQ item in the Help menu
-list-remove-all=
-mail-forward=The icon for the forward action of an electronic mail application
-mail-mark-junk=The icon for the mark as junk action of an electronic mail application
-mail-mark-notjunk=The icon for the mark as not junk action of an electronic mail application
-mail-mark-read=The icon for the mark as read action of an electronic mail application
-mail-mark-unread=The icon for the mark as unread action of an electronic mail application
-mail-message-new=The icon for the compose new mail action of an electronic mail application
-mail-reply-all=The icon for the reply to all action of an electronic mail application
-mail-reply-sender=The icon for the reply to sender action of an electronic mail application
-pan-down=
-pan-end=
-pan-start=
-pan-up=
-system-lock-screen=The icon used for the “Lock Screen” item in the desktop's panel application
-system-log-out=The icon used for the “Log Out” item in the desktop's panel application
-system-run=The icon used for the “Run Application...” item in the desktop's panel application
-system-search=The icon used for the “Search” item in the desktop's panel application
-system-reboot=The icon used for the “Reboot” item in the desktop's panel application
-system-shutdown=The icon used for the “Shutdown” item in the desktop's panel application
-tools-check-spelling=The icon used for the “Check Spelling” item in the application's “Tools” menu
-window-maximize=
-window-minimize=
-window-restore=
-window-new=The icon used for the “New Window” item in the application's “Windows” menu
-accessories-calculator=The icon used for the desktop's calculator accessory program
-accessories-character-map=The icon used for the desktop's international and extended text character accessory program
-accessories-dictionary=The icon used for the desktop's dictionary accessory program
-multimedia-volume-control=The icon used for the desktop's hardware volume control application
-preferences-desktop-accessibility=The icon used for the desktop's accessibility preferences
-preferences-desktop-display=
-preferences-desktop-font=The icon used for the desktop's font preferences
-preferences-desktop-keyboard=The icon used for the desktop's keyboard preferences
-preferences-desktop-keyboard-shortcuts=
-preferences-desktop-locale=The icon used for the desktop's locale preferences
-preferences-desktop-remote-desktop=
-preferences-desktop-multimedia=The icon used for the desktop's multimedia preferences
-preferences-desktop-screensaver=The icon used for the desktop's screen saving preferences
-preferences-desktop-theme=The icon used for the desktop's theme preferences
-preferences-desktop-wallpaper=The icon used for the desktop's wallpaper preferences
-preferences-system-privacy=
-preferences-system-windows=
-system-file-manager=The icon used for the desktop's file management application
-system-software-install=The icon used for the desktop's software installer application
-system-software-update=The icon used for the desktop's software updating application
-system-users=
-user-info=
-utilities-system-monitor=The icon used for the desktop's system resource monitor application
-utilities-terminal=The icon used for the desktop's terminal emulation application.
-application-x-addon=
-application-x-executable=The icon used for executable file types
-font-x-generic=The icon used for generic font file types
-image-x-generic=The icon used for generic image file types
-package-x-generic=The icon used for generic package file types
-text-html=The icon used for HTML text file types
-text-x-generic-template=The icon used for generic text templates
-text-x-preview=
-text-x-script=The icon used for script file types, such as shell scripts
-x-office-address-book=The icon used for generic address book file types
-x-office-document=The icon used for generic document and letter file types
-x-office-document-template=
-x-office-presentation=The icon used for generic presentation file types
-x-office-presentation-template=
-x-office-spreadsheet=The icon used for generic spreadsheet file types
-x-office-spreadsheet-template=
-x-package-repository=
-applications-accessories=The icon for the “Accessories” sub-menu of the Programs menu
-applications-development=The icon for the “Programming” sub-menu of the Programs menu
-applications-engineering=The icon for the “Engineering” sub-menu of the Programs menu
-applications-games=The icon for the “Games” sub-menu of the Programs menu
-applications-graphics=The icon for the “Graphics” sub-menu of the Programs menu
-applications-internet=The icon for the “Internet” sub-menu of the Programs menu
-applications-multimedia=The icon for the “Multimedia” sub-menu of the Programs menu
-applications-office=The icon for the “Office” sub-menu of the Programs menu
-applications-other=The icon for the “Other” sub-menu of the Programs menu
-applications-science=The icon for the “Science” sub-menu of the Programs menu
-applications-system=The icon for the “System Tools” sub-menu of the Programs menu
-applications-utilities=The icon for the “Utilities” sub-menu of the Programs menu
-preferences-desktop=The icon for the “Desktop Preferences” category
-preferences-desktop-peripherals=The icon for the “Peripherals” sub-category of the “Desktop Preferences” category
-preferences-desktop-personal=The icon for the “Personal” sub-category of the “Desktop Preferences” category
-preferences-other=The icon for the “Other” preferences category
-preferences-system=The icon for the “System Preferences” category
-preferences-system-network=The icon for the “Network” sub-category of the “System Preferences” category
-system-help=The icon for the “Help” system category
-battery=The icon used for the system battery device
-computer-apple-ipad=
-colorimeter-colorhug=
-drive-harddisk=The icon used for hard disk drives
-drive-harddisk-ieee1394=
-drive-harddisk-system=
-drive-multidisk=
-media-optical-bd=
-media-optical-cd-audio=
-media-optical-dvd=
-media-tape=The icon used for generic physical tape media
-media-zip=
-modem=The icon used for modem devices
-multimedia-player-apple-ipod-touch=
-network-vpn=
-pda=This is the fallback icon for Personal Digial Assistant devices. Primary use of this icon is for PDA devices connected to the PC. Connection medium is not an important aspect of the icon. The metaphor for this fallback icon should be a generic PDA device icon
-phone-apple-iphone=
-uninterruptible-power-supply=
-emblem-default=The icon used as an emblem to specify the default selection of a printer for example
-emblem-documents=The icon used as an emblem for the directory where a user's documents are stored
-emblem-downloads=The icon used as an emblem for the directory where a user's downloads from the internet are stored
-emblem-favorite=The icon used as an emblem for files and directories that the user marks as favorites
-emblem-generic=
-emblem-important=The icon used as an emblem for files and directories that are marked as important by the user
-emblem-mail=The icon used as an emblem to specify the directory where the user's electronic mail is stored
-emblem-new=
-emblem-ok=
-emblem-package=
-emblem-photos=The icon used as an emblem to specify the directory where the user stores photographs
-emblem-readonly=The icon used as an emblem for files and directories which can not be written to by the user
-emblem-symbolic-link=The icon used as an emblem for files and direcotires that are links to other files or directories on the filesystem
-emblem-synchronized=The icon used as an emblem for files or directories that are configured to be synchronized to another device
-emblem-unreadable=The icon used as an emblem for files and directories that are inaccessible.
-emblem-urgent=
-emblem-videos=
-emblem-web=
-folder-documents=
-folder-download=The icon representing the location in the file system where downloaded files are stored
-folder-music=
-folder-pictures=
-folder-publicshare=
-folder-remote=The icon used for normal directories on a remote filesystem
-folder-saved-search=
-folder-templates=
-folder-videos=
-network-server=The icon used for individual host machines under the “Network Servers” place in the file manager
-network-workgroup=The icon for the “Network Servers” place in the desktop's file manager, and workgroups within the network
-start-here=The icon used by the desktop's main menu for accessing places, applications, and other features
-user-bookmarks=The icon for the user's special “Bookmarks” place
-user-desktop=The icon for the special “Desktop” directory of the user
-user-home=The icon for the special “Home” directory of the user
-airplane-mode=
-battery-caution-charging=
-battery-caution=The icon used when the battery is below 40%
-battery-empty-charging=
-battery-empty=
-battery-full-charged=
-battery-full-charging=
-battery-full=
-battery-good-charging=
-battery-good=
-battery-low-charging=
-battery-low=The icon used when the battery is below 20%
-battery-missing=
-bluetooth-active=
-bluetooth-disabled=
-channel-insecure=
-channel-secure=
-computer-fail=
-display-brightness=
-keyboard-brightness=
-folder-drag-accept=The icon used for a folder while an object is being dragged onto it, that is of a type that the directory can contain
-folder-open=The icon used for folders, while their contents are being displayed within the same window. This icon would normally be shown in a tree or list view, next to the main view of a folder's contents
-folder-visiting=The icon used for folders, while their contents are being displayed in another window. This icon would typically be used when using multiple windows to navigate the hierarchy, such as in Nautilus's spatial mode
-image-loading=The icon used when another image is being loaded, such as thumnails for larger images in the file manager
-image-missing=The icon used when another image could not be loaded
-mail-signed=The icon used for an electronic mail that contains a signature
-mail-signed-verified=The icon used for an electronic mail that contains a signature which has also been verified by the security system
-network-cellular-3g=
-network-cellular-4g=
-network-cellular-edge=
-network-cellular-gprs=
-network-cellular-umts=
-network-cellular-acquiring=
-network-cellular-connected=
-network-cellular-no-route=
-network-cellular-offline=
-network-cellular-signal-excellent=
-network-cellular-signal-good=
-network-cellular-signal-ok=
-network-cellular-signal-weak=
-network-cellular-signal-none=
-network-vpn-acquiring=
-network-vpn=
-network-wired-acquiring=
-network-wired-disconnected=
-network-wired-no-route=
-network-wired-offline=
-network-wireless-acquiring=
-network-wireless-connected=
-network-wireless-encrypted=
-network-wireless-hotspot=
-network-wireless-no-route=
-network-wireless-offline=
-network-wireless-signal-excellent=
-network-wireless-signal-good=
-network-wireless-signal-ok=
-network-wireless-signal-weak=
-network-wireless-signal-none=
-rotation-allowed=
-rotation-locked=
-software-update-available=The icon used when an update is available for software installed on the computing device, through the system software update program
-software-update-urgent=The icon used when an urgent update is available through the system software update program
-sync-error=The icon used when an error occurs while attempting to synchronize data from the computing device, to another device
-sync-synchronizing=The icon used while data is successfully synchronizing to another device
-touchpad-disabled=
-trophy-bronze=
-trophy-silver=
-trophy-gold=
-night-light=
-daytime-sunrise=
-daytime-sunset=
--- a/demos/icon-browser/iconbrowser.gresource.xml
+++ b/demos/icon-browser/iconbrowser.gresource.xml
@@ -3,6 +3,5 @@
  <gresource prefix="/org/gtk/iconbrowser/gtk">
    <file preprocess="xml-stripblanks">window.ui</file>
    <file preprocess="xml-stripblanks">menus.ui</file>
-    <file>icon.list</file>
  </gresource>
 </gresources>
--- a/demos/icon-browser/iconbrowserwin.c
+++ b/demos/icon-browser/iconbrowserwin.c
@@ -4,29 +4,13 @@
 #include "iconstore.h"
 #include <gtk/gtk.h>

-/* Drag 'n Drop */
-static GtkTargetEntry target_table[] = {
-  { "text/uri-list", 0, 0 },
-};
-
 typedef struct
 {
-  gchar *id;
-  gchar *name;
-  gchar *description;
+  const gchar *id;
+  const gchar *name;
+  const gchar *description;
 } Context;

-static void
-context_free (gpointer data)
-{
-  Context *context = data;
-
-  g_free (context->id);
-  g_free (context->name);
-  g_free (context->description);
-  g_free (context);
-}
-
 struct _IconBrowserWindow
 {
  GtkApplicationWindow parent;
@@ -51,8 +35,6 @@ struct _IconBrowserWindow
  GtkWidget *image3;
  GtkWidget *image4;
  GtkWidget *image5;
-  GtkWidget *image6;
-  GtkWidget *label6;
  GtkWidget *description;
 };

@@ -134,19 +116,6 @@ item_activated (GtkIconView *icon_view, GtkTreePath *path, IconBrowserWindow *wi
  set_image (win->image3, name, 32);
  set_image (win->image4, name, 48);
  set_image (win->image5, name, 64);
-  if (win->symbolic)
-    {
-      gtk_widget_show (win->image6);
-      gtk_widget_show (win->label6);
-      gtk_widget_show (gtk_widget_get_parent (win->image6));
-      set_image (win->image6, name, 64);
-    }
-  else
-    {
-      gtk_widget_hide (win->image6);
-      gtk_widget_hide (win->label6);
-      gtk_widget_hide (gtk_widget_get_parent (win->image6));
-    }
  if (description && description[0])
    {
      gtk_label_set_text (GTK_LABEL (win->description), description);
@@ -185,7 +154,6 @@ add_icon (IconBrowserWindow *win,
      g_free (symbolic_name);
      symbolic_name = NULL;
    }
-
  gtk_list_store_insert_with_values (win->store, NULL, -1,
                                     ICON_STORE_NAME_COLUMN, regular_name,
                                     ICON_STORE_SYMBOLIC_NAME_COLUMN, symbolic_name,
@@ -204,11 +172,11 @@ add_context (IconBrowserWindow *win,
  GtkWidget *row;

  c = g_new (Context, 1);
-  c->id = g_strdup (id);
-  c->name = g_strdup (name);
-  c->description = g_strdup (description);
+  c->id = id;
+  c->name = name;
+  c->description = description;

-  g_hash_table_insert (win->contexts, c->id, c);
+  g_hash_table_insert (win->contexts, (gpointer)id, c);

  row = gtk_label_new (name);
  g_object_set_data (G_OBJECT (row), "context", c);
@@ -245,50 +213,475 @@ selected_context_changed (GtkListBox *list, IconBrowserWindow *win)
 static void
 populate (IconBrowserWindow *win)
 {
-  GFile *file;
-  GKeyFile *kf;
-  char *data;
-  gsize length;
-  char **groups;
-  int i;
+  add_context (win, "volume", "Volume", "Icons related to audio input and output volume");
+  add_icon (win, "audio-volume-high", "The icon used to indicate high audio volume", "volume");
+  add_icon (win, "audio-volume-low", "The icon used to indicate low audio volume", "volume");
+  add_icon (win, "audio-volume-medium", "The icon used to indicate medium audio volume", "volume");
+  add_icon (win, "audio-volume-muted", "The icon used to indicate the muted state for audio playback", "volume");
+  add_icon (win, "microphone-sensitivity-high", "The icon used to indicate high microphone sensitivity", "volume");
+  add_icon (win, "microphone-sensitivity-low", "The icon used to indicate low microphone sensitivity", "volume");
+  add_icon (win, "microphone-sensitivity-medium", "The icon used to indicate medium microphone sensitivity", "volume");
+  add_icon (win, "microphone-sensitivity-muted", "The icon used to indicate that a microphone is muted", "volume");

-  file = g_file_new_for_uri ("resource:/org/gtk/iconbrowser/gtk/icon.list");
-  g_file_load_contents (file, NULL, &data, &length, NULL, NULL);
+  add_context (win, "multimedia", "Multimedia", "Icons related to playback of media");
+  add_icon (win, "media-playlist-repeat", "The icon for the repeat mode of a media player", "multimedia");
+  add_icon (win, "media-playlist-repeat-song", "The icon for repeating a song in a media player", "multimedia");
+  add_icon (win, "media-playlist-shuffle", "The icon for the shuffle mode of a media player", "multimedia");
+  add_icon (win, "media-playlist-consecutive", "The icon for consecutive mode of a media player", "multimedia");
+  add_icon (win, "media-skip-backward", "The icon for the skip backward action of a media player", "multimedia");
+  add_icon (win, "media-seek-backward", "The icon for the seek backward action of a media player", "multimedia");
+  add_icon (win, "media-playback-start", "The icon for the start playback action of a media player", "multimedia");
+  add_icon (win, "media-seek-forward", "The icon for the seek forward action of a media player", "multimedia");
+  add_icon (win, "media-skip-forward", "The icon for the skip forward action of a media player", "multimedia");
+  add_icon (win, "media-playback-stop", "The icon for the stop action of a media player", "multimedia");
+  add_icon (win, "media-playback-pause", "The icon for the pause action of a media player", "multimedia");
+  add_icon (win, "media-eject", "The icon for the eject action of a media player or file manager", "multimedia");
+  add_icon (win, "media-record", "The icon for the record action of a media application", "multimedia");
+  add_icon (win, "media-view-subtitles", "The icon used to show subtitles in a media player", "multimedia");

-  kf = g_key_file_new ();
-  g_key_file_load_from_data (kf, data, length, G_KEY_FILE_NONE, NULL);
+  add_context (win, "network", "Network", "Icons related to network status");
+  add_icon (win, "network-transmit-receive", "The icon used data is being both transmitted and received simultaneously, while the computing device is connected to a network", "network");
+  add_icon (win, "network-transmit", "The icon used when data is being transmitted, while the computing device is connected to a network", "network");
+  add_icon (win, "network-receive", "The icon used when data is being received, while the computing device is connected to a network", "network");
+  add_icon (win, "network-idle", "The icon used when no data is being transmitted or received, while the computing device is connected to a network", "network");
+ add_icon (win, "network-error", "The icon used when an error occurs trying to intialize the network connection of the computing device", "network");
+  add_icon (win, "network-offline", "The icon used when the computing device is disconnected from the network", "network");

-  groups = g_key_file_get_groups (kf, &length);
-  for (i = 0; i < length; i++)
-    {
-      const char *context;
-      const char *name;
-      const char *description;
-      char **keys;
-      gsize len;
-      int j;
+  add_context (win, "weather", "Weather", "Icons about weather conditions");
+  add_icon (win, "weather-clear", "The icon used while the weather for a region is “clear skies”", "weather");
+  add_icon (win, "weather-clear-night", "The icon used while the weather for a region is “clear skies” during the night", "weather");
+  add_icon (win, "weather-few-clouds", "The icon used while the weather for a region is “partly cloudy”", "weather");
+  add_icon (win, "weather-few-clouds-night", "The icon used while the weather for a region is “partly cloudy” during the night", "weather");
+  add_icon (win, "weather-fog", "The icon used while the weather for a region is “foggy”", "weather");
+  add_icon (win, "weather-overcast", "The icon used while the weather for a region is “overcast”", "weather");
+  add_icon (win, "weather-severe-alert", "The icon used while a sever weather alert is in effect for a region", "weather");
+  add_icon (win, "weather-showers", "The icon used while rain showers are occurring in a region", "weather");
+  add_icon (win, "weather-showers-scattered", "The icon used while scattered rain showers are occurring in a region", "weather");
+  add_icon (win, "weather-snow", "The icon used while snow showers are occurring in a region", "weather");
+  add_icon (win, "weather-storm", "The icon used while storms are occurring in a region", "weather");

-      context = groups[i];
-      name = g_key_file_get_string (kf, context, "Name", NULL);
-      description = g_key_file_get_string (kf, context, "Description", NULL);
-      add_context (win, context, name, description);
+  add_context (win, "navigation", "Navigation", "Icons for navigation in the user interface of a program");
+  add_icon (win, "go-first", "The icon for the go to the first item in a list", "navigation");
+  add_icon (win, "go-previous", "The icon for the go to the previous item in a list", "navigation");
+  add_icon (win, "go-next", "The icon for the go to the next item in a list", "navigation");
+  add_icon (win, "go-last", "The icon for the go to the last item in a list", "navigation");
+  add_icon (win, "go-bottom", "The icon for the go to bottom of a list", "navigation");
+  add_icon (win, "go-down", "The icon for the go down in a list", "navigation");
+  add_icon (win, "go-up", "The icon for the go up in a list", "navigation");
+  add_icon (win, "go-top", "The icon for the go to the top of a list", "navigation");
+  add_icon (win, "go-home", "The icon for the go to home location", "navigation");
+  add_icon (win, "go-jump", "The icon for the jump to action", "navigation");

-      keys = g_key_file_get_keys (kf, context, &len, NULL);
-      for (j = 0; j < len; j++)
-        {
-          const char *key = keys[j];
-          const char *value;
+  add_context (win, "editing", "Editing", "Icons related to editing a document");
+  add_icon (win, "format-indent-less", "The icon for the decrease indent formatting action", "editing");
+  add_icon (win, "format-indent-more", "The icon for the increase indent formatting action", "editing");
+  add_icon (win, "format-justify-center", "The icon for the center justification formatting action", "editing");
+  add_icon (win, "format-justify-fill", "The icon for the fill justification formatting action", "editing");
+  add_icon (win, "format-justify-left", "The icon for the left justification formatting action", "editing");
+  add_icon (win, "format-justify-right", "The icon for the right justification action", "editing");
+  add_icon (win, "format-text-direction-ltr", "The icon for the left-to-right text formatting action", "editing");
+  add_icon (win, "format-text-direction-rtl", "The icon for the right-to-left formatting action", "editing");
+  add_icon (win, "format-text-bold", "The icon for the bold text formatting action", "editing");
+  add_icon (win, "format-text-italic", "The icon for the italic text formatting action", "editing");
+  add_icon (win, "format-text-underline", "The icon for the underlined text formatting action", "editing");
+  add_icon (win, "format-text-strikethrough", "The icon for the strikethrough text formatting action", "editing");
+  add_icon (win, "edit-clear", "The icon for the clear action", "editing");
+  add_icon (win, "edit-clear-all", "", "editing");
+  add_icon (win, "edit-copy", "The icon for the copy action", "editing");
+  add_icon (win, "edit-cut", "The icon for the cut action", "editing");
+  add_icon (win, "edit-delete", "The icon for the delete action", "editing");
+  add_icon (win, "edit-find-replace", "The icon for the find and replace action", "editing");
+  add_icon (win, "edit-paste", "The icon for the paste action", "editing");
+  add_icon (win, "edit-redo", "The icon for the redo action", "editing");
+  add_icon (win, "edit-select-all", "The icon for the select all action", "editing");
+  add_icon (win, "edit-select", "", "editing");
+  add_icon (win, "edit-undo", "The icon for the undo action", "editing");
+  add_icon (win, "document-properties", "The icon for the action to view the properties of a document in an application", "editing");
+  add_icon (win, "document-new", "The icon used for the action to create a new document", "editing");
+  add_icon (win, "document-open", "The icon used for the action to open a document", "editing");
+  add_icon (win, "document-open-recent", "The icon used for the action to open a document that was recently opened", "editing");
+  add_icon (win, "document-save", "The icon for the save action. Should be an arrow pointing down and toward a hard disk", "editing");
+  add_icon (win, "document-save-as", "The icon for the save as action", "editing");
+  add_icon (win, "document-send", "The icon for the send action. Should be an arrow pointing up and away from a hard disk", "editing");
+  add_icon (win, "document-page-setup", "The icon for the page setup action of a document editor", "editing");
+  add_icon (win, "changes-allow", "", "other");
+  add_icon (win, "changes-prevent", "", "other");
+  add_icon (win, "object-flip-horizontal", "The icon for the action to flip an object horizontally", "editing");
+  add_icon (win, "object-flip-vertical", "The icon for the action to flip an object vertically", "editing");
+  add_icon (win, "object-rotate-left", "The icon for the rotate left action performed on an object", "editing");
+  add_icon (win, "object-rotate-right", "The icon for the rotate rigt action performed on an object", "editing");
+  add_icon (win, "insert-image", "The icon for the insert image action of an application", "editing");
+  add_icon (win, "insert-link", "The icon for the insert link action of an application", "editing");
+  add_icon (win, "insert-object", "The icon for the insert object action of an application", "editing");
+  add_icon (win, "insert-text", "The icon for the insert text action of an application", "editing");
+  add_icon (win, "accessories-text-editor", "The icon used for the desktop's text editing accessory program", "editing");

-          if (strcmp (key, "Name") == 0 || strcmp (key, "Description") == 0)
-            continue;
+  add_context (win, "view", "View Controls", "Icons for view controls in a user interface");
+  add_icon (win, "view-list", "The icon used for “List“ view mode", "view");
+  add_icon (win, "view-grid", "The icon used for “Grid“ view mode (as opposed to “List“)", "view");
+  add_icon (win, "view-fullscreen", "The icon used for the “Fullscreen” item in the application's “View” menu", "view");
+  add_icon (win, "view-restore", "The icon used by an application for leaving the fullscreen view, and returning to a normal windowed view", "view");
+  add_icon (win, "zoom-fit-best", "The icon used for the “Best Fit” item in the application's “View” menu", "view");
+  add_icon (win, "zoom-in", "The icon used for the “Zoom in” item in the application's “View” menu", "view");
+  add_icon (win, "zoom-out", "The icon used for the “Zoom Out” item in the application's “View” menu ", "view");
+  add_icon (win, "zoom-original", "The icon used for the “Original Size” item in the application's “View” menu", "view");
+  add_icon (win, "view-continuous", "The icon used for a continuous view mode", "view");
+  add_icon (win, "view-paged", "The icon used for a paged view mode (as opposed to continuous)", "view");
+  add_icon (win, "view-dual", "The icon used for a side-by-side view of paginated content", "view");
+  add_icon (win, "view-wrapped", "The icon used to indicate a wrap-around to the beginning", "view");

-          value = g_key_file_get_string (kf, context, key, NULL);
+  add_context (win, "calendar", "Calendar, Tasks and Alarms", "Icons related to calendars, tasks and alarms");
+  add_icon (win, "task-due", "The icon used when a task is due soon", "calendar");
+  add_icon (win, "task-past-due", "The icon used when a task that was due, has been left incomplete", "calendar");
+  add_icon (win, "appointment-soon", "The icon used when an appointment will occur soon", "calendar");
+  add_icon (win, "appointment-missed", "The icon used when an appointment was missed", "calendar");
+  add_icon (win, "alarm", "The icon used for alarms when a task or appointment is due", "calendar");

-          add_icon (win, key, value, context);
-        }
-      g_strfreev (keys);
-    }
-  g_strfreev (groups);
+  add_context (win, "communication", "Communication", "Icons related email, phone calls, IM and other forms of communication");
+  add_icon (win, "mail-unread", "The icon used for an electronic mail that is unread", "communication");
+  add_icon (win, "mail-read", "The icon used for an electronic mail that is read", "communication");
+  add_icon (win, "mail-replied", "The icon used for an electronic mail that has been replied to", "communication");
+  add_icon (win, "mail-attachment", "The icon used for an electronic mail that contains attachments", "communication");
+  add_icon (win, "mail-mark-important", "The icon for the mark as important action of an electronic mail application", "communication");
+  add_icon (win, "mail-send", "The icon for the send action of an electronic mail application", "communication");
+  add_icon (win, "mail-send-receive", "The icon for the send and receive action of an electronic mail application", "communication");
+  add_icon (win, "call-start", "The icon used for initiating or accepting a call", "communication");
+  add_icon (win, "call-stop", "The icon used for stopping a current call", "communication");
+  add_icon (win, "call-missed", "The icon used to show a missed call", "communication");
+  add_icon (win, "user-available", "The icon used when a user on a chat network is available to initiate a conversation with", "communication");
+  add_icon (win, "user-offline", "The icon used when a user on a chat network is not available", "communication");
+  add_icon (win, "user-idle", "The icon used when a user on a chat network has not been an active participant in any chats on the network, for an extended period of time", "communication");
+  add_icon (win, "user-invisible", "The icon used when a user is on a chat network, but is invisible to others", "communication");
+  add_icon (win, "user-busy", "The icon used when a user is on a chat network, and has marked himself as busy", "communication");
+  add_icon (win, "user-away", "The icon used when a user on a chat network is away from their keyboard and the chat program", "communication");
+  add_icon (win, "user-status-pending", "The icon used when the current user status on a chat network is not known", "communication");
+
+  add_context (win, "devices", "Devices and Media", "Icons for devices and media");
+  add_icon (win, "audio-input-microphone", "The icon used for the microphone audio input device", "devices");
+  add_icon (win, "camera-web", "The fallback icon for web cameras", "devices");
+  add_icon (win, "camera-photo", "The icon used for a digital still camera devices", "devices");
+  add_icon (win, "input-keyboard", "The icon used for the keyboard input device", "devices");
+  add_icon (win, "printer", "The icon used for a printer device", "devices");
+  add_icon (win, "video-display", "The icon used for the monitor that video gets displayed to", "devices");
+  add_icon (win, "computer", "The icon used for the computing device as a whole", "devices");
+  add_icon (win, "media-optical", "The icon used for physical optical media such as CD and DVD", "devices");
+  add_icon (win, "phone", "The icon used for phone devices which support connectivity to the PC, such as VoIP, cellular, or possibly landline phones", "devices");
+  add_icon (win, "input-dialpad", "The icon used for dialpad input devices", "devices");
+  add_icon (win, "input-touchpad", "The icon used for touchpad input devices", "devices");
+  add_icon (win, "scanner", "The icon used for a scanner device", "devices");
+  add_icon (win, "audio-card", "The icon used for the audio rendering device", "devices");
+  add_icon (win, "input-gaming", "The icon used for the gaming input device", "devices");
+  add_icon (win, "input-mouse", "The icon used for the mousing input device", "devices");
+  add_icon (win, "multimedia-player", "The icon used for generic multimedia playing devices", "devices");
+  add_icon (win, "audio-headphones", "The icon used for headphones", "devices");
+  add_icon (win, "audio-headset", "The icon used for headsets", "devices");
+  add_icon (win, "display-projector", "The icon used for projectors", "devices");
+  add_icon (win, "media-removable", "The icon used for generic removable media", "devices");
+  add_icon (win, "printer-network", "The icon used for printers which are connected via the network", "devices");
+  add_icon (win, "audio-speakers", "The icon used for speakers", "devices");
+  add_icon (win, "camera-video", "The fallback icon for video cameras", "devices");
+  add_icon (win, "drive-optical", "The icon used for optical media drives such as CD and DVD", "devices");
+  add_icon (win, "drive-removable-media", "The icon used for removable media drives", "devices");
+  add_icon (win, "input-tablet", "The icon used for graphics tablet input devices", "devices");
+  add_icon (win, "network-wireless", "The icon used for wireless network connections", "devices");
+  add_icon (win, "network-wired", "The icon used for wired network connections", "devices");
+  add_icon (win, "media-floppy", "The icon used for physical floppy disk media", "devices");
+  add_icon (win, "media-flash", "The fallback icon used for flash media, such as memory stick and SD", "devices");
+
+  add_context (win, "contenttypes", "Content Types", "Icons for different types of data, such as audio or image files");
+  add_icon (win, "application-certificate", "", "contenttypes"); 
+  add_icon (win, "application-rss+xml", "", "contenttypes"); 
+  add_icon (win, "application-x-appliance", "", "contenttypes"); 
+  add_icon (win, "audio-x-generic", "The icon used for generic audio file types", "contenttypes");
+  add_icon (win, "folder", "The standard folder icon used to represent directories on local filesystems, mail folders, and other hierarchical groups", "contenttypes");
+  add_icon (win, "text-x-generic", "The icon used for generic text file types", "contenttypes");
+  add_icon (win, "video-x-generic", "The icon used for generic video file types", "contenttypes");
+  add_icon (win, "x-office-calendar", "The icon used for generic calendar file types", "contenttypes");
+
+  add_context (win, "emotes", "Emotes", "Icons for emotions that are expressed through text chat applications such as :-) or :-P in IRC or instant messengers");
+  add_icon (win, "face-angel", "The icon used for the 0:-) emote", "emotes");
+  add_icon (win, "face-angry", "The icon used for the X-( emote", "emotes");
+  add_icon (win, "face-cool", "The icon used for the B-) emote", "emotes");
+  add_icon (win, "face-crying", "The icon used for the :'( emote", "emotes");
+  add_icon (win, "face-devilish", "The icon used for the >:-) emote", "emotes");
+  add_icon (win, "face-embarrassed", "The icon used for the :-[ emote", "emotes");
+  add_icon (win, "face-kiss", "The icon used for the :-* emote", "emotes");
+  add_icon (win, "face-laugh", "The icon used for the :-)) emote", "emotes");
+  add_icon (win, "face-monkey", "The icon used for the :-(|) emote", "emotes");
+  add_icon (win, "face-plain", "The icon used for the :-| emote", "emotes");
+  add_icon (win, "face-raspberry", "The icon used for the :-P emote", "emotes");
+  add_icon (win, "face-sad", "The icon used for the :-( emote", "emotes");
+  add_icon (win, "face-shutmouth", "The 'shut mouth' emote", "emotes"); 
+  add_icon (win, "face-sick", "The icon used for the :-& emote", "emotes");
+  add_icon (win, "face-smile", "The icon used for the :-) emote", "emotes");
+  add_icon (win, "face-smile-big", "The icon used for the :-D emote", "emotes");
+  add_icon (win, "face-smirk", "The icon used for the :-! emote", "emotes");
+  add_icon (win, "face-surprise", "The icon used for the :-0 emote", "emotes");
+  add_icon (win, "face-tired", "The icon used for the |-) emote", "emotes");
+  add_icon (win, "face-uncertain", "The icon used for the :-/ emote", "emotes");
+  add_icon (win, "face-wink", "The icon used for the ;-) emote", "emotes");
+  add_icon (win, "face-worried", "The icon used for the :-S emote", "emotes");
+  add_icon (win, "face-yawn", "", "emotes"); 
+
+  add_context (win, "general", "General", "Generally useful icons that don't fit in a particular category");
+  add_icon (win, "edit-find", "The icon for generic search actions", "general");
+  add_icon (win, "content-loading", "The icon used to indicate that content is loading", "general"); 
+  add_icon (win, "open-menu", "The icon used for a menu button in the header bar", "general"); 
+  add_icon (win, "view-more", "The icon used for a  “View More“ action", "general"); 
+  add_icon (win, "tab-new", "The icon used for a “New Tab“ action", "general"); 
+  add_icon (win, "bookmark-new", "The icon used for creating a new bookmark", "general"); 
+  add_icon (win, "mark-location", "The icon used to mark a location on a map", "general"); 
+  add_icon (win, "find-location", "The icon used for a  “Search location“ action", "general"); 
+  add_icon (win, "send-to", "The icon used for a  “Send to“ action", "general"); 
+  add_icon (win, "object-select", "The icon used for generic selection actions", "general"); 
+  add_icon (win, "window-close", "The icon used for actions that close a view, such as window or tab close button", "general");
+  add_icon (win, "view-refresh", "The icon used for the “Refresh” item in the application's “View” menu", "general");
+  add_icon (win, "process-stop", "The icon used for the “Stop” action in applications with actions that may take a while to process, such as web page loading in a browser", "general");
+  add_icon (win, "action-unavailable", "The icon used to indicate that an action is currently unavailable, such as “Pause“ when no media is playing", "general"); 
+  add_icon (win, "document-print", "The icon for the print action of an application", "general");
+  add_icon (win, "printer-printing", "The icon used while a print job is successfully being spooled to a printing device", "general");
+  add_icon (win, "printer-warning", "The icon used when a recoverable problem occurs while attempting to printing", "general"); 
+  add_icon (win, "printer-error", "The icon used when an error occurs while attempting to print", "general");
+  add_icon (win, "dialog-information", "The icon used when a dialog is opened to give information to the user that may be pertinent to the requested action", "general");
+  add_icon (win, "dialog-question", "The icon used when a dialog is opened to ask a simple question of the user", "general");
+  add_icon (win, "dialog-warning", "The icon used when a dialog is opened to warn the user of impending issues with the requested action", "general");
+  add_icon (win, "dialog-password", "The icon used when a dialog requesting the authentication credentials for a user is opened", "general");
+  add_icon (win, "dialog-error", "The icon used when a dialog is opened to explain an error condition to the user", "general");
+  add_icon (win, "list-add", "The icon for the add to list action", "general");
+  add_icon (win, "list-remove", "The icon for the remove from list action", "general");
+  add_icon (win, "non-starred", "The icon used to indicate that an object is not 'starred'", "general"); 
+  add_icon (win, "semi-starred", "The icon used to indicate that an object has is 'half-starred'", "general"); 
+  add_icon (win, "starred", "The icon used to indicate that an object is 'starred'", "general"); 
+  add_icon (win, "star-new", "The used for the “New Star“ action", "general"); 
+  add_icon (win, "security-low", "The icon used to indicate that the security level of a connection is presumed to be insecure, either by using weak encryption, or by using a certificate that the could not be automatically verified, and which the user has not chosent to trust", "general");
+  add_icon (win, "security-medium", "The icon used to indicate that the security level of a connection is presumed to be secure, using strong encryption, and a certificate that could not be automatically verified, but which the user has chosen to trust", "general");
+  add_icon (win, "security-high", "The icon used to indicate that the security level of a connection is known to be secure, using strong encryption and a valid certificate", "general");
+  add_icon (win, "user-trash", "The icon for the user's “Trash” place in the file system", "other");
+  add_icon (win, "user-trash-full", "The icon for the user's “Trash” in the file system, when there are items in the “Trash” waiting for disposal or recovery", "general");
+  add_icon (win, "emblem-system", "The icon used as an emblem for directories that contain system libraries, settings, and data", "general");
+  add_icon (win, "avatar-default", "The generic avatar icon, which is used to represent a user that doesn't have a personalized avatar", "general"); 
+  add_icon (win, "emblem-synchronizing", "The icon used as an emblem to indicate that a a synchronizing operation is in process", "general"); 
+  add_icon (win, "emblem-shared", "The icon used as an emblem for files and directories that are shared to other users", "general");
+  add_icon (win, "folder-download", "The icon representing the location in the file system where downloaded files are stored", "general"); 
+  add_icon (win, "help-browser", "The icon used for the desktop's help browsing application", "general");
+
+  add_context (win, "other", "Other", "Icons which have may be too specialized and not of general interest");
+  add_icon (win, "view-sort-ascending", "The icon used for the “Sort Ascending” item in the application's “View” menu, or in a button for changing the sort method for a list", "other");
+  add_icon (win, "view-sort-descending", "The icon used for the “Sort Descending” item in the application's “View” menu, or in a button for changing the sort method for a list", "other");
+  add_icon (win, "document-revert", "The icon for the action of reverting to a previous version of a document", "other");
+  add_icon (win, "address-book-new", "The icon used for the action to create a new address book", "other");
+  add_icon (win, "application-exit", "The icon used for exiting an application. Typically this is seen in the application's menus as File->Quit", "other");
+  add_icon (win, "appointment-new", "The icon used for the action to create a new appointment in a calendaring application", "other");
+  add_icon (win, "contact-new", "The icon used for the action to create a new contact in an address book application", "other");
+  add_icon (win, "document-print-preview", "The icon for the print preview action of an application", "other");
+  add_icon (win, "folder-new", "The icon for creating a new folder", "other");
+  add_icon (win, "help-about", "The icon for the About item in the Help menu", "other");
+  add_icon (win, "help-contents", "The icon for Contents item in the Help menu", "other");
+  add_icon (win, "help-faq", "The icon for the FAQ item in the Help menu", "other");
+  add_icon (win, "list-remove-all", "", "other");
+  add_icon (win, "mail-forward", "The icon for the forward action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-junk", "The icon for the mark as junk action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-notjunk", "The icon for the mark as not junk action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-read", "The icon for the mark as read action of an electronic mail application", "other");
+  add_icon (win, "mail-mark-unread", "The icon for the mark as unread action of an electronic mail application", "other");
+  add_icon (win, "mail-message-new", "The icon for the compose new mail action of an electronic mail application", "other");
+  add_icon (win, "mail-reply-all", "The icon for the reply to all action of an electronic mail application", "other");
+  add_icon (win, "mail-reply-sender", "The icon for the reply to sender action of an electronic mail application", "other");
+  add_icon (win, "pan-down", "", "other"); 
+  add_icon (win, "pan-end", "", "other"); 
+  add_icon (win, "pan-start", "", "other"); 
+  add_icon (win, "pan-up", "", "other"); 
+  add_icon (win, "system-lock-screen", "The icon used for the “Lock Screen” item in the desktop's panel application", "other");
+  add_icon (win, "system-log-out", "The icon used for the “Log Out” item in the desktop's panel application", "other");
+  add_icon (win, "system-run", "The icon used for the “Run Application...” item in the desktop's panel application", "other");
+  add_icon (win, "system-search", "The icon used for the “Search” item in the desktop's panel application", "other");
+  add_icon (win, "system-reboot", "The icon used for the “Reboot” item in the desktop's panel application", "other");
+  add_icon (win, "system-shutdown", "The icon used for the “Shutdown” item in the desktop's panel application", "other");
+  add_icon (win, "tools-check-spelling", "The icon used for the “Check Spelling” item in the application's “Tools” menu", "other");
+  add_icon (win, "window-maximize", "", "other"); 
+  add_icon (win, "window-minimize", "", "other"); 
+  add_icon (win, "window-restore", "", "other"); 
+  add_icon (win, "window-new", "The icon used for the “New Window” item in the application's “Windows” menu", "other");
+  add_icon (win, "accessories-calculator", "The icon used for the desktop's calculator accessory program", "other"); 
+  add_icon (win, "accessories-character-map", "The icon used for the desktop's international and extended text character accessory program", "other");
+  add_icon (win, "accessories-dictionary", "The icon used for the desktop's dictionary accessory program", "other");
+  add_icon (win, "multimedia-volume-control", "The icon used for the desktop's hardware volume control application", "other");
+  add_icon (win, "preferences-desktop-accessibility", "The icon used for the desktop's accessibility preferences", "other");
+  add_icon (win, "preferences-desktop-display", "", "other"); 
+  add_icon (win, "preferences-desktop-font", "The icon used for the desktop's font preferences", "other");
+  add_icon (win, "preferences-desktop-keyboard", "The icon used for the desktop's keyboard preferences", "other");
+  add_icon (win, "preferences-desktop-keyboard-shortcuts", "", "other"); 
+  add_icon (win, "preferences-desktop-locale", "The icon used for the desktop's locale preferences", "other");
+  add_icon (win, "preferences-desktop-remote-desktop", "", "other"); 
+  add_icon (win, "preferences-desktop-multimedia", "The icon used for the desktop's multimedia preferences", "other");
+  add_icon (win, "preferences-desktop-screensaver", "The icon used for the desktop's screen saving preferences", "other");
+  add_icon (win, "preferences-desktop-theme", "The icon used for the desktop's theme preferences", "other");
+  add_icon (win, "preferences-desktop-wallpaper", "The icon used for the desktop's wallpaper preferences", "other");
+  add_icon (win, "preferences-system-privacy", "", "other"); 
+  add_icon (win, "preferences-system-windows", "", "other"); 
+  add_icon (win, "system-file-manager", "The icon used for the desktop's file management application", "other");
+  add_icon (win, "system-software-install", "The icon used for the desktop's software installer application", "other");
+  add_icon (win, "system-software-update", "The icon used for the desktop's software updating application", "other");
+  add_icon (win, "system-users", "", "other"); 
+  add_icon (win, "user-info", "", "other"); 
+  add_icon (win, "utilities-system-monitor", "The icon used for the desktop's system resource monitor application", "other");
+  add_icon (win, "utilities-terminal", "The icon used for the desktop's terminal emulation application. ", "other");
+  add_icon (win, "application-x-addon", "", "other");
+  add_icon (win, "application-x-executable", "The icon used for executable file types", "other");
+  add_icon (win, "font-x-generic", "The icon used for generic font file types", "other");
+  add_icon (win, "image-x-generic", "The icon used for generic image file types", "other");
+  add_icon (win, "package-x-generic", "The icon used for generic package file types", "other");
+  add_icon (win, "text-html", "The icon used for HTML text file types", "other");
+  add_icon (win, "text-x-generic-template", "The icon used for generic text templates", "other");
+  add_icon (win, "text-x-preview", "", "other"); 
+  add_icon (win, "text-x-script", "The icon used for script file types, such as shell scripts", "other");
+  add_icon (win, "x-office-address-book", "The icon used for generic address book file types", "other");
+  add_icon (win, "x-office-document", "The icon used for generic document and letter file types", "other");
+  add_icon (win, "x-office-document-template", "", "other"); 
+  add_icon (win, "x-office-presentation", "The icon used for generic presentation file types", "other");
+  add_icon (win, "x-office-presentation-template", "", "other"); 
+  add_icon (win, "x-office-spreadsheet", "The icon used for generic spreadsheet file types", "other");
+  add_icon (win, "x-office-spreadsheet-template", "", "other"); 
+  add_icon (win, "x-package-repository", "", "other"); 
+  add_icon (win, "applications-accessories", "The icon for the “Accessories” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-development", "The icon for the “Programming” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-engineering", "The icon for the “Engineering” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-games", "The icon for the “Games” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-graphics", "The icon for the “Graphics” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-internet", "The icon for the “Internet” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-multimedia", "The icon for the “Multimedia” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-office", "The icon for the “Office” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-other", "The icon for the “Other” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-science", "The icon for the “Science” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-system", "The icon for the “System Tools” sub-menu of the Programs menu", "other");
+  add_icon (win, "applications-utilities", "The icon for the “Utilities” sub-menu of the Programs menu", "other");
+  add_icon (win, "preferences-desktop", "The icon for the “Desktop Preferences” category", "other");
+  add_icon (win, "preferences-desktop-peripherals", "The icon for the “Peripherals” sub-category of the “Desktop Preferences” category", "other");
+  add_icon (win, "preferences-desktop-personal", "The icon for the “Personal” sub-category of the “Desktop Preferences” category", "other");
+  add_icon (win, "preferences-other", "The icon for the “Other” preferences category", "other");
+  add_icon (win, "preferences-system", "The icon for the “System Preferences” category", "other");
+  add_icon (win, "preferences-system-network", "The icon for the “Network” sub-category of the “System Preferences” category", "other");
+  add_icon (win, "system-help", "The icon for the “Help” system category", "other");
+  add_icon (win, "battery", "The icon used for the system battery device", "other");
+  add_icon (win, "computer-apple-ipad", "", "other"); 
+  add_icon (win, "colorimeter-colorhug", "", "other"); 
+  add_icon (win, "drive-harddisk", "The icon used for hard disk drives", "other");
+  add_icon (win, "drive-harddisk-ieee1394", "", "other"); 
+  add_icon (win, "drive-harddisk-system", "", "other"); 
+  add_icon (win, "drive-multidisk", "", "other"); 
+  add_icon (win, "media-optical-bd", "", "other"); 
+  add_icon (win, "media-optical-cd-audio", "", "other"); 
+  add_icon (win, "media-optical-dvd", "", "other"); 
+  add_icon (win, "media-tape", "The icon used for generic physical tape media", "other");
+  add_icon (win, "media-zip", "", "other"); 
+  add_icon (win, "modem", "The icon used for modem devices", "other");
+  add_icon (win, "multimedia-player-apple-ipod-touch", "", "other"); 
+  add_icon (win, "network-vpn", "", "other"); 
+  add_icon (win, "pda", "This is the fallback icon for Personal Digial Assistant devices. Primary use of this icon is for PDA devices connected to the PC. Connection medium is not an important aspect of the icon. The metaphor for this fallback icon should be a generic PDA device icon", "other");
+  add_icon (win, "phone-apple-iphone", "", "other"); 
+  add_icon (win, "uninterruptible-power-supply", "", "other"); 
+  add_icon (win, "emblem-default", "The icon used as an emblem to specify the default selection of a printer for example", "other");
+  add_icon (win, "emblem-documents", "The icon used as an emblem for the directory where a user's documents are stored", "other");
+  add_icon (win, "emblem-downloads", "The icon used as an emblem for the directory where a user's downloads from the internet are stored", "other");
+  add_icon (win, "emblem-favorite", "The icon used as an emblem for files and directories that the user marks as favorites", "other");
+  add_icon (win, "emblem-generic", "", "other"); 
+  add_icon (win, "emblem-important", "The icon used as an emblem for files and directories that are marked as important by the user", "other");
+  add_icon (win, "emblem-mail", "The icon used as an emblem to specify the directory where the user's electronic mail is stored", "other");
+  add_icon (win, "emblem-new", "", "other"); 
+  add_icon (win, "emblem-ok", "", "other"); 
+  add_icon (win, "emblem-package", "", "other"); 
+  add_icon (win, "emblem-photos", "The icon used as an emblem to specify the directory where the user stores photographs", "other");
+  add_icon (win, "emblem-readonly", "The icon used as an emblem for files and directories which can not be written to by the user", "other");
+  add_icon (win, "emblem-symbolic-link", "The icon used as an emblem for files and direcotires that are links to other files or directories on the filesystem", "other");
+  add_icon (win, "emblem-synchronized", "The icon used as an emblem for files or directories that are configured to be synchronized to another device", "other");
+  add_icon (win, "emblem-unreadable", "The icon used as an emblem for files and directories that are inaccessible. ", "other");
+  add_icon (win, "emblem-urgent", "", "other"); 
+  add_icon (win, "emblem-videos", "", "other"); 
+  add_icon (win, "emblem-web", "", "other"); 
+  add_icon (win, "folder-documents", "", "other"); 
+  add_icon (win, "folder-download", "", "other"); 
+  add_icon (win, "folder-music", "", "other"); 
+  add_icon (win, "folder-pictures", "", "other"); 
+  add_icon (win, "folder-documents", "", "other"); 
+  add_icon (win, "folder-publicshare", "", "other"); 
+  add_icon (win, "folder-remote", "The icon used for normal directories on a remote filesystem", "other");
+  add_icon (win, "folder-saved-search", "", "other"); 
+  add_icon (win, "folder-templates", "", "other"); 
+  add_icon (win, "folder-videos", "", "other"); 
+  add_icon (win, "network-server", "The icon used for individual host machines under the “Network Servers” place in the file manager", "other");
+  add_icon (win, "network-workgroup", "The icon for the “Network Servers” place in the desktop's file manager, and workgroups within the network", "other");
+  add_icon (win, "start-here", "The icon used by the desktop's main menu for accessing places, applications, and other features", "other");
+  add_icon (win, "user-bookmarks", "The icon for the user's special “Bookmarks” place", "other");
+  add_icon (win, "user-desktop", "The icon for the special “Desktop” directory of the user", "other");
+  add_icon (win, "user-home", "The icon for the special “Home” directory of the user", "other");
+  add_icon (win, "airplane-mode", "", "other"); 
+  add_icon (win, "battery-caution-charging", "", "other"); 
+  add_icon (win, "battery-caution", "The icon used when the battery is below 40%", "other");
+  add_icon (win, "battery-empty-charging", "", "other"); 
+  add_icon (win, "battery-empty", "", "other"); 
+  add_icon (win, "battery-full-charged", "", "other"); 
+  add_icon (win, "battery-full-charging", "", "other"); 
+  add_icon (win, "battery-full", "", "other"); 
+  add_icon (win, "battery-good-charging", "", "other"); 
+  add_icon (win, "battery-good", "", "other"); 
+  add_icon (win, "battery-low-charging", "", "other"); 
+  add_icon (win, "battery-low", "The icon used when the battery is below 20%", "other");
+  add_icon (win, "battery-missing", "", "other"); 
+  add_icon (win, "bluetooth-active", "", "other"); 
+  add_icon (win, "bluetooth-disabled", "", "other"); 
+  add_icon (win, "channel-insecure", "", "other"); 
+  add_icon (win, "channel-secure", "", "other"); 
+  add_icon (win, "computer-fail", "", "other"); 
+  add_icon (win, "display-brightness", "", "other"); 
+  add_icon (win, "keyboard-brightness", "", "other"); 
+  add_icon (win, "folder-drag-accept", "The icon used for a folder while an object is being dragged onto it, that is of a type that the directory can contain", "other");
+  add_icon (win, "folder-open", "The icon used for folders, while their contents are being displayed within the same window. This icon would normally be shown in a tree or list view, next to the main view of a folder's contents", "other");
+  add_icon (win, "folder-visiting", "The icon used for folders, while their contents are being displayed in another window. This icon would typically be used when using multiple windows to navigate the hierarchy, such as in Nautilus's spatial mode", "other");
+  add_icon (win, "image-loading", "The icon used when another image is being loaded, such as thumnails for larger images in the file manager", "other");
+  add_icon (win, "image-missing", "The icon used when another image could not be loaded", "other");
+  add_icon (win, "mail-signed", "The icon used for an electronic mail that contains a signature", "other");
+  add_icon (win, "mail-signed-verified", "The icon used for an electronic mail that contains a signature which has also been verified by the security system", "other");
+  add_icon (win, "network-cellular-3g", "", "other"); 
+  add_icon (win, "network-cellular-4g", "", "other"); 
+  add_icon (win, "network-cellular-edge", "", "other"); 
+  add_icon (win, "network-cellular-gprs", "", "other"); 
+  add_icon (win, "network-cellular-umts", "", "other"); 
+  add_icon (win, "network-cellular-acquiring", "", "other"); 
+  add_icon (win, "network-cellular-connected", "", "other"); 
+  add_icon (win, "network-cellular-no-route", "", "other"); 
+  add_icon (win, "network-cellular-offline", "", "other"); 
+  add_icon (win, "network-cellular-signal-excellent", "", "other"); 
+  add_icon (win, "network-cellular-signal-good", "", "other"); 
+  add_icon (win, "network-cellular-signal-ok", "", "other"); 
+  add_icon (win, "network-cellular-signal-weak", "", "other"); 
+  add_icon (win, "network-cellular-signal-none", "", "other"); 
+  add_icon (win, "network-vpn-acquiring", "", "other"); 
+  add_icon (win, "network-vpn", "", "other"); 
+  add_icon (win, "network-wired-acquiring", "", "other"); 
+  add_icon (win, "network-wired-disconnected", "", "other"); 
+  add_icon (win, "network-wired-no-route", "", "other"); 
+  add_icon (win, "network-wired-offline", "", "other"); 
+  add_icon (win, "network-wireless-acquiring", "", "other"); 
+  add_icon (win, "network-wireless-connected", "", "other"); 
+  add_icon (win, "network-wireless-encrypted", "", "other"); 
+  add_icon (win, "network-wireless-hotspot", "", "other"); 
+  add_icon (win, "network-wireless-no-route", "", "other"); 
+  add_icon (win, "network-wireless-offline", "", "other"); 
+  add_icon (win, "network-wireless-signal-excellent", "", "other"); 
+  add_icon (win, "network-wireless-signal-good", "", "other"); 
+  add_icon (win, "network-wireless-signal-ok", "", "other"); 
+  add_icon (win, "network-wireless-signal-weak", "", "other"); 
+  add_icon (win, "network-wireless-signal-none", "", "other"); 
+  add_icon (win, "rotation-allowed", "", "other"); 
+  add_icon (win, "rotation-locked", "", "other"); 
+  add_icon (win, "software-update-available", "The icon used when an update is available for software installed on the computing device, through the system software update program", "other");
+  add_icon (win, "software-update-urgent", "The icon used when an urgent update is available through the system software update program", "other");
+  add_icon (win, "sync-error", "The icon used when an error occurs while attempting to synchronize data from the computing device, to another device", "other");
+  add_icon (win, "sync-synchronizing", "The icon used while data is successfully synchronizing to another device", "other");
+  add_icon (win, "touchpad-disabled", "", "other"); 
+  add_icon (win, "trophy-bronze", "", "other"); 
+  add_icon (win, "trophy-silver", "", "other"); 
+  add_icon (win, "trophy-gold", "", "other"); 
 }

 static gboolean
@@ -301,16 +694,6 @@ key_press_event_cb (GtkWidget *widget,
  return gtk_search_bar_handle_event (GTK_SEARCH_BAR (win->searchbar), event);
 }

-static void
-copy_to_clipboard (GtkButton         *button,
-                   IconBrowserWindow *win)
-{
-  GtkClipboard *clipboard;
-
-  clipboard = gtk_clipboard_get_default (gdk_display_get_default ());
-  gtk_clipboard_set_text (clipboard, gtk_window_get_title (GTK_WINDOW (win->details)), -1);
-}
-
 static gboolean
 icon_visible_func (GtkTreeModel *model,
                   GtkTreeIter  *iter,
@@ -365,7 +748,7 @@ symbolic_toggled (GtkToggleButton *toggle, IconBrowserWindow *win)

  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->cell, "icon-name", column, NULL);
  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (win->list), win->text_cell, "text", column, NULL);
-
+  
  gtk_tree_model_filter_refilter (win->filter_model);
  gtk_widget_queue_draw (win->list);
 }
@@ -400,35 +783,6 @@ get_image_data (GtkWidget        *widget,
  g_object_unref (pixbuf);
 }

-static void
-get_scalable_image_data (GtkWidget        *widget,
-                         GdkDragContext   *context,
-                         GtkSelectionData *selection,
-                         guint             target_info,
-                         guint             time,
-                         gpointer          data)
-{
-  gchar *uris[2];
-  GtkIconInfo *info;
-  GtkWidget *image;
-  GFile *file;
-  const gchar *name;
-
-  image = gtk_bin_get_child (GTK_BIN (widget));
-  gtk_image_get_icon_name (GTK_IMAGE (image), &name, NULL);
-
-  info = gtk_icon_theme_lookup_icon (gtk_icon_theme_get_default (), name, -1, 0);
-  file = g_file_new_for_path (gtk_icon_info_get_filename (info));
-  uris[0] = g_file_get_uri (file);
-  uris[1] = NULL;
-
-  gtk_selection_data_set_uris (selection, uris);
-
-  g_free (uris[0]);
-  g_object_unref (info);
-  g_object_unref (file);
-}
-
 static void
 setup_image_dnd (GtkWidget *image)
 {
@@ -440,19 +794,6 @@ setup_image_dnd (GtkWidget *image)
  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_image_data), NULL);
 }

-static void
-setup_scalable_image_dnd (GtkWidget *image)
-{
-  GtkWidget *parent;
-
-  parent = gtk_widget_get_parent (image);
-  gtk_drag_source_set (parent, GDK_BUTTON1_MASK,
-                       target_table, G_N_ELEMENTS (target_table),
-                       GDK_ACTION_COPY);
-
-  g_signal_connect (parent, "drag-data-get", G_CALLBACK (get_scalable_image_data), NULL);
-}
-
 static void
 icon_browser_window_init (IconBrowserWindow *win)
 {
@@ -479,9 +820,8 @@ icon_browser_window_init (IconBrowserWindow *win)
  setup_image_dnd (win->image3);
  setup_image_dnd (win->image4);
  setup_image_dnd (win->image5);
-  setup_scalable_image_dnd (win->image6);

-  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, context_free);
+  win->contexts = g_hash_table_new_full (g_str_hash, g_str_equal, NULL, g_free);

  gtk_tree_model_filter_set_visible_func (win->filter_model, icon_visible_func, win, NULL);
  gtk_window_set_transient_for (GTK_WINDOW (win->details), GTK_WINDOW (win));
@@ -519,8 +859,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image3);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image4);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image5);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, image6);
-  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, label6);
  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), IconBrowserWindow, description);

  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
@@ -528,7 +866,6 @@ icon_browser_window_class_init (IconBrowserWindowClass *class)
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), selected_context_changed);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), symbolic_toggled);
  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), key_press_event_cb);
-  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), copy_to_clipboard);
 }

 IconBrowserWindow *
--- a/demos/icon-browser/meson.build
+++ b/demos/icon-browser/meson.build
@@ -1,24 +0,0 @@
-iconbrowser_sources = [
-  'main.c',
-  'iconbrowserapp.c',
-  'iconbrowserwin.c',
-  'iconstore.c'
-]
-
-iconbrowser_resources = gnome.compile_resources(
-  'iconbrowser_resources',
-  'iconbrowser.gresource.xml',
-  source_dir: '.'
-)
-
-iconbrowser = executable(
-  'gtk3-icon-browser',
-  iconbrowser_sources,
-  iconbrowser_resources,
-  dependencies: libgtk_dep,
-  include_directories : confinc,
-  install: true
-)
-
-# desktop file
-install_data('gtk3-icon-browser.desktop', install_dir: gtk_applicationsdir)
--- a/demos/icon-browser/window.ui
+++ b/demos/icon-browser/window.ui
@@ -109,7 +109,7 @@
                      <object class="GtkCellRendererPixbuf" id="cell">
                        <property name="xpad">10</property>
                        <property name="ypad">10</property>
-                        <property name="stock-size">6</property>
+                        <property name="stock-size">5</property>
                        <property name="follow-state">True</property>
                      </object>
                    </child>
@@ -150,7 +150,6 @@
            <property name="margin">10</property>
            <property name="row-spacing">18</property>
            <property name="column-spacing">18</property>
-            <property name="halign">center</property>
            <child>
              <object class="GtkEventBox">
                <property name="visible">True</property>
@@ -231,22 +230,6 @@
                <property name="top-attach">1</property>
              </packing>
            </child>
-            <child>
-              <object class="GtkEventBox">
-                <property name="visible">True</property>
-                <child>
-                  <object class="GtkImage" id="image6">
-                    <property name="visible">True</property>
-                    <property name="halign">center</property>
-                    <property name="valign">end</property>
-                  </object>
-                </child>
-              </object>
-              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">1</property>
-              </packing>
-            </child>

            <child>
              <object class="GtkLabel" id="label1">
@@ -324,41 +307,21 @@
              </packing>
            </child>
            <child>
-              <object class="GtkLabel" id="label6">
+              <object class="GtkLabel" id="description">
                <property name="visible">True</property>
-                <property name="halign">center</property>
-                <property name="valign">baseline</property>
-                <property name="label">scalable</property>
-                <style>
-                  <class name="dim-label"/>
-                </style>
+                <property name="wrap">True</property>
+                <property name="max-width-chars">60</property>
+                <property name="xalign">0</property>
+                <property name="valign">start</property>
              </object>
              <packing>
-                <property name="left-attach">5</property>
-                <property name="top-attach">2</property>
+                <property name="left-attach">0</property>
+                <property name="top-attach">3</property>
+                <property name="width">5</property>
              </packing>
            </child>
          </object>
        </child>
-        <child>
-          <object class="GtkButton">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Copy to Clipboard</property>
-            <property name="halign">center</property>
-            <property name="valign">center</property>
-            <property name="margin">20</property>
-            <signal name="clicked" handler="copy_to_clipboard"/>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel" id="description">
-            <property name="margin">10</property>
-            <property name="visible">True</property>
-            <property name="wrap">True</property>
-            <property name="max-width-chars">60</property>
-            <property name="valign">start</property>
-          </object>
-        </child>
      </object>
    </child>
  </object>
--- a/demos/meson.build
+++ b/demos/meson.build
@@ -1,3 +0,0 @@
-  subdir('icon-browser')
-  subdir('widget-factory')
-  subdir('gtk-demo')
--- a/demos/widget-factory/Makefile.am
+++ b/demos/widget-factory/Makefile.am
@@ -63,10 +63,10 @@ uninstall-update-icon-cache:
 EXTRA_DIST += 				\
 	widget-factory.ui 		\
 	widget-factory.css		\
+	menus.ui 			\
 	help-overlay.ui			\
 	widget-factory.gresource.xml	\
 	data/source.svg			\
-	data/symbolic-source.svg	\
-	meson.build
+	data/symbolic-source.svg

 -include $(top_srcdir)/git.mk
--- a/demos/widget-factory/menus.ui
+++ b/demos/widget-factory/menus.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <menu id="app-menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">About</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel">&lt;Primary&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -1,29 +0,0 @@
-
-widgetfactory_sources = [
-  'widget-factory.c'
-]
-
-widgetfactory_resources = gnome.compile_resources(
-  'widgetfactory_resources',
-  'widget-factory.gresource.xml',
-  source_dir: '.'
-)
-
-foreach s: [ '16', '22', '24', '32', '48', '256']
-  icon_destdir = join_paths(gtk_datadir, 'icons', 'hicolor', '@0@x@0@'.format(s), 'apps')
-  icons = [join_paths('data', '@0@x@0@'.format(s), 'gtk3-widget-factory.png'),
-           join_paths('data', '@0@x@0@'.format(s), 'gtk3-widget-factory-symbolic.symbolic.png')]
-  install_data(icons, install_dir: icon_destdir)
-endforeach
-
-widget_factory = executable(
-  'gtk3-widget-factory',
-  widgetfactory_sources,
-  widgetfactory_resources,
-  dependencies: libgtk_dep,
-  include_directories : confinc,
-  install: true
-)
-
-# desktop file
-install_data('gtk3-widget-factory.desktop', install_dir: gtk_applicationsdir)
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -211,15 +211,15 @@ activate_about (GSimpleAction *action,
                             gtk_get_micro_version ());

  gtk_show_about_dialog (GTK_WINDOW (gtk_application_get_active_window (app)),
-                         "program-name", "GTK Widget Factory",
+                         "program-name", "GTK+ Widget Factory",
                         "version", version,
-                         "copyright", "© 1997—2019 The GTK Team",
+                         "copyright", "(C) 1997-2013 The GTK+ Team",
                         "license-type", GTK_LICENSE_LGPL_2_1,
                         "website", "http://www.gtk.org",
-                         "comments", "Program to demonstrate GTK themes and widgets",
+                         "comments", "Program to demonstrate GTK+ themes and widgets",
                         "authors", authors,
                         "logo-icon-name", "gtk3-widget-factory",
-                         "title", "About GTK Widget Factory",
+                         "title", "About GTK+ Widget Factory",
                         NULL);

  g_free (version);
@@ -246,14 +246,6 @@ activate_quit (GSimpleAction *action,
    }
 }

-static void
-activate_inspector (GSimpleAction *action,
-                    GVariant      *parameter,
-                    gpointer       user_data)
-{
-  gtk_window_set_interactive_debugging (TRUE);
-}
-
 static void
 spin_value_changed (GtkAdjustment *adjustment, GtkWidget *label)
 {
@@ -1736,14 +1728,12 @@ activate (GApplication *app)

  widget = (GtkWidget *)gtk_builder_get_object (builder, "statusbar");
  gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "All systems are operating normally.");
-  action = G_ACTION (g_property_action_new ("statusbar", widget, "visible"));
-  g_action_map_add_action (G_ACTION_MAP (window), action);
-  g_object_unref (G_OBJECT (action));
+  g_action_map_add_action (G_ACTION_MAP (window),
+                           G_ACTION (g_property_action_new ("statusbar", widget, "visible")));

  widget = (GtkWidget *)gtk_builder_get_object (builder, "toolbar");
-  action = G_ACTION (g_property_action_new ("toolbar", widget, "visible"));
-  g_action_map_add_action (G_ACTION_MAP (window), action);
-  g_object_unref (G_OBJECT (action));
+  g_action_map_add_action (G_ACTION_MAP (window),
+                           G_ACTION (g_property_action_new ("toolbar", widget, "visible")));

  adj = (GtkAdjustment *)gtk_builder_get_object (builder, "adjustment1");

@@ -1976,7 +1966,6 @@ main (int argc, char *argv[])
  static GActionEntry app_entries[] = {
    { "about", activate_about, NULL, NULL, NULL },
    { "quit", activate_quit, NULL, NULL, NULL },
-    { "inspector", activate_inspector, NULL, NULL, NULL },
    { "main", NULL, "s", "'steak'", NULL },
    { "wine", NULL, NULL, "false", NULL },
    { "beer", NULL, NULL, "false", NULL },
--- a/demos/widget-factory/widget-factory.css
+++ b/demos/widget-factory/widget-factory.css
@@ -2,25 +2,3 @@
  padding: 0;
  outline-width: 0;
 }
-
-frame.border-inset > border {
-  border-style: inset;
-}
-
-frame.border-outset > border {
-  border-style: outset;
-}
-
-frame.border-groove > border {
-  border-style: groove;
-}
-
-frame.border-ridge > border {
-  border-style: ridge;
-}
-
-/* These effects use 2 lines, so show them */
-frame.border-groove > border,
-frame.border-ridge > border {
-  border-width: 2px;
-}
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -6,6 +6,9 @@
  <gresource prefix="/org/gtk/WidgetFactory">
    <file>widget-factory.css</file>
  </gresource>
+  <gresource prefix="/org/gtk/WidgetFactory/gtk">
+    <file preprocess="xml-stripblanks">menus.ui</file>
+  </gresource>
  <gresource prefix="/org/gtk/WidgetFactory/gtk">
    <file preprocess="xml-stripblanks">help-overlay.ui</file>
  </gresource>
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -16,20 +16,6 @@
        <attribute name="action">win.transition</attribute>
      </item>
    </section>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">_Inspector</attribute>
-        <attribute name="action">app.inspector</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
-        <attribute name="action">win.show-help-overlay</attribute>
-      </item>
-      <item>
-        <attribute name="label" translatable="yes">_About Widget Factory</attribute>
-        <attribute name="action">app.about</attribute>
-      </item>
-    </section>
  </menu>
  <menu id="dinner_menu">
    <section>
@@ -507,11 +493,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                          <object class="GtkEntry" id="entry1">
                            <property name="visible">1</property>
                            <property name="can_focus">1</property>
-                            <property name="enable-emoji-completion">1</property>
                            <property name="invisible_char">•</property>
                            <property name="placeholder-text" translatable="yes">Click icon to change mode</property>
                            <property name="secondary_icon_name">view-refresh-symbolic</property>
-                            <property name="secondary_icon_tooltip_text">Change mode</property>
                            <signal name="icon-release" handler="on_entry_icon_release" swapped="no"/>
                          </object>
                          <packing>
@@ -1316,13 +1300,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                        <child>
                          <object class="GtkFrame" id="frame1">
                            <property name="visible">1</property>
-                            <style>
-                              <class name="border-inset"/>
-                            </style>
+                            <property name="shadow_type">in</property>
                            <child type="label">
                              <object class="GtkLabel" id="label1">
                                <property name="visible">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Inset&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;In&lt;/b&gt;</property>
                                <property name="use_markup">1</property>
                              </object>
                            </child>
@@ -1334,13 +1316,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                        <child>
                          <object class="GtkFrame" id="frame2">
                            <property name="visible">1</property>
-                            <style>
-                              <class name="border-outset"/>
-                            </style>
+                            <property name="shadow_type">out</property>
                            <child type="label">
                              <object class="GtkLabel" id="label2">
                                <property name="visible">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Outset&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Out&lt;/b&gt;</property>
                                <property name="use_markup">1</property>
                              </object>
                            </child>
@@ -1353,13 +1333,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                        <child>
                          <object class="GtkFrame" id="frame3">
                            <property name="visible">1</property>
-                            <style>
-                              <class name="border-groove"/>
-                            </style>
                            <child type="label">
                              <object class="GtkLabel" id="label17">
                                <property name="visible">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Groove&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Etched in&lt;/b&gt;</property>
                                <property name="use_markup">1</property>
                              </object>
                            </child>
@@ -1372,13 +1349,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                        <child>
                          <object class="GtkFrame" id="frame4">
                            <property name="visible">1</property>
-                            <style>
-                              <class name="border-ridge"/>
-                            </style>
+                            <property name="shadow_type">etched-out</property>
                            <child type="label">
                              <object class="GtkLabel" id="label18">
                                <property name="visible">1</property>
-                                <property name="label" translatable="yes">&lt;b&gt;Ridge&lt;/b&gt;</property>
+                                <property name="label" translatable="yes">&lt;b&gt;Etched out&lt;/b&gt;</property>
                                <property name="use_markup">1</property>
                              </object>
                            </child>
@@ -3749,7 +3724,6 @@ microphone-sensitivity-medium-symbolic</property>
                          <object class="GtkEntry">
                            <property name="visible">1</property>
                            <property name="can_focus">1</property>
-                            <property name="show_emoji_icon">1</property>
                            <property name="placeholder_text" translatable="yes">Age…</property>
                          </object>
                          <packing>
@@ -3776,7 +3750,6 @@ microphone-sensitivity-medium-symbolic</property>
                            <property name="visible">1</property>
                            <property name="valign">center</property>
                            <property name="popover">notebook_info_popover</property>
-                            <property name="relief">none</property>
                            <child>
                              <object class="GtkImage">
                                <property name="visible">1</property>
@@ -3787,6 +3760,7 @@ microphone-sensitivity-medium-symbolic</property>
                            <style>
                              <class name="image-button"/>
                              <class name="circular"/>
+                              <class name="flat"/>
                            </style>
                          </object>
                        </child>
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -5,7 +5,4 @@ SUBDIRS = gdk gtk libgail-util

 GITIGNOREFILES = */*.1

-EXTRA_DIST += \
-	meson.build
-
 -include $(top_srcdir)/git.mk
--- a/docs/reference/gdk/Makefile.am
+++ b/docs/reference/gdk/Makefile.am
@@ -198,9 +198,7 @@ endif
 include $(top_srcdir)/gtk-doc.make

 # Other files to distribute
-EXTRA_DIST += \
-	version.xml.in \
-	meson.build
+EXTRA_DIST += version.xml.in

 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \
--- a/docs/reference/gdk/gdk-docs.sgml
+++ b/docs/reference/gdk/gdk-docs.sgml
@@ -10,9 +10,9 @@
    <releaseinfo>
      This document is for the GDK 3 library, version &version;
      The latest versions can be found online at
-      <ulink role="online-location" url="https://developer.gnome.org/gdk3/">https://developer.gnome.org/gdk3/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/gdk3/">http://developer.gnome.org/gdk3/</ulink>.
      If you are looking for the older GDK 2 series of libraries,
-      see <ulink role="online-location" url="https://developer.gnome.org/gdk2/">https://developer.gnome.org/gdk2/</ulink>.
+      see <ulink role="online-location" url="http://developer.gnome.org/gdk2/">http://developer.gnome.org/gdk2/</ulink>.
    </releaseinfo>
  </bookinfo>

@@ -113,10 +113,6 @@
    <title>Index of new symbols in 3.22</title>
    <xi:include href="xml/api-index-3.22.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-24" role="3.24">
-    <title>Index of new symbols in 3.24</title>
-    <xi:include href="xml/api-index-3.24.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

--- a/docs/reference/gdk/gdk3-overrides.txt
+++ b/docs/reference/gdk/gdk3-overrides.txt
@@ -1,9 +1,8 @@

 # GdkAtom is an opaque typedef
-<TYPEDEF>
+<STRUCT>
 <NAME>GdkAtom</NAME>
-typedef struct _GdkAtom *GdkAtom;
-</TYPEDEF>
+</STRUCT>

 <MACRO>
 <NAME>GDK_WINDOWING_X11</NAME>
--- a/docs/reference/gdk/gdk3-sections.txt
+++ b/docs/reference/gdk/gdk3-sections.txt
@@ -386,7 +386,6 @@ gdk_window_move
 gdk_window_resize
 gdk_window_move_resize
 gdk_window_scroll
-gdk_window_move_to_rect
 gdk_window_move_region
 gdk_window_flush
 gdk_window_has_native
@@ -1124,7 +1123,6 @@ gdk_x11_get_default_screen
 gdk_x11_get_default_xdisplay
 gdk_x11_grab_server
 gdk_x11_ungrab_server
-gdk_x11_get_parent_relative_pattern
 gdk_x11_cursor_get_xcursor
 gdk_x11_cursor_get_xdisplay
 gdk_x11_keymap_get_group_for_state
@@ -1272,7 +1270,6 @@ gdk_wayland_device_get_wl_seat
 gdk_wayland_display_get_wl_compositor
 gdk_wayland_display_get_wl_display
 gdk_wayland_display_get_xdg_shell
-gdk_wayland_display_query_registry
 gdk_wayland_window_get_wl_surface
 gdk_wayland_window_set_use_custom_surface
 GdkWaylandWindowExported
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -1,180 +0,0 @@
-private_headers = [
-  'gdkintl.h',
-  'gdkmarshalers.h',
-  'gdkkeysyms.h',
-  'gdkinternals.h',
-  'gdkprivate.h',
-  'gdk-private.h',
-  'gdkapplaunchcontextprivate.h',
-  'gdkcursorprivate.h',
-  'gdkdevicemanagerprivate.h',
-  'gdkdeviceprivate.h',
-  'gdkdisplaymanagerprivate.h',
-  'gdkdisplayprivate.h',
-  'gdkdndprivate.h',
-  'gdkframeclockprivate.h',
-  'gdkglcontextprivate.h',
-  'gdkkeysprivate.h',
-  'gdkscreenprivate.h',
-  'gdkseatdefaultprivate.h',
-  'gdkseatprivate.h',
-  'gdkvisualprivate.h',
-  'keyname-table.h',
-  'win32',
-  'x11',
-  'quartz',
-  'broadway',
-  'wayland',
-]
-
-images = [
-  'images/rotated-text.png',
-  'images/X_cursor.png',
-  'images/arrow.png',
-  'images/based_arrow_down.png',
-  'images/based_arrow_up.png',
-  'images/boat.png',
-  'images/bogosity.png',
-  'images/bottom_left_corner.png',
-  'images/bottom_right_corner.png',
-  'images/bottom_side.png',
-  'images/bottom_tee.png',
-  'images/box_spiral.png',
-  'images/center_ptr.png',
-  'images/circle.png',
-  'images/clock.png',
-  'images/coffee_mug.png',
-  'images/cross.png',
-  'images/cross_reverse.png',
-  'images/crosshair.png',
-  'images/diamond_cross.png',
-  'images/dot.png',
-  'images/dotbox.png',
-  'images/double_arrow.png',
-  'images/draft_large.png',
-  'images/draft_small.png',
-  'images/draped_box.png',
-  'images/exchange.png',
-  'images/fleur.png',
-  'images/gobbler.png',
-  'images/gumby.png',
-  'images/hand1.png',
-  'images/hand2.png',
-  'images/heart.png',
-  'images/icon.png',
-  'images/iron_cross.png',
-  'images/left_ptr.png',
-  'images/left_side.png',
-  'images/left_tee.png',
-  'images/leftbutton.png',
-  'images/ll_angle.png',
-  'images/lr_angle.png',
-  'images/man.png',
-  'images/middlebutton.png',
-  'images/mouse.png',
-  'images/pencil.png',
-  'images/pirate.png',
-  'images/plus.png',
-  'images/question_arrow.png',
-  'images/right_ptr.png',
-  'images/right_side.png',
-  'images/right_tee.png',
-  'images/rightbutton.png',
-  'images/rtl_logo.png',
-  'images/sailboat.png',
-  'images/sb_down_arrow.png',
-  'images/sb_h_double_arrow.png',
-  'images/sb_left_arrow.png',
-  'images/sb_right_arrow.png',
-  'images/sb_up_arrow.png',
-  'images/sb_v_double_arrow.png',
-  'images/shuttle.png',
-  'images/sizing.png',
-  'images/spider.png',
-  'images/spraycan.png',
-  'images/star.png',
-  'images/target.png',
-  'images/tcross.png',
-  'images/top_left_arrow.png',
-  'images/top_left_corner.png',
-  'images/top_right_corner.png',
-  'images/top_side.png',
-  'images/top_tee.png',
-  'images/trek.png',
-  'images/ul_angle.png',
-  'images/umbrella.png',
-  'images/ur_angle.png',
-  'images/watch.png',
-  'images/xterm.png',
-  'images/alias_cursor.png',
-  'images/all_scroll_cursor.png',
-  'images/cell_cursor.png',
-  'images/col_resize_cursor.png',
-  'images/copy_cursor.png',
-  'images/crosshair_cursor.png',
-  'images/default_cursor.png',
-  'images/e_resize_cursor.png',
-  'images/ew_resize_cursor.png',
-  'images/grabbing_cursor.png',
-  'images/grab_cursor.png',
-  'images/hand_cursor.png',
-  'images/context_menu_cursor.png',
-  'images/help_cursor.png',
-  'images/move_cursor.png',
-  'images/ne_resize_cursor.png',
-  'images/nesw_resize_cursor.png',
-  'images/no_drop_cursor.png',
-  'images/not_allowed_cursor.png',
-  'images/n_resize_cursor.png',
-  'images/ns_resize_cursor.png',
-  'images/nw_resize_cursor.png',
-  'images/nwse_resize_cursor.png',
-  'images/pointer_cursor.png',
-  'images/progress_cursor.png',
-  'images/row_resize_cursor.png',
-  'images/se_resize_cursor.png',
-  'images/s_resize_cursor.png',
-  'images/sw_resize_cursor.png',
-  'images/text_cursor.png',
-  'images/vertical_text_cursor.png',
-  'images/wait_cursor.png',
-  'images/w_resize_cursor.png',
-  'images/X_cursor.png',
-  'images/zoom_in_cursor.png',
-  'images/zoom_out_cursor.png',
-]
-
-src_dir = [ gdkinc ]
-
-if x11_enabled
-  src_dir += [ gdkx11_inc ]
-endif
-
-if wayland_enabled
-  src_dir += [ gdkwayland_inc ]
-endif
-
-if get_option('gtk_doc')
-
-    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
-
-    gnome.gtkdoc('gdk3',
-                 mode: 'none',
-                 main_xml: 'gdk-docs.sgml',
-                 src_dir: src_dir,
-                 dependencies: libgdk_dep,
-                 gobject_typesfile: join_paths(meson.current_source_dir(), 'gdk3.types'),
-                 scan_args: [
-                   '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
-                   '--ignore-headers=' + ' '.join(private_headers),
-                 ],
-                 fixxref_args: [
-                   '--html-dir=@0@'.format(docpath),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
-                   '--extra-dir=@0@'.format(cairo_docpath),
-                 ],
-                 html_assets: images,
-                 install: true)
-endif
--- a/docs/reference/gtk/Makefile.am
+++ b/docs/reference/gtk/Makefile.am
@@ -276,7 +276,9 @@ GTKDOC_LIBS = \


 # Extra options to supply to gtkdoc-mkdb
-MKDB_OPTIONS=--output-format=xml --name-space=gtk --default-includes=gtk/gtk.h
+MKDB_OPTIONS=--output-format=xml --name-space=gtk
+
+MKHTML_OPTIONS="--path=\"$(abs_srcdir):$(top_srcdir)/examples\""

 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE)
 content_files =					\
@@ -287,7 +289,7 @@ content_files =					\
 	css-overview.xml			\
 	css-properties.xml			\
 	drawing-model.xml			\
-	$(builddir)/getting_started.xml			\
+	getting_started.xml			\
 	glossary.xml				\
 	gtk3-demo-application.xml		\
 	gtk3-demo.xml				\
@@ -324,7 +326,7 @@ content_files =					\
 expand_content_files = 				\
 	compiling.sgml				\
 	drawing-model.xml			\
-	$(builddir)/getting_started.xml			\
+	getting_started.xml			\
 	glossary.xml				\
 	input-handling.xml			\
 	migrating-2to3.xml			\
@@ -496,7 +498,7 @@ endif
 include $(top_srcdir)/gtk-doc.make

 # Other files to distribute
-EXTRA_DIST += version.xml.in gtk3.types.in getting_started.xml.in
+EXTRA_DIST += version.xml.in gtk3.types.in

 ########################################################################

@@ -543,9 +545,7 @@ endif

 MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)

-EXTRA_DIST += \
-	$(man_MANS) \
-	meson.build
+EXTRA_DIST += $(man_MANS)

 if ENABLE_GTK_DOC
 TESTS_ENVIRONMENT = cd $(srcdir) && \
--- a/docs/reference/gtk/building.sgml
+++ b/docs/reference/gtk/building.sgml
@@ -140,7 +140,7 @@ How to compile GTK+ itself
      <listitem>
        <para>
          <ulink
-          url="https://www.freedesktop.org/wiki/Software/pkg-config/">pkg-config</ulink>
+          url="http://pkg-config.freedesktop.org">pkg-config</ulink>
          is a tool for tracking the compilation flags needed for
          libraries that are used by the GTK+ libraries. (For each
          library, a small <literal>.pc</literal> text file is installed
@@ -153,7 +153,7 @@ How to compile GTK+ itself
          The GTK+ makefiles will mostly work with different versions
          of <command>make</command>, however, there tends to be
          a few incompatibilities, so the GTK+ team recommends
-          installing <ulink url="https://www.gnu.org/software/make">GNU
+          installing <ulink url="http://www.gnu.org/software/make">GNU
            make</ulink> if you don't already have it on your system
          and using it. (It may be called <command>gmake</command>
          rather than <command>make</command>.)
@@ -171,24 +171,24 @@ How to compile GTK+ itself
          The GLib library provides core non-graphical functionality
          such as high level data types, Unicode manipulation, and
          an object and type system to C programs. It is available
-          from the <ulink url="https://ftp.gtk.org/pub/glib/">GTK+
+          from the <ulink url="http://ftp.gtk.org/pub/glib/">GTK+
          FTP site</ulink> or
-          <ulink url="https://download.gnome.org/sources/glib/">here</ulink>.
+          <ulink url="http://download.gnome.org/sources/glib/">here</ulink>.
        </para>
      </listitem>
      <listitem>
        <para>
-          The <ulink url="https://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
+          The <ulink url="http://git.gnome.org/browse/gdk-pixbuf/">GdkPixbuf library</ulink>
          provides facilities for loading images in a variety of file formats.
          It is available
-          <ulink url="https://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
+          <ulink url="http://download.gnome.org/sources/gdk-pixbuf/">here</ulink>.
        </para>
      </listitem>
      <listitem>
        <para>
          <ulink url="http://www.pango.org">Pango</ulink> is a library
          for internationalized text handling. It is available
-          <ulink url="https://download.gnome.org/sources/pango/">here</ulink>.
+          <ulink url="http://download.gnome.org/sources/pango/">here</ulink>.
        </para>
      </listitem>
      <listitem>
@@ -197,7 +197,7 @@ How to compile GTK+ itself
          interfaces allowing accessibility technologies such as
          screen readers to interact with a graphical user interface.
          It is available
-          <ulink url="https://download.gnome.org/sources/atk/">here</ulink>.
+          <ulink url="http://download.gnome.org/sources/atk/">here</ulink>.
        </para>
      </listitem>
      <listitem>
@@ -205,7 +205,7 @@ How to compile GTK+ itself
          <ulink url="https://wiki.gnome.org/Projects/GObjectIntrospection">Gobject Introspection</ulink>
          is a framework for making introspection data available to
          language bindings. It is available
-          <ulink url="https://download.gnome.org/sources/gobject-introspection/">here</ulink>.
+          <ulink url="http://download.gnome.org/sources/gobject-introspection/">here</ulink>.
        </para>
      </listitem>
    </itemizedlist>
@@ -213,7 +213,7 @@ How to compile GTK+ itself
      <title>External dependencies</title>
      <listitem>
        <para>
-          The <ulink url="https://www.gnu.org/software/libiconv/">GNU
+          The <ulink url="http://www.gnu.org/software/libiconv/">GNU
          libiconv library</ulink> is needed to build GLib if your
          system doesn't have the <function>iconv()</function>
          function for doing conversion between character
@@ -224,7 +224,7 @@ How to compile GTK+ itself
      <listitem>
        <para>
          The libintl library from the <ulink
-          url="https://www.gnu.org/software/gettext/">GNU gettext
+          url="http://www.gnu.org/software/gettext/">GNU gettext
          package</ulink> is needed if your system doesn't have the
          <function>gettext()</function> functionality for handling
          message translation databases.
@@ -241,14 +241,14 @@ How to compile GTK+ itself
      </listitem>
      <listitem>
        <para>
-          The <ulink url="https://www.freedesktop.org/wiki/Software/fontconfig/">fontconfig</ulink>
+          The <ulink url="http://www.fontconfig.org">fontconfig</ulink>
          library provides Pango with a standard way of locating
          fonts and matching them against font names.
        </para>
      </listitem>
      <listitem>
        <para>
-          <ulink url="https://www.cairographics.org">Cairo</ulink>
+          <ulink url="http://www.cairographics.org">Cairo</ulink>
          is a graphics library that supports vector graphics and image
          compositing. Both Pango and GTK+ use cairo for all of their
          drawing.
@@ -263,13 +263,13 @@ How to compile GTK+ itself
      </listitem>
      <listitem>
        <para>
-          The <ulink url="https://wayland.freedesktop.org">Wayland</ulink> libraries
+          The <ulink url="http://wayland.freedesktop.org">Wayland</ulink> libraries
          are needed to build GTK+ with the Wayland backend.
        </para>
      </listitem>
      <listitem>
        <para>
-          The <ulink url="https://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
+          The <ulink url="http://www.freedesktop.org/wiki/Software/shared-mime-info">shared-mime-info</ulink>
          package is not a hard dependency of GTK+, but it contains definitions
          for mime types that are used by GIO and, indirectly, by GTK+.
          gdk-pixbuf will use GIO for mime type detection if possible. For this
--- a/docs/reference/gtk/css-overview.xml
+++ b/docs/reference/gtk/css-overview.xml
@@ -4,13 +4,13 @@
 ]>
 <refentry id="chap-css-overview">
 <refmeta>
-<refentrytitle>GTK+ CSS Overview</refentrytitle>
+<refentrytitle>GTK+ CSS</refentrytitle>
 <manvolnum>3</manvolnum>
 <refmiscinfo>GTK Library</refmiscinfo>
 </refmeta>

 <refnamediv>
-<refname>GTK+ CSS Overview</refname>
+<refname>GTK+ CSS</refname>
 <refpurpose>
 Overview of CSS in GTK+
 </refpurpose>
@@ -21,6 +21,12 @@ Overview of CSS in GTK+
 Formatting conventions:
 We use

+‑ U+2011 Non-breaking Hyphen
+  U+00A0 No-break Space
+
+to control line breaks in the Name and Value columns.
+We use
+
 〈 U+2329 Left-pointing Angle Bracket
 〉 U+232A Right-pointing Angle Bracket

@@ -40,7 +46,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>

  <para>
    We loosely follow the CSS
-    <ulink url="https://www.w3.org/TR/css-values/#value-defs">value definition</ulink>
+    <ulink url="http://www.w3.org/TR/css-values/#value-defs">value definition</ulink>
    specification in the formatting of syntax productions.
    <simplelist>
      <member>Nonterminals are enclosed in angle backets (〈〉), all other strings that are not listed here are literals</member>
@@ -117,7 +123,7 @@ scale[.fine-tune]
      <programlisting><![CDATA[
 button, entry {
  color: #ff00ea;
-  font: 12px "Comic Sans";
+  font: Comic Sans 12
 }
 ]]></programlisting>
    </example>
@@ -136,8 +142,8 @@ button, entry {
      The syntax for @import rules is as follows:
    </para>

-<literallayout><code>〈import rule〉 = @import [ 〈url〉 | 〈string〉 ]</code>
-<code>〈url〉 = url( 〈string〉 )</code>
+<literallayout><code>〈import rule〉 = @import [ 〈url〉 | 〈string〉] ;</code>
+<code>〈url〉 = url( 〈string〉)</code>
 </literallayout>

    <example><title>An example for using the @import rule</title>
@@ -148,7 +154,7 @@ button, entry {

    <para>
      To learn more about the @import rule, you can read the
-      <ulink url="https://www.w3.org/TR/css3-cascade/#at-import">Cascading</ulink>
+      <ulink url="http://www.w3.org/TR/css3-cascade/#at-import">Cascading</ulink>
      module of the CSS specification.
    </para>

@@ -181,7 +187,7 @@ button, entry {
      <title>Theme labels that are descendants of a window</title>
      <programlisting><![CDATA[
 window label {
-  background-color: #898989;
+  background-color: #898989
 }
 ]]></programlisting>
    </example>
@@ -190,7 +196,7 @@ window label {
      <title>Theme notebooks, and anything within</title>
      <programlisting><![CDATA[
 notebook {
-  background-color: #a939f0;
+  background-color: #a939f0
 }
 ]]></programlisting>
    </example>
@@ -201,7 +207,7 @@ notebook {
 combobox,
 notebook > entry {
  color: @fg_color;
-  background-color: #1209a2;
+  background-color: #1209a2
 }
 ]]></programlisting>
    </example>
@@ -210,7 +216,7 @@ notebook > entry {
      <title>Theme any widget within a GtkBox</title>
      <programlisting><![CDATA[
 box * {
-  font: 20px Sans;
+  font: Sans 20
 }
 ]]></programlisting>
    </example>
@@ -219,7 +225,7 @@ box * {
      <title>Theme a label named title-label</title>
      <programlisting><![CDATA[
 label#title-label {
-  font: 15px Sans;
+  font: Sans 15
 }
 ]]></programlisting>
    </example>
@@ -228,7 +234,7 @@ label#title-label {
      <title>Theme any widget named main-entry</title>
      <programlisting><![CDATA[
 #main-entry {
-  background-color: #f0a810;
+  background-color: #f0a810
 }
 ]]></programlisting>
    </example>
@@ -246,7 +252,7 @@ label#title-label {
      <title>Theme the entry of a GtkSpinButton</title>
      <programlisting><![CDATA[
 spinbutton entry {
-  color: #900185;
+  color: 900185;
 }
 ]]></programlisting>
    </example>
@@ -352,136 +358,136 @@ checkbutton:indeterminate {
        </thead>
        <tbody>
          <row>
-            <entry><phrase role="nowrap">*</phrase></entry>
+            <entry>*</entry>
            <entry>any node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#universal-selector">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#universal-selector">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E</phrase></entry>
+            <entry>E</entry>
            <entry>any node with name E</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#type-selectors">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#type-selectors">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E.class</phrase></entry>
+            <entry>E.class</entry>
            <entry>any E node with the given style class</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#class-html">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#class-html">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E#id</phrase></entry>
+            <entry>E#id</entry>
            <entry>any E node with the given ID</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#id-selectors">CSS</ulink></entry>
            <entry>GTK+ uses the widget name as ID</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:nth-child(〈nth-child〉)</phrase></entry>
+            <entry>E:nth‑child(〈nth‑child〉)</entry>
            <entry>any E node which is the n-th child of its parent node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:nth-last-child(〈nth-child〉)</phrase></entry>
+            <entry>E:nth‑last‑child(〈nth‑child〉)</entry>
            <entry>any E node which is the n-th child of its parent node, counting from the end</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:first-child</phrase></entry>
+            <entry>E:first‑child</entry>
            <entry>any E node which is the first child of its parent node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:last-child</phrase></entry>
+            <entry>E:last‑child</entry>
            <entry>any E node which is the last child of its parent node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:only-child</phrase></entry>
+            <entry>E:only‑child</entry>
            <entry>any E node which is the only child of its parent node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#structural-pseudos">CSS</ulink></entry>
            <entry>Equivalent to E:first-child:last-child</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:link, E:visited</phrase></entry>
+            <entry>E:link, E:visited</entry>
            <entry>any E node which represents a hyperlink, not yet visited (:link) or already visited (:visited)</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#link">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#link">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_LINK and GTK_STATE_FLAGS_VISITED</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:active, E:hover, E:focus</phrase></entry>
+            <entry>E:active, E:hover, E:focus</entry>
            <entry>any E node which is part of a widget with the corresponding state</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#useraction-pseudos">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#useraction-pseudos">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_ACTIVE, GTK_STATE_FLAG_PRELIGHT and GTK_STATE_FLAGS_FOCUSED; GTK+ also allows E:prelight and E:focused</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:disabled</phrase></entry>
-            <entry>any E node which is part of a widget which is disabled</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
+            <entry>E:disabled</entry>
+            <entry>any E node which is part of a widget with is disabled</entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_INSENSITIVE; GTK+ also allows E:insensitive</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:checked</phrase></entry>
+            <entry>E:checked</entry>
            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is checked</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#UIstates">CSS</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_CHECKED</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:indeterminate</phrase></entry>
-            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is in an indeterminate state</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#indeterminate">CSS3</ulink>,
+            <entry>E:indeterminate</entry>
+            <entry>any E node which is part of a widget (e.g. radio- or checkbuttons) which is in an inconsistent state</entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#indeterminate">CSS3</ulink>,
                   <ulink url="https://drafts.csswg.org/selectors/#indeterminate">CSS4</ulink></entry>
            <entry>Corresponds to GTK_STATE_FLAG_INCONSISTENT; GTK+ also allows E:inconsistent</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:backdrop, E:selected</phrase></entry>
+            <entry>E:backdrop, E:selected</entry>
            <entry>any E node which is part of a widget with the corresponding state</entry>
            <entry></entry>
            <entry>Corresponds to GTK_STATE_FLAG_BACKDROP, GTK_STATE_FLAG_SELECTED</entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:not(〈selector〉)</phrase></entry>
+            <entry>E:not(〈selector〉)</entry>
            <entry>any E node which does not match the simple selector 〈selector〉</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#negation">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#negation">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:dir(ltr), E:dir(rtl)</phrase></entry>
+            <entry>E:dir(ltr), E:dir(rtl)</entry>
            <entry>any E node that has the corresponding text direction</entry>
            <entry><ulink url="https://drafts.csswg.org/selectors/#the-dir-pseudo">CSS4</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E:drop(active)</phrase></entry>
+            <entry>E:drop(active)</entry>
            <entry>any E node that is an active drop target for a current DND operation</entry>
            <entry><ulink url="https://drafts.csswg.org/selectors/#drag-pseudos">CSS4</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E F</phrase></entry>
+            <entry>E F</entry>
            <entry>any F node which is a descendent of an E node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#descendent-combinators">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#descendent-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E > F</phrase></entry>
+            <entry>E > F</entry>
            <entry>any F node which is a child of an E node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#child-combinators">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#child-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E ~ F</phrase></entry>
+            <entry>E ~ F</entry>
            <entry>any F node which is preceded by an E node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#general-sibling-combinators">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#general-sibling-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
          <row>
-            <entry><phrase role="nowrap">E + F</phrase></entry>
+            <entry>E + F</entry>
            <entry>any F node which is immediately preceded by an E node</entry>
-            <entry><ulink url="https://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators">CSS</ulink></entry>
+            <entry><ulink url="http://www.w3.org/TR/css3-selectors/#adjacent-sibling-combinators">CSS</ulink></entry>
            <entry></entry>
          </row>
        </tbody>
@@ -493,7 +499,7 @@ checkbutton:indeterminate {

    <para>
      To learn more about selectors in CSS, read the
-      <ulink url="https://www.w3.org/TR/css3-selectors/">Selectors</ulink>
+      <ulink url="http://www.w3.org/TR/css3-selectors/">Selectors</ulink>
      module of the CSS specification.
    </para>

@@ -508,8 +514,8 @@ checkbutton:indeterminate {
    </para>

 <literallayout><code>〈color〉 = currentColor | transparent | 〈color name〉 | 〈rgb color〉 | 〈rgba color〉 | 〈hex color〉 | 〈gtk color〉</code>
-<code>〈rgb color〉 = rgb( 〈number〉, 〈number〉, 〈number〉 ) | rgb( 〈percentage〉, 〈percentage〉, 〈percentage〉 )</code>
-<code>〈rgba color〉 = rgba( 〈number〉, 〈number〉, 〈number〉, 〈alpha value〉 ) | rgba( 〈percentage〉, 〈percentage〉, 〈percentage〉, 〈alpha value〉 )</code>
+<code>〈rgb color 〉 = rgb( 〈number〉, 〈number〉, 〈number〉 ) | rgb( 〈percentage〉, 〈percentage〉, 〈percentage〉 )</code>
+<code>〈rgba color 〉 = rgba(〈number〉, 〈number〉, 〈number〉, 〈alpha value〉) | rgba( 〈percentage〉, 〈percentage〉, 〈percentage〉, 〈alpha value〉 )</code>
 <code>〈hex color〉 = #〈hex digits〉</code>
 <code>〈alpha value〉 = 〈number〉</code>, clamped to values between 0 and 1
 </literallayout>
@@ -526,7 +532,7 @@ checkbutton:indeterminate {

    <para>
      For a list of valid color names and for more background on colors in
-      CSS, see the <ulink url="https://www.w3.org/TR/css3-color/#svg-color">Color</ulink>
+      CSS, see the <ulink url="http://www.w3.org/TR/css3-color/#svg-color">Color</ulink>
      module of the CSS specification.
    </para>

@@ -546,7 +552,7 @@ checkbutton:indeterminate {
      GTK+ adds several additional ways to specify colors.
    </para>

-<literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉 | 〈win32 color〉</code>
+<literallayout><code>〈gtk color〉 = 〈symbolic color〉 | 〈color expression〉| 〈win32 color〉</code>
 </literallayout>

    <para>
@@ -570,35 +576,25 @@ checkbutton:indeterminate {
@define-color bg_color #f9a039;

 * {
-  background-color: @bg_color;
+background-color: @bg_color;
 }
 ]]></programlisting>
    </example>

    <para>
-      GTK+ also supports color expressions, which allow colors to be transformed
-      to new ones and can be nested, providing a rich language to define colors.
-      Color expressions resemble functions, taking 1 or more colors and in some
-      cases a number as arguments.
-    </para>
-    <para>
-      shade() leaves the color unchanged when the number is 1 and transforms it
-      to black or white as the number approaches 0 or 2 respectively. For mix(),
-      0 or 1 return the unaltered 1st or 2nd color respectively; numbers between
-      0 and 1 return blends of the two; and numbers below 0 or above 1 intensify
-      the RGB components of the 1st or 2nd color respectively. alpha() takes a
-      number from 0 to 1 and applies that as the opacity of the supplied color.
+      GTK+ also allows to form color expressions, which can be nested and
+      provide a rich language to define colors which are derived from a
+      set of base colors.
    </para>

-<literallayout><code>〈color expression〉 = lighter( 〈color〉 ) | darker( 〈color〉 ) | shade( 〈color〉, 〈number〉 ) |</code>
-<code>                     alpha( 〈color〉, 〈number〉 ) | mix( 〈color〉, 〈color〉, 〈number〉 )</code>
+<literallayout><code>〈color expression〉 = lighter(〈color〉) | darker(〈color〉) | shade(〈number〉,〈color〉) | alpha(〈number〉,〈color〉) | mix(〈number〉,〈color〉,〈color〉)</code>
 </literallayout>

    <para>
      On Windows, GTK+ allows to refer to system colors, as follows:
    </para>

-<literallayout><code>〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉 )</code>
+<literallayout><code>〈win32 color〉 = -gtk-win32-color( 〈name〉, 〈integer〉)</code>
 </literallayout>

  </refsect2>
@@ -612,17 +608,17 @@ checkbutton:indeterminate {
    </para>

 <literallayout><code>〈image〉 = 〈url〉 | 〈crossfade〉 | 〈alternatives〉 | 〈gradient〉 | 〈gtk image〉</code>
-<code>〈crossfade〉 = cross-fade( 〈percentage〉, 〈image〉, 〈image〉 )</code>
-<code>〈alternatives〉 = image([ 〈image〉, ]* [ 〈image〉 | 〈color〉 ] )</code>
+<code>〈crossfade〉 = cross-fade( 〈percentage〉, 〈image〉, 〈image〉)</code>
+<code>〈alternatives〉 = image([ 〈image〉, ]* [ 〈image〉 | 〈color〉 ])</code>
 <code>〈gradient〉 = 〈linear gradient〉 | 〈radial gradient〉</code>
 <code>〈linear gradient〉 = [ linear-gradient | repeating-linear-gradient ] (</code>
 <code>                      [ [ 〈angle〉 | to 〈side or corner〉 ] , ]?</code>
 <code>                      〈color stops〉 )</code>
-<code>〈radial gradient〉 = [ radial-gradient | repeating-radial-gradient ] (</code>
+<code>〈radial gradient〉 = [ radial‑gradient | repeating‑radial‑gradient ] (</code>
 <code>                      [ [ 〈shape〉 || 〈size〉 ] [ at 〈position〉 ]? , | at 〈position〉, ]?</code>
 <code>                      〈color stops〉 )</code>
 <code>〈side or corner〉 = [ left | right ] || [ top | bottom ]</code>
-<code>〈color stops〉 =  〈color stop〉 [ , 〈color stop〉 ]+</code>
+<code>〈color stops〉 =  〈color stop〉 [ , 〈color stop〉]+</code>
 <code>〈color stop〉 = 〈color〉 [ 〈percentage〉 | 〈length〉 ]?</code>
 <code>〈shape〉 = circle | ellipse</code>
 <code>〈size〉 = 〈extent keyword〉 | 〈length〉 | [ 〈length〉 | 〈percentage〉 ]{1,2}</code>
@@ -649,7 +645,7 @@ button {
    <para>
      A crossfade lets you specify an image as an intermediate between two
      images. Crossfades are specified in the draft of the level 4
-      <ulink url="https://www.w3.org/TR/css4-images">Image</ulink>
+      <ulink url="http://www.w3.org/TR/css4-images">Image</ulink>
      module of the CSS specification.
    </para>

@@ -730,7 +726,7 @@ label {
      To learn more about gradients in CSS, including details of how color stops
      are placed on the gradient line and keywords for specifying radial sizes,
      you can read the
-      <ulink url="https://www.w3.org/TR/css3-images/#gradients">Image</ulink>
+      <ulink url="http://www.w3.org/TR/css3-images/#gradients">Image</ulink>
      module of the CSS specification.
    </para>

@@ -843,7 +839,7 @@ arrow.fancy {
      CSS, this can be done with the -gtk-scaled syntax.
    </para>

-<literallayout><code>〈scaled image〉 = -gtk-scaled( 〈image〉[ , 〈image〉 ]* )</code>
+<literallayout><code>〈scaled image〉 = -gtk-scaled( 〈image〉[, 〈image〉]* )</code>
 </literallayout>

    <para>
@@ -862,7 +858,7 @@ arrow {
 ]]></programlisting>
    </example>

-<literallayout><code>〈recolored image〉 = -gtk-recolor( 〈url〉 [ , 〈color palette〉 ] )</code>
+<literallayout><code>〈recolored image〉 = -gtk-recolored( 〈url〉[, 〈color palette〉] )</code>
 </literallayout>

    <para>
@@ -888,7 +884,7 @@ arrow {
    </para>

 <literallayout><code>〈win32 theme part〉 = -gtk-win32-theme-part( 〈name〉, 〈integer〉 〈integer〉</code>
-<code>                                              [ , [ over( 〈integer〉 〈integer〉 [ , 〈alpha value〉 ]? ) | margins( 〈integer〉{1,4} ) ] ]* )</code>
+<code>                                              [, [ over( 〈integer〉 〈integer〉 [ , 〈alpha value〉]? ) | margins( 〈integer〉{1,4} ) ] ]* )</code>
 </literallayout>

  </refsect2>
@@ -939,7 +935,7 @@ arrow {

 <literallayout><code>〈keyframe rule〉 = @keyframes 〈name〉 { 〈animation rule〉 }</code>
 <code>〈animation rule〉 = 〈animation selector〉 { 〈declaration〉* }</code>
-<code>〈animation selector〉 = 〈single animation selector〉 [ , 〈single animation selector〉 ]*</code>
+<code>〈animation selector〉 = 〈single animation selector〉 [ , 〈single animation selector  ]*</code>
 <code>〈single animation selector〉 = from | to | 〈percentage〉</code>
 </literallayout>

@@ -989,10 +985,10 @@ spinner {
      The syntax for @binding-set rules is as follows:
    </para>

-<literallayout><code>〈binding set rule〉 = @binding-set 〈binding name〉 { [ [ 〈binding〉 | 〈unbinding〉 ] ; ]* }</code>
+<literallayout><code>〈binding set rule〉 = @binding-set 〈binding name〉{ [ [ 〈binding〉 | 〈unbinding〉] ; ]* }</code>
 <code>〈binding〉 = bind "〈accelerator〉" { 〈signal emission〉* }</code>
-<code>〈signal emission〉 = "〈signal name〉" ( [ 〈argument〉 [ , 〈argument〉 ]* ]? }</code>
-<code>〈unbinding〉 = unbind "〈accelerator〉"</code>
+<code>〈signal emission〉 = "〈signal name〉" ( [ 〈argument〉[ , 〈argument〉]* ]? }</code>
+<code>〈unbinding〉 = unbind "〈accelerator〉" ;</code>
 </literallayout>

    <para>
--- a/docs/reference/gtk/css-properties.xml
+++ b/docs/reference/gtk/css-properties.xml
--- a/docs/reference/gtk/getting_started.xml.in
+++ b/docs/reference/gtk/getting_started.xml.in
@@ -44,7 +44,7 @@

    <informalexample>
      <para>Create a new file with the following content named <filename>example-0.c.</filename></para>
-      <programlisting><xi:include href="@abs_top_srcdir@/examples/window-default.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/window-default.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
    </informalexample>

    <para>
@@ -153,7 +153,7 @@
    <example id="gtk-getting-started-hello-world">
      <title>Hello World in GTK+</title>
      <para>Create a new file with the following content named example-1.c.</para>
-      <programlisting><xi:include href="@abs_top_srcdir@/examples/hello-world.c" parse="text">
+      <programlisting><xi:include href="../../../../examples/hello-world.c" parse="text">
          <xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
    </example>

@@ -233,7 +233,7 @@
    <example id="gtk-getting-started-grid-packing">
      <title>Packing buttons</title>
      <para>Create a new file with the following content named example-2.c.</para>
-      <programlisting><xi:include href="@abs_top_srcdir@/examples/grid-packing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/grid-packing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
    </example>
    <para>
      You can compile the program above with GCC using:
@@ -256,15 +256,15 @@

    <example>
      <title>Packing buttons with GtkBuilder</title>
-      <para>Create a new file with the following content named example-3.c.</para>
-      <programlisting><xi:include href="@abs_top_srcdir@/examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <para>Create a new file with the following content named example-4.c.</para>
+      <programlisting><xi:include href="../../../../examples/builder.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      <para>Create a new file with the following content named builder.ui.</para>
-      <programlisting><xi:include href="@abs_top_srcdir@/examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <programlisting><xi:include href="../../../../examples/builder.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
    </example>
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-3 example-3.c `pkg-config --libs gtk+-3.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-4 example-4.c `pkg-config --libs gtk+-3.0`</literal>
      </literallayout>
    </para>

@@ -346,7 +346,7 @@
      of our application class.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/main.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/main.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>All the application logic is in the application class, which
@@ -364,7 +364,7 @@
      GIO <ulink url="https://developer.gnome.org/gio/2.36/GApplication.html#GApplication.description">documentation</ulink>.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/exampleapp.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/exampleapp.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>Another important class that is part of the application support
@@ -373,7 +373,7 @@
      window.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/exampleappwin.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/exampleappwin.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>As part of the initial setup of our application, we also
@@ -388,7 +388,7 @@
      </informalfigure>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application1/exampleapp.desktop" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application1/exampleapp.desktop" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>Note that <replaceable>@<!-- -->bindir@</replaceable> needs to be replaced
@@ -420,7 +420,7 @@
      </para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application2/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application2/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>To make use of this file in our application, we revisit
@@ -450,17 +450,17 @@ example_app_window_class_init (ExampleAppWindowClass *class)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application2/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application2/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>You may have noticed that we used the <literal>_from_resource(<!-- -->)</literal> variant
-      of the function that sets a template. Now we need to use <ulink url="https://developer.gnome.org/gio/stable/GResource.html">GLib's resource functionality</ulink>
-      to include the ui file in the binary. This is commonly done by listing
-      all resources in a .gresource.xml file, such as this:
+      of the function that sets a template. Now we need to use GLib's resource
+      functionality to include the ui file in the binary. This is commonly
+      done by listing all resources in a .gresource.xml file, such as this:
      </para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application2/exampleapp.gresource.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application2/exampleapp.gresource.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>This file has to be converted into a C source file that will be
@@ -518,7 +518,7 @@ example_app_window_class_init (ExampleAppWindowClass *class)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application3/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application3/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>Now we revisit the example_app_window_open() function that
@@ -567,7 +567,7 @@ example_app_window_open (ExampleAppWindow *win,

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application3/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application3/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>Note that we did not have to touch the stack switcher
@@ -598,7 +598,7 @@ example_app_window_open (ExampleAppWindow *win,
      in a ui file, and add it as a resource to our binary.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application4/app-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application4/app-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>To associate the app menu with the application, we have to call
@@ -665,7 +665,7 @@ example_app_class_init (ExampleAppClass *class)

 ...
        </programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application4/exampleapp.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application4/exampleapp.c">full source</ulink>)</para>
      </informalexample>

      <para>Our preferences menu item does not do anything yet,
@@ -697,7 +697,7 @@ example_app_class_init (ExampleAppClass *class)
      GSettings requires a schema that describes our settings:</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application5/org.gtk.exampleapp.gschema.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application5/org.gtk.exampleapp.gschema.xml" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>Before we can make use of this schema in our application,
@@ -731,7 +731,7 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application5/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application5/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>The code to connect the font setting is a little more involved,
@@ -749,13 +749,13 @@ example_app_window_init (ExampleAppWindow *win)
      <para>Lets start with the template.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application6/prefs.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application6/prefs.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>Next comes the dialog subclass.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application6/exampleappprefs.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application6/exampleappprefs.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>Now we revisit the <literal>preferences_activated(<!-- -->)</literal> function in our
@@ -780,7 +780,7 @@ preferences_activated (GSimpleAction *action,

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application6/exampleapp.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application6/exampleapp.c">full source</ulink>)</para>
      </informalexample>

      <para>After all this work, our application can now show
@@ -807,7 +807,7 @@ preferences_activated (GSimpleAction *action,
      to slide out the search bar below the header bar.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application7/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application7/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>Implementing the search needs quite a few code changes that
@@ -866,7 +866,7 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application7/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application7/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>With the search bar, our application now looks like this:</para>
@@ -887,7 +887,7 @@ example_app_window_init (ExampleAppWindow *win)
      which demonstrates #GtkMenuButton, #GtkRevealer and #GtkListBox.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application8/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application8/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>The code to populate the sidebar with buttons for the words
@@ -898,7 +898,7 @@ example_app_window_init (ExampleAppWindow *win)
      ui file.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application8/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application8/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>To connect the menuitem to the show-words setting, we use
@@ -926,7 +926,7 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        ]]></programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application8/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application8/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>What our application looks like now:</para>
@@ -957,7 +957,7 @@ example_app_window_init (ExampleAppWindow *win)
      triggers the show-lines action:</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application9/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application9/gears-menu.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>To make this menu item do something, we create a property
@@ -989,12 +989,12 @@ example_app_window_init (ExampleAppWindow *win)

 ...
        </programlisting>
-        <para>(<ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application9/exampleappwin.c">full source</ulink>)</para>
+        <para>(<ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application9/exampleappwin.c">full source</ulink>)</para>
      </informalexample>

      <para>We also need a function that counts the lines of the currently
      active tab, and updates the @lines label. See the
-      <ulink url="https://gitlab.gnome.org/GNOME/gtk/blob/gtk-3-22/examples/application9/exampleappwin.c">full source</ulink>
+      <ulink url="https://git.gnome.org/browse/gtk+/tree/examples/application9/exampleappwin.c">full source</ulink>
      if you are interested in the details.</para>

      <para>This brings our example application to this appearance:</para>
@@ -1017,7 +1017,7 @@ example_app_window_init (ExampleAppWindow *win)
      be a direct child of the window, and set its type to be titlebar.</para>

      <informalexample>
-        <programlisting><xi:include href="@abs_top_srcdir@/examples/application10/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+        <programlisting><xi:include href="../../../../examples/application10/window.ui" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
      </informalexample>

      <para>A small extra bonus of using a header bar is that we get
@@ -1072,13 +1072,13 @@ example_app_window_init (ExampleAppWindow *win)

    <example id="gtk-getting-started-drawing">
      <title>Drawing in response to input</title>
-      <para>Create a new file with the following content named example-4.c.</para>
-      <programlisting><xi:include href="@abs_top_srcdir@/examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
+      <para>Create a new file with the following content named example-3.c.</para>
+      <programlisting><xi:include href="../../../../examples/drawing.c" parse="text"><xi:fallback>MISSING XINCLUDE CONTENT</xi:fallback></xi:include></programlisting>
    </example>
    <para>
      You can compile the program above with GCC using:
      <literallayout>
-        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-4 example-4.c `pkg-config --libs gtk+-3.0`</literal>
+        <literal>gcc `pkg-config --cflags gtk+-3.0` -o example-3 example-3.c `pkg-config --libs gtk+-3.0`</literal>
      </literallayout>
    </para>
  </section>
--- a/docs/reference/gtk/gtk-docs.sgml
+++ b/docs/reference/gtk/gtk-docs.sgml
@@ -12,9 +12,9 @@
    <releaseinfo>
      This document is for the GTK+ 3 library, version &version;.
      The latest versions can be found online at
-      <ulink role="online-location" url="https://developer.gnome.org/gtk3/">https://developer.gnome.org/gtk3/</ulink>.
+      <ulink role="online-location" url="http://developer.gnome.org/gtk3/">http://developer.gnome.org/gtk3/</ulink>.
      If you are looking for the older GTK+ 2 series of libraries,
-      see <ulink role="online-location" url="https://developer.gnome.org/gtk2/">https://developer.gnome.org/gtk2/</ulink>.
+      see <ulink role="online-location" url="http://developer.gnome.org/gtk2/">http://developer.gnome.org/gtk2/</ulink>.
    </releaseinfo>
  </bookinfo>

@@ -301,9 +301,6 @@
    <chapter id="Gestures">
      <title>Gestures and event handling</title>
      <xi:include href="xml/gtkeventcontroller.xml" />
-      <xi:include href="xml/gtkeventcontrollerkey.xml" />
-      <xi:include href="xml/gtkeventcontrollerscroll.xml" />
-      <xi:include href="xml/gtkeventcontrollermotion.xml" />
      <xi:include href="xml/gtkgesture.xml" />
      <xi:include href="xml/gtkgesturesingle.xml" />
      <xi:include href="xml/gtkgesturedrag.xml" />
@@ -313,7 +310,6 @@
      <xi:include href="xml/gtkgestureswipe.xml" />
      <xi:include href="xml/gtkgesturerotate.xml" />
      <xi:include href="xml/gtkgesturezoom.xml" />
-      <xi:include href="xml/gtkgesturestylus.xml" />
      <xi:include href="xml/gtkpadcontroller.xml" />
    </chapter>

@@ -498,10 +494,6 @@
    <title>Index of new symbols in 3.22</title>
    <xi:include href="xml/api-index-3.22.xml"><xi:fallback /></xi:include>
  </index>
-  <index id="api-index-3-24" role="3.24">
-    <title>Index of new symbols in 3.24</title>
-    <xi:include href="xml/api-index-3.24.xml"><xi:fallback /></xi:include>
-  </index>

  <xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>

--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1,3 +1,6 @@
+
+<INCLUDE>gtk/gtk.h</INCLUDE>
+
 <SECTION>
 <FILE>gtkaboutdialog</FILE>
 <TITLE>GtkAboutDialog</TITLE>
@@ -1662,11 +1665,6 @@ GtkFontFilterFunc
 gtk_font_chooser_set_filter_func
 gtk_font_chooser_set_font_map
 gtk_font_chooser_get_font_map
-gtk_font_chooser_set_level
-gtk_font_chooser_get_level
-gtk_font_chooser_get_font_features
-gtk_font_chooser_set_language
-gtk_font_chooser_get_language

 <SUBSECTION Standard>
 GtkFontChooserIface
@@ -2490,8 +2488,6 @@ gtk_info_bar_get_action_area
 gtk_info_bar_get_content_area
 gtk_info_bar_get_show_close_button
 gtk_info_bar_set_show_close_button
-gtk_info_bar_get_revealed
-gtk_info_bar_set_revealed

 <SUBSECTION Standard>
 GTK_TYPE_INFO_BAR
@@ -7086,6 +7082,7 @@ GtkPrintOperationPrivate


 <SECTION>
+<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintunixdialog</FILE>
 <TITLE>GtkPrintUnixDialog</TITLE>
 GtkPrintUnixDialog
@@ -7432,6 +7429,7 @@ gtk_print_context_get_type


 <SECTION>
+<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkprintjob</FILE>
 <TITLE>GtkPrintJob</TITLE>
 GtkPrintJob
@@ -7483,6 +7481,7 @@ gtk_print_job_get_type


 <SECTION>
+<INCLUDE>gtk/gtkunixprint.h</INCLUDE>
 <FILE>gtkpagesetupunixdialog</FILE>
 <TITLE>GtkPageSetupUnixDialog</TITLE>
 GtkPageSetupUnixDialog
@@ -8260,63 +8259,6 @@ GtkEventControllerPriv
 gtk_event_controller_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkeventcontrollerscroll</FILE>
-<TITLE>GtkEventControllerScroll</TITLE>
-GtkEventControllerScroll
-GtkEventControllerScrollFlags
-gtk_event_controller_scroll_new
-gtk_event_controller_scroll_set_flags
-gtk_event_controller_scroll_get_flags
-
-<SUBSECTION Standard>
-GTK_TYPE_EVENT_CONTROLLER_SCROLL
-GTK_EVENT_CONTROLLER_SCROLL
-GTK_EVENT_CONTROLLER_SCROLL_CLASS
-GTK_IS_EVENT_CONTROLLER_SCROLL
-GTK_IS_EVENT_CONTROLLER_SCROLL_CLASS
-GTK_EVENT_CONTROLLER_SCROLL_GET_CLASS
-
-<SUBSECTION Private>
-gtk_event_controller_scroll_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkeventcontrollermotion</FILE>
-<TITLE>GtkEventControllerMotion</TITLE>
-GtkEventControllerMotion
-gtk_event_controller_motion_new
-
-<SUBSECTION Standard>
-GTK_TYPE_EVENT_CONTROLLER_MOTION
-GTK_EVENT_CONTROLLER_MOTION
-GTK_EVENT_CONTROLLER_MOTION_CLASS
-GTK_IS_EVENT_CONTROLLER_MOTION
-GTK_IS_EVENT_CONTROLLER_MOTION_CLASS
-GTK_EVENT_CONTROLLER_MOTION_GET_CLASS
-
-<SUBSECTION Private>
-gtk_event_controller_motion_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkeventcontrollerkey</FILE>
-<TITLE>GtkEventControllerKey</TITLE>
-GtkEventControllerKey
-gtk_event_controller_key_new
-
-<SUBSECTION Standard>
-GTK_TYPE_EVENT_CONTROLLER_KEY
-GTK_EVENT_CONTROLLER_KEY
-GTK_EVENT_CONTROLLER_KEY_CLASS
-GTK_IS_EVENT_CONTROLLER_KEY
-GTK_IS_EVENT_CONTROLLER_KEY_CLASS
-GTK_EVENT_CONTROLLER_KEY_GET_CLASS
-
-<SUBSECTION Private>
-gtk_event_controller_key_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkgesture</FILE>
 <TITLE>GtkGesture</TITLE>
@@ -8541,30 +8483,6 @@ GTK_PAD_CONTROLLER_GET_CLASS
 gtk_pad_controller_get_type
 </SECTION>

-<SECTION>
-<FILE>gtkgesturestylus</FILE>
-<TITLE>GtkGestureStylus</TITLE>
-GtkGestureStylus
-
-gtk_gesture_stylus_new
-gtk_gesture_stylus_get_axis
-gtk_gesture_stylus_get_axes
-gtk_gesture_stylus_get_backlog
-gtk_gesture_stylus_get_device_tool
-
-<SUBSECTION Standard>
-GTK_TYPE_GESTURE_STYLUS
-GTK_GESTURE_STYLUS
-GTK_GESTURE_STYLUS_CLASS
-GTK_IS_GESTURE_STYLUS
-GTK_IS_GESTURE_STYLUS_CLASS
-GTK_GESTURE_STYLUS_GET_CLASS
-GtkGestureStylusClass
-
-<SUBSECTION Private>
-gtk_gesture_stylus_get_type
-</SECTION>
-
 <SECTION>
 <FILE>gtkstacksidebar</FILE>
 GtkStackSidebar
--- a/docs/reference/gtk/gtk3.types.in
+++ b/docs/reference/gtk/gtk3.types.in
@@ -65,9 +65,6 @@ gtk_entry_completion_get_type
 gtk_entry_get_type
 gtk_event_box_get_type
 gtk_event_controller_get_type
-gtk_event_controller_key_get_type
-gtk_event_controller_motion_get_type
-gtk_event_controller_scroll_get_type
 gtk_expander_get_type
 gtk_file_chooser_button_get_type
 gtk_file_chooser_dialog_get_type
@@ -91,7 +88,6 @@ gtk_gesture_multi_press_get_type
 gtk_gesture_pan_get_type
 gtk_gesture_rotate_get_type
 gtk_gesture_single_get_type
-gtk_gesture_stylus_get_type
 gtk_gesture_swipe_get_type
 gtk_gesture_zoom_get_type
 gtk_gl_area_get_type
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -1,535 +0,0 @@
-private_headers = [
-  'inspector',
-  'a11y',
-  'gtkaccelgroupprivate.h',
-  'gtkaccelmapprivate.h',
-  'gtkadjustmentprivate.h',
-  'gtkallocatedbitmaskprivate.h',
-  'gtkappchooserprivate.h',
-  'gtkapplicationaccelsprivate.h',
-  'gtkapplicationprivate.h',
-  'gtkbindingsprivate.h',
-  'gtkbitmaskprivate.h',
-  'gtkboxprivate.h',
-  'gtkbuilderprivate.h',
-  'gtkbuttonprivate.h',
-  'gtkcairoblurprivate.h',
-  'gtkcellareaboxcontextprivate.h',
-  'gtkclipboardprivate.h',
-  'gtkcolorchooserprivate.h',
-  'gtkcoloreditorprivate.h',
-  'gtkcolorplaneprivate.h',
-  'gtkcolorscaleprivate.h',
-  'gtkcolorswatchprivate.h',
-  'gtkcomboboxprivate.h',
-  'gtkcontainerprivate.h',
-  'gtkcssanimatedstyleprivate.h',
-  'gtkcssanimationprivate.h',
-  'gtkcssarrayvalueprivate.h',
-  'gtkcssbgsizevalueprivate.h',
-  'gtkcssbordervalueprivate.h',
-  'gtkcsscolorvalueprivate.h',
-  'gtkcsscornervalueprivate.h',
-  'gtkcsscustompropertyprivate.h',
-  'gtkcsseasevalueprivate.h',
-  'gtkcssenginevalueprivate.h',
-  'gtkcssenumvalueprivate.h',
-  'gtkcssiconthemevalueprivate.h',
-  'gtkcssimagebuiltinprivate.h',
-  'gtkcssimagecrossfadeprivate.h',
-  'gtkcssimagegradientprivate.h',
-  'gtkcssimageiconthemeprivate.h',
-  'gtkcssimagelinearprivate.h',
-  'gtkcssimageprivate.h',
-  'gtkcssimagescaledprivate.h',
-  'gtkcssimagesurfaceprivate.h',
-  'gtkcssimageurlprivate.h',
-  'gtkcssimagevalueprivate.h',
-  'gtkcssimagewin32private.h',
-  'gtkcssinheritvalueprivate.h',
-  'gtkcssinitialvalueprivate.h',
-  'gtkcsskeyframesprivate.h',
-  'gtkcsslookupprivate.h',
-  'gtkcssmatcherprivate.h',
-  'gtkcssnodeprivate.h',
-  'gtkcssnodedeclarationprivate.h',
-  'gtkcssnumbervalueprivate.h',
-  'gtkcsspathnodeprivate.h',
-  'gtkcssparserprivate.h',
-  'gtkcsspositionvalueprivate.h',
-  'gtkcssproviderprivate.h',
-  'gtkcssrepeatvalueprivate.h',
-  'gtkcssrgbavalueprivate.h',
-  'gtkcsssectionprivate.h',
-  'gtkcssselectorprivate.h',
-  'gtkcssshadowsvalueprivate.h',
-  'gtkcssshadowvalueprivate.h',
-  'gtkcssshorthandpropertyprivate.h',
-  'gtkcssstaticstyleprivate.h',
-  'gtkcssstringvalueprivate.h',
-  'gtkcssstylefuncsprivate.h',
-  'gtkcssstyleprivate.h',
-  'gtkcssstylepropertyprivate.h',
-  'gtkcsstransformvalueprivate.h',
-  'gtkcsstransientnodeprivate.h',
-  'gtkcsstransitionprivate.h',
-  'gtkcsstypedvalueprivate.h',
-  'gtkcsstypesprivate.h',
-  'gtkcssunsetvalueprivate.h',
-  'gtkcssvalueprivate.h',
-  'gtkcsswidgetnodeprivate.h',
-  'gtkdialogprivate.h',
-  'gtkentryprivate.h',
-  'gtkeventcontrollerprivate.h',
-  'gtkfilechooserprivate.h',
-  'gtkfilechooserwidgetprivate.h',
-  'gtkfontchooserprivate.h',
-  'gtkgesturedragprivate.h',
-  'gtkgesturelongpressprivate.h',
-  'gtkgesturemultipressprivate.h',
-  'gtkgesturepanprivate.h',
-  'gtkgestureprivate.h',
-  'gtkgesturerotateprivate.h',
-  'gtkgesturesingleprivate.h',
-  'gtkgestureswipeprivate.h',
-  'gtkgesturezoomprivate.h',
-  'gtkheaderbarprivate.h',
-  'gtkhslaprivate.h',
-  'gtkiconhelperprivate.h',
-  'gtkiconviewprivate.h',
-  'gtkimageprivate.h',
-  'gtkimmoduleprivate.h',
-  'gtklabelprivate.h',
-  'gtklockbuttonprivate.h',
-  'gtkmagnifierprivate.h',
-  'gtkmenubuttonprivate.h',
-  'gtkmenuitemprivate.h',
-  'gtkmenuprivate.h',
-  'gtkmenushellprivate.h',
-  'gtkmodulesprivate.h',
-  'gtkmountoperationprivate.h',
-  'gtkorientableprivate.h',
-  'gtkpixelcacheprivate.h',
-  'gtkplacessidebarprivate.h',
-  'gtkplacesviewprivate.h',
-  'gtkplacesviewrowprivate.h',
-  'gtkpopoverprivate.h',
-  'gtkprinter-private.h',
-  'gtkprintoperation-private.h',
-  'gtkprivate.h',
-  'gtkrangeprivate.h',
-  'gtkrecentchooserprivate.h',
-  'gtkrenderbackgroundprivate.h',
-  'gtkrenderborderprivate.h',
-  'gtkrendericonprivate.h',
-  'gtkrenderprivate.h',
-  'gtkroundedboxprivate.h',
-  'gtkscaleprivate.h',
-  'gtksearchengine.h',
-  'gtksearchenginemodel.h',
-  'gtksearchenginequartz.h',
-  'gtksearchenginesimple.h',
-  'gtksearchenginetracker.h',
-  'gtksearchentryprivate.h',
-  'gtkselectionprivate.h',
-  'gtksettingsprivate.h',
-  'gtksidebarrowprivate.h',
-  'gtksizegroup-private.h',
-  'gtksizerequestcacheprivate.h',
-  'gtksocketprivate.h',
-  'gtkstyleanimationprivate.h',
-  'gtkstylecascadeprivate.h',
-  'gtkstylecontextprivate.h',
-  'gtkstylepropertyprivate.h',
-  'gtkstyleproviderprivate.h',
-  'gtktextattributesprivate.h',
-  'gtktextchildprivate.h',
-  'gtktexthandleprivate.h',
-  'gtktextiterprivate.h',
-  'gtktextmarkprivate.h',
-  'gtktexttagprivate.h',
-  'gtktogglebuttonprivate.h',
-  'gtktoolbarprivate.h',
-  'gtktoolpaletteprivate.h',
-  'gtktooltipprivate.h',
-  'gtktooltipwindowprivate.h',
-  'gtktreeprivate.h',
-  'gtkwidgetprivate.h',
-  'gtkwin32themeprivate.h',
-  'gtkwindowprivate.h',
-  'fnmatch.h',
-  'gtkactionmuxer.h',
-  'gtkactionobserver.h',
-  'gtkactionobservable.h',
-  'gtk9slice.h',
-  'gtkanimationdescription.h',
-  'gtkbitmaskprivateimpl.h',
-  'gtkbookmarksmanager.h',
-  'gtkdbusgenerated.c',
-  'gtkdbusgenerated.h',
-  'gtkdebug.h',
-  'gtkactionhelper.h',
-  'gtkdndcursors.h',
-  'gtkfilechooserdefault.h',
-  'gtkfilechooserembed.h',
-  'gtkfilechooserentry.h',
-  'gtkfilechoosersettings.h',
-  'gtkfilechooserutils.h',
-  'gtkfilesystem.h',
-  'gtkfilesystemmodel.h',
-  'gtkfilesystemunix.h',
-  'gtkfilesystemwin32.h',
-  'gtkfontchooserutils.h',
-  'gtkiconcache.h',
-  'gtkiconcachevalidator.h',
-  'gtkiconthemeparser.h',
-  'gtkintl.h',
-  'gtkkeyhash.h',
-  'gtkkineticscrolling.h',
-  'gtkmarshal.h',
-  'gtkmnemonichash.h',
-  'gtkmenutracker.h',
-  'gtkmenutrackeritem.h',
-  'gtkmenusectionbox.h',
-  'gtkmodelmenu.h',
-  'gtkmodelmenuitem.h',
-  'gtkmodifierstyle.h',
-  'gtkpathbar.h',
-  'gtkprintbackend.h',
-  'gtkprinteroption.h',
-  'gtkprinteroptionset.h',
-  'gtkprinteroptionwidget.h',
-  'gtkprint-win32.h',
-  'gtkprintutils.h',
-  'gtkprivate.h',
-  'gtkprivatetypebuiltins.h',
-  'gtkquery.h',
-  'gtkrbtree.h',
-  'gtkrecentchooserdefault.h',
-  'gtkrecentchooserutils.h',
-  'gtksearchengine.h',
-  'gtksearchenginetracker.h',
-  'gtksearchenginesimple.h',
-  'gtksearchenginequartz.h',
-  'gtksequence.h',
-  'gtksocketprivate.h',
-  'gtktextbtree.h',
-  'gtktextbufferserialize.h',
-  'gtktextdisplay.h',
-  'gtktextlayout.h',
-  'gtktextsegment.h',
-  'gtktexttypes.h',
-  'gtktextutil.h',
-  'gtktimeline.h',
-  'gtkthemes.h',
-  'gtktrashmonitor.h',
-  'gtktrayicon.h',
-  'gtktreedatalist.h',
-  'gtktreemenu.h',
-  'gtktypebuiltins.h',
-  'gtkxembed.h',
-  'gtkwin32embed.h',
-  'gtkwin32embedwidget.h',
-  'gtkwindow-decorate.h',
-  'xdgmime',
-  'xembed.h',
-]
-
-images = [
-  'images/aboutdialog.png',
-  'images/accel-label.png',
-  'images/action-bar.png',
-  'images/appchooserbutton.png',
-  'images/appchooserdialog.png',
-  'images/assistant.png',
-  'images/box-packing.png',
-  'images/box-expand.png',
-  'images/button.png',
-  'images/check-button.png',
-  'images/color-button.png',
-  'images/colorchooser.png',
-  'images/combo-box.png',
-  'images/combo-box-entry.png',
-  'images/combo-box-text.png',
-  'images/entry.png',
-  'images/figure-hierarchical-drawing.png',
-  'images/figure-windowed-label.png',
-  'images/file-button.png',
-  'images/filechooser.png',
-  'images/font-button.png',
-  'images/fontchooser.png',
-  'images/frame.png',
-  'images/glarea.png',
-  'images/headerbar.png',
-  'images/icon-view.png',
-  'images/image.png',
-  'images/info-bar.png',
-  'images/label.png',
-  'images/levelbar.png',
-  'images/link-button.png',
-  'images/list-and-tree.png',
-  'images/lock-button.png',
-  'images/lockbutton.png',
-  'images/lockbutton-locked.png',
-  'images/lockbutton-unlocked.png',
-  'images/lockbutton-sorry.png',
-  'images/menubar.png',
-  'images/menu-button.png',
-  'images/messagedialog.png',
-  'images/multiline-text.png',
-  'images/notebook.png',
-  'images/panes.png',
-  'images/pagesetupdialog.png',
-  'images/placessidebar.png',
-  'images/popup-anchors.png',
-  'images/popup-flip.png',
-  'images/popup-slide.png',
-  'images/printdialog.png',
-  'images/progressbar.png',
-  'images/radio-group.png',
-  'images/recentchooserdialog.png',
-  'images/scales.png',
-  'images/scrollbar.png',
-  'images/scrolledwindow.png',
-  'images/search-bar.png',
-  'images/search-entry.png',
-  'images/separator.png',
-  'images/sidebar.png',
-  'images/spinbutton.png',
-  'images/spinner.png',
-  'images/stack.png',
-  'images/stackswitcher.png',
-  'images/statusbar.png',
-  'images/toggle-button.png',
-  'images/toolbar.png',
-  'images/toolpalette.png',
-  'images/tree-view-coordinates.png',
-  'images/volumebutton.png',
-  'images/window.png',
-  'images/layout-btlr.png',
-  'images/layout-btrl.png',
-  'images/layout-lrbt.png',
-  'images/layout-lrtb.png',
-  'images/layout-rlbt.png',
-  'images/layout-rltb.png',
-  'images/layout-tblr.png',
-  'images/layout-tbrl.png',
-  'images/widget-hvalign.png',
-  'images/window-default.png',
-  'images/hello-world.png',
-  'images/grid-packing.png',
-  'images/drawing.png',
-  'images/switch.png',
-  'images/linear.png',
-  'images/ease.png',
-  'images/ease-in-out.png',
-  'images/ease-in.png',
-  'images/ease-out.png',
-  'images/gradient1.png',
-  'images/gradient2.png',
-  'images/gradient3.png',
-  'images/gradient4.png',
-  'images/border1.png',
-  'images/border2.png',
-  'images/border3.png',
-  'images/slices.png',
-  'images/checks.png',
-  'images/options.png',
-  'images/arrows.png',
-  'images/expanders.png',
-  'images/background.png',
-  'images/frames.png',
-  'images/frame-gap.png',
-  'images/sliders.png',
-  'images/focus.png',
-  'images/handles.png',
-  'images/extensions.png',
-  'images/numerableicon.png',
-  'images/numerableicon2.png',
-  'images/bloatpad-osx.png',
-  'images/bloatpad-gnome.png',
-  'images/bloatpad-xfce.png',
-  'images/down-center.png',
-  'images/down-end.png',
-  'images/down-start.png',
-  'images/left-center.png',
-  'images/left-end.png',
-  'images/left-start.png',
-  'images/right-center.png',
-  'images/right-end.png',
-  'images/right-start.png',
-  'images/up-center.png',
-  'images/up-end.png',
-  'images/up-start.png',
-  'images/list-box.png',
-  'images/getting-started-app1.png',
-  'images/getting-started-app2.png',
-  'images/getting-started-app3.png',
-  'images/getting-started-app4.png',
-  'images/getting-started-app6.png',
-  'images/getting-started-app7.png',
-  'images/getting-started-app8.png',
-  'images/getting-started-app9.png',
-  'images/getting-started-app10.png',
-  'images/exampleapp.png',
-  'images/flow-box.png',
-  'images/inspector.png',
-  'images/gedit-shortcuts.png',
-  'images/clocks-shortcuts.png',
-  'images/builder-shortcuts.png',
-]
-
-content_files = [
-  'broadway.xml',
-  'broadwayd.xml',
-  'building.sgml',
-  'css-overview.xml',
-  'css-properties.xml',
-  'gtk3-demo-application.xml',
-  'gtk3-demo.xml',
-  'gtk3-icon-browser.xml',
-  'gtk3-widget-factory.xml',
-  'gtk-builder-tool.xml',
-  'gtk-encode-symbolic-svg.xml',
-  'gtk-launch.xml',
-  'gtk-query-immodules-3.0.xml',
-  'gtk-query-settings.xml',
-  'gtk-update-icon-cache.xml',
-  'mir.xml',
-  'osx.sgml',
-  'overview.xml',
-  'resources.sgml',
-  'running.sgml',
-  'visual_index.xml',
-  'wayland.xml',
-  'windows.sgml',
-  'x11.sgml',
-]
-
-expand_content_files = [
-  'compiling.sgml',
-  'drawing-model.xml',
-  join_paths(meson.current_build_dir(), 'getting_started.xml'),
-  'glossary.xml',
-  'input-handling.xml',
-  'migrating-2to3.xml',
-  'migrating-3xtoy.xml',
-  'migrating-checklist.sgml',
-  'migrating-GtkGrid.xml',
-  'migrating-GtkStyleContext.xml',
-  'migrating-smclient-GtkApplication.xml',
-  'migrating-unique-GtkApplication.xml',
-  'question_index.sgml',
-  'text_widget.sgml',
-  'tree_widget.sgml',
-]
-
-content_files += expand_content_files
-
-types_conf = configuration_data()
-if os_win32
-  types_conf.set('DISABLE_ON_W32', '%')
-else
-  types_conf.set('DISABLE_ON_W32', '')
-endif
-
-if os_darwin
-  types_conf.set('DISABLE_ON_QUARTZ', '%')
-else
-  types_conf.set('DISABLE_ON_QUARTZ', '')
-endif
-
-if x11_enabled
-  types_conf.set('ENABLE_ON_X11', '')
-else
-  types_conf.set('ENABLE_ON_X11', '%')
-endif
-
-if get_option('gtk_doc')
-
-    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
-    configure_file(input: 'getting_started.xml.in', output: 'getting_started.xml', configuration: src_dir_conf)
-
-    gnome.gtkdoc('gtk3',
-                 mode: 'none',
-                 main_xml: 'gtk-docs.sgml',
-                 src_dir: [
-                   gtkinc,
-                ],
-                 dependencies: libgtk_dep,
-                 gobject_typesfile: configure_file(
-                   input: 'gtk3.types.in',
-                   output: 'gtk3.types',
-                   configuration: types_conf,
-                 ),
-                 scan_args: [
-                   '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
-                   '--ignore-headers=' + ' '.join(private_headers),
-                 ],
-                 mkdb_args: [
-                   '--default-includes=gtk/gtk.h',
-                 ],
-                 fixxref_args: [
-                   '--html-dir=@0@'.format(docpath),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
-                   '--extra-dir=@0@'.format(cairo_docpath),
-                   '--extra-dir=@0@'.format(gdkpixbuf_docpath),
-                   '--extra-dir=../gdk',
-                 ],
-                 content_files: content_files,
-                 expand_content_files: expand_content_files,
-                 html_assets: images,
-                 install: true)
-endif
-
-xsltproc = find_program('xsltproc', required: false)
-if get_option('man') and not xsltproc.found()
-  error('No xsltproc found, but man pages were explicitly enabled')
-endif
-
-if get_option('man') and xsltproc.found()
-  xlstproc_flags = [
-    '--nonet',
-    '--stringparam', 'man.output.quietly', '1',
-    '--stringparam', 'funcsynopsis.style', 'ansi',
-    '--stringparam', 'man.th.extra1.suppress', '1',
-    '--stringparam', 'man.authors.section.enabled', '0',
-    '--stringparam', 'man.copyright.section.enabled', '0',
-  ]
-
-  man_files = [
-    [ 'gtk-query-immodules-3.0', '1', ],
-    [ 'gtk-update-icon-cache', '1', ],
-    [ 'gtk-encode-symbolic-svg', '1', ],
-    [ 'gtk-launch', '1', ],
-    [ 'gtk3-demo', '1', ],
-    [ 'gtk3-demo-application', '1', ],
-    [ 'gtk3-widget-factory', '1', ],
-    [ 'gtk3-icon-browser', '1', ],
-    [ 'gtk-builder-tool', '1', ],
-    [ 'gtk-query-settings', '1', ],
-  ]
-
-  if broadway_enabled
-    man_files += [[ 'broadwayd', '1', ]]
-  endif
-
-  foreach man: man_files
-    man_name = man.get(0)
-    man_section = man.get(1, '1')
-    custom_target('@0@.@1@'.format(man_name, man_section),
-                  input: '@0@.xml'.format(man_name),
-                  output: '@0@.@1@'.format(man_name, man_section),
-                  command: [
-                    xsltproc,
-                    xlstproc_flags,
-                    '-o', '@OUTPUT@',
-                    'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl',
-                    '@INPUT@',
-                  ],
-                  install: true,
-                  install_dir: join_paths(get_option('mandir'), 'man@0@'.format(man_section)))
-  endforeach
-endif
--- a/docs/reference/gtk/migrating-GtkStyleContext.xml
+++ b/docs/reference/gtk/migrating-GtkStyleContext.xml
@@ -415,7 +415,7 @@

    <para>
      It is worth mentioning that the new file format does not support
-      stock icon mappings as the RC format did.
+      custom keybindings nor stock icon mappings as the RC format did.
    </para>
  </section>

--- a/docs/reference/gtk/question_index.sgml
+++ b/docs/reference/gtk/question_index.sgml
@@ -35,11 +35,11 @@ How do I get started with GTK+?
 </para></question>

 <answer><para>
-The GTK+ <ulink url="https://www.gtk.org">website</ulink> offers some
-<ulink url="https://www.gtk.org/documentation.php">tutorials</ulink> and other
+The GTK+ <ulink url="http://www.gtk.org">website</ulink> offers some
+<ulink url="http://www.gtk.org/documentation.php">tutorials</ulink> and other
 documentation (most of it about GTK+ 2.x, but mostly still applicable).
 More documentation ranging from whitepapers to online books can be found at
-the <ulink url="https://developer.gnome.org">GNOME developer's site</ulink>.
+the <ulink url="http://developer.gnome.org">GNOME developer's site</ulink>.
 After studying these materials you should be well prepared to come back to
 this reference manual for details.
 </para></answer>
@@ -77,7 +77,7 @@ specific widgets and functions.
 <para>
 If you have a question not covered in the manual, feel free to
 ask on the mailing lists and please <ulink
-url="https://bugzilla.gnome.org">file a bug report</ulink> against the
+url="http://bugzilla.gnome.org">file a bug report</ulink> against the
 documentation.
 </para>

@@ -106,7 +106,7 @@ For strings returned from functions, they will be declared "const"
 if they should not be freed. Non-const strings should be
 freed with g_free(). Arrays follow the same rule. If you find an
 undocumented exception to the rules, please report a bug to <ulink
-url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
+url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>.
 </para>

 </answer>
@@ -180,7 +180,7 @@ How do I internationalize a GTK+ program?

 <answer>
 <para>
-Most people use <ulink url="https://www.gnu.org/software/gettext/">GNU
+Most people use <ulink url="http://www.gnu.org/software/gettext/">GNU
 gettext</ulink>, already required in order to install GLib. On a UNIX
 or Linux system with gettext installed, type <literal>info gettext</literal>
 to read the documentation.
@@ -281,7 +281,7 @@ zero-terminated strings.
 </para></listitem>
 </itemizedlist>
 More information about Unicode and UTF-8 can be found in the
-<ulink url="https://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode
+<ulink url="http://www.cl.cam.ac.uk/~mgk25/unicode.html">UTF-8 and Unicode
 FAQ for Unix/Linux</ulink>.
 GLib provides functions for converting strings between UTF-8 and other
 encodings, see g_locale_to_utf8() and g_convert().
@@ -376,7 +376,7 @@ How do I use GTK+ with C++?
 There are two ways to approach this. The GTK+ header files use the subset
 of C that's also valid C++, so you can simply use the normal GTK+ API
 in a C++ program. Alternatively, you can use a "C++ binding"
-such as <ulink url="https://www.gtkmm.org/">gtkmm</ulink>
+such as <ulink url="http://gtkmm.sourceforge.net/">gtkmm</ulink>
 which provides a native C++ API.
 </para>
 <para>
@@ -415,9 +415,9 @@ How do I use GTK+ with other non-C languages?

 <answer>
 <para>
-See the <ulink url="https://www.gtk.org/language-bindings.php">list of language
+See the <ulink url="http://www.gtk.org/language-bindings.php">list of language
 bindings</ulink> on <ulink
-url="https://www.gtk.org">https://www.gtk.org</ulink>.
+url="http://www.gtk.org">http://www.gtk.org</ulink>.
 </para>

 </answer>
@@ -473,8 +473,8 @@ To draw a piece of text, use a Pango layout and pango_cairo_show_layout().

 <para>
 See also the
-<ulink url="https://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html">Cairo Rendering</ulink>
-section of <ulink url="https://developer.gnome.org/pango/stable/">Pango manual</ulink>.
+<ulink url="http://developer.gnome.org/pango/stable/pango-Cairo-Rendering.html">Cairo Rendering</ulink>
+section of <ulink url="http://developer.gnome.org/pango/stable/">Pango manual</ulink>.
 </para>
 </answer>

@@ -505,8 +505,8 @@ pango_layout_get_pixel_size(), using code like the following:

 <para>
 See also the
-<ulink url="https://developer.gnome.org/pango/stable/pango-Layout-Objects.html">Layout Objects</ulink>
-section of <ulink url="https://developer.gnome.org/pango/stable/">Pango manual</ulink>.
+<ulink url="http://developer.gnome.org/pango/stable/pango-Layout-Objects.html">Layout Objects</ulink>
+section of <ulink url="http://developer.gnome.org/pango/stable/">Pango manual</ulink>.
 </para>
 </answer>
 </qandaentry>
--- a/docs/reference/gtk/resources.sgml
+++ b/docs/reference/gtk/resources.sgml
@@ -22,7 +22,7 @@ Getting help with GTK+
 <para>
 If you encounter a bug, misfeature, or missing feature in GTK+, please
 file a bug report on 
-<ulink url="https://bugzilla.gnome.org">https://bugzilla.gnome.org</ulink>.
+<ulink url="http://bugzilla.gnome.org">http://bugzilla.gnome.org</ulink>. 
 We'd also appreciate reports of incomplete or misleading information in 
 the GTK+ documentation; file those against the "docs" component of the "gtk+"
 product in Bugzilla.
@@ -72,7 +72,7 @@ There are several mailing lists dedicated to GTK+ and related
 libraries. Discussion of GLib, Pango, and ATK in addition to GTK+
 proper is welcome on these lists. You can subscribe or view the
 archives of these lists on 
-<ulink url="https://mail.gnome.org">http://mail.gnome.org</ulink>.
+<ulink url="http://mail.gnome.org">http://mail.gnome.org</ulink>.
 If you aren't subscribed to the list, any message you post to
 the list will be held for manual moderation, which might take
 some days to happen.      
--- a/docs/reference/gtk/running.sgml
+++ b/docs/reference/gtk/running.sgml
@@ -522,42 +522,15 @@ nevertheless.
  </para>
 </formalpara>

-<formalpara>
-  <title><envar>GTK_CSD</envar></title>
-
-  <para>
-    The default value of this environment variable is 1. If changed to 0, this
-    disables the default use of client-side decorations on GTK+ windows, thus
-    making the window manager responsible for drawing the decorations of
-    windows that do not have a custom titlebar widget.
-  </para>
-  <para>
-    CSD is always used for windows with a custom titlebar widget set, as the WM
-    should not draw another titlebar or other decorations around the custom one.
-  </para>
-</formalpara>
-
-<formalpara>
-  <title><envar>GTK_OVERLAY_SCROLLING</envar></title>
-
-  <para>
-    The default value of this environment variable is 1, which means that each
-    instance of GtkScrolledWindow will choose whether to use overlay or full-
-    size scrollbars via its own GtkScrolledWindow:overlay-scrolling property,
-    which defaults to <literal>TRUE</literal>. If this variable is set to 0,
-    all GtkScrolledWindow instances are made to use full/non-overlay scrollbars.
-  </para>
-</formalpara>
-
 <formalpara>
  <title><envar>XDG_DATA_HOME</envar>, <envar>XDG_DATA_DIRS</envar></title>

  <para>
    GTK+ uses these environment variables to locate icon themes
    and MIME information. For more information, see
-    <ulink url="https://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
-    the <ulink url="https://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
-    and the <ulink url="https://freedesktop.org/Standards/basedir-spec">Base Directory Specification</ulink>.
+    <ulink url="http://freedesktop.org/Standards/icon-theme-spec">Icon Theme Specification</ulink>,
+    the <ulink url="http://freedesktop.org/Standards/shared-mime-info-spec">Shared MIME-info Database</ulink>
+    and the <ulink url="http://freedesktop.org/Standards/basedir-spec">Base Directory Specification</ulink>.
  </para>
 </formalpara>

@@ -566,7 +539,7 @@ nevertheless.

  <para>
    GTK+ uses this environment variable to provide startup notification
-    according to the <ulink url="https://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
+    according to the <ulink url="http://standards.freedesktop.org/startup-notification-spec/startup-notification-latest.txt">Startup Notification Spec</ulink>.
    Following the specification, GTK+ unsets this variable after reading
    it (to keep it from leaking to child processes). So, if you need its
    value for your own purposes, you have to read it before calling
--- a/docs/reference/gtk/wayland.xml
+++ b/docs/reference/gtk/wayland.xml
@@ -32,7 +32,7 @@ options or environment variables.

 <para>
 For up-to-date information about the current status of this backend, see
-the <ulink url="https://wiki.gnome.org/Initiatives/Wayland/GTK%2B">project page</ulink>.
+the <ulink url="http://wayland.freedesktop.org/gtk.html">project page</ulink>.
 </para>

 </refsect1>
--- a/docs/reference/libgail-util/Makefile.am
+++ b/docs/reference/libgail-util/Makefile.am
@@ -34,8 +34,6 @@ HTML_IMAGES =
 include $(top_srcdir)/gtk-doc.make

 # Other files to distribute
-EXTRA_DIST += \
-	version.xml.in \
-	meson.build
+EXTRA_DIST += version.xml.in

 -include $(top_srcdir)/git.mk
--- a/docs/reference/libgail-util/meson.build
+++ b/docs/reference/libgail-util/meson.build
@@ -1,21 +0,0 @@
-if get_option('gtk_doc')
-    configure_file(input: 'version.xml.in', output: 'version.xml', configuration: version_conf)
-
-    gnome.gtkdoc('gail-libgail-util3',
-                 mode: 'none',
-                 main_xml: 'gail-libgail-util-docs.sgml',
-                 src_dir: libgailutilinc,
-                 dependencies: [libgtk_dep, libgailutil],
-                 gobject_typesfile: join_paths(meson.current_source_dir(), 'gail-libgail-util3.types'),
-                 scan_args: [
-                   '--ignore-decorators=_GDK_EXTERN|G_GNUC_WARN_UNUSED_RESULT',
-                 ],
-                 fixxref_args: [
-                   '--html-dir=@0@'.format(docpath),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'glib')),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gobject')),
-                   '--extra-dir=@0@'.format(join_paths(glib_docpath, 'gio')),
-                   '--extra-dir=../gtk',
-                 ],
-                 install: true)
-endif
--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -1,22 +0,0 @@
-if get_option('gtk_doc')
-    glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
-    glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
-
-    cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix')
-    cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo')
-
-    gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix')
-    gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf')
-
-    docpath = join_paths(gtk_datadir, 'gtk-doc', 'html')
-
-    version_conf = configuration_data()
-    version_conf.set('GTK_VERSION', meson.project_version())
-
-    src_dir_conf = configuration_data()
-    src_dir_conf.set('abs_top_srcdir', meson.source_root())
-endif
-
-subdir('gdk')
-subdir('gtk')
-subdir('libgail-util')
--- a/docs/tools/Makefile.am
+++ b/docs/tools/Makefile.am
@@ -20,9 +20,6 @@ LDADDS = \
 	$(GDK_DEP_LIBS)			\
 	-lm

-EXTRA_DIST += \
-	meson.build
-
 if USE_X11
 noinst_PROGRAMS = 		\
 	doc-shooter
--- a/Show More
+++ b/Show More