node-editor: Don't use the ::query-tooltip signal

Use the vfunc, the signal is going away.
inspector: Don't use the ::query-tooltip signal
2020-05-09 23:24:59 -04:00 · 2020-05-09 22:49:55 -04:00 · 2020-05-09 22:31:00 -04:00 · 2020-05-09 22:31:00 -04:00 · 2020-05-09 22:30:59 -04:00 · 2020-05-09 22:30:59 -04:00
1105 changed files with 47483 additions and 151850 deletions
@@ -27,41 +27,14 @@ variables:

 style-check-diff:
  extends: .only-default
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: .pre
  allow_failure: true
  script:
    - .gitlab-ci/run-style-check-diff.sh

-.build-fedora-default:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v17
-  artifacts:
-    when: always
-    reports:
-      junit:
-        - "${CI_PROJECT_DIR}/_build/report-x11.xml"
-        - "${CI_PROJECT_DIR}/_build/report-wayland.xml"
-        - "${CI_PROJECT_DIR}/_build/report-broadway.xml"
-    name: "gtk-${CI_COMMIT_REF_NAME}"
-    paths:
-      - "${CI_PROJECT_DIR}/_build/meson-logs"
-      - "${CI_PROJECT_DIR}/_build/report*.xml"
-      - "${CI_PROJECT_DIR}/_build/report*.html"
-      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
-      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
-  cache:
-    key: "$CI_JOB_NAME"
-    paths:
-      - _ccache/
-      - subprojects/gdk-pixbuf/
-      - subprojects/glib/
-      - subprojects/graphene/
-      - subprojects/libepoxy/
-      - subprojects/pango/
-
 fedora-x86_64:
-  extends: .build-fedora-default
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: build
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=debug --default-library=both"
@@ -74,12 +47,26 @@ fedora-x86_64:
            -Dprofiler=true
            _build
    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build x11
-    - .gitlab-ci/run-tests.sh _build wayland
-    - .gitlab-ci/run-tests.sh _build broadway
+    - .gitlab-ci/run-tests.sh _build
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report.xml"
+    name: "gtk-${CI_COMMIT_REF_NAME}"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/report.xml"
+      - "${CI_PROJECT_DIR}/_build/report.html"
+      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
+  cache:
+    key: "$CI_JOB_NAME"
+    <<: *cache-paths

 release-build:
-  extends: .build-fedora-default
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: build
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
@@ -91,9 +78,25 @@ release-build:
            -Dvulkan=yes
            _build
    - ninja -C _build
-    - .gitlab-ci/run-tests.sh _build x11
+    - .gitlab-ci/run-tests.sh _build
+  artifacts:
+    when: always
+    reports:
+      junit:
+        - "${CI_PROJECT_DIR}/_build/report.xml"
+    name: "gtk-${CI_COMMIT_REF_NAME}"
+    paths:
+      - "${CI_PROJECT_DIR}/_build/meson-logs"
+      - "${CI_PROJECT_DIR}/_build/report.xml"
+      - "${CI_PROJECT_DIR}/_build/report.html"
+      - "${CI_PROJECT_DIR}/_build/testsuite/reftests/output/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*.png"
+      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*.syscap"
+  cache:
+    key: "$CI_JOB_NAME"
+    <<: *cache-paths

-.mingw-defaults:
+.mingw-defaults: &mingw-defaults
  stage: build
  tags:
    - win32-ps
@@ -102,21 +105,15 @@ release-build:
    - C:\msys64\usr\bin\bash -lc "bash -x ./.gitlab-ci/test-msys2.sh"
  cache:
    key: "$CI_JOB_NAME"
-    paths:
-      - _ccache/
-      - subprojects/gdk-pixbuf/
-      - subprojects/glib/
-      - subprojects/graphene/
-      - subprojects/libepoxy/
-      - subprojects/pango/
+    <<: *cache-paths

 msys2-mingw32:
-  extends: .mingw-defaults
  variables:
    MSYSTEM: "MINGW32"
    CHERE_INVOKING: "yes"
+  <<: *mingw-defaults

-.flatpak-defaults:
+.flatpak-defaults: &flatpak-defaults
  image: registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master
  stage: flatpak
  allow_failure: true
@@ -130,45 +127,45 @@ msys2-mingw32:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"

 # Manual jobs, for branches and MRs
-.flatpak-manual:
-  extends: .flatpak-defaults
+.flatpak-manual: &flatpak-manual
+  <<: *flatpak-defaults
  when: manual

 # Only build Flatpak bundles automatically on master
-.flatpak-master:
-  extends: .flatpak-defaults
+.flatpak-master: &flatpak-master
+  <<: *flatpak-defaults
  only:
    - master

 flatpak-manual:demo:
-  extends: .flatpak-manual
  variables:
    APPID: org.gtk.Demo4
+  <<: *flatpak-manual

 flatpak-master:demo:
-  extends: .flatpak-master
  variables:
    APPID: org.gtk.Demo4
+  <<: *flatpak-master

 flatpak-manual:widget-factory:
-  extends: .flatpak-manual
  variables:
    APPID: org.gtk.WidgetFactory4
+  <<: *flatpak-manual

 flatpak-master:widget-factory:
-  extends: .flatpak-master
  variables:
    APPID: org.gtk.WidgetFactory4
+  <<: *flatpak-master

 flatpak-manual:icon-browser:
-  extends: .flatpak-manual
  variables:
    APPID: org.gtk.IconBrowser4
+  <<: *flatpak-manual

 flatpak-master:icon-browser:
-  extends: .flatpak-master
  variables:
    APPID: org.gtk.IconBrowser4
+  <<: *flatpak-master

 static-scan:
  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
@@ -184,7 +181,7 @@ static-scan:
  allow_failure: true

 reference:
-  image: registry.gitlab.gnome.org/gnome/gtk/fedora-docs:v19
+  image: registry.gitlab.gnome.org/gnome/gtk/fedora:v16
  stage: docs
  variables:
    EXTRA_MESON_FLAGS: "--buildtype=release"
@@ -1,88 +0,0 @@
-FROM fedora:31
-
-RUN dnf -y install \
-    adwaita-icon-theme \
-    atk-devel \
-    at-spi2-atk-devel \
-    avahi-gobject-devel \
-    cairo-devel \
-    cairo-gobject-devel \
-    ccache \
-    clang \
-    clang-analyzer \
-    colord-devel \
-    cups-devel \
-    dbus-daemon \
-    dbus-x11 \
-    dejavu-sans-mono-fonts \
-    desktop-file-utils \
-    diffutils \
-    elfutils-libelf-devel \
-    fribidi-devel \
-    gcc \
-    gcc-c++ \
-    gdk-pixbuf2-devel \
-    gdk-pixbuf2-modules \
-    gettext \
-    git \
-    glib2-devel \
-    glib2-static \
-    glibc-devel \
-    glibc-headers \
-    gobject-introspection-devel \
-    graphene-devel \
-    gstreamer1-devel \
-    gstreamer1-plugins-good \
-    gstreamer1-plugins-bad-free-devel \
-    gstreamer1-plugins-base-devel \
-    gtk-doc \
-    hicolor-icon-theme \
-    iso-codes \
-    itstool \
-    json-glib-devel \
-    lcov \
-    libattr-devel \
-    libepoxy-devel \
-    libffi-devel \
-    libmount-devel \
-    librsvg2 \
-    libselinux-devel \
-    libXcomposite-devel \
-    libXcursor-devel \
-    libXcursor-devel \
-    libXdamage-devel \
-    libXfixes-devel \
-    libXi-devel \
-    libXinerama-devel \
-    libxkbcommon-devel \
-    libXrandr-devel \
-    libXrender-devel \
-    libXtst-devel \
-    libxslt \
-    mesa-dri-drivers \
-    mesa-libEGL-devel \
-    mesa-libwayland-egl-devel \
-    ninja-build \
-    pango-devel \
-    pcre-devel \
-    pcre-static \
-    python3 \
-    python3-jinja2 \
-    python3-pip \
-    python3-pygments \
-    python3-wheel \
-    redhat-rpm-config \
-    sassc \
-    sysprof-devel \
-    systemtap-sdt-devel \
-    vulkan-devel \
-    wayland-devel \
-    wayland-protocols-devel \
-    weston \
-    weston-libs \
-    which \
-    xorg-x11-server-Xvfb \
- && dnf clean all
-
-RUN pip3 install meson==0.53.1
-
@@ -1,12 +0,0 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
-
-RUN dnf -y install pandoc
-
-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.UTF-8
@@ -1,4 +1,88 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v19
+FROM fedora:31
+
+RUN dnf -y install \
+    adwaita-icon-theme \
+    atk-devel \
+    at-spi2-atk-devel \
+    avahi-gobject-devel \
+    cairo-devel \
+    cairo-gobject-devel \
+    ccache \
+    clang \
+    clang-analyzer \
+    colord-devel \
+    cups-devel \
+    dbus-daemon \
+    dbus-x11 \
+    dejavu-sans-mono-fonts \
+    desktop-file-utils \
+    diffutils \
+    elfutils-libelf-devel \
+    fribidi-devel \
+    gcc \
+    gcc-c++ \
+    gdk-pixbuf2-devel \
+    gdk-pixbuf2-modules \
+    gettext \
+    git \
+    glib2-devel \
+    glib2-static \
+    glibc-devel \
+    glibc-headers \
+    gobject-introspection-devel \
+    graphene-devel \
+    gstreamer1-devel \
+    gstreamer1-plugins-good \
+    gstreamer1-plugins-bad-free-devel \
+    gstreamer1-plugins-base-devel \
+    gtk-doc \
+    hicolor-icon-theme \
+    iso-codes \
+    itstool \
+    json-glib-devel \
+    lcov \
+    libattr-devel \
+    libepoxy-devel \
+    libffi-devel \
+    libmount-devel \
+    librsvg2 \
+    libselinux-devel \
+    libXcomposite-devel \
+    libXcursor-devel \
+    libXcursor-devel \
+    libXdamage-devel \
+    libXfixes-devel \
+    libXi-devel \
+    libXinerama-devel \
+    libxkbcommon-devel \
+    libXrandr-devel \
+    libXrender-devel \
+    libXtst-devel \
+    libxslt \
+    mesa-dri-drivers \
+    mesa-libEGL-devel \
+    mesa-libwayland-egl-devel \
+    ninja-build \
+    pango-devel \
+    pcre-devel \
+    pcre-static \
+    python3 \
+    python3-jinja2 \
+    python3-pip \
+    python3-pygments \
+    python3-wheel \
+    redhat-rpm-config \
+    sassc \
+    sysprof-devel \
+    systemtap-sdt-devel \
+    vulkan-devel \
+    wayland-devel \
+    wayland-protocols-devel \
+    which \
+    xorg-x11-server-Xvfb \
+ && dnf clean all
+
+RUN pip3 install meson==0.53.1

 ARG HOST_USER_ID=5555
 ENV HOST_USER_ID ${HOST_USER_ID}
@@ -138,13 +138,12 @@ ul.images li {
 </head>
 <body>
  <header>
-    <h1>{{ report.project_name }}/{{ report.backend }}/{{ report.branch_name }} :: Test Reports</h1>
+    <h1>{{ report.project_name }}/{{ report.branch_name }} :: Test Reports</h1>
  </header>

  <article>
    <section>
      <div class="report-meta">
-        <p><strong>Backend:</strong> {{ report.backend }}</p>
        <p><strong>Branch:</strong> {{ report.branch_name }}</p>
        <p><strong>Date:</strong> <time datetime="{{ report.date.isoformat() }}">{{ report.locale_date }}</time></p>
        {% if report.job_id %}<p><strong>Job ID:</strong> {{ report.job_id }}</p>{% endif %}
@@ -260,9 +259,6 @@ aparser = argparse.ArgumentParser(description='Turns a Meson test log into an HT
 aparser.add_argument('--project-name', metavar='NAME',
                     help='The project name',
                     default='Unknown')
-aparser.add_argument('--backend', metavar='NAME',
-                     help='The used backend',
-                     default='unknown')
 aparser.add_argument('--job-id', metavar='ID',
                     help='The job ID for the report',
                     default=None)
@@ -323,7 +319,6 @@ report = {}
 report['date'] = datetime.datetime.utcnow()
 report['locale_date'] = report['date'].strftime("%c")
 report['project_name'] = args.project_name
-report['backend'] = args.backend
 report['job_id'] = args.job_id
 report['branch_name'] = args.branch
 report['total_successes'] = 0
@@ -19,9 +19,6 @@ aparser = argparse.ArgumentParser(description='Turns a Meson test log into a JUn
 aparser.add_argument('--project-name', metavar='NAME',
                     help='The project name',
                     default='unknown')
-aparser.add_argument('--backend', metavar='NAME',
-                     help='The used backend',
-                     default='unknown')
 aparser.add_argument('--job-id', metavar='ID',
                     help='The job ID for the report',
                     default='Unknown')
@@ -95,18 +92,18 @@ for name, units in suites.items():
    for unit in successes:
        testcase = ET.SubElement(testsuite, 'testcase')
        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
+        testcase.set('name', unit['name'])
        testcase.set('time', str(unit['duration']))

    for unit in failures:
        testcase = ET.SubElement(testsuite, 'testcase')
        testcase.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
+        testcase.set('name', unit['name'])
        testcase.set('time', str(unit['duration']))

        failure = ET.SubElement(testcase, 'failure')
        failure.set('classname', '{}/{}'.format(args.project_name, unit['suite']))
-        testcase.set('name', '{}/{}'.format(args.backend, unit['name']))
+        failure.set('name', unit['name'])
        failure.set('type', 'error')
        failure.text = unit['stdout']

@@ -81,7 +81,7 @@ fi

 if [ -z $base_version ]; then
        base_version="latest"
-elif [ $base_version != "latest" ]; then
+else
        base_version="v$base_version"
 fi

@@ -95,7 +95,7 @@ if [ ! -x "$(command -v docker)" ] || [ docker --help |& grep -q podman ]; then
 else
        echo "Using: Docker"
        format=""
-        CMD="sudo docker"
+        CMD="sudo socker"
 fi

 REGISTRY="registry.gitlab.gnome.org"
@@ -5,75 +5,30 @@ set +e

 srcdir=$( pwd )
 builddir=$1
-backend=$2

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

-    # Store the exit code for the CI run, but always
-    # generate the reports
-    exit_code=$?
-    ;;
-
-  wayland)
-    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-    weston --backend=headless-backend.so --socket=wayland-5 --idle-time=0 &
-    compositor=$!
-    export WAYLAND_DISPLAY=wayland-5
-
-    meson test -C ${builddir} \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gtk:a11y \
-                --no-suite=gsk-compare-broadway
-
-    exit_code=$?
-    kill ${compositor}
-    ;;
-
-  broadway)
-    export XDG_RUNTIME_DIR="$(mktemp -p $(pwd) -d xdg-runtime-XXXXXX)"
-
-    ${builddir}/gdk/broadway/gtk4-broadwayd :5 &
-    server=$!
-    export BROADWAY_DISPLAY=:5
-
-    meson test -C ${builddir} \
-                --print-errorlogs \
-                --setup=${backend} \
-                --suite=gtk \
-                --no-suite=gtk:a11y \
-                --no-suite=gsk-compare-opengl
-
-    # don't let Broadway failures fail the run, for now
-    exit_code=0
-    kill ${server}
-    ;;
-esac
+# Store the exit code for the CI run, but always
+# generate the reports
+exit_code=$?

 cd ${builddir}

 $srcdir/.gitlab-ci/meson-junit-report.py \
        --project-name=gtk \
-        --backend=${backend} \
        --job-id="${CI_JOB_NAME}" \
-        --output=report-${backend}.xml \
-        meson-logs/testlog-${backend}.json
+        --output=report.xml \
+        meson-logs/testlog.json
 $srcdir/.gitlab-ci/meson-html-report.py \
        --project-name=gtk \
-        --backend=${backend} \
        --job-id="${CI_JOB_NAME}" \
-        --reftest-output-dir="testsuite/reftests/output/${backend}" \
-        --output=report-${backend}.html \
-        meson-logs/testlog-${backend}.json
+        --reftest-output-dir="testsuite/reftests/output" \
+        --output=report.html \
+        meson-logs/testlog.json

 exit $exit_code
@@ -34,11 +34,8 @@ pacman --noconfirm -S --needed \
    mingw-w64-$MSYS2_ARCH-shared-mime-info

 # https://gitlab.gnome.org/GNOME/gtk/issues/2243
-wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
-pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-git-1.44.7.90.ge48ae523-1-any.pkg.tar.zst"
-
-# https://github.com/msys2/MINGW-packages/pull/6465
-pacman --noconfirm -S --needed mingw-w64-$MSYS2_ARCH-brotli
+wget "https://gitlab.gnome.org/creiter/gitlab-ci-win32-runner-v2/raw/master/pango/mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"
+pacman --noconfirm -U "mingw-w64-$MSYS2_ARCH-pango-1.44.7-1-any.pkg.tar.xz"

 mkdir -p _ccache
 export CCACHE_BASEDIR="$(pwd)"
@@ -1,92 +1,3 @@
-Overview of Changes in GTK 3.98.4
-=================================
-
-* Themes
- - Refine menu styling
- - Tweak visible focus behavior
- - HighConstrast: Add public colors
- - HighContrast: Fix scale borders
-
-* CSS:
- - Drop the nonstandard -gtk-icon-theme property
- - Add a system_setting_changed vfunc to propagate global changes
-
-* Untangle titlebars from windows:
- - Add a GtkWindowControls widget
- - Add a GtkWindowHandle widget
- - Add actions for window menu items
- - Remove app menu fallback from GtkHeaderBar
- - Remove title and subtitle properties from GtkHeaderBar,
-   rename custom-title to title-widget
-
-* GtkWidget
- - Add a focusable property
-
-* GtkPopover:
- -  Fix (re-)positioning issues
-
-* GtkStack:
- - Drop the homogeneous property
- - Add a use-underline property to stack pages
-
-* GtkScale:
- - Make area around the trough clickable
-
-* GtkScrolledWindow:
- - Fix kinetic scrolling
-
-* GtkTreeView:
- - Break reference cycles in unroot
-
-* Drop GtkBin and GtkContainer. All existing GtkBin subclasses
-  have grown a child property with setter and getter. All
-  existing GtkContainer subclasses have grown widget-specific
-  remove (and in some cases, add) functions. <child> in ui
-  files continues to work as before
-
-* Replace gtk_widget_destroy by gtk_window_destroy
-
-* Drop the ::size-allocate signal. Use a GtkWidgetPaintable
-  if you need to be informed about changes to a widgets
-  content or size
-
-* Remove gtk_dialog_run
-
-* GDK:
- - Wayland: Provide a builtin cursor of last resort
- - Change the monitor api to use a GListModel
-
-* GSK:
- - Don't include renderer-specific headers automatically
- - GL: Fix nested rounded clips
-
-* Introspection:
- - Assorted annotation fixes
-
-* Inspector:
- - Preview media resources
- - Show media backend information
-
-* gtk4-widget-factory:
- - Add GtkVideo
- - Add text styles
- - Add a print dialog
- - Add a password entry
- - Improve toolbar styling
- - Revamp transition effects
-
-* gtk4-demo:
- - Replace some demos
-
-* Translation updates:
- Chinese (Taiwan)
- Esperanto
- Japanese
- Romanian
- Spanish
- Ukrainian
-
-
 Overview of Changes in GTK 3.98.3
 =================================

@@ -35,10 +35,6 @@
   */
 #mesondefine HAVE_DECL_ISNAN

-/* Define to 1 if you have the declaration of `isnanf', and to 0 if you don't.
-   */
-#mesondefine HAVE_DECL_ISNANF
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #mesondefine HAVE_DLFCN_H

@@ -150,6 +146,9 @@
 /* Have the Xcursor library */
 #mesondefine HAVE_XCURSOR

+/* Have the XDAMAGE X extension */
+#mesondefine HAVE_XDAMAGE
+
 /* Have the XFIXES X extension */
 #mesondefine HAVE_XFIXES

@@ -296,6 +295,3 @@
 #mesondefine HAVE_PANGOFT

 #mesondefine ISO_CODES_PREFIX
-
-/* Define if tracker3 is available */
-#mesondefine HAVE_TRACKER3
@@ -317,7 +317,7 @@ save_response_cb (GtkNativeDialog        *dialog,
                                                   "Saving failed");
          gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (message_dialog),
                                                    "%s", error->message);
-          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
+          g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), NULL);
          gtk_widget_show (message_dialog);
          g_error_free (error);
        }
@@ -403,7 +403,7 @@ constraint_editor_done (ConstraintEditor *editor,

  g_clear_object (&old_constraint);

-  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
+  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
 }

 static void
@@ -444,7 +444,7 @@ guide_editor_done (GuideEditor            *editor,
                   GtkConstraintGuide     *guide,
                   ConstraintEditorWindow *win)
 {
-  gtk_window_destroy (GTK_WINDOW (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW)));
+  gtk_widget_destroy (gtk_widget_get_ancestor (GTK_WIDGET (editor), GTK_TYPE_WINDOW));
 }

 static void
@@ -487,6 +487,8 @@ constraint_editor_window_class_init (ConstraintEditorWindowClass *class)
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);

+  g_type_ensure (CONSTRAINT_VIEW_TYPE);
+
  object_class->finalize = constraint_editor_window_finalize;

  gtk_widget_class_set_template_from_resource (widget_class,
@@ -605,8 +607,8 @@ create_widget_func (gpointer item,
  gtk_widget_set_margin_bottom (label, 10);
  gtk_label_set_xalign (GTK_LABEL (label), 0.0);
  gtk_widget_set_hexpand (label, TRUE);
-  gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), box);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (row), box);
+  gtk_container_add (GTK_CONTAINER (box), label);

  if (GTK_IS_CONSTRAINT (item) || GTK_IS_CONSTRAINT_GUIDE (item))
    {
@@ -614,18 +616,18 @@ create_widget_func (gpointer item,
      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_edit), win);
      g_object_set_data (G_OBJECT (row), "edit", button);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
    }
  else if (GTK_IS_WIDGET (item))
    {
      button = gtk_button_new_from_icon_name ("edit-delete-symbolic");
      gtk_button_set_has_frame (GTK_BUTTON (button), FALSE);
      g_signal_connect (button, "clicked", G_CALLBACK (row_delete), win);
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
    }

  g_free (freeme);
@@ -169,7 +169,6 @@ constraint_view_init (ConstraintView *self)
  GListModel *guides;
  GListModel *children;
  GListModel *constraints;
-  GtkFilter *filter;

  manager = gtk_constraint_layout_new ();
  gtk_widget_set_layout_manager (GTK_WIDGET (self), manager);
@@ -177,12 +176,8 @@ constraint_view_init (ConstraintView *self)
  all_children = gtk_widget_observe_children (GTK_WIDGET (self));
  all_constraints = gtk_constraint_layout_observe_constraints (GTK_CONSTRAINT_LAYOUT (manager));
  guides = gtk_constraint_layout_observe_guides (GTK_CONSTRAINT_LAYOUT (manager));
-  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
-  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, filter);
-  g_object_unref (filter);
-  filter = gtk_custom_filter_new (omit_internal, NULL, NULL);
-  children = (GListModel *)gtk_filter_list_model_new (all_children, filter);
-  g_object_unref (filter);
+  constraints = (GListModel *)gtk_filter_list_model_new (all_constraints, omit_internal, NULL, NULL);
+  children = (GListModel *)gtk_filter_list_model_new (all_children, omit_internal, NULL, NULL);

  list = g_list_store_new (G_TYPE_LIST_MODEL);
  g_list_store_append (list, children);
@@ -23,7 +23,6 @@

 #define CONSTRAINT_VIEW_TYPE (constraint_view_get_type ())

-G_MODULE_EXPORT
 G_DECLARE_FINAL_TYPE (ConstraintView, constraint_view, CONSTRAINT, VIEW, GtkWidget)

 ConstraintView * constraint_view_new (void);
@@ -184,6 +184,58 @@ max_input (GtkSpinButton *spin_button,
  return FALSE;
 }

+static gboolean
+min_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  double value;
+  GtkWidget *box, *text;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+
+  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
+  text = gtk_widget_get_first_child (box);
+
+  if (value == 0.0)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
+      return TRUE;
+    }
+  else
+    {
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
+      return FALSE;
+    }
+}
+
+static gboolean
+max_output (GtkSpinButton *spin_button)
+{
+  GtkAdjustment *adjustment;
+  double value;
+  GtkWidget *box, *text;
+
+  adjustment = gtk_spin_button_get_adjustment (spin_button);
+  value = gtk_adjustment_get_value (adjustment);
+
+  box = gtk_widget_get_first_child (GTK_WIDGET (spin_button));
+  text = gtk_widget_get_first_child (box);
+
+  if (value == (double)G_MAXINT)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (spin_button), "");
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "unset");
+      return TRUE;
+    }
+  else
+    {
+      gtk_text_set_placeholder_text (GTK_TEXT (text), "");
+      return FALSE;
+    }
+}
+
 static void
 guide_editor_constructed (GObject *object)
 {
@@ -192,12 +244,16 @@ guide_editor_constructed (GObject *object)
  guide_strength_combo (editor->strength);

  g_signal_connect (editor->min_width, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_width, "output", G_CALLBACK (min_output), NULL);

  g_signal_connect (editor->min_height, "input", G_CALLBACK (min_input), NULL);
+  g_signal_connect (editor->min_height, "output", G_CALLBACK (min_output), NULL);

  g_signal_connect (editor->max_width, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_width, "output", G_CALLBACK (max_output), NULL);

  g_signal_connect (editor->max_height, "input", G_CALLBACK (max_input), NULL);
+  g_signal_connect (editor->max_height, "output", G_CALLBACK (max_output), NULL);

  if (editor->guide)
    {
@@ -47,7 +47,7 @@ show_action_dialog (GSimpleAction *action)
                                    name);

  g_signal_connect (dialog, "response",
-                    G_CALLBACK (gtk_window_destroy), NULL);
+                    G_CALLBACK (gtk_widget_destroy), NULL);

  gtk_widget_show (dialog);
 }
@@ -120,7 +120,7 @@ open_response_cb (GtkNativeDialog *dialog,
                                                   "Error loading file: \"%s\"",
                                                   error->message);
          g_signal_connect (message_dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);
          gtk_widget_show (message_dialog);
          g_error_free (error);
        }
@@ -234,7 +234,7 @@ activate_quit (GSimpleAction *action,
      win = list->data;
      next = list->next;

-      gtk_window_destroy (GTK_WINDOW (win));
+      gtk_widget_destroy (GTK_WIDGET (win));

      list = next;
    }
@@ -328,14 +328,19 @@ static void
 startup (GApplication *app)
 {
  GtkBuilder *builder;
+  GMenuModel *appmenu;
+  GMenuModel *menubar;

  G_APPLICATION_CLASS (demo_application_parent_class)->startup (app);

  builder = gtk_builder_new ();
  gtk_builder_add_from_resource (builder, "/application_demo/menus.ui", NULL);

-  gtk_application_set_menubar (GTK_APPLICATION (app),
-                               G_MENU_MODEL (gtk_builder_get_object (builder, "menubar")));
+  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
+  menubar = (GMenuModel *)gtk_builder_get_object (builder, "menubar");
+
+  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
+  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);

  g_object_unref (builder);
 }
@@ -348,7 +353,6 @@ create_window (GApplication *app,

  window = (DemoApplicationWindow *)g_object_new (demo_application_window_get_type (),
                                                  "application", app,
-                                                  "show-menubar", TRUE,
                                                  NULL);
  if (content)
    gtk_text_buffer_set_text (window->buffer, content, -1);
@@ -31,7 +31,12 @@ on_name_vanished (GDBusConnection *connection,
  if (!name_seen)
    return;

-  g_clear_object (&placeholder);
+  if (placeholder)
+    {
+      gtk_widget_destroy (placeholder);
+      g_object_unref (placeholder);
+      placeholder = NULL;
+    }
 }

 #ifdef G_OS_WIN32
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <menu id="appmenu">
+    <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;Control&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
@@ -26,7 +26,7 @@ apply_changes_gradually (gpointer data)
  else
    {
      /* Close automatically once changes are fully applied. */
-      gtk_window_destroy (GTK_WINDOW (data));
+      gtk_widget_destroy (data);
      return G_SOURCE_REMOVE;
    }
 }
@@ -41,7 +41,7 @@ on_assistant_apply (GtkWidget *widget, gpointer data)
 static void
 on_assistant_close_cancel (GtkWidget *widget, gpointer data)
 {
-  gtk_window_destroy (GTK_WINDOW (widget));
+  gtk_widget_destroy (widget);
 }

 static void
@@ -95,12 +95,12 @@ create_page1 (GtkWidget *assistant)
  gtk_widget_set_margin_bottom (box, 12);

  label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);

  entry = gtk_entry_new ();
  gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
  gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (box), entry);
+  gtk_container_add (GTK_CONTAINER (box), entry);
  g_signal_connect (G_OBJECT (entry), "changed",
                    G_CALLBACK (on_entry_changed), assistant);

@@ -123,7 +123,7 @@ create_page2 (GtkWidget *assistant)
  checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                 "even if you do not check this");
  gtk_widget_set_valign (checkbutton, GTK_ALIGN_CENTER);
-  gtk_box_append (GTK_BOX (box), checkbutton);
+  gtk_container_add (GTK_CONTAINER (box), checkbutton);

  gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
  gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
@@ -178,7 +178,8 @@ do_assistant (GtkWidget *do_widget)

      gtk_window_set_display (GTK_WINDOW (assistant),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (assistant), (gpointer *)&assistant);
+      g_signal_connect (assistant, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &assistant);

      create_page1 (assistant);
      create_page2 (assistant);
@@ -198,7 +199,7 @@ do_assistant (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (assistant))
    gtk_widget_show (assistant);
  else
-    gtk_window_destroy (GTK_WINDOW (assistant));
+    gtk_widget_destroy (assistant);

  return assistant;
 }
@@ -1,247 +0,0 @@
-/*
- * Copyright © 2018 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Benjamin Otte <otte@gnome.org>
- */
-
-#include "award.h"
-
-struct _GtkAward
-{
-  GObject parent;
-
-  char *explanation;
-  char *name;
-  char *title;
-  GDateTime *granted; /* or NULL if not granted */
-};
-
-enum {
-  PROP_0,
-  PROP_EXPLANATION,
-  PROP_NAME,
-  PROP_TITLE,
-  PROP_GRANTED,
-
-  N_PROPS,
-};
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-G_DEFINE_TYPE (GtkAward, gtk_award, G_TYPE_OBJECT)
-
-static void
-gtk_award_set_property (GObject      *object,
-                        guint         prop_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPLANATION:
-      self->explanation = g_value_dup_string (value);
-      break;
-
-    case PROP_NAME:
-      self->name = g_value_dup_string (value);
-      break;
-
-    case PROP_TITLE:
-      self->title = g_value_dup_string (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_award_get_property (GObject    *object,
-                        guint       prop_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  switch (prop_id)
-    {
-    case PROP_EXPLANATION:
-      g_value_set_string (value, self->explanation);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_TITLE:
-      g_value_set_string (value, self->title);
-      break;
-
-    case PROP_GRANTED:
-      g_value_set_boxed (value, self->granted);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_award_dispose (GObject *object)
-{
-  GtkAward *self = GTK_AWARD (object);
-
-  g_clear_pointer (&self->name, g_free);
-  g_clear_pointer (&self->title, g_free);
-  g_clear_pointer (&self->granted, g_date_time_unref);
-
-  G_OBJECT_CLASS (gtk_award_parent_class)->dispose (object);
-}
-
-static void
-gtk_award_class_init (GtkAwardClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-
-  gobject_class->set_property = gtk_award_set_property;
-  gobject_class->get_property = gtk_award_get_property;
-  gobject_class->dispose = gtk_award_dispose;
-
-  properties[PROP_EXPLANATION] =
-    g_param_spec_string ("explanation",
-                         "Explanation",
-                         "How to get the title",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_NAME] =
-    g_param_spec_string ("name",
-                         "Name",
-                         "internal name of the award",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_TITLE] =
-    g_param_spec_string ("title",
-                         "Title",
-                         "user-visible title",
-                         NULL,
-                         G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  properties[PROP_GRANTED] =
-    g_param_spec_boxed ("granted",
-                        "Granted",
-                        "Timestamp the award was granted or NULL if not granted yet",
-                        G_TYPE_DATE_TIME,
-                        G_PARAM_READABLE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_award_init (GtkAward *self)
-{
-}
-
-GListModel *
-gtk_award_get_list (void)
-{
-  static GListModel *list = NULL;
-
-  if (list == NULL)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (GTK_TYPE_AWARD);
-      builder = gtk_builder_new_from_resource ("/awards.ui");
-      list = G_LIST_MODEL (gtk_builder_get_object (builder, "list"));
-      g_object_ref (list);
-      g_object_unref (builder);
-    }
-
-  return g_object_ref (list);
-}
-
-const char *
-gtk_award_get_name (GtkAward *award)
-{
-  return award->name;
-}
-
-const char *
-gtk_award_get_title (GtkAward *award)
-{
-  return award->title;
-}
-
-GDateTime *
-gtk_award_get_granted (GtkAward *award)
-{
-  return award->granted;
-}
-
-GtkAward *
-award_find (const char *name)
-{
-  GListModel *list;
-  GtkAward *self;
-  guint i;
-
-  list = gtk_award_get_list ();
-  g_object_unref (list);
-
-  for (i = 0; i < g_list_model_get_n_items (list); i++)
-    {
-      self = g_list_model_get_item (list, i);
-      g_object_unref (self);
-
-      if (g_ascii_strcasecmp (name, self->name) == 0)
-        return self;
-    }
-
-  return NULL;
-}
-
-void
-award (const char *name)
-{
-  GtkAward *self;
-  GNotification *notification;
-
-  self = award_find (name);
-  if (self == NULL)
-    {
-      g_warning ("Did not find award \"%s\"", name);
-      return;
-    }
-
-  if (self->granted)
-    return;
-
-  self->granted = g_date_time_new_now_utc ();
-  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_GRANTED]);
-
-  notification = g_notification_new ("You won an award!");
-  g_notification_set_body (notification, self->title);
-  g_application_send_notification (g_application_get_default (), NULL, notification);
-  g_object_unref (notification);
-}
-
@@ -1,18 +0,0 @@
-#ifndef __AWARD_H__
-#define __AWARD_H__
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_AWARD (gtk_award_get_type ())
-
-G_DECLARE_FINAL_TYPE (GtkAward, gtk_award, GTK, AWARD, GObject)
-
-GListModel *    gtk_award_get_list                      (void);
-
-const char *    gtk_award_get_name                      (GtkAward               *award);
-const char *    gtk_award_get_title                     (GtkAward               *award);
-GDateTime *     gtk_award_get_granted                   (GtkAward               *award);
-
-void            award                                   (const char             *name);
-
-#endif /* __AWARD_H__ */
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface domain="gtk40">
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="label" bind-source="GtkListItem" bind-property="position"></property>
-        <property name="margin">6</property>
-      </object>
-    </property>
-  </template>
-</interface>
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GListStore" id="list">
-    <property name="item-type">GtkAward</property>
-    <child>
-      <object class="GtkAward">
-        <property name="name">demo-inspector</property>
-        <!-- Transformers -->
-        <property name="title" translatable="yes">You got a high-rise double-pump carburetor.</property>
-        <property name="explanation" translatable="yes">Launch the inspector</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">demo-start</property>
-        <!-- The Matrix -->
-        <property name="title" translatable="yes">After this, there is no turning back.</property>
-        <property name="explanation" translatable="yes">Start gtk-demo</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">listbox-reshare</property>
-        <!-- Mean Girls -->
-        <property name="title" translatable="yes">Trying to make fetch happen</property>
-        <property name="explanation" translatable="yes">Reshare a tweet</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">listbox-100th-row</property>
-        <!-- Aladdin -->
-        <property name="title" translatable="yes">The ever impressive, long contained, often imitated, but never duplicated Genie of the lamp.</property>
-        <property name="explanation" translatable="yes">Select a 100th row in a list</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">password-best</property>
-        <!-- Spaceballs -->
-        <property name="title" translatable="yes">I've got the same combination on my luggage!</property>
-        <property name="explanation" translatable="yes">Use "12345" as the password</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">password-correct</property>
-        <!-- Stanley Parable -->
-        <property name="title" translatable="yes">Night Shark 1-1-5</property>
-        <property name="explanation" translatable="yes">Correctly enter a password</property>
-      </object>
-    </child>
-
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-give-up</property>
-        <!-- Pretty Woman -->
-        <property name="title" translatable="yes">Big Mistake. Big. Huge!</property>
-        <property name="explanation" translatable="yes">Close the puzzle without finishing it</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve</property>
-        <!-- The Incredibles -->
-        <property name="title" translatable="yes">That was totally wicked!</property>
-        <property name="explanation" translatable="yes">Solve a puzzle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve-animated</property>
-        <!-- The Phantom Menace -->
-        <property name="title" translatable="yes">A surprise to be sure but a welcome one.</property>
-        <property name="explanation" translatable="yes">Solve an animated puzzle</property>
-      </object>
-    </child>
-    <child>
-      <object class="GtkAward">
-        <property name="name">puzzle-solve-large</property>
-        <!-- Portal -->
-        <property name="title" translatable="yes">Science isn't about WHY. It's about WHY NOT?!</property>
-        <property name="explanation" translatable="yes">Solve a puzzle with at least 20 pieces</property>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,48 +0,0 @@
-/* Awards
- *
- * This demo demonstrates how to use lists to show the awards you have collected
- * while exploring this demo.
- *
- */
-
-#include <gtk/gtk.h>
-
-/* Include the header for accessing the awards */
-#include "award.h"
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_awardview (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *sw, *listview;
-      GListModel *list;
-
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Awards");
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_window_set_child (GTK_WINDOW (window), sw);
-
-      listview = gtk_list_view_new_with_factory (
-          gtk_builder_list_item_factory_new_from_resource (NULL, "/awardview/awardlistitem.ui"));
-      list = gtk_award_get_list ();
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), list);
-      g_object_unref (list);
-      gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -12,7 +12,7 @@ quit_activate (GSimpleAction *action,
 {
  GtkWidget *window = user_data;

-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
 }

 static void
@@ -26,10 +26,8 @@ about_activate (GSimpleAction *action,

  builder = g_object_get_data (G_OBJECT (window), "builder");
  about_dlg = GTK_WIDGET (gtk_builder_get_object (builder, "aboutdialog1"));
-  gtk_window_set_transient_for (GTK_WINDOW (about_dlg), GTK_WINDOW (window));
-  gtk_window_set_hide_on_close (GTK_WINDOW (about_dlg), TRUE);
-  g_signal_connect (about_dlg, "response", G_CALLBACK (gtk_widget_hide), NULL);
-  gtk_widget_show (about_dlg);
+  gtk_dialog_run (GTK_DIALOG (about_dlg));
+  gtk_widget_hide (about_dlg);
 }

 static void
@@ -76,20 +74,21 @@ do_builder (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      actions = (GActionGroup*)g_simple_action_group_new ();
      g_action_map_add_action_entries (G_ACTION_MAP (actions),
                                       win_entries, G_N_ELEMENTS (win_entries),
                                       window);
      gtk_widget_insert_action_group (window, "win", actions);

-      g_object_unref (builder);
+      g_object_set_data_full (G_OBJECT(window), "builder", builder, g_object_unref);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -69,7 +69,7 @@ paste_received (GObject      *source_object,
                                       "Could not paste text: %s",
                                       error->message);
      g_signal_connect (dialog, "response",
-                        G_CALLBACK (gtk_window_destroy), NULL);
+                        G_CALLBACK (gtk_widget_destroy), NULL);
      gtk_widget_show (dialog);

      g_error_free (error);
@@ -108,7 +108,9 @@ do_clipboard (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_widget_set_margin_start (vbox, 8);
@@ -120,72 +122,72 @@ do_clipboard (GtkWidget *do_widget)

      label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");

-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_widget_set_margin_start (hbox, 8);
      gtk_widget_set_margin_end (hbox, 8);
      gtk_widget_set_margin_top (hbox, 8);
      gtk_widget_set_margin_bottom (hbox, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the first entry */
      entry = gtk_entry_new ();
-      gtk_box_append (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (copy_button_clicked), entry);

      label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_widget_set_margin_start (hbox, 8);
      gtk_widget_set_margin_end (hbox, 8);
      gtk_widget_set_margin_top (hbox, 8);
      gtk_widget_set_margin_bottom (hbox, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the second entry */
      entry = gtk_entry_new ();
-      gtk_box_append (GTK_BOX (hbox), entry);
+      gtk_container_add (GTK_CONTAINER (hbox), entry);

      /* Create the button */
      button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);
      g_signal_connect (button, "clicked",
                        G_CALLBACK (paste_button_clicked), entry);

      label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_widget_set_margin_start (hbox, 8);
      gtk_widget_set_margin_end (hbox, 8);
      gtk_widget_set_margin_top (hbox, 8);
      gtk_widget_set_margin_bottom (hbox, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      /* Create the first image */
      image = demo_image_new ("dialog-warning");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);

      /* Create the second image */
      image = demo_image_new ("process-stop");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);

      /* Create the third image */
      image = demo_image_new ("weather-clear");
-      gtk_box_append (GTK_BOX (hbox), image);
+      gtk_container_add (GTK_CONTAINER (hbox), image);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -315,7 +315,9 @@ do_combobox (GtkWidget *do_widget)
    gtk_window_set_display (GTK_WINDOW (window),
                            gtk_widget_get_display (do_widget));
    gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
-    g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+    g_signal_connect (window, "destroy",
+                      G_CALLBACK (gtk_widget_destroyed), &window);

    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
    gtk_widget_set_margin_start (vbox, 10);
@@ -328,7 +330,7 @@ do_combobox (GtkWidget *do_widget)
     *  insensitive rows
     */
    frame = gtk_frame_new ("Items with icons");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -340,7 +342,7 @@ do_combobox (GtkWidget *do_widget)
    model = create_icon_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

    renderer = gtk_cell_renderer_pixbuf_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, FALSE);
@@ -372,7 +374,7 @@ do_combobox (GtkWidget *do_widget)
    /* A combobox demonstrating trees.
     */
    frame = gtk_frame_new ("Where are we ?");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -384,7 +386,7 @@ do_combobox (GtkWidget *do_widget)
    model = create_capital_store ();
    combo = gtk_combo_box_new_with_model (model);
    g_object_unref (model);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

    renderer = gtk_cell_renderer_text_new ();
    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), renderer, TRUE);
@@ -403,7 +405,7 @@ do_combobox (GtkWidget *do_widget)

    /* A GtkComboBoxEntry with validation */
    frame = gtk_frame_new ("Editable");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -414,7 +416,7 @@ do_combobox (GtkWidget *do_widget)

    combo = gtk_combo_box_text_new_with_entry ();
    fill_combo_entry (combo);
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

    entry = g_object_new (TYPE_MASK_ENTRY, NULL);
    MASK_ENTRY (entry)->mask = "^([0-9]*|One|Two|2\302\275|Three)$";
@@ -423,7 +425,7 @@ do_combobox (GtkWidget *do_widget)

    /* A combobox with string IDs */
    frame = gtk_frame_new ("String IDs");
-    gtk_box_append (GTK_BOX (vbox), frame);
+    gtk_container_add (GTK_CONTAINER (vbox), frame);

    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_widget_set_margin_start (box, 5);
@@ -436,19 +438,19 @@ do_combobox (GtkWidget *do_widget)
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "never", "Not visible");
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "when-active", "Visible when active");
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), "always", "Always visible");
-    gtk_box_append (GTK_BOX (box), combo);
+    gtk_container_add (GTK_CONTAINER (box), combo);

    entry = gtk_entry_new ();
    g_object_bind_property (combo, "active-id",
                            entry, "text",
                            G_BINDING_BIDIRECTIONAL);
-    gtk_box_append (GTK_BOX (box), entry);
+    gtk_container_add (GTK_CONTAINER (box), entry);
  }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -25,9 +25,9 @@ simple_grid_dispose (GObject *object)
 {
  SimpleGrid *self = SIMPLE_GRID (object);

-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);

  G_OBJECT_CLASS (simple_grid_parent_class)->dispose (object);
 }
@@ -263,7 +263,8 @@ do_constraints (GtkWidget *do_widget)
     header = gtk_header_bar_new ();
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_window_set_child (GTK_WINDOW (window), box);
@@ -271,19 +272,19 @@ do_constraints (GtkWidget *do_widget)
     grid = g_object_new (simple_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);

     button = gtk_button_new_with_label ("Close");
-     gtk_box_append (GTK_BOX (box), button);
+     gtk_container_add (GTK_CONTAINER (box), button);
     gtk_widget_set_hexpand (grid, TRUE);
     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_window_destroy), window);
+                               G_CALLBACK (gtk_widget_destroy), window);
   }

 if (!gtk_widget_get_visible (window))
   gtk_widget_show (window);
 else
-   gtk_window_destroy (GTK_WINDOW (window));
+   gtk_widget_destroy (window);

 return window;
 }
@@ -26,9 +26,9 @@ interactive_grid_dispose (GObject *object)
 {
  InteractiveGrid *self = INTERACTIVE_GRID (object);

-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);

  G_OBJECT_CLASS (interactive_grid_parent_class)->dispose (object);
 }
@@ -219,7 +219,8 @@ do_constraints2 (GtkWidget *do_widget)
     header = gtk_header_bar_new ();
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_window_set_child (GTK_WINDOW (window), box);
@@ -227,19 +228,19 @@ do_constraints2 (GtkWidget *do_widget)
     grid = g_object_new (interactive_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);

     button = gtk_button_new_with_label ("Close");
-     gtk_box_append (GTK_BOX (box), button);
+     gtk_container_add (GTK_CONTAINER (box), button);
     gtk_widget_set_hexpand (grid, TRUE);
     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_window_destroy), window);
+                               G_CALLBACK (gtk_widget_destroy), window);
   }

 if (!gtk_widget_get_visible (window))
   gtk_widget_show (window);
 else
-   gtk_window_destroy (GTK_WINDOW (window));
+   gtk_widget_destroy (window);

 return window;
 }
@@ -24,9 +24,9 @@ vfl_grid_dispose (GObject *object)
 {
  VflGrid *self = VFL_GRID (object);

-  g_clear_pointer (&self->button1, gtk_widget_unparent);
-  g_clear_pointer (&self->button2, gtk_widget_unparent);
-  g_clear_pointer (&self->button3, gtk_widget_unparent);
+  g_clear_pointer (&self->button1, gtk_widget_destroy);
+  g_clear_pointer (&self->button2, gtk_widget_destroy);
+  g_clear_pointer (&self->button3, gtk_widget_destroy);

  G_OBJECT_CLASS (vfl_grid_parent_class)->dispose (object);
 }
@@ -139,7 +139,8 @@ do_constraints3 (GtkWidget *do_widget)
     header = gtk_header_bar_new ();
     gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
     gtk_window_set_titlebar (GTK_WINDOW (window), header);
-     g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+     g_signal_connect (window, "destroy",
+                       G_CALLBACK (gtk_widget_destroyed), &window);

     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
     gtk_window_set_child (GTK_WINDOW (window), box);
@@ -147,19 +148,19 @@ do_constraints3 (GtkWidget *do_widget)
     grid = g_object_new (vfl_grid_get_type (), NULL);
     gtk_widget_set_hexpand (grid, TRUE);
     gtk_widget_set_vexpand (grid, TRUE);
-     gtk_box_append (GTK_BOX (box), grid);
+     gtk_container_add (GTK_CONTAINER (box), grid);

     button = gtk_button_new_with_label ("Close");
-     gtk_box_append (GTK_BOX (box), button);
+     gtk_container_add (GTK_CONTAINER (box), button);
     gtk_widget_set_hexpand (grid, TRUE);
     g_signal_connect_swapped (button, "clicked",
-                               G_CALLBACK (gtk_window_destroy), window);
+                               G_CALLBACK (gtk_widget_destroy), window);
   }

 if (!gtk_widget_get_visible (window))
   gtk_widget_show (window);
 else
-   gtk_window_destroy (GTK_WINDOW (window));
+   gtk_widget_destroy (window);

 return window;
 }
@@ -9,13 +9,9 @@
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

 GtkWidget *
@@ -32,7 +28,8 @@ do_css_accordion (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "CSS Accordion");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
@@ -40,22 +37,22 @@ do_css_accordion (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), container);

      child = gtk_button_new_with_label ("This");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new_with_label ("Is");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new_with_label ("A");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new_with_label ("CSS");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new_with_label ("Accordion");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new_with_label (":-)");
-      gtk_box_append (GTK_BOX (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
      gtk_css_provider_load_from_resource (GTK_CSS_PROVIDER (provider), "/css_accordion/css_accordion.css");
@@ -66,7 +63,7 @@ do_css_accordion (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -55,13 +55,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

 GtkWidget *
@@ -80,7 +76,8 @@ do_css_basics (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -97,7 +94,7 @@ do_css_basics (GtkWidget *do_widget)
      container = gtk_scrolled_window_new (NULL, NULL);
      gtk_window_set_child (GTK_WINDOW (window), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
      g_signal_connect (text, "changed",
                        G_CALLBACK (css_text_changed), provider);

@@ -116,7 +113,7 @@ do_css_basics (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -79,7 +79,7 @@ setup_listbox (GtkBuilder       *builder,

  normal_row = NULL;
  listbox = gtk_list_box_new ();
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (WID ("scrolledwindow")), listbox);
+  gtk_container_add (GTK_CONTAINER (WID ("scrolledwindow")), listbox);

  g_signal_connect (listbox, "row-activated", G_CALLBACK (row_activated), provider);

@@ -95,8 +95,9 @@ setup_listbox (GtkBuilder       *builder,
                            "xalign", 0.0,
                            NULL);

-      gtk_list_box_row_set_child (GTK_LIST_BOX_ROW (row), label);
-      gtk_list_box_insert (GTK_LIST_BOX (listbox), row, -1);
+      gtk_container_add (GTK_CONTAINER (row), label);
+
+      gtk_container_add (GTK_CONTAINER (listbox), row);

      /* The first selected row is "normal" */
      if (g_strcmp0 (blend_modes[i].id, "normal") == 0)
@@ -124,7 +125,7 @@ do_css_blendmodes (GtkWidget *do_widget)

      window = WID ("window");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

      /* Setup the CSS provider for window */
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());
@@ -134,14 +135,12 @@ do_css_blendmodes (GtkWidget *do_widget)
                                                  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);

      setup_listbox (builder, provider);
-
-      g_object_unref (builder);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -69,13 +69,9 @@ drawing_area_draw (GtkDrawingArea *da,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

 GtkWidget *
@@ -85,7 +81,7 @@ do_css_multiplebgs (GtkWidget *do_widget)

  if (!window)
    {
-      GtkWidget *paned, *overlay, *child, *sw;
+      GtkWidget *paned, *container, *child;
      GtkStyleProvider *provider;
      GtkTextBuffer *text;
      GBytes *bytes;
@@ -94,31 +90,32 @@ do_css_multiplebgs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

-      overlay = gtk_overlay_new ();
-      gtk_window_set_child (GTK_WINDOW (window), overlay);
+      container = gtk_overlay_new ();
+      gtk_window_set_child (GTK_WINDOW (window), container);

      child = gtk_drawing_area_new ();
      gtk_widget_set_name (child, "canvas");
      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (child),
                                      drawing_area_draw,
                                      NULL, NULL);
-      gtk_overlay_set_child (GTK_OVERLAY (overlay), child);
+      gtk_container_add (GTK_CONTAINER (container), child);

      child = gtk_button_new ();
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
+      gtk_overlay_add_overlay (GTK_OVERLAY (container), child);
      gtk_widget_set_name (child, "bricks-button");
      gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (child, GTK_ALIGN_CENTER);
      gtk_widget_set_size_request (child, 250, 84);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), paned);
+      gtk_overlay_add_overlay (GTK_OVERLAY (container), paned);

      /* Need a filler so we get a handle */
      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_paned_set_start_child (GTK_PANED (paned), child);
+      gtk_container_add (GTK_CONTAINER (paned), child);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -132,10 +129,10 @@ do_css_multiplebgs (GtkWidget *do_widget)

      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), sw);
+      container = gtk_scrolled_window_new (NULL, NULL);
+      gtk_container_add (GTK_CONTAINER (paned), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
      g_signal_connect (text,
                        "changed",
                        G_CALLBACK (css_text_changed),
@@ -156,7 +153,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -55,13 +55,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

 GtkWidget *
@@ -80,14 +76,15 @@ do_css_pixbufs (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_window_set_child (GTK_WINDOW (window), paned);

      /* Need a filler so we get a handle */
      child = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_paned_set_start_child (GTK_PANED (paned), child);
+      gtk_container_add (GTK_CONTAINER (paned), child);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -102,9 +99,9 @@ do_css_pixbufs (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), container);
+      gtk_container_add (GTK_CONTAINER (paned), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
      g_signal_connect (text, "changed",
                        G_CALLBACK (css_text_changed), provider);

@@ -123,7 +120,7 @@ do_css_pixbufs (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -53,13 +53,9 @@ css_text_changed (GtkTextBuffer  *buffer,
 static void
 apply_css (GtkWidget *widget, GtkStyleProvider *provider)
 {
-  GtkWidget *child;
-
  gtk_style_context_add_provider (gtk_widget_get_style_context (widget), provider, G_MAXUINT);
-  for (child = gtk_widget_get_first_child (widget);
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
-    apply_css (child, provider);
+  if (GTK_IS_CONTAINER (widget))
+    gtk_container_forall (GTK_CONTAINER (widget), (GtkCallback) apply_css, provider);
 }

 static GtkWidget *
@@ -72,13 +68,13 @@ create_toolbar (void)
  gtk_widget_set_valign (toolbar, GTK_ALIGN_CENTER);

  item = gtk_button_new_from_icon_name ("go-next");
-  gtk_box_append (GTK_BOX (toolbar), item);
+  gtk_container_add (GTK_CONTAINER (toolbar), item);

  item = gtk_button_new_from_icon_name ("go-previous");
-  gtk_box_append (GTK_BOX (toolbar), item);
+  gtk_container_add (GTK_CONTAINER (toolbar), item);

  item = gtk_button_new_with_label ("Hello World");
-  gtk_box_append (GTK_BOX (toolbar), item);
+  gtk_container_add (GTK_CONTAINER (toolbar), item);

  return toolbar;
 }
@@ -99,13 +95,14 @@ do_css_shadows (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Shadows");
      gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      paned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
      gtk_window_set_child (GTK_WINDOW (window), paned);

      child = create_toolbar ();
-      gtk_paned_set_start_child (GTK_PANED (paned), child);
+      gtk_container_add (GTK_CONTAINER (paned), child);

      text = gtk_text_buffer_new (NULL);
      gtk_text_buffer_create_tag (text,
@@ -120,9 +117,9 @@ do_css_shadows (GtkWidget *do_widget)
      provider = GTK_STYLE_PROVIDER (gtk_css_provider_new ());

      container = gtk_scrolled_window_new (NULL, NULL);
-      gtk_paned_set_end_child (GTK_PANED (paned), container);
+      gtk_container_add (GTK_CONTAINER (paned), container);
      child = gtk_text_view_new_with_buffer (text);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (container), child);
+      gtk_container_add (GTK_CONTAINER (container), child);
      g_signal_connect (text, "changed",
                        G_CALLBACK (css_text_changed), provider);

@@ -141,7 +138,7 @@ do_css_shadows (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -29,14 +29,14 @@ do_cursors (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_signal_connect (window, "destroy",
                        G_CALLBACK (on_destroy), NULL);
-      g_object_unref (builder);
+      g_object_set_data_full (G_OBJECT (window), "builder", builder, g_object_unref);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
    {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
    }

  return window;
@@ -1,20 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <gresources>
-  <gresource prefix="/">
-    <file>awards.ui</file>
-  </gresource>
  <gresource prefix="/ui">
    <file preprocess="xml-stripblanks">main.ui</file>
-    <file preprocess="xml-stripblanks">main-listitem.ui</file>
+    <file preprocess="xml-stripblanks">appmenu.ui</file>
  </gresource>
  <gresource prefix="/application_demo">
    <file>application.c</file>
    <file>application.ui</file>
    <file>menus.ui</file>
  </gresource>
-  <gresource prefix="/awardview">
-    <file>awardlistitem.ui</file>
-  </gresource>
  <gresource prefix="/builder">
    <file>demo.ui</file>
  </gresource>
@@ -125,22 +119,6 @@
    <file>gnome-fs-directory.png</file>
    <file>gnome-fs-regular.png</file>
  </gresource>
-  <gresource prefix="/listview_filebrowser">
-    <file>listview_filebrowser.ui</file>
-  </gresource>
-  <gresource prefix="/listview_minesweeper">
-    <file>listview_minesweeper.ui</file>
-    <file>listview_minesweeper_cell.ui</file>
-  </gresource>
-  <gresource prefix="/listview_settings">
-    <file>listview_settings.ui</file>
-  </gresource>
-  <gresource prefix="/listview_weather">
-    <file compressed="true">listview_weather.txt</file>
-  </gresource>
-  <gresource prefix="/listview_colors">
-    <file compressed="true">color.names.txt</file>
-  </gresource>
  <gresource prefix="/shortcuts">
    <file>shortcuts.ui</file>
    <file>shortcuts-builder.ui</file>
@@ -177,7 +155,6 @@
  </gresource>
  <gresource prefix="/sources">
    <file>application_demo.c</file>
-    <file>awardview.c</file>
    <file>assistant.c</file>
    <file>builder.c</file>
    <file>clipboard.c</file>
@@ -218,13 +195,6 @@
    <file>infobar.c</file>
    <file>links.c</file>
    <file>listbox.c</file>
-    <file>listview_applauncher.c</file>
-    <file>listview_colors.c</file>
-    <file>listview_clocks.c</file>
-    <file>listview_filebrowser.c</file>
-    <file>listview_minesweeper.c</file>
-    <file>listview_settings.c</file>
-    <file>listview_weather.c</file>
    <file>list_store.c</file>
    <file>markup.c</file>
    <file>modelbutton.c</file>
@@ -94,7 +94,6 @@
  <object class="GtkAboutDialog" id="aboutdialog1">
    <property name="program-name" translatable="yes">Builder demo</property>
    <property name="logo-icon-name" translatable="yes">gtk3-demo</property>
-    <property name="modal">True</property>
    <accessibility>
      <relation target="window1" type="subwindow-of"/>
    </accessibility>
@@ -49,7 +49,7 @@ demo_tagged_entry_init (DemoTaggedEntry *entry)
  gtk_widget_set_vexpand (priv->entry, TRUE);
  gtk_widget_set_hexpand (priv->box, FALSE);
  gtk_widget_set_vexpand (priv->box, FALSE);
-  gtk_box_append (GTK_BOX (priv->box), priv->entry);
+  gtk_container_add (GTK_CONTAINER (priv->box), priv->entry);
  gtk_editable_init_delegate (GTK_EDITABLE (entry));
 }

@@ -188,7 +188,7 @@ demo_tagged_entry_add_tag (DemoTaggedEntry *entry,

  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_box_append (GTK_BOX (priv->box), tag);
+  gtk_container_add (GTK_CONTAINER (priv->box), tag);
 }

 void
@@ -201,7 +201,7 @@ demo_tagged_entry_insert_tag_after (DemoTaggedEntry *entry,
  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

  if (sibling == NULL)
-    gtk_box_append (GTK_BOX (priv->box), tag);
+    gtk_container_add (GTK_CONTAINER (priv->box), tag);
  else
    gtk_box_insert_child_after (GTK_BOX (priv->box), tag, sibling); 
 }
@@ -214,7 +214,7 @@ demo_tagged_entry_remove_tag (DemoTaggedEntry *entry,

  g_return_if_fail (DEMO_IS_TAGGED_ENTRY (entry));

-  gtk_box_remove (GTK_BOX (priv->box), tag);
+  gtk_container_remove (GTK_CONTAINER (priv->box), tag);
 }

 struct _DemoTaggedEntryTag
@@ -268,7 +268,7 @@ demo_tagged_entry_tag_init (DemoTaggedEntryTag *tag)
  tag->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
  gtk_widget_set_parent (tag->box, GTK_WIDGET (tag));
  tag->label = gtk_label_new ("");
-  gtk_box_append (GTK_BOX (tag->box), tag->label);
+  gtk_container_add (GTK_CONTAINER (tag->box), tag->label);

  gesture = gtk_gesture_click_new ();
  g_signal_connect (gesture, "released", G_CALLBACK (on_released), tag);
@@ -460,7 +460,7 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,

  if (!has_close_button && tag->button)
    {
-      gtk_box_remove (GTK_BOX (tag->box), tag->button);
+      gtk_container_remove (GTK_CONTAINER (tag->box), tag->button);
      tag->button = NULL;
    }
  else if (has_close_button && tag->button == NULL)
@@ -469,11 +469,11 @@ demo_tagged_entry_tag_set_has_close_button (DemoTaggedEntryTag *tag,

      image = gtk_image_new_from_icon_name ("window-close-symbolic");
      tag->button = gtk_button_new ();
-      gtk_box_append (GTK_BOX (tag->button), image);
+      gtk_container_add (GTK_CONTAINER (tag->button), image);
      gtk_widget_set_halign (tag->button, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (tag->button, GTK_ALIGN_CENTER);
      gtk_button_set_has_frame (GTK_BUTTON (tag->button), FALSE);
-      gtk_box_append (GTK_BOX (tag->box), tag->button);
+      gtk_container_add (GTK_CONTAINER (tag->box), tag->button);
      g_signal_connect (tag->button, "clicked", G_CALLBACK (on_button_clicked), tag);
    }

@@ -25,36 +25,11 @@ message_dialog_clicked (GtkButton *button,
                                   "number of times:");
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "%d", i);
-  g_signal_connect (dialog, "response", G_CALLBACK (gtk_window_destroy), NULL);
-  gtk_widget_show (dialog);
+  gtk_dialog_run (GTK_DIALOG (dialog));
+  gtk_widget_destroy (dialog);
  i++;
 }

-typedef struct {
-  GtkWidget *local_entry1;
-  GtkWidget *local_entry2;
-  GtkWidget *global_entry1;
-  GtkWidget *global_entry2;
-} ResponseData;
-
-static void
-on_dialog_response (GtkDialog *dialog,
-                    int        response,
-                    gpointer   user_data)
-{
-  ResponseData *data = user_data;
-
-  if (response == GTK_RESPONSE_OK)
-    {
-      gtk_editable_set_text (GTK_EDITABLE (data->global_entry1),
-                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry1)));
-      gtk_editable_set_text (GTK_EDITABLE (data->global_entry2),
-                             gtk_editable_get_text (GTK_EDITABLE (data->local_entry2)));
-    }
-
-  gtk_window_destroy (GTK_WINDOW (dialog));
-}
-
 static void
 interactive_dialog_clicked (GtkButton *button,
                            gpointer   user_data)
@@ -67,7 +42,7 @@ interactive_dialog_clicked (GtkButton *button,
  GtkWidget *local_entry1;
  GtkWidget *local_entry2;
  GtkWidget *label;
-  ResponseData *data;
+  gint response;

  dialog = gtk_dialog_new_with_buttons ("Interactive Dialog",
                                        GTK_WINDOW (window),
@@ -81,16 +56,16 @@ interactive_dialog_clicked (GtkButton *button,
  content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));

  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_append (GTK_BOX (content_area), hbox);
+  gtk_container_add (GTK_CONTAINER (content_area), hbox);

  image = gtk_image_new_from_icon_name ("dialog-question");
  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-  gtk_box_append (GTK_BOX (hbox), image);
+  gtk_container_add (GTK_CONTAINER (hbox), image);

  table = gtk_grid_new ();
  gtk_grid_set_row_spacing (GTK_GRID (table), 4);
  gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_box_append (GTK_BOX (hbox), table);
+  gtk_container_add (GTK_CONTAINER (hbox), table);
  label = gtk_label_new_with_mnemonic ("_Entry 1");
  gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
  local_entry1 = gtk_entry_new ();
@@ -106,18 +81,15 @@ interactive_dialog_clicked (GtkButton *button,
  gtk_grid_attach (GTK_GRID (table), local_entry2, 1, 1, 1, 1);
  gtk_label_set_mnemonic_widget (GTK_LABEL (label), local_entry2);

-  data = g_new (ResponseData, 1);
-  data->local_entry1 = local_entry1;
-  data->local_entry2 = local_entry2;
-  data->global_entry1 = entry1;
-  data->global_entry2 = entry2;
+  response = gtk_dialog_run (GTK_DIALOG (dialog));

-  g_signal_connect_data (dialog, "response",
-                         G_CALLBACK (on_dialog_response),
-                         data, (GClosureNotify) g_free,
-                         0);
+  if (response == GTK_RESPONSE_OK)
+    {
+      gtk_editable_set_text (GTK_EDITABLE (entry1), gtk_editable_get_text (GTK_EDITABLE (local_entry1)));
+      gtk_editable_set_text (GTK_EDITABLE (entry2), gtk_editable_get_text (GTK_EDITABLE (local_entry2)));
+    }

-  gtk_widget_show (dialog);
+  gtk_widget_destroy (dialog);
 }

 GtkWidget *
@@ -137,7 +109,9 @@ do_dialog (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      frame = gtk_frame_new ("Dialogs");
      gtk_widget_set_margin_start (frame, 8);
@@ -155,29 +129,29 @@ do_dialog (GtkWidget *do_widget)

      /* Standard message dialog */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
      button = gtk_button_new_with_mnemonic ("_Message Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);

-      gtk_box_append (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
+      gtk_container_add (GTK_CONTAINER (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));

      /* Interactive dialog*/
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);
      vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);

      button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_append (GTK_BOX (hbox), vbox2);
-      gtk_box_append (GTK_BOX (vbox2), button);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox2);
+      gtk_container_add (GTK_CONTAINER (vbox2), button);

      table = gtk_grid_new ();
      gtk_grid_set_row_spacing (GTK_GRID (table), 4);
      gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_box_append (GTK_BOX (hbox), table);
+      gtk_container_add (GTK_CONTAINER (hbox), table);

      label = gtk_label_new_with_mnemonic ("_Entry 1");
      gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
@@ -196,7 +170,7 @@ do_dialog (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -7,292 +7,6 @@

 #include <gtk/gtk.h>

-G_DECLARE_FINAL_TYPE (CanvasItem, canvas_item, CANVAS, ITEM, GtkWidget)
-
-struct _CanvasItem {
-  GtkWidget parent;
-
-  GtkWidget *fixed;
-  GtkWidget *label;
-
-  double r;
-  double angle;
-  double delta;
-
-  GtkWidget *editor;
-};
-
-struct _CanvasItemClass {
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (CanvasItem, canvas_item, GTK_TYPE_WIDGET)
-
-static int n_items = 0;
-
-static void
-set_color (CanvasItem *item,
-           GdkRGBA    *color)
-{
-  char *css;
-  char *str;
-  GtkStyleContext *context;
-  GtkCssProvider *provider;
-
-  str = gdk_rgba_to_string (color);
-  css = g_strdup_printf ("* { background: %s; padding: 10px; margin: 1px; }", str);
-
-  context = gtk_widget_get_style_context (item->label);
-  provider = g_object_get_data (G_OBJECT (context), "style-provider");
-  if (provider)
-    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
-
-  provider = gtk_css_provider_new ();
-  gtk_css_provider_load_from_data (provider, css, -1);
-  gtk_style_context_add_provider (gtk_widget_get_style_context (item->label), GTK_STYLE_PROVIDER (provider), 800);
-  g_object_set_data_full (G_OBJECT (context), "style-provider", provider, g_object_unref);
-
-  g_free (str);
-  g_free (css);
-}
-
-static gboolean
-item_drag_drop (GtkDropTarget *dest,
-                const GValue  *value,
-                double         x,
-                double         y)
-{
-  GtkWidget *label = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-  CanvasItem *item = CANVAS_ITEM (gtk_widget_get_parent (gtk_widget_get_parent (label)));
-
-  set_color (item, g_value_get_boxed (value));
-
-  return TRUE;
-}
-
-static void
-apply_transform (CanvasItem *item)
-{
-  GskTransform *transform;
-  double x, y;
-
-  x = gtk_widget_get_allocated_width (item->label) / 2.0;
-  y = gtk_widget_get_allocated_height (item->label) / 2.0;
-  item->r = sqrt (x*x + y*y);
-
-  transform = gsk_transform_translate (
-                 gsk_transform_rotate (
-                   gsk_transform_translate (NULL,
-                                            &(graphene_point_t) { item->r, item->r }),
-                   item->angle + item->delta),
-                 &(graphene_point_t) { - x, - y });
-
-  gtk_fixed_set_child_transform (GTK_FIXED (item->fixed), item->label, transform);
-  gsk_transform_unref (transform);
-}
-
-static void
-angle_changed (GtkGestureRotate *gesture,
-               double            angle,
-               double            delta)
-{
-  CanvasItem *item = CANVAS_ITEM (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
-
-  item->delta = angle / M_PI * 180.0;
-
-  apply_transform (item);
-}
-
-static void
-rotate_done (GtkGesture *gesture)
-{
-  CanvasItem *item = CANVAS_ITEM (gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture)));
-
-  item->angle = item->angle + item->delta;
-  item->delta = 0;
-}
-
-static void
-click_done (GtkGesture *gesture)
-{
-  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
-  GtkWidget *canvas = gtk_widget_get_parent (item);
-  GtkWidget *last_child;
-
-  last_child = gtk_widget_get_last_child (canvas);
-  if (item != last_child)
-    gtk_widget_insert_after (item, canvas, last_child);
-}
-
-static void
-canvas_item_init (CanvasItem *item)
-{
-  char *text;
-  char *id;
-  GdkRGBA rgba;
-  GtkDropTarget *dest;
-  GtkGesture *gesture;
-
-  n_items++;
-
-  text = g_strdup_printf ("Item %d", n_items);
-  item->label = gtk_label_new (text);
-  g_free (text);
-
-  item->fixed = gtk_fixed_new ();
-  gtk_widget_set_parent (item->fixed, GTK_WIDGET (item));
-  gtk_fixed_put (GTK_FIXED (item->fixed), item->label, 0, 0);
-
-  gtk_widget_add_css_class (item->label, "frame");
-
-  id = g_strdup_printf ("item%d", n_items);
-  gtk_widget_set_name (item->label, id);
-  g_free (id);
-
-  gdk_rgba_parse (&rgba, "yellow");
-  set_color (item, &rgba);
-
-  item->angle = 0;
-
-  dest = gtk_drop_target_new (GDK_TYPE_RGBA, GDK_ACTION_COPY);
-  g_signal_connect (dest, "drop", G_CALLBACK (item_drag_drop), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (item->label), GTK_EVENT_CONTROLLER (dest));
-
-  gesture = gtk_gesture_rotate_new ();
-  g_signal_connect (gesture, "angle-changed", G_CALLBACK (angle_changed), NULL);
-  g_signal_connect (gesture, "end", G_CALLBACK (rotate_done), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (item), GTK_EVENT_CONTROLLER (gesture));
-
-  gesture = gtk_gesture_click_new ();
-  g_signal_connect (gesture, "released", G_CALLBACK (click_done), NULL);
-  gtk_widget_add_controller (GTK_WIDGET (item), GTK_EVENT_CONTROLLER (gesture));
-}
-
-static void
-canvas_item_dispose (GObject *object)
-{
-  CanvasItem *item = CANVAS_ITEM (object);
-
-  g_clear_pointer (&item->fixed, gtk_widget_unparent);
-  g_clear_pointer (&item->editor, gtk_widget_unparent);
-
-  G_OBJECT_CLASS (canvas_item_parent_class)->dispose (object);
-}
-
-static void
-canvas_item_map (GtkWidget *widget)
-{
-  CanvasItem *item = CANVAS_ITEM (widget);
-
-  GTK_WIDGET_CLASS (canvas_item_parent_class)->map (widget);
-
-  apply_transform (item);
-}
-
-static void
-canvas_item_class_init (CanvasItemClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = canvas_item_dispose;
-
-  widget_class->map = canvas_item_map;
-
-  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
-  gtk_widget_class_set_css_name (widget_class, "item");
-}
-
-static GtkWidget *
-canvas_item_new (void)
-{
-  CanvasItem *item = g_object_new (canvas_item_get_type (), NULL);
-
-  return GTK_WIDGET (item);
-}
-
-static GdkPaintable *
-canvas_item_get_drag_icon (CanvasItem *item)
-{
-  return gtk_widget_paintable_new (item->fixed);
-}
-
-static gboolean
-canvas_item_is_editing (CanvasItem *item)
-{
-  return item->editor != NULL;
-}
-
-static void
-scale_changed (GtkRange   *range,
-               CanvasItem *item)
-{
-  item->angle = gtk_range_get_value (range);
-  apply_transform (item);
-}
-
-static void
-text_changed (GtkEditable *editable,
-              GParamSpec  *pspec,
-              CanvasItem  *item)
-{
-  gtk_label_set_text (GTK_LABEL (item->label), gtk_editable_get_text (editable));
-  apply_transform (item);
-}
-
-static void
-canvas_item_stop_editing (CanvasItem *item)
-{
-  GtkWidget *scale;
-
-  if (!item->editor)
-    return;
-
-  scale = gtk_widget_get_last_child (item->editor);
-  g_signal_handlers_disconnect_by_func (scale, scale_changed, item);
-
-  gtk_fixed_remove (GTK_FIXED (gtk_widget_get_parent (item->editor)), item->editor);
-  item->editor = NULL;
-}
-
-static void
-canvas_item_start_editing (CanvasItem *item)
-{
-  GtkWidget *canvas = gtk_widget_get_parent (GTK_WIDGET (item));
-  GtkWidget *entry;
-  GtkWidget *scale;
-  double x, y;
-
-  if (item->editor)
-    return;
-
-  item->editor = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-
-  entry = gtk_entry_new ();
-
-  gtk_editable_set_text (GTK_EDITABLE (entry),
-                         gtk_label_get_text (GTK_LABEL (item->label)));
-
-  gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
-  g_signal_connect (entry, "notify::text", G_CALLBACK (text_changed), item);
-  g_signal_connect_swapped (entry, "activate", G_CALLBACK (canvas_item_stop_editing), item);
-
-  gtk_box_append (GTK_BOX (item->editor), entry);
-
-  scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 360, 1);
-  gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
-  gtk_range_set_value (GTK_RANGE (scale), fmod (item->angle, 360));
-
-  g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed), item);
-
-  gtk_box_append (GTK_BOX (item->editor), scale);
-
-  gtk_widget_translate_coordinates (GTK_WIDGET (item), canvas, 0, 0, &x, &y);
-  gtk_fixed_put (GTK_FIXED (canvas), item->editor, x, y + 2 * item->r);
-  gtk_widget_grab_focus (entry);
-
-}
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
         double         x,
@@ -304,8 +18,7 @@ prepare (GtkDragSource *source,
  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
  item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);

-  item = gtk_widget_get_ancestor (item, canvas_item_get_type ());
-  if (!item)
+  if (!GTK_IS_LABEL (item))
    return NULL;

  g_object_set_data (G_OBJECT (canvas), "dragged-item", item);
@@ -318,17 +31,12 @@ drag_begin (GtkDragSource *source,
            GdkDrag       *drag)
 {
  GtkWidget *canvas;
-  CanvasItem *item;
-  GdkPaintable *paintable;
+  GtkWidget *item;

  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-  item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
+  item = g_object_get_data (G_OBJECT (canvas), "dragged-item");

-  paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
-  g_object_unref (paintable);
-
-  gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);
+  gtk_widget_set_opacity (item, 0.5);
 }

 static void
@@ -345,12 +53,32 @@ drag_end (GtkDragSource *source,
  gtk_widget_set_opacity (item, 1.0);
 }

-static gboolean
+static void
 drag_cancel (GtkDragSource       *source,
             GdkDrag             *drag,
             GdkDragCancelReason  reason)
 {
-  return FALSE;
+  drag_end (source, drag);
+}
+
+typedef struct {
+  double x, y;
+  double angle;
+  double delta;
+} TransformData;
+
+static void
+apply_transform (GtkWidget *item)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (item);
+  TransformData *data;
+  GskTransform *transform;
+
+  data = g_object_get_data (G_OBJECT (item), "transform-data");
+  transform = gsk_transform_rotate (gsk_transform_translate (NULL, &(graphene_point_t){data->x, data->y}),
+                                    data->angle + data->delta);
+  gtk_fixed_set_child_transform (GTK_FIXED (canvas), item, transform);
+  gsk_transform_unref (transform);
 }

 static gboolean
@@ -359,58 +87,90 @@ drag_drop (GtkDropTarget *target,
           double         x,
           double         y)
 {
-  CanvasItem *item;
+  GtkWidget *item;
+  TransformData *transform_data;
  GtkWidget *canvas;
  GtkWidget *last_child;

  item = g_value_get_object (value);
+  transform_data = g_object_get_data (G_OBJECT (item), "transform-data");

-  canvas = gtk_widget_get_parent (GTK_WIDGET (item));
+  transform_data->x = x;
+  transform_data->y = y;
+
+  canvas = gtk_widget_get_parent (item);
  last_child = gtk_widget_get_last_child (canvas);
-  if (GTK_WIDGET (item) != last_child)
-    gtk_widget_insert_after (GTK_WIDGET (item), canvas, last_child);
+  if (item != last_child)
+    gtk_widget_insert_after (item, canvas, last_child);

-  gtk_fixed_move (GTK_FIXED (canvas), GTK_WIDGET (item), x - item->r, y - item->r);
+  apply_transform (item);

  return TRUE;
 }

+static double pos_x, pos_y;
+
+static GtkWidget * canvas_item_new (double x, double y);
+
 static void
 new_item_cb (GtkWidget *button, gpointer data)
 {
  GtkWidget *canvas = data;
-  GtkWidget *popover;
  GtkWidget *item;
-  GdkRectangle rect;

-  popover = gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER);
-  gtk_popover_get_pointing_to (GTK_POPOVER (popover), &rect);
-
-  item = canvas_item_new ();
-  gtk_fixed_put (GTK_FIXED (canvas), item, rect.x, rect.y);
-  apply_transform (CANVAS_ITEM (item));
+  item = canvas_item_new (pos_x, pos_y);
+  gtk_container_add (GTK_CONTAINER (canvas), item);
+  apply_transform (item);

  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }

+static void
+edit_label_done (GtkWidget *entry, gpointer data)
+{
+  GtkWidget *canvas = gtk_widget_get_parent (entry);
+  GtkWidget *label;
+  int x, y;
+
+  gtk_fixed_get_child_position (GTK_FIXED (canvas), entry, &x, &y);
+
+  label = GTK_WIDGET (g_object_get_data (G_OBJECT (entry), "label"));
+  gtk_label_set_text (GTK_LABEL (label), gtk_editable_get_text (GTK_EDITABLE (entry)));
+  gtk_widget_show (label);
+
+  gtk_widget_destroy (entry);
+}
+
 static void
 edit_cb (GtkWidget *button, GtkWidget *child)
 {
-  CanvasItem *item = CANVAS_ITEM (child);
+  GtkWidget *canvas = gtk_widget_get_parent (child);
+  int x, y;
+
+  gtk_fixed_get_child_position (GTK_FIXED (canvas), child, &x, &y);
+
+  if (GTK_IS_LABEL (child))
+    {
+      GtkWidget *entry = gtk_entry_new ();
+
+      g_object_set_data (G_OBJECT (entry), "label", child);
+
+      gtk_editable_set_text (GTK_EDITABLE (entry), gtk_label_get_text (GTK_LABEL (child)));
+      gtk_editable_set_width_chars (GTK_EDITABLE (entry), 12);
+      g_signal_connect (entry, "activate", G_CALLBACK (edit_label_done), NULL);
+      gtk_fixed_put (GTK_FIXED (canvas), entry, x, y);
+      gtk_widget_grab_focus (entry);
+      gtk_widget_hide (child);
+    }

  if (button)
    gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
-
-  if (!canvas_item_is_editing (item))
-    canvas_item_start_editing (item);
 }

 static void
 delete_cb (GtkWidget *button, GtkWidget *child)
 {
-  GtkWidget *canvas = gtk_widget_get_parent (child);
-
-  gtk_fixed_remove (GTK_FIXED (canvas), child);
+  gtk_widget_destroy (child);

  gtk_popover_popdown (GTK_POPOVER (gtk_widget_get_ancestor (button, GTK_TYPE_POPOVER)));
 }
@@ -427,7 +187,6 @@ pressed_cb (GtkGesture *gesture,

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
  child = gtk_widget_pick (widget, x, y, GTK_PICK_DEFAULT);
-  child = gtk_widget_get_ancestor (child, canvas_item_get_type ());

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_SECONDARY)
    {
@@ -435,35 +194,38 @@ pressed_cb (GtkGesture *gesture,
      GtkWidget *box;
      GtkWidget *item;

+      pos_x = x;
+      pos_y = y;
+
      menu = gtk_popover_new ();
      gtk_widget_set_parent (menu, widget);
      gtk_popover_set_has_arrow (GTK_POPOVER (menu), FALSE);
      gtk_popover_set_pointing_to (GTK_POPOVER (menu), &(GdkRectangle){ x, y, 1, 1});
      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_popover_set_child (GTK_POPOVER (menu), box);
+      gtk_container_add (GTK_CONTAINER (menu), box);

      item = gtk_button_new_with_label ("New");
      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
      g_signal_connect (item, "clicked", G_CALLBACK (new_item_cb), widget);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);

      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);

      item = gtk_button_new_with_label ("Edit");
      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
      gtk_widget_set_sensitive (item, child != NULL && child != widget);
      g_signal_connect (item, "clicked", G_CALLBACK (edit_cb), child);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);

      item = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);

      item = gtk_button_new_with_label ("Delete");
      gtk_button_set_has_frame (GTK_BUTTON (item), FALSE);
      gtk_widget_set_sensitive (item, child != NULL && child != widget);
      g_signal_connect (item, "clicked", G_CALLBACK (delete_cb), child);
-      gtk_box_append (GTK_BOX (box), item);
+      gtk_container_add (GTK_CONTAINER (box), item);

      gtk_popover_popup (GTK_POPOVER (menu));
    }
@@ -478,20 +240,14 @@ released_cb (GtkGesture *gesture,
 {
  GtkWidget *widget;
  GtkWidget *child;
-  CanvasItem *item;

  widget = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
  child = gtk_widget_pick (widget, x, y, 0);
-  item = (CanvasItem *)gtk_widget_get_ancestor (child, canvas_item_get_type ());
-  if (!item)
-    return;

  if (gtk_gesture_single_get_current_button (GTK_GESTURE_SINGLE (gesture)) == GDK_BUTTON_PRIMARY)
    {
-      if (canvas_item_is_editing (item))
-        canvas_item_stop_editing (item);
-      else
-        canvas_item_start_editing (item);
+      if (child != NULL && child != widget)
+        edit_cb (NULL, child);
    }
 }

@@ -529,6 +285,131 @@ canvas_new (void)
  return canvas;
 }

+static void
+set_color (GtkWidget *item,
+           GdkRGBA   *color)
+{
+  char *css;
+  char *str;
+  GtkStyleContext *context;
+  GtkCssProvider *provider;
+
+  str = gdk_rgba_to_string (color);
+  css = g_strdup_printf ("* { background: %s; padding: 10px; }", str);
+
+  context = gtk_widget_get_style_context (item);
+  provider = g_object_get_data (G_OBJECT (context), "style-provider");
+  if (provider)
+    gtk_style_context_remove_provider (context, GTK_STYLE_PROVIDER (provider));
+
+  provider = gtk_css_provider_new ();
+  gtk_css_provider_load_from_data (provider, css, -1);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (item), GTK_STYLE_PROVIDER (provider), 800);
+  g_object_set_data_full (G_OBJECT (context), "style-provider", provider, g_object_unref);
+
+  g_free (str);
+  g_free (css);
+}
+
+static gboolean
+item_drag_drop (GtkDropTarget *dest,
+                const GValue  *value,
+                double         x,
+                double         y)
+{
+  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
+
+  set_color (item, g_value_get_boxed (value));
+
+  return TRUE;
+}
+
+static void
+angle_changed (GtkGestureRotate *gesture,
+               double            angle,
+               double            delta)
+{
+  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
+  TransformData *data = g_object_get_data (G_OBJECT (item), "transform-data");
+
+  data->delta = angle / M_PI * 180.0;
+
+  apply_transform (item);
+}
+
+static void
+rotate_done (GtkGesture *gesture)
+{
+  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
+  TransformData *data = g_object_get_data (G_OBJECT (item), "transform-data");
+
+  data->angle = data->angle + data->delta;
+  data->delta = 0;
+}
+
+static void
+click_done (GtkGesture *gesture)
+{
+  GtkWidget *item = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (gesture));
+  GtkWidget *canvas = gtk_widget_get_parent (item);
+  GtkWidget *last_child;
+
+  last_child = gtk_widget_get_last_child (canvas);
+  if (item != last_child)
+    gtk_widget_insert_after (item, canvas, last_child);
+}
+
+static int n_items = 0;
+
+static GtkWidget *
+canvas_item_new (double x,
+                 double y)
+{
+  GtkWidget *widget;
+  char *label;
+  char *id;
+  TransformData *transform_data;
+  GdkRGBA rgba;
+  GtkDropTarget *dest;
+  GtkGesture *gesture;
+
+  n_items++;
+
+  label = g_strdup_printf ("Item %d", n_items);
+  id = g_strdup_printf ("item%d", n_items);
+
+  gdk_rgba_parse (&rgba, "yellow");
+
+  widget = gtk_label_new (label);
+  gtk_widget_add_css_class (widget, "frame");
+  gtk_widget_set_name (widget, id);
+
+  set_color (widget, &rgba);
+  transform_data = g_new0 (TransformData, 1);
+  transform_data->x = x;
+  transform_data->y = y;
+  transform_data->angle = 0.0;
+  g_object_set_data_full (G_OBJECT (widget), "transform-data", transform_data, g_free);
+
+  g_free (label);
+  g_free (id);
+
+  dest = gtk_drop_target_new (GDK_TYPE_RGBA, GDK_ACTION_COPY);
+  g_signal_connect (dest, "drop", G_CALLBACK (item_drag_drop), NULL);
+  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (dest));
+
+  gesture = gtk_gesture_rotate_new ();
+  g_signal_connect (gesture, "angle-changed", G_CALLBACK (angle_changed), NULL);
+  g_signal_connect (gesture, "end", G_CALLBACK (rotate_done), NULL);
+  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture));
+
+  gesture = gtk_gesture_click_new ();
+  g_signal_connect (gesture, "released", G_CALLBACK (click_done), NULL);
+  gtk_widget_add_controller (widget, GTK_EVENT_CONTROLLER (gesture));
+  
+  return widget;
+}
+
 static GtkWidget *window = NULL;

 GtkWidget *
@@ -536,9 +417,9 @@ do_dnd (GtkWidget *do_widget)
 {
  if (!window)
    {
-      GtkWidget *button;
      GtkWidget *sw;
      GtkWidget *canvas;
+      GtkWidget *widget;
      GtkWidget *box, *box2, *box3;
      const char *colors[] = {
        "red", "green", "blue", "magenta", "orange", "gray", "black", "yellow",
@@ -549,24 +430,26 @@ do_dnd (GtkWidget *do_widget)
      int i;
      int x, y;

-      button = gtk_color_button_new ();
-      g_object_unref (g_object_ref_sink (button));
-
+      widget = gtk_color_button_new ();
+      gtk_widget_destroy (widget);
+  
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Drag-and-Drop");
      gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_window_set_child (GTK_WINDOW (window), box);

      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
+      gtk_container_add (GTK_CONTAINER (box), box2);

      canvas = canvas_new ();
-      gtk_box_append (GTK_BOX (box2), canvas);
+      gtk_container_add (GTK_CONTAINER (box2), canvas);

      n_items = 0;

@@ -575,9 +458,9 @@ do_dnd (GtkWidget *do_widget)
        {
          GtkWidget *item;

-          item = canvas_item_new ();
-          gtk_fixed_put (GTK_FIXED (canvas), item, x, y);
-          apply_transform (CANVAS_ITEM (item));
+          item = canvas_item_new (x, y);
+          gtk_container_add (GTK_CONTAINER (canvas), item);
+          apply_transform (item);

          x += 150;
          y += 100;
@@ -587,7 +470,7 @@ do_dnd (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_NEVER);
-      gtk_box_append (GTK_BOX (box), sw);
+      gtk_container_add (GTK_CONTAINER (box), sw);

      box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
      gtk_widget_add_css_class (box3, "linked");
@@ -604,14 +487,14 @@ do_dnd (GtkWidget *do_widget)
                                 "rgba", &rgba,
                                 "selectable", FALSE,
                                 NULL);
-          gtk_box_append (GTK_BOX (box3), swatch);
+          gtk_container_add (GTK_CONTAINER (box3), swatch);
        }
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -125,164 +125,49 @@ drag_end (GtkGestureDrag *gesture,
 }

 static void
-oval_path (cairo_t *cr,
-           double xc, double yc,
-           double xr, double yr)
+checkerboard_draw (GtkDrawingArea *da,
+                   cairo_t        *cr,
+                   int             width,
+                   int             height,
+                   gpointer        data)
 {
-  cairo_save (cr);
+  gint i, j, xcount, ycount;

-  cairo_translate (cr, xc, yc);
-  cairo_scale (cr, 1.0, yr / xr);
-  cairo_move_to (cr, xr, 0.0);
-  cairo_arc (cr,
-             0, 0,
-             xr,
-             0, 2 * G_PI);
-  cairo_close_path (cr);
+#define CHECK_SIZE 10
+#define SPACING 2

-  cairo_restore (cr);
-}
+  /* At the start of a draw handler, a clip region has been set on
+   * the Cairo context, and the contents have been cleared to the
+   * widget's background color. The docs for
+   * gdk_surface_begin_paint_region() give more details on how this
+   * works.
+   */

-/* Fill the given area with checks in the standard style
- * for showing compositing effects.
- *
- * It would make sense to do this as a repeating surface,
- * but most implementations of RENDER currently have broken
- * implementations of repeat + transform, even when the
- * transform is a translation.
- */
-static void
-fill_checks (cairo_t *cr,
-             int x,     int y,
-             int width, int height)
-{
-  int i, j;
-
-#define CHECK_SIZE 16
-
-  cairo_rectangle (cr, x, y, width, height);
-  cairo_set_source_rgb (cr, 0.4, 0.4, 0.4);
-  cairo_fill (cr);
-
-  /* Only works for CHECK_SIZE a power of 2 */
-  j = x & (-CHECK_SIZE);
-
-  for (; j < height; j += CHECK_SIZE)
+  xcount = 0;
+  i = SPACING;
+  while (i < width)
    {
-      i = y & (-CHECK_SIZE);
-      for (; i < width; i += CHECK_SIZE)
-        if ((i / CHECK_SIZE + j / CHECK_SIZE) % 2 == 0)
+      j = SPACING;
+      ycount = xcount % 2; /* start with even/odd depending on row */
+      while (j < height)
+        {
+          if (ycount % 2)
+            cairo_set_source_rgb (cr, 0.45777, 0, 0.45777);
+          else
+            cairo_set_source_rgb (cr, 1, 1, 1);
+
+          /* If we're outside the clip, this will do nothing.
+           */
          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
+          cairo_fill (cr);
+
+          j += CHECK_SIZE + SPACING;
+          ++ycount;
+        }
+
+      i += CHECK_SIZE + SPACING;
+      ++xcount;
    }
-
-  cairo_set_source_rgb (cr, 0.7, 0.7, 0.7);
-  cairo_fill (cr);
-
-#undef CHECK_SIZE
-}
-
-/* Draw a red, green, and blue circle equally spaced inside
- * the larger circle of radius r at (xc, yc)
- */
-static void
-draw_3circles (cairo_t *cr,
-               double xc, double yc,
-               double radius,
-               double alpha)
-{
-  double subradius = radius * (2 / 3. - 0.1);
-
-  cairo_set_source_rgba (cr, 1., 0., 0., alpha);
-  oval_path (cr,
-             xc + radius / 3. * cos (G_PI * (0.5)),
-             yc - radius / 3. * sin (G_PI * (0.5)),
-             subradius, subradius);
-  cairo_fill (cr);
-
-  cairo_set_source_rgba (cr, 0., 1., 0., alpha);
-  oval_path (cr,
-             xc + radius / 3. * cos (G_PI * (0.5 + 2/.3)),
-             yc - radius / 3. * sin (G_PI * (0.5 + 2/.3)),
-             subradius, subradius);
-  cairo_fill (cr);
-
-  cairo_set_source_rgba (cr, 0., 0., 1., alpha);
-  oval_path (cr,
-             xc + radius / 3. * cos (G_PI * (0.5 + 4/.3)),
-             yc - radius / 3. * sin (G_PI * (0.5 + 4/.3)),
-             subradius, subradius);
-  cairo_fill (cr);
-}
-
-static void
-groups_draw (GtkDrawingArea *darea,
-             cairo_t        *cr,
-             int             width,
-             int             height,
-             gpointer        data)
-{
-  cairo_surface_t *overlay, *punch, *circles;
-  cairo_t *overlay_cr, *punch_cr, *circles_cr;
-
-  /* Fill the background */
-  double radius = 0.5 * (width < height ? width : height) - 10;
-  double xc = width / 2.;
-  double yc = height / 2.;
-
-  overlay = cairo_surface_create_similar (cairo_get_target (cr),
-                                          CAIRO_CONTENT_COLOR_ALPHA,
-                                          width, height);
-
-  punch = cairo_surface_create_similar (cairo_get_target (cr),
-                                        CAIRO_CONTENT_ALPHA,
-                                        width, height);
-
-  circles = cairo_surface_create_similar (cairo_get_target (cr),
-                                          CAIRO_CONTENT_COLOR_ALPHA,
-                                          width, height);
-
-  fill_checks (cr, 0, 0, width, height);
-
-  /* Draw a black circle on the overlay
-   */
-  overlay_cr = cairo_create (overlay);
-  cairo_set_source_rgb (overlay_cr, 0., 0., 0.);
-  oval_path (overlay_cr, xc, yc, radius, radius);
-  cairo_fill (overlay_cr);
-
-  /* Draw 3 circles to the punch surface, then cut
-   * that out of the main circle in the overlay
-   */
-  punch_cr = cairo_create (punch);
-  draw_3circles (punch_cr, xc, yc, radius, 1.0);
-  cairo_destroy (punch_cr);
-
-  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_DEST_OUT);
-  cairo_set_source_surface (overlay_cr, punch, 0, 0);
-  cairo_paint (overlay_cr);
-
-  /* Now draw the 3 circles in a subgroup again
-   * at half intensity, and use OperatorAdd to join up
-   * without seams.
-   */
-  circles_cr = cairo_create (circles);
-
-  cairo_set_operator (circles_cr, CAIRO_OPERATOR_OVER);
-  draw_3circles (circles_cr, xc, yc, radius, 0.5);
-  cairo_destroy (circles_cr);
-
-  cairo_set_operator (overlay_cr, CAIRO_OPERATOR_ADD);
-  cairo_set_source_surface (overlay_cr, circles, 0, 0);
-  cairo_paint (overlay_cr);
-
-  cairo_destroy (overlay_cr);
-
-  cairo_set_source_surface (cr, overlay, 0, 0);
-  cairo_paint (cr);
-
-  cairo_surface_destroy (overlay);
-  cairo_surface_destroy (punch);
-  cairo_surface_destroy (circles);
 }

 static void
@@ -322,21 +207,22 @@ do_drawingarea (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      /*
-       * Create the groups area
+       * Create the checkerboard area
       */
+
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
-                            "<u>Knockout groups</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+                            "<u>Checkerboard pattern</u>");
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
      gtk_drawing_area_set_content_height (GTK_DRAWING_AREA (da), 100);
-      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), groups_draw, NULL, NULL);
+      gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), checkerboard_draw, NULL, NULL);
      gtk_frame_set_child (GTK_FRAME (frame), da);

      /*
@@ -346,11 +232,11 @@ do_drawingarea (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Scribble area</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_vexpand (frame, TRUE);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      da = gtk_drawing_area_new ();
      gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -374,7 +260,7 @@ do_drawingarea (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
      gtk_widget_show (window);
  else
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);

  return window;
 }
@@ -352,7 +352,8 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -361,7 +362,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_widget_set_margin_bottom (vbox, 5);
      gtk_window_set_child (GTK_WINDOW (window), vbox);

-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          gtk_label_new ("Shopping list (you can edit the cells!)"));

      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -369,7 +370,7 @@ do_editable_cells (GtkWidget *do_widget)
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* create models */
      items_model = create_items_model ();
@@ -391,17 +392,17 @@ do_editable_cells (GtkWidget *do_widget)
      /* some buttons */
      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
      gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_append (GTK_BOX (vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (vbox), hbox);

      button = gtk_button_new_with_label ("Add item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (add_item), treeview);
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);

      button = gtk_button_new_with_label ("Remove item");
      g_signal_connect (button, "clicked",
                        G_CALLBACK (remove_item), treeview);
-      gtk_box_append (GTK_BOX (hbox), button);
+      gtk_container_add (GTK_CONTAINER (hbox), button);

      gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
    }
@@ -409,7 +410,7 @@ do_editable_cells (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -50,7 +50,9 @@ do_entry_completion (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -61,11 +63,11 @@ do_entry_completion (GtkWidget *do_widget)

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example.");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
-      gtk_box_append (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);

      /* Create the completion object */
      completion = gtk_entry_completion_new ();
@@ -86,7 +88,7 @@ do_entry_completion (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -25,7 +25,8 @@ do_entry_undo (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
      gtk_widget_set_margin_start (vbox, 5);
@@ -37,18 +38,18 @@ do_entry_undo (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "Use Primary+z or Primary+Shift+z to undo or redo changes");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      /* Create our entry */
      entry = gtk_entry_new ();
      gtk_editable_set_enable_undo (GTK_EDITABLE (entry), TRUE);
-      gtk_box_append (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -15,7 +15,7 @@ static GtkWidget *window = NULL;
 static void
 response_cb (GtkDialog *dialog, gint response_id)
 {
-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
  window = NULL;
 }

@@ -79,8 +79,8 @@ do_expander (GtkWidget *do_widget)
                                "innuendo, just to make you scroll down or "
                                "resize the window. Do it already !", -1);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
-      gtk_expander_set_child (GTK_EXPANDER (expander), sw);
-      gtk_box_append (GTK_BOX (area), expander);
+      gtk_container_add (GTK_CONTAINER (expander), sw);
+      gtk_container_add (GTK_CONTAINER (area), expander);
      g_signal_connect (expander, "notify::expanded",
                        G_CALLBACK (expander_cb), window);

@@ -90,7 +90,7 @@ do_expander (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -125,7 +125,8 @@ do_filtermodel (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      store = (GtkListStore*)gtk_builder_get_object (builder, "liststore1");

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

  return window;
 }
@@ -249,14 +249,6 @@ fishbowl_changes_toggled_cb (GtkToggleButton *button,
    gtk_button_set_icon_name (GTK_BUTTON (button), "changes-allow");
 }

-char *
-format_header_cb (GObject *object,
-                  guint    count,
-                  double   fps)
-{
-  return g_strdup_printf ("%u Icons, %.2f fps", count, fps);
-}
-
 GtkWidget *
 do_fishbowl (GtkWidget *do_widget)
 {
@@ -281,13 +273,15 @@ do_fishbowl (GtkWidget *do_widget)

      builder = gtk_builder_new_from_resource ("/fishbowl/fishbowl.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      bowl = GTK_WIDGET (gtk_builder_get_object (builder, "bowl"));
      selected_widget_type = -1;
      set_widget_type (GTK_FISHBOWL (bowl), 0);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_widget_realize (window);
      g_object_unref (builder);
@@ -296,7 +290,7 @@ do_fishbowl (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -28,12 +28,22 @@
        </child>
        <child type="end">
          <object class="GtkLabel">
-            <binding name="label">
-              <closure type="gchararray" function="format_header_cb">
-                <lookup name="count">bowl</lookup>
-                <lookup name="framerate">bowl</lookup>
-              </closure>
-            </binding>
+            <property name="label">fps</property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="framerate-string"/>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label">Icons, </property>
+          </object>
+        </child>
+        <child type="end">
+          <object class="GtkLabel">
+            <property name="label" bind-source="bowl" bind-property="count"/>
          </object>
        </child>
        <child type="end">
@@ -48,7 +58,6 @@
    <child>
      <object class="GtkFishbowl" id="bowl">
        <property name="visible">True</property>
-        <property name="overflow">hidden</property>
        <property name="animating">True</property>
        <property name="benchmark" bind-source="changes_allow" bind-property="active" bind-flags="invert-boolean | sync-create"/>
      </object>
@@ -53,7 +53,7 @@ create_faces (void)
      faces[i].face = gtk_frame_new (NULL);
      gtk_widget_set_size_request (faces[i].face, face_size, face_size);
      gtk_widget_add_css_class (faces[i].face, faces[i].css_class);
-      gtk_fixed_put (GTK_FIXED (fixed), faces[i].face, 0, 0);
+      gtk_container_add (GTK_CONTAINER (fixed), faces[i].face);

      /* Set up the transformation for each face */
      transform = gsk_transform_translate (transform, &GRAPHENE_POINT_INIT (w, h));
@@ -139,7 +139,7 @@ create_demo_window (GtkWidget *do_widget)
  gtk_widget_set_valign (GTK_WIDGET (fixed), GTK_ALIGN_CENTER);

  cube = create_faces ();
-  gtk_fixed_put (GTK_FIXED (fixed), cube, 0, 0);
+  gtk_container_add (GTK_CONTAINER (fixed), cube);
  gtk_widget_set_overflow (fixed, GTK_OVERFLOW_VISIBLE);

  provider = gtk_css_provider_new ();
@@ -161,7 +161,7 @@ do_fixed (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (demo_window))
    gtk_widget_show (demo_window);
  else
-    gtk_window_destroy (GTK_WINDOW (demo_window));
+    gtk_widget_destroy (demo_window);

  return demo_window;
 }
@@ -4,8 +4,6 @@
 * as needed and support sorting and filtering.
 *
 * The children of a GtkFlowBox are regular widgets
- *
- * The dataset used here has 665 colors.
 */

 #include <gtk/gtk.h>
@@ -726,7 +724,9 @@ do_flowbox (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -739,13 +739,13 @@ do_flowbox (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), scrolled);

      for (i = 0; colors[i]; i++)
-        gtk_flow_box_insert (GTK_FLOW_BOX (flowbox), color_swatch_new (colors[i]), -1);
+        gtk_container_add (GTK_CONTAINER (flowbox), color_swatch_new (colors[i]));
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -194,7 +194,7 @@ add_check_group (GtkWidget   *box,
  pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
  gtk_label_set_attributes (GTK_LABEL (label), attrs);
  pango_attr_list_unref (attrs);
-  gtk_box_append (GTK_BOX (group), label);
+  gtk_container_add (GTK_CONTAINER (group), label);

  for (i = 0; tags[i]; i++)
    {
@@ -211,7 +211,7 @@ add_check_group (GtkWidget   *box,
      g_signal_connect (feat, "notify::inconsistent", G_CALLBACK (update_display), NULL);
      g_signal_connect (feat, "clicked", G_CALLBACK (feat_clicked), NULL);

-      gtk_box_append (GTK_BOX (group), feat);
+      gtk_container_add (GTK_CONTAINER (group), feat);

      item = g_new (FeatureItem, 1);
      item->name = tags[i];
@@ -223,7 +223,7 @@ add_check_group (GtkWidget   *box,
      feature_items = g_list_prepend (feature_items, item);
    }

-  gtk_box_append (GTK_BOX (box), group);
+  gtk_container_add (GTK_CONTAINER (box), group);
 }

 static void
@@ -248,7 +248,7 @@ add_radio_group (GtkWidget *box,
  pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
  gtk_label_set_attributes (GTK_LABEL (label), attrs);
  pango_attr_list_unref (attrs);
-  gtk_box_append (GTK_BOX (group), label);
+  gtk_container_add (GTK_CONTAINER (group), label);

  for (i = 0; tags[i]; i++)
    {
@@ -268,7 +268,7 @@ add_radio_group (GtkWidget *box,
      g_signal_connect (feat, "notify::active", G_CALLBACK (update_display), NULL);
      g_object_set_data (G_OBJECT (feat), "default", group_button);

-      gtk_box_append (GTK_BOX (group), feat);
+      gtk_container_add (GTK_CONTAINER (group), feat);

      item = g_new (FeatureItem, 1);
      item->name = tags[i];
@@ -280,7 +280,7 @@ add_radio_group (GtkWidget *box,
      feature_items = g_list_prepend (feature_items, item);
    }

-  gtk_box_append (GTK_BOX (box), group);
+  gtk_container_add (GTK_CONTAINER (box), group);
 }

 static void
@@ -1025,7 +1025,7 @@ denorm_coord (hb_ot_var_axis_info_t *axis, int coord)
 static void
 update_font_variations (void)
 {
-  GtkWidget *child;
+  GtkWidget *child, *next;
  PangoFont *pango_font = NULL;
  hb_font_t *hb_font;
  hb_face_t *hb_face;
@@ -1037,8 +1037,12 @@ update_font_variations (void)
  int i;

  child = gtk_widget_get_first_child (variations_grid);
-  while ((child = gtk_widget_get_first_child (variations_grid)))
-    gtk_grid_remove (GTK_GRID (variations_grid), child);
+  while (child != NULL)
+    {
+      next = gtk_widget_get_next_sibling (child);
+      gtk_widget_destroy (child);
+      child = next;
+    }

  instance_combo = NULL;

@@ -1329,7 +1333,8 @@ do_font_features (GtkWidget *do_widget)

      font_features_font_changed ();

-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      g_object_unref (builder);

@@ -1339,7 +1344,7 @@ do_font_features (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_window_present (GTK_WINDOW (window));
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -281,7 +281,7 @@ do_fontrendering (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -53,7 +53,7 @@ create_axis_slider (GtkGears *gears,
    }

  label = gtk_label_new (text);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);
  gtk_widget_show (label);

  adj = gtk_adjustment_new (gtk_gears_get_axis (gears, axis), 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -63,7 +63,7 @@ create_axis_slider (GtkGears *gears,
                    gears);
  slider = gtk_scale_new (GTK_ORIENTATION_VERTICAL, adj);
  gtk_scale_set_draw_value (GTK_SCALE (slider), FALSE);
-  gtk_box_append (GTK_BOX (box), slider);
+  gtk_container_add (GTK_CONTAINER (box), slider);
  gtk_widget_set_vexpand (slider, TRUE);
  gtk_widget_show (slider);

@@ -85,7 +85,7 @@ do_gears (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Gears");
      gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
      gtk_window_set_default_size (GTK_WINDOW (window), 640, 640);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

      overlay = gtk_overlay_new ();
      gtk_widget_set_margin_start (overlay, 12);
@@ -111,19 +111,19 @@ do_gears (GtkWidget *do_widget)

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
      gtk_box_set_spacing (GTK_BOX (box), 6);
-      gtk_box_append (GTK_BOX (box), hbox);
+      gtk_container_add (GTK_CONTAINER (box), hbox);

      gears = gtk_gears_new ();
      gtk_widget_set_hexpand (gears, TRUE);
      gtk_widget_set_vexpand (gears, TRUE);
-      gtk_box_append (GTK_BOX (hbox), gears);
+      gtk_container_add (GTK_CONTAINER (hbox), gears);

      for (i = 0; i < GTK_GEARS_N_AXIS; i++)
-        gtk_box_append (GTK_BOX (hbox), create_axis_slider (GTK_GEARS (gears), i));
+        gtk_container_add (GTK_CONTAINER (hbox), create_axis_slider (GTK_GEARS (gears), i));

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, FALSE);
      gtk_box_set_spacing (GTK_BOX (hbox), 6);
-      gtk_box_append (GTK_BOX (box), hbox);
+      gtk_container_add (GTK_CONTAINER (box), hbox);

      gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
    }
@@ -131,7 +131,7 @@ do_gears (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -13,16 +13,17 @@ in_files = sys.argv[2:]
 file_output = """
 typedef GtkWidget *(*GDoDemoFunc) (GtkWidget *do_widget);

-typedef struct _DemoData DemoData;
+typedef struct _Demo Demo;

-struct _DemoData
+struct _Demo
 {
  const char *name;
  const char *title;
  const char *filename;
  GDoDemoFunc func;
-  DemoData *children;
+  Demo *children;
 };
+
 """

 # Demo = namedtuple('Demo', ['name', 'title', 'file', 'func'])
@@ -66,7 +67,7 @@ for demo in demos:
 i = 0
 for parent in parents:
    id = parent_ids[i]
-    file_output += "\nDemoData child" + str(id) + "[] = {\n"
+    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 + "/"):
@@ -81,7 +82,7 @@ for parent in parents:
 # Sort demos by title
 demos = sorted(demos, key=lambda x: x[1])

-file_output += "\nDemoData gtk_demos[] = {\n"
+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]:
@@ -149,7 +149,8 @@ do_gestures (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
      gtk_window_set_title (GTK_WINDOW (window), "Gestures");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      drawing_area = gtk_drawing_area_new ();
      gtk_window_set_child (GTK_WINDOW (window), drawing_area);
@@ -209,7 +210,7 @@ do_gestures (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -354,7 +354,7 @@ create_axis_slider (int axis)
    }

  label = gtk_label_new (text);
-  gtk_box_append (GTK_BOX (box), label);
+  gtk_container_add (GTK_CONTAINER (box), label);
  gtk_widget_show (label);

  adj = gtk_adjustment_new (0.0, 0.0, 360.0, 1.0, 12.0, 0.0);
@@ -362,7 +362,7 @@ create_axis_slider (int axis)
                    G_CALLBACK (on_axis_value_change),
                    GINT_TO_POINTER (axis));
  slider = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adj);
-  gtk_box_append (GTK_BOX (box), slider);
+  gtk_container_add (GTK_CONTAINER (box), slider);
  gtk_widget_set_hexpand (slider, TRUE);
  gtk_widget_show (slider);

@@ -406,7 +406,7 @@ create_glarea_window (GtkWidget *do_widget)
  gl_area = gtk_gl_area_new ();
  gtk_widget_set_hexpand (gl_area, TRUE);
  gtk_widget_set_vexpand (gl_area, TRUE);
-  gtk_box_append (GTK_BOX (box), gl_area);
+  gtk_container_add (GTK_CONTAINER (box), gl_area);

  /* We need to initialize and free GL resources, so we use
   * the realize and unrealize signals on the widget
@@ -418,16 +418,16 @@ create_glarea_window (GtkWidget *do_widget)
  g_signal_connect (gl_area, "render", G_CALLBACK (render), NULL);

  controls = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
-  gtk_box_append (GTK_BOX (box), controls);
+  gtk_container_add (GTK_CONTAINER (box), controls);
  gtk_widget_set_hexpand (controls, TRUE);

  for (i = 0; i < N_AXIS; i++)
-    gtk_box_append (GTK_BOX (controls), create_axis_slider (i));
+    gtk_container_add (GTK_CONTAINER (controls), create_axis_slider (i));

  button = gtk_button_new_with_label ("Quit");
  gtk_widget_set_hexpand (button, TRUE);
-  gtk_box_append (GTK_BOX (box), button);
-  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
+  gtk_container_add (GTK_CONTAINER (box), button);
+  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);

  return window;
 }
@@ -441,7 +441,7 @@ do_glarea (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (demo_window))
    gtk_widget_show (demo_window);
  else
-    gtk_window_destroy (GTK_WINDOW (demo_window));
+    gtk_widget_destroy (demo_window);

  return demo_window;
 }
@@ -53,6 +53,7 @@ enum {
   PROP_BENCHMARK,
   PROP_COUNT,
   PROP_FRAMERATE,
+   PROP_FRAMERATE_STRING,
   PROP_UPDATE_DELAY,
   NUM_PROPERTIES
 };
@@ -288,6 +289,14 @@ gtk_fishbowl_get_property (GObject         *object,
      g_value_set_double (value, gtk_fishbowl_get_framerate (fishbowl));
      break;

+    case PROP_FRAMERATE_STRING:
+      {
+        char *s = g_strdup_printf ("%.2f", gtk_fishbowl_get_framerate (fishbowl));
+        g_value_set_string (value, s);
+        g_free (s);
+      }
+      break;
+
    case PROP_UPDATE_DELAY:
      g_value_set_int64 (value, gtk_fishbowl_get_update_delay (fishbowl));
      break;
@@ -341,6 +350,13 @@ gtk_fishbowl_class_init (GtkFishbowlClass *klass)
                           0,
                           G_PARAM_READABLE);

+  props[PROP_FRAMERATE_STRING] =
+      g_param_spec_string ("framerate-string",
+                           "Framerate as string",
+                           "Framerate as string, with 2 decimals",
+                           NULL,
+                           G_PARAM_READABLE);
+
  props[PROP_UPDATE_DELAY] =
      g_param_spec_int64 ("update-delay",
                          "Update delay",
@@ -492,6 +508,7 @@ gtk_fishbowl_do_update (GtkFishbowl *fishbowl)
  priv->framerate = ((int)(priv->framerate * 100))/100.0;

  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE]);
+  g_object_notify_by_pspec (G_OBJECT (fishbowl), props[PROP_FRAMERATE_STRING]);

  if (!priv->benchmark)
    return;
@@ -197,7 +197,7 @@ gtk_gears_class_init (GtkGearsClass *klass)
 * @param v the vertex to fill
 * @param x the x coordinate
 * @param y the y coordinate
- * @param z the z coordinate
+ * @param z the z coortinate
 * @param n pointer to the normal table
 *
 * @return the operation error code
@@ -25,8 +25,8 @@ do_headerbar (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Welcome to Facebook - Log in, sign up or learn more");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);

      header = gtk_header_bar_new ();
@@ -43,10 +43,10 @@ do_headerbar (GtkWidget *do_widget)
      gtk_widget_add_css_class (box, "linked");
      button = gtk_button_new ();
      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-start-symbolic"));
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);
      button = gtk_button_new ();
      gtk_button_set_child (GTK_BUTTON (button), gtk_image_new_from_icon_name ("pan-end-symbolic"));
-      gtk_box_append (GTK_BOX (box), button);
+      gtk_container_add (GTK_CONTAINER (box), button);

      gtk_header_bar_pack_start (GTK_HEADER_BAR (header), box);

@@ -58,7 +58,7 @@ do_headerbar (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -237,7 +237,9 @@ do_hypertext (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      view = gtk_text_view_new ();
      gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
@@ -273,7 +275,7 @@ do_hypertext (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -12,7 +12,7 @@ static GtkWidget *window = NULL;
 static GtkWidget *scrolledwindow;
 static int selected;

-#define N_WIDGET_TYPES 6
+#define N_WIDGET_TYPES 4


 static int hincrement = 5;
@@ -64,7 +64,6 @@ populate_icons (void)
      gtk_grid_attach (GTK_GRID (grid), create_icon (), left, top, 1, 1);

  hincrement = 0;
-  vincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                  GTK_POLICY_NEVER,
@@ -101,7 +100,6 @@ populate_text (gboolean hilight)
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (textview), buffer);

  hincrement = 0;
-  vincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                  GTK_POLICY_NEVER,
@@ -126,7 +124,6 @@ populate_image (void)
  gtk_picture_set_can_shrink (GTK_PICTURE (image), FALSE);

  hincrement = 5;
-  vincrement = 5;

  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
                                  GTK_POLICY_AUTOMATIC,
@@ -134,42 +131,6 @@ populate_image (void)
  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), image);
 }

-extern GtkWidget *create_weather_view (void);
-
-static void
-populate_list (void)
-{
-  GtkWidget *list;
-
-  list = create_weather_view ();
-
-  hincrement = 5;
-  vincrement = 0;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
-}
-
-extern GtkWidget *create_color_grid (void);
-
-static void
-populate_grid (void)
-{
-  GtkWidget *list;
-
-  list = create_color_grid ();
-
-  hincrement = 0;
-  vincrement = 5;
-
-  gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
-                                  GTK_POLICY_AUTOMATIC,
-                                  GTK_POLICY_AUTOMATIC);
-  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolledwindow), list);
-}
-
 static void
 set_widget_type (int type)
 {
@@ -203,16 +164,6 @@ set_widget_type (int type)
      populate_image ();
      break;

-    case 4:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a list");
-      populate_list ();
-      break;
-
-    case 5:
-      gtk_window_set_title (GTK_WINDOW (window), "Scrolling a grid");
-      populate_grid ();
-      break;
-
    default:
      g_assert_not_reached ();
    }
@@ -258,23 +209,23 @@ do_iconscroll (GtkWidget *do_widget)

      builder = gtk_builder_new_from_resource ("/iconscroll/iconscroll.ui");
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      scrolledwindow = GTK_WIDGET (gtk_builder_get_object (builder, "scrolledwindow"));
      gtk_widget_realize (window);
      hadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "hadjustment"));
      vadjustment = GTK_ADJUSTMENT (gtk_builder_get_object (builder, "vadjustment"));
      set_widget_type (0);
-
-      g_object_unref (builder);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -228,7 +228,7 @@ home_clicked (GtkButton *item,

 static void close_window(void)
 {
-  gtk_window_destroy (GTK_WINDOW (window));
+  gtk_widget_destroy (window);
  window = NULL;

  g_object_unref (file_pixbuf);
@@ -266,14 +266,14 @@ do_iconview (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      tool_bar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (vbox), tool_bar);
+      gtk_container_add (GTK_CONTAINER (vbox), tool_bar);

      up_button = gtk_button_new_with_mnemonic ("_Up");
      gtk_widget_set_sensitive (GTK_WIDGET (up_button), FALSE);
-      gtk_box_append (GTK_BOX (tool_bar), up_button);
+      gtk_container_add (GTK_CONTAINER (tool_bar), up_button);

      home_button = gtk_button_new_with_mnemonic ("_Home");
-      gtk_box_append (GTK_BOX (tool_bar), home_button);
+      gtk_container_add (GTK_CONTAINER (tool_bar), home_button);


      sw = gtk_scrolled_window_new (NULL, NULL);
@@ -283,7 +283,7 @@ do_iconview (GtkWidget *do_widget)
                                      GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (sw, TRUE);

-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* Create the store and fill it with the contents of '/' */
      parent = g_strdup ("/");
@@ -320,7 +320,7 @@ do_iconview (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -111,7 +111,9 @@ do_iconview_edit (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Editing and Drag-and-Drop");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      store = create_store ();
      fill_store (store);
@@ -150,7 +152,7 @@ do_iconview_edit (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -91,7 +91,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);

          g_object_unref (image_stream);
          image_stream = NULL;
@@ -119,7 +119,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);

          g_object_unref (image_stream);
          image_stream = NULL;
@@ -152,7 +152,7 @@ progressive_timeout (gpointer data)
              g_error_free (error);

              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_window_destroy), NULL);
+                                G_CALLBACK (gtk_widget_destroy), NULL);

              gtk_widget_show (dialog);

@@ -189,7 +189,7 @@ progressive_timeout (gpointer data)
              g_error_free (error);

              g_signal_connect (dialog, "response",
-                                G_CALLBACK (gtk_window_destroy), NULL);
+                                G_CALLBACK (gtk_widget_destroy), NULL);

              gtk_widget_show (dialog);

@@ -223,7 +223,7 @@ progressive_timeout (gpointer data)
          g_error_free (error);

          g_signal_connect (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), NULL);
+                            G_CALLBACK (gtk_widget_destroy), NULL);

          gtk_widget_show (dialog);

@@ -293,16 +293,24 @@ static void
 toggle_sensitivity_callback (GtkWidget *togglebutton,
                             gpointer   user_data)
 {
-  GtkWidget *child;
+  GtkContainer *container = user_data;
+  GList *list;
+  GList *tmp;

-  for (child = gtk_widget_get_first_child (GTK_WIDGET (user_data));
-       child != NULL;
-       child = gtk_widget_get_next_sibling (child))
+  list = gtk_container_get_children (container);
+
+  tmp = list;
+  while (tmp != NULL)
    {
      /* don't disable our toggle */
-      if (child != togglebutton)
-        gtk_widget_set_sensitive (child, !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
+      if (GTK_WIDGET (tmp->data) != togglebutton)
+        gtk_widget_set_sensitive (GTK_WIDGET (tmp->data),
+                                  !gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (togglebutton)));
+
+      tmp = tmp->next;
    }
+
+  g_list_free (list);
 }


@@ -327,8 +335,9 @@ do_images (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Images");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
      g_signal_connect (window, "destroy",
                        G_CALLBACK (cleanup_callback), NULL);

@@ -340,20 +349,20 @@ do_images (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), base_vbox);

      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 16);
-      gtk_box_append (GTK_BOX (base_vbox), hbox);
+      gtk_container_add (GTK_CONTAINER (base_vbox), hbox);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Image loaded from a file</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      image = gtk_image_new_from_icon_name ("gtk3-demo");
      gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
@@ -366,12 +375,12 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Animation loaded from a file</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      picture = gtk_picture_new_for_resource ("/images/floppybuddy.gif");

@@ -382,12 +391,12 @@ do_images (GtkWidget *do_widget)
      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Symbolic themed icon</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
      image = gtk_image_new_from_gicon (gicon);
@@ -398,17 +407,17 @@ do_images (GtkWidget *do_widget)

      /* Progressive */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Progressive image loading</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      /* Create an empty image for now; the progressive loader
       * will create the pixbuf and fill it in.
@@ -420,17 +429,17 @@ do_images (GtkWidget *do_widget)

      /* Video */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>Displaying video</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
      gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      video = gtk_video_new_for_resource ("/images/gtk-logo.webm");
      gtk_media_stream_set_loop (gtk_video_get_media_stream (GTK_VIDEO (video)), TRUE);
@@ -438,22 +447,22 @@ do_images (GtkWidget *do_widget)

      /* Widget paintables */
      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_box_append (GTK_BOX (hbox), vbox);
+      gtk_container_add (GTK_CONTAINER (hbox), vbox);

      label = gtk_label_new (NULL);
      gtk_label_set_markup (GTK_LABEL (label),
                            "<u>GtkWidgetPaintable</u>");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      paintable = gtk_widget_paintable_new (do_widget);
      picture = gtk_picture_new_for_paintable (paintable);
      gtk_widget_set_size_request (picture, 100, 100);
      gtk_widget_set_valign (picture, GTK_ALIGN_START);
-      gtk_box_append (GTK_BOX (vbox), picture);
+      gtk_container_add (GTK_CONTAINER (vbox), picture);

      /* Sensitivity control */
      button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_append (GTK_BOX (base_vbox), button);
+      gtk_container_add (GTK_CONTAINER (base_vbox), button);

      g_signal_connect (button, "toggled",
                        G_CALLBACK (toggle_sensitivity_callback),
@@ -463,7 +472,7 @@ do_images (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -29,8 +29,10 @@ on_bar_response (GtkInfoBar *info_bar,
  gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
                                            "Your response has id %d", response_id);

-  g_signal_connect_swapped (dialog, "response",
-                            G_CALLBACK (gtk_window_destroy), dialog);
+  g_signal_connect_swapped (dialog,
+                            "response",
+                            G_CALLBACK (gtk_widget_destroy),
+                            dialog);

  gtk_widget_show (dialog);
 }
@@ -56,7 +58,8 @@ do_infobar (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
      gtk_widget_set_margin_start (vbox, 8);
@@ -66,73 +69,73 @@ do_infobar (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);

      button = gtk_toggle_button_new_with_label ("Message");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);

      button = gtk_toggle_button_new_with_label ("Warning");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
      gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
      g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);
      gtk_info_bar_set_default_response (GTK_INFO_BAR (bar), GTK_RESPONSE_OK);

      button = gtk_toggle_button_new_with_label ("Question");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);

      button = gtk_toggle_button_new_with_label ("Error");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);

-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);

      bar = gtk_info_bar_new ();
-      gtk_box_append (GTK_BOX (vbox), bar);
+      gtk_container_add (GTK_CONTAINER (vbox), bar);
      gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
      label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
      gtk_label_set_wrap (GTK_LABEL (label), TRUE);
      gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_info_bar_add_child (GTK_INFO_BAR (bar), label);
+      gtk_container_add (GTK_CONTAINER (bar), label);

      button = gtk_toggle_button_new_with_label ("Other");
      g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-      gtk_box_append (GTK_BOX (actions), button);
+      gtk_container_add (GTK_CONTAINER (actions), button);

      frame = gtk_frame_new ("An example of different info bars");
      gtk_widget_set_margin_top (frame, 8);
      gtk_widget_set_margin_bottom (frame, 8);
-      gtk_box_append (GTK_BOX (vbox), frame);
+      gtk_container_add (GTK_CONTAINER (vbox), frame);

      gtk_widget_set_halign (actions, GTK_ALIGN_CENTER);

@@ -146,7 +149,7 @@ do_infobar (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -12,7 +12,7 @@ response_cb (GtkWidget *dialog,
             gint       response_id,
             gpointer   data)
 {
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (dialog);
 }

 static gboolean
@@ -59,7 +59,8 @@ do_links (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "Links");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\""
                             "title=\"plain text\">text</a> may be marked up "
@@ -87,7 +88,7 @@ do_links (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -257,7 +257,9 @@ do_list_store (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "List Store");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
      gtk_widget_set_margin_start (vbox, 8);
@@ -267,14 +269,14 @@ do_list_store (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), vbox);

      label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though).");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      sw = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                      GTK_POLICY_NEVER,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_append (GTK_BOX (vbox), sw);
+      gtk_container_add (GTK_CONTAINER (vbox), sw);

      /* create tree model */
      model = create_model ();
@@ -307,7 +309,7 @@ do_list_store (GtkWidget *do_widget)
    }
  else
    {
-      gtk_window_destroy (GTK_WINDOW (window));
+      gtk_widget_destroy (window);
      window = NULL;
      if (timeout != 0)
        {
@@ -8,7 +8,6 @@
 #include <gtk/gtk.h>
 #include <stdlib.h>
 #include <string.h>
-#include "award.h"

 static GdkPixbuf *avatar_pixbuf_other;
 static GtkWidget *window = NULL;
@@ -235,9 +234,9 @@ reshare_clicked (GtkMessageRow *row,
 {
  GtkMessageRowPrivate *priv = row->priv;

-  award ("listbox-reshare");
  priv->message->n_reshares++;
  gtk_message_row_update (row);
+
 }

 static void
@@ -256,14 +255,11 @@ gtk_message_row_state_flags_changed (GtkWidget    *widget,
 {
  GtkMessageRowPrivate *priv = GTK_MESSAGE_ROW (widget)->priv;
  GtkStateFlags flags;
-  gboolean visible;

  flags = gtk_widget_get_state_flags (widget);

-  visible = flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED) ? TRUE : FALSE;
-  gtk_widget_set_visible (priv->extra_buttons_box, visible);
-  if (visible && gtk_list_box_row_get_index (GTK_LIST_BOX_ROW (widget)) % 100 == 99)
-    award ("listbox-100th-row");
+  gtk_widget_set_visible (priv->extra_buttons_box,
+                          flags & (GTK_STATE_FLAG_PRELIGHT | GTK_STATE_FLAG_SELECTED));

  GTK_WIDGET_CLASS (gtk_message_row_parent_class)->state_flags_changed (widget, previous_state_flags);
 }
@@ -355,17 +351,22 @@ do_listbox (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_title (GTK_WINDOW (window), "List Box");
-      gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      gtk_window_set_default_size (GTK_WINDOW (window),
+                                   400, 600);
+
+      /* NULL window variable when window is closed */
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed),
+                        &window);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
      gtk_window_set_child (GTK_WINDOW (window), vbox);
      label = gtk_label_new ("Messages from GTK and friends");
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);
      scrolled = gtk_scrolled_window_new (NULL, NULL);
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
      gtk_widget_set_vexpand (scrolled, TRUE);
-      gtk_box_append (GTK_BOX (vbox), scrolled);
+      gtk_container_add (GTK_CONTAINER (vbox), scrolled);
      listbox = gtk_list_box_new ();
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), listbox);

@@ -381,7 +382,7 @@ do_listbox (GtkWidget *do_widget)
          message = gtk_message_new (lines[i]);
          row = gtk_message_row_new (message);
          gtk_widget_show (GTK_WIDGET (row));
-          gtk_list_box_insert (GTK_LIST_BOX (listbox), GTK_WIDGET (row), -1);
+          gtk_container_add (GTK_CONTAINER (listbox), GTK_WIDGET (row));
        }

      g_strfreev (lines);
@@ -391,7 +392,7 @@ do_listbox (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -150,7 +150,7 @@
                  </object>
                </child>
                <child>
-                  <object class="GtkButton" id="favorite-button">
+                  <object class="GtkButton" id="favorite-buttton">
                    <property name="label" translatable="yes">Favorite</property>
                    <property name="receives-default">1</property>
                    <property name="has-frame">0</property>
@@ -1,199 +0,0 @@
-/* Lists/Application launcher
- *
- * This demo uses the GtkCoverFlow widget as a fancy application launcher.
- *
- * It is also a very small introduction to listviews.
- */
-
-#include <gtk/gtk.h>
-
-/* This is the function that creates the #GListModel that we need.
- * GTK list widgets need a #GListModel to display, as models support change
- * notifications.
- * Unfortunately various older APIs do not provide list models, so we create
- * our own.
- */
-static GListModel *
-create_application_list (void)
-{
-  GListStore *store;
-  GList *apps, *l;
-
-  /* We use a #GListStore here, which is a simple array-like list implementation
-   * for manual management.
-   * List models need to know what type of data they provide, so we need to
-   * provide the type here. As we want to do a list of applications, #GAppInfo
-   * is the object we provide.
-   */
-  store = g_list_store_new (G_TYPE_APP_INFO);
-
-  apps = g_app_info_get_all ();
-
-  for (l = apps; l; l = l->next)
-    {
-      g_list_store_append (store, l->data);
-    }
-
-  g_list_free_full (apps, g_object_unref);
-
-  return G_LIST_MODEL (store);
-}
-
-/* This is the function we use for setting up new listitems to display.
- * We add just a #GtkImage here to display the application's icon as this is just
- * a simple demo.
- */
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *image;
-
-  image = gtk_image_new ();
-  gtk_image_set_icon_size (GTK_IMAGE (image), GTK_ICON_SIZE_LARGE);
-
-  gtk_list_item_set_child (list_item, image);
-}
-
-/* Here we need to prepare the listitem for displaying its item. We get the
- * listitem already set up from the previous function, so we can reuse the
- * #GtkImage widget we set up above.
- * We get the item - which we know is a #GAppInfo because it comes out of
- * the model we set up above, grab its icon and display it.
- */
-static void
-bind_listitem_cb (GtkListItemFactory *factory,
-                  GtkListItem        *list_item)
-{
-  GtkWidget *image;
-  GAppInfo *app_info;
-
-  image = gtk_list_item_get_child (list_item);
-  app_info = gtk_list_item_get_item (list_item);
-
-  gtk_image_set_from_gicon (GTK_IMAGE (image), g_app_info_get_icon (app_info));
-}
-
-/* In more complex code, we would also need functions to unbind and teardown
- * the listitem, but this is simple code, so the default implementations are
- * enough. If we had connected signals, this step would have been necessary.
- *
- * The #GtkSignalListItemFactory documentation contains more information about
- * this step.
- */
-
-/* This function is called whenever an item in the list is activated. This is
- * the simple way to allow reacting to the Enter key or double-clicking on a
- * listitem.
- * Of course, it is possible to use far more complex interactions by turning
- * off activation and adding buttons or other widgets in the setup function
- * above, but this is a simple demo, so we'll use the simple way.
- */
-static void
-activate_cb (GtkCoverFlow *coverflow,
-             guint         position,
-             gpointer      unused)
-{
-  GAppInfo *app_info;
-  GdkAppLaunchContext *context;
-  GError *error = NULL;
-
-  app_info = g_list_model_get_item (gtk_cover_flow_get_model (coverflow), position);
-
-  /* Prepare the context for launching the application and launch it. This
-   * code is explained in detail in the documentation for #GdkAppLaunchContext
-   * and #GAppInfo.
-   */
-  context = gdk_display_get_app_launch_context (gtk_widget_get_display (GTK_WIDGET (coverflow)));
-  if (!g_app_info_launch (app_info,
-                          NULL, 
-                          G_APP_LAUNCH_CONTEXT (context),
-                          &error))
-    {
-      GtkWidget *dialog;
-
-      /* And because error handling is important, even a simple demo has it:
-       * We display an error dialog that something went wrong.
-       */
-      dialog = gtk_message_dialog_new (GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (coverflow))),
-                                       GTK_DIALOG_DESTROY_WITH_PARENT | GTK_DIALOG_MODAL,
-                                       GTK_MESSAGE_ERROR,
-                                       GTK_BUTTONS_CLOSE,
-                                       "Could not launch %s", g_app_info_get_display_name (app_info));
-      gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), "%s", error->message);
-      g_clear_error (&error);
-      gtk_widget_show (dialog);
-    }
-
-  g_object_unref (context);
-  g_object_unref (app_info);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_applauncher (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *coverflow, *sw;;
-      GListModel *model;
-      GtkListItemFactory *factory;
-
-      /* Create a window and set a few defaults */
-      window = gtk_window_new ();
-      gtk_window_set_default_size (GTK_WINDOW (window), 640, 320);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Application Launcher");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-    
-      /* The #GtkListitemFactory is what is used to create #GtkListItems
-       * to display the data from the model. So it is absolutely necessary
-       * to create one.
-       * We will use a #GtkSignalListItemFactory because it is the simplest
-       * one to use. Different ones are available for different use cases.
-       * The most powerful one is #GtkBuilderListItemFactory which uses
-       * #GtkBuilder .ui files, so it requires little code.
-       */
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-      g_signal_connect (factory, "bind", G_CALLBACK (bind_listitem_cb), NULL);
-
-      /* Create the list widget here: We use a coverflow widget because it's
-       * the coolest one. We could just as well use other list widgets such
-       * as a #GtkListView or a #GtkGridView and the code would look very
-       * similar.
-       */
-      coverflow = gtk_cover_flow_new_with_factory (factory);
-      /* We connect the activate signal here. It's the function we defined
-       * above for launching the selected application.
-       */
-      g_signal_connect (coverflow, "activate", G_CALLBACK (activate_cb), NULL);
-
-      /* And of course we need to set the data model. Here we call the function
-       * we wrote above that gives us the list of applications. Then we set
-       * it on the coverflow list widget.
-       * The coverflow will now take items from the model and use the factory
-       * to create as many listitems as it needs to show itself to the user.
-       */
-      model = create_application_list ();
-      gtk_cover_flow_set_model (GTK_COVER_FLOW (coverflow), model);
-      g_object_unref (model);
-
-      /* List widgets should always be contained in a #GtkScrolledWindow,
-       * because otherwise they might get too large or they might not
-       * be scrollable.
-       */
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_window_set_child (GTK_WINDOW (window), sw);
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), coverflow);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,489 +0,0 @@
-/* Lists/Clocks
- *
- * This demo displays the time in different timezones.
- *
- * The goal is to show how to set up expressions that track changes
- * in objects and make them update widgets.
- *
- * For that, we create a GtkClock object that updates its time every
- * second and then use various ways to display that time.
- *
- * Typically, this will be done using GtkBuilder .ui files with the
- * help of the <binding> tag, but this demo shows the code that runs
- * behind that.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_CLOCK (gtk_clock_get_type ())
-G_DECLARE_FINAL_TYPE (GtkClock, gtk_clock, GTK, CLOCK, GObject)
-
-/* This is our object. It's just a timezone */
-typedef struct _GtkClock GtkClock;
-struct _GtkClock
-{
-  GObject parent_instance;
-
-  /* We allow this to be NULL for the local timezone */
-  GTimeZone *timezone;
-  /* Name of the location we're displaying time for */
-  char *location;
-};
-
-enum {
-  PROP_0,
-  PROP_LOCATION,
-  PROP_TIME,
-  PROP_TIMEZONE,
-
-  N_PROPS
-};
-
-/* This function returns the current time in the clock's timezone.
- * Note that this returns a new object every time, so we need to
- * remember to unref it after use. */
-static GDateTime *
-gtk_clock_get_time (GtkClock *clock)
-{
-  if (clock->timezone)
-    return g_date_time_new_now (clock->timezone);
-  else
-    return g_date_time_new_now_local ();
-}
-
-/* Here, we implement the functionality required by the GdkPaintable interface.
- * This way we have a trivial way to display an analog clock.
- * It also allows demonstrating how to directly use objects in the listview
- * later by making this object do something interesting. */
-static void
-gtk_clock_snapshot (GdkPaintable *paintable,
-                    GdkSnapshot  *snapshot,
-                    double        width,
-                    double        height)
-{
-  GtkClock *self = GTK_CLOCK (paintable);
-  GDateTime *time;
-  GskRoundedRect outline;
-
-#define BLACK ((GdkRGBA) { 0, 0, 0, 1 })
-
-  /* save/restore() is necessary so we can undo the transforms we start
-   * out with. */
-  gtk_snapshot_save (snapshot);
-
-  /* First, we move the (0, 0) point to the center of the area so
-   * we can draw everything relative to it. */
-  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (width / 2, height / 2));
-  /* Next we scale it, so that we can pretend that the clock is
-   * 100px in size. That way, we don't need to do any complicated
-   * math later.
-   * We use MIN() here so that we use the smaller dimension for sizing.
-   * That way we don't overdraw but keep the aspect ratio. */
-  gtk_snapshot_scale (snapshot, MIN (width, height) / 100.0, MIN (width, height) / 100.0);
-  /* Now we have a circle with diameter 100px (and radius 50px) that
-   * has its (0, 0) point at the center.
-   * Let's draw a simple clock into it. */
-
-  time = gtk_clock_get_time (self);
-
-  /* First, draw a circle. This is a neat little trick to draw a circle
-   * without requiring Cairo. */
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-50, -50, 100, 100), 50);
-  gtk_snapshot_append_border (snapshot,
-                              &outline,
-                              (float[4]) { 4, 4, 4, 4 },
-                              (GdkRGBA [4]) { BLACK, BLACK, BLACK, BLACK });
-
-  /* Next, draw the hour hand.
-   * We do this using tranforms again: Instead of computing where the angle points
-   * to, we just rotate everything and then draw the hand as if if was :00.
-   * We don't even need to care about am/pm here because rotations just work. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 30 * g_date_time_get_hour (time) + 0.5 * g_date_time_get_minute (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -23, 4, 25), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* And the same as above for the minute hand. Just make this one longer
-   * so people can tell the hands apart. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_minute (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 45), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* and finally, the second indicator. */
-  gtk_snapshot_save (snapshot);
-  gtk_snapshot_rotate (snapshot, 6 * g_date_time_get_second (time));
-  gsk_rounded_rect_init_from_rect (&outline, &GRAPHENE_RECT_INIT(-2, -43, 4, 10), 2);
-  gtk_snapshot_push_rounded_clip (snapshot, &outline);
-  gtk_snapshot_append_color (snapshot, &BLACK, &outline.bounds);
-  gtk_snapshot_pop (snapshot);
-  gtk_snapshot_restore (snapshot);
-
-  /* And finally, don't forget to restore the initial save() that we did for
-   * the initial transformations. */
-  gtk_snapshot_restore (snapshot);
-
-  g_date_time_unref (time);
-}
-
-/* Our desired size is 100px. That sounds okay for an analog clock */
-static int
-gtk_clock_get_intrinsic_width (GdkPaintable *paintable)
-{
-  return 100;
-}
-
-static int
-gtk_clock_get_intrinsic_height (GdkPaintable *paintable)
-{
-  return 100;
-}
-
-/* Initialize the paintable interface. This way we turn our clock objects
- * into objects that can be drawn.
- * There are more functions to this interface to define desired size,
- * but this is enough.
- */
-static void
-gtk_clock_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_clock_snapshot;
-  iface->get_intrinsic_width = gtk_clock_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_clock_get_intrinsic_height;
-}
-
-/* Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
- */
-G_DEFINE_TYPE_WITH_CODE (GtkClock, gtk_clock, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_clock_paintable_init))
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_clock_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  switch (property_id)
-    {
-    case PROP_LOCATION:
-      g_value_set_string (value, self->location);
-      break;
-
-    case PROP_TIME:
-      g_value_take_boxed (value, gtk_clock_get_time (self));
-      break;
-
-    case PROP_TIMEZONE:
-      g_value_set_boxed (value, self->timezone);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_clock_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  switch (property_id)
-    {
-    case PROP_LOCATION:
-      self->location = g_value_dup_string (value);
-      break;
-
-    case PROP_TIMEZONE:
-      self->timezone = g_value_dup_boxed (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-/* This is the list of all the ticking clocks */
-static GSList *ticking_clocks = NULL;
-/* This is the id of the timeout source that is updating all ticking clocks */
-static guint ticking_clock_id = 0;
-
-/* Every second, this function is called to tell everybody that the
- * clocks are ticking.
- */
-static gboolean
-gtk_clock_tick (gpointer unused)
-{
-  GSList *l;
-
-  for (l = ticking_clocks; l; l = l->next)
-    {
-      GtkClock *clock = l->data;
-
-      /* We will now return a different value for the time porperty,
-       * so notify about that.
-       */
-      g_object_notify_by_pspec (G_OBJECT (clock), properties[PROP_TIME]);
-      /* We will also draw the hands of the clock differently.
-       * So notify about that, too.
-       */
-      gdk_paintable_invalidate_contents (GDK_PAINTABLE (clock));
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-gtk_clock_stop_ticking (GtkClock *self)
-{
-  ticking_clocks = g_slist_remove (ticking_clocks, self);
-
-  /* If no clock is remaining, stop running the tick updates */
-  if (ticking_clocks == NULL && ticking_clock_id != 0)
-    g_clear_handle_id (&ticking_clock_id, g_source_remove);
-}
-
-static void
-gtk_clock_start_ticking (GtkClock *self)
-{
-  /* if no clock is ticking yet, start */
-  if (ticking_clock_id == 0)
-    ticking_clock_id = g_timeout_add_seconds (1, gtk_clock_tick, NULL);
-
-  ticking_clocks = g_slist_prepend (ticking_clocks, self);
-}
-
-static void
-gtk_clock_finalize (GObject *object)
-{
-  GtkClock *self = GTK_CLOCK (object);
-
-  gtk_clock_stop_ticking (self);
-
-  g_free (self->location);
-  g_clear_pointer (&self->timezone, g_time_zone_unref);
-
-  G_OBJECT_CLASS (gtk_clock_parent_class)->finalize (object);
-}
-
-static void
-gtk_clock_class_init (GtkClockClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_clock_get_property;
-  gobject_class->set_property = gtk_clock_set_property;
-  gobject_class->finalize = gtk_clock_finalize;
-
-  properties[PROP_LOCATION] =
-    g_param_spec_string ("location", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_TIME] =
-    g_param_spec_boxed ("time", NULL, NULL, G_TYPE_DATE_TIME, G_PARAM_READABLE);
-  properties[PROP_TIMEZONE] =
-    g_param_spec_boxed ("timezone", NULL, NULL, G_TYPE_TIME_ZONE, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_clock_init (GtkClock *self)
-{
-  gtk_clock_start_ticking (self);
-}
-
-static GtkClock *
-gtk_clock_new (const char *location,
-               GTimeZone  *timezone)
-{
-  GtkClock *result;
-
-  result = g_object_new (GTK_TYPE_CLOCK,
-                         "location", location,
-                         "timezone", timezone,
-                         NULL);
-
-  g_clear_pointer (&timezone, g_time_zone_unref);
-
-  return result;
-}
-
-static GListModel *
-create_clocks_model (void)
-{
-  GListStore *result;
-  GtkClock *clock;
-
-  result = g_list_store_new (GTK_TYPE_CLOCK);
-
-  /* local time */
-  clock = gtk_clock_new ("local", NULL);
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  /* UTC time */
-  clock = gtk_clock_new ("UTC", g_time_zone_new_utc ());
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  /* A bunch of timezones with GTK hackers */
-  clock = gtk_clock_new ("San Francisco", g_time_zone_new ("America/Los_Angeles"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Boston", g_time_zone_new ("America/New_York"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("London", g_time_zone_new ("Europe/London"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Berlin", g_time_zone_new ("Europe/Berlin"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Moscow", g_time_zone_new ("Europe/Moscow"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("New Delhi", g_time_zone_new ("Asia/Kolkata"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-  clock = gtk_clock_new ("Shanghai", g_time_zone_new ("Asia/Shanghai"));
-  g_list_store_append (result, clock);
-  g_object_unref (clock);
-
-  return G_LIST_MODEL (result);
-}
-
-static char *
-convert_time_to_string (GObject   *image,
-                        GDateTime *time,
-                        gpointer   unused)
-{
-  return g_date_time_format (time, "%x\n%X");
-}
-
-/* And this function is the crux for this whole demo.
- * It shows how to use expressions to set up bindings.
- */
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *box, *picture, *location_label, *time_label;
-  GtkExpression *clock_expression, *expression;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  /* First, we create an expression that gets us the clock from the listitem:
-   * 1. Create an expression that gets the list item.
-   * 2. Use that expression's "item" property to get the clock
-   */
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  clock_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  /* Bind the clock's location to a label.
-   * This is easy: We just get the "location" property of the clock.
-   */
-  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
-                                            gtk_expression_ref (clock_expression),
-                                            "location");
-  /* Now create the label and bind the expression to it. */
-  location_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, location_label, "label", location_label);
-  gtk_box_append (GTK_BOX (box), location_label);
-
-
-  /* Here we bind the item itself to a GdkPicture.
-   * This is simply done by using the clock expression itself.
-   */
-  expression = gtk_expression_ref (clock_expression);
-  /* Now create the widget and bind the expression to it. */
-  picture = gtk_picture_new ();
-  gtk_expression_bind (expression, picture, "paintable", picture);
-  gtk_box_append (GTK_BOX (box), picture);
-
-
-  /* And finally, everything comes together.
-   * We create a label for displaying the time as text.
-   * For that, we need to transform the "GDateTime" of the
-   * time property into a string so that the label can display it.
-   */
-  expression = gtk_property_expression_new (GTK_TYPE_CLOCK,
-                                            gtk_expression_ref (clock_expression),
-                                            "time");
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, (GtkExpression *[1]) { expression },
-                                            G_CALLBACK (convert_time_to_string),
-                                            NULL, NULL);
-  /* Now create the label and bind the expression to it. */
-  time_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, time_label, "label", time_label);
-  gtk_box_append (GTK_BOX (box), time_label);
-
-  gtk_expression_unref (clock_expression);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_clocks (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *gridview, *sw;
-      GtkListItemFactory *factory;
-      GListModel *model;
-      GtkNoSelection *selection;
-
-      /* This is the normal window setup code every demo does */
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Clocks");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      /* List widgets go into a scrolled window. Always. */
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_window_set_child (GTK_WINDOW (window), sw);
-
-      /* Create the factory that creates the listitems. Because we
-       * used bindings above during setup, we only need to connect
-       * to the setup signal.
-       * The bindings take care of the bind step.
-       */
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-
-      gridview = gtk_grid_view_new_with_factory (factory);
-      gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-      gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-
-      model = create_clocks_model ();
-      selection = gtk_no_selection_new (model);
-      gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), G_LIST_MODEL (selection));
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
-      g_object_unref (selection);
-      g_object_unref (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,593 +0,0 @@
-/* Lists/Colors
- *
- * This demo displays a list of named colors.
- *
- * It is using a GtkGridView, and shows how to display
- * and sort the data in various ways. The controls for
- * this are implemented using GtkDropDown.
- *
- * The dataset used here has 9283 items.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_COLOR (gtk_color_get_type ())
-G_DECLARE_FINAL_TYPE (GtkColor, gtk_color, GTK, COLOR, GObject)
-
-/* This is our object. It's just a color */
-typedef struct _GtkColor GtkColor;
-struct _GtkColor
-{
-  GObject parent_instance;
-
-  char *name;
-  GdkRGBA *color;
-  int h, s, v;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_COLOR,
-  PROP_RED,
-  PROP_GREEN,
-  PROP_BLUE,
-  PROP_HUE,
-  PROP_SATURATION,
-  PROP_VALUE,
-
-  N_PROPS
-};
-
-static void
-gtk_color_snapshot (GdkPaintable *paintable,
-                    GdkSnapshot  *snapshot,
-                    double        width,
-                    double        height)
-{
-  GtkColor *self = GTK_COLOR (paintable);
-
-  gtk_snapshot_append_color (snapshot, self->color, &GRAPHENE_RECT_INIT (0, 0, width, height));
-}
-
-static int
-gtk_color_get_intrinsic_width (GdkPaintable *paintable)
-{
-  return 32;
-}
-
-static int
-gtk_color_get_intrinsic_height (GdkPaintable *paintable)
-{
-  return 32;
-}
-
-static void
-gtk_color_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_color_snapshot;
-  iface->get_intrinsic_width = gtk_color_get_intrinsic_width;
-  iface->get_intrinsic_height = gtk_color_get_intrinsic_height;
-}
-
-/*
- * Finally, we define the type. The important part is adding the paintable
- * interface, so GTK knows that this object can indeed be drawm.
- */
-G_DEFINE_TYPE_WITH_CODE (GtkColor, gtk_color, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_color_paintable_init))
-
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_color_get_property (GObject    *object,
-                        guint       property_id,
-                        GValue     *value,
-                        GParamSpec *pspec)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_COLOR:
-      g_value_set_boxed (value, self->color);
-      break;
-
-    case PROP_RED:
-      g_value_set_float (value, self->color->red);
-      break;
-
-    case PROP_GREEN:
-      g_value_set_float (value, self->color->green);
-      break;
-
-    case PROP_BLUE:
-      g_value_set_float (value, self->color->blue);
-      break;
-
-    case PROP_HUE:
-      g_value_set_int (value, self->h);
-      break;
-
-    case PROP_SATURATION:
-      g_value_set_int (value, self->s);
-      break;
-
-    case PROP_VALUE:
-      g_value_set_int (value, self->v);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_set_property (GObject      *object,
-                        guint         property_id,
-                        const GValue *value,
-                        GParamSpec   *pspec)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  switch (property_id)
-    {
-    case PROP_NAME:
-      self->name = g_value_dup_string (value);
-      break;
-
-    case PROP_COLOR:
-      self->color = g_value_dup_boxed (value);
-      break;
-
-    case PROP_HUE:
-      self->h = g_value_get_int (value);
-      break;
-
-    case PROP_SATURATION:
-      self->s = g_value_get_int (value);
-      break;
-
-    case PROP_VALUE:
-      self->v = g_value_get_int (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-gtk_color_finalize (GObject *object)
-{
-  GtkColor *self = GTK_COLOR (object);
-
-  g_free (self->name);
-  g_clear_pointer (&self->color, gdk_rgba_free);
-
-  G_OBJECT_CLASS (gtk_color_parent_class)->finalize (object);
-}
-
-static void
-gtk_color_class_init (GtkColorClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_color_get_property;
-  gobject_class->set_property = gtk_color_set_property;
-  gobject_class->finalize = gtk_color_finalize;
-
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_COLOR] =
-    g_param_spec_boxed ("color", NULL, NULL, GDK_TYPE_RGBA, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_RED] =
-    g_param_spec_float ("red", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_GREEN] =
-    g_param_spec_float ("green", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_BLUE] =
-    g_param_spec_float ("blue", NULL, NULL, 0, 1, 0, G_PARAM_READABLE);
-  properties[PROP_HUE] =
-    g_param_spec_int ("hue", NULL, NULL, 0, 360, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_SATURATION] =
-    g_param_spec_int ("saturation", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-  properties[PROP_VALUE] =
-    g_param_spec_int ("value", NULL, NULL, 0, 100, 0, G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-gtk_color_init (GtkColor *self)
-{
-}
-
-static GtkColor *
-gtk_color_new (const char *name,
-               float r, float g, float b,
-               int h, int s, int v)
-{
-  GtkColor *result;
-  GdkRGBA color = { r, g, b, 1.0 };
-
-  result = g_object_new (GTK_TYPE_COLOR,
-                         "name", name,
-                         "color", &color,
-                         "hue", h,
-                         "saturation", s,
-                         "value", v,
-                         NULL);
-
-  return result;
-}
-
-static GListModel *
-create_colors_model (void)
-{
-  GListStore *result;
-  GtkColor *color;
-  GBytes *data;
-  char **lines;
-  guint i;
-
-  result = g_list_store_new (GTK_TYPE_COLOR);
-  data = g_resources_lookup_data ("/listview_colors/color.names.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  for (i = 0; lines[i]; i++)
-    {
-      const char *name;
-      char **fields;
-      int red, green, blue;
-      int h, s, v;
-
-      if (lines[i][0] == '#' || lines[i][0] == '\0')
-        continue;
-
-      fields = g_strsplit (lines[i], " ", 0);
-      name = fields[1];
-      red = atoi (fields[3]);
-      green = atoi (fields[4]);
-      blue = atoi (fields[5]);
-      h = atoi (fields[9]);
-      s = atoi (fields[10]);
-      v = atoi (fields[11]);
- 
-      color = gtk_color_new (name, red / 255., green / 255., blue / 255., h, s, v);
-      g_list_store_append (result, color);
-      g_object_unref (color);
-
-      g_strfreev (fields);
-    }
-  g_strfreev (lines);
-
-  g_bytes_unref (data);
-
-  return G_LIST_MODEL (result);
-}
-
-static char *
-get_rgb_markup (gpointer this,
-                GtkColor *color)
-{
-  if (!color)
-    return NULL;
-
-  return g_strdup_printf ("<b>R:</b> %d <b>G:</b> %d <b>B:</b> %d",
-                          (int)(color->color->red * 255), 
-                          (int)(color->color->green * 255),
-                          (int)(color->color->blue * 255));
-}
-
-static char *
-get_hsv_markup (gpointer this,
-                GtkColor *color)
-{
-  if (!color)
-    return NULL;
-
-  return g_strdup_printf ("<b>H:</b> %d <b>S:</b> %d <b>V:</b> %d",
-                          color->h, 
-                          color->s,
-                          color->v);
-}
-
-static void
-setup_simple_listitem_cb (GtkListItemFactory *factory,
-                          GtkListItem        *list_item)
-{
-  GtkWidget *picture;
-  GtkExpression *color_expression, *expression;
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  picture = gtk_picture_new ();
-  gtk_widget_set_size_request (picture, 32, 32);
-  gtk_expression_bind (color_expression, picture, "paintable", NULL);
-
-  gtk_list_item_set_child (list_item, picture);
-}
-
-static void
-setup_listitem_cb (GtkListItemFactory *factory,
-                   GtkListItem        *list_item)
-{
-  GtkWidget *box, *picture, *name_label, *rgb_label, *hsv_label;;
-  GtkExpression *color_expression, *expression;
-  GtkExpression *params[1];
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  expression = gtk_constant_expression_new (GTK_TYPE_LIST_ITEM, list_item);
-  color_expression = gtk_property_expression_new (GTK_TYPE_LIST_ITEM, expression, "item");
-
-  expression = gtk_property_expression_new (GTK_TYPE_COLOR,
-                                            gtk_expression_ref (color_expression),
-                                            "name");
-  name_label = gtk_label_new (NULL);
-  gtk_expression_bind (expression, name_label, "label", NULL);
-  gtk_box_append (GTK_BOX (box), name_label);
-
-  expression = gtk_expression_ref (color_expression);
-  picture = gtk_picture_new ();
-  gtk_expression_bind (expression, picture, "paintable", NULL);
-  gtk_box_append (GTK_BOX (box), picture);
-
-  params[0] = gtk_expression_ref (color_expression);
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, params,
-                                            (GCallback)get_rgb_markup,
-                                            NULL, NULL);
-
-  rgb_label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (rgb_label), TRUE);
-  gtk_expression_bind (expression, rgb_label, "label", NULL);
-  gtk_box_append (GTK_BOX (box), rgb_label);
-
-  params[0] = gtk_expression_ref (color_expression);
-  expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                            NULL,
-                                            1, params,
-                                            (GCallback)get_hsv_markup,
-                                            NULL, NULL);
-
-  hsv_label = gtk_label_new (NULL);
-  gtk_label_set_use_markup (GTK_LABEL (hsv_label), TRUE);
-  gtk_expression_bind (expression, hsv_label, "label", NULL);
-  gtk_box_append (GTK_BOX (box), hsv_label);
-
-  gtk_expression_unref (color_expression);
-}
-
-static void
-set_title (gpointer    item,
-           const char *title)
-{
-  g_object_set_data (G_OBJECT (item), "title", (gpointer)title);
-}
-
-static char *
-get_title (gpointer item)
-{
-  return g_strdup ((char *)g_object_get_data (G_OBJECT (item), "title"));
-}
-
-static gboolean
-set_item (GBinding *binding,
-          const GValue *from,
-          GValue *to,
-          gpointer data)
-{
-  GObject *source = g_binding_get_source (binding);
-  GListModel *model;
-  guint selected;
-  gpointer item;
-
-  selected = g_value_get_uint (from);
-
-  model = gtk_drop_down_get_model (GTK_DROP_DOWN (source));
-  item = g_list_model_get_item (model, selected);
-
-  g_value_set_object (to, item);
-
-  g_clear_object (&item);
-
-  return TRUE;
-}
-
-GtkWidget *
-create_color_grid (void)
-{
-  GtkWidget *gridview;
-  GtkListItemFactory *factory;
-  GListModel *model, *selection;
-
-  gridview = gtk_grid_view_new ();
-  gtk_scrollable_set_hscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-  gtk_scrollable_set_vscroll_policy (GTK_SCROLLABLE (gridview), GTK_SCROLL_NATURAL);
-
-  factory = gtk_signal_list_item_factory_new ();
-  g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
-  gtk_grid_view_set_factory (GTK_GRID_VIEW (gridview), factory);
-  g_object_unref (factory);
- 
-  gtk_grid_view_set_max_columns (GTK_GRID_VIEW (gridview), 24);
-  gtk_grid_view_set_enable_rubberband (GTK_GRID_VIEW (gridview), TRUE);
-
-  model = G_LIST_MODEL (gtk_sort_list_model_new (create_colors_model (), NULL));
-  selection = G_LIST_MODEL (gtk_multi_selection_new (model));
-  gtk_grid_view_set_model (GTK_GRID_VIEW (gridview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
-
-  return gridview;
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_colors (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *header, *gridview, *sw, *box, *dropdown;
-      GtkListItemFactory *factory;
-      GListStore *factories;
-      GListModel *model;
-
-      GtkSorter *sorter;
-      GtkSorter *multi_sorter;
-      GListStore *sorters;
-      GtkExpression *expression;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Colors");
-      header = gtk_header_bar_new ();
-      gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-      gtk_window_set_titlebar (GTK_WINDOW (window), header);
-
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer*)&window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_window_set_child (GTK_WINDOW (window), sw);
-
-      gridview = create_color_grid ();
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), gridview);
-      model = gtk_grid_view_get_model (GTK_GRID_VIEW (gridview));
-      g_object_get (model, "model", &model, NULL);
-
-      sorters = g_list_store_new (GTK_TYPE_SORTER);
-
-      sorter = gtk_string_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "name"));
-      set_title (sorter, "Name");
-      g_list_store_append (sorters, sorter);
-      g_object_unref (sorter);
-
-      multi_sorter = gtk_multi_sorter_new ();
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "red"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Red");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "green"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Green");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "blue"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Blue");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      set_title (multi_sorter, "RGB");
-      g_list_store_append (sorters, multi_sorter);
-      g_object_unref (multi_sorter);
-
-      multi_sorter = gtk_multi_sorter_new ();
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "hue"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Hue");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "saturation"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Saturation");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      sorter = gtk_numeric_sorter_new (gtk_property_expression_new (GTK_TYPE_COLOR, NULL, "value"));
-      gtk_numeric_sorter_set_sort_order (GTK_NUMERIC_SORTER (sorter), GTK_SORT_DESCENDING);
-      set_title (sorter, "Value");
-      g_list_store_append (sorters, sorter);
-      gtk_multi_sorter_append (GTK_MULTI_SORTER (multi_sorter), sorter);
-
-      set_title (multi_sorter, "HSV");
-      g_list_store_append (sorters, multi_sorter);
-      g_object_unref (multi_sorter);
-
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (box), gtk_label_new ("Sort by:"));
-      gtk_box_append (GTK_BOX (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                                NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (sorters));
-      g_object_unref (sorters);
-
-      g_object_bind_property_full (dropdown, "selected",
-                                   model, "sorter",
-                                   G_BINDING_SYNC_CREATE,
-                                   set_item, NULL,
-                                   NULL, NULL);
-
-      factories = g_list_store_new (GTK_TYPE_LIST_ITEM_FACTORY);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_simple_listitem_cb), NULL);
-      set_title (factory, "Colors");
-      g_list_store_append (factories, factory);
-
-      factory = gtk_signal_list_item_factory_new ();
-      g_signal_connect (factory, "setup", G_CALLBACK (setup_listitem_cb), NULL);
-      set_title (factory, "Everything");
-      g_list_store_append (factories, factory);
-
-      dropdown = gtk_drop_down_new ();
-      box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_append (GTK_BOX (box), gtk_label_new ("Show:"));
-      gtk_box_append (GTK_BOX (box), dropdown);
-      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), box);
-
-      expression = gtk_cclosure_expression_new (G_TYPE_STRING,
-                                                NULL,
-                                                0, NULL,
-                                                (GCallback)get_title,
-                                                NULL, NULL);
-      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown), expression);
-      gtk_expression_unref (expression);
-
-      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown), G_LIST_MODEL (factories));
-      g_object_unref (factories);
-
-      g_object_bind_property_full (dropdown, "selected",
-                                   gridview, "factory",
-                                   G_BINDING_SYNC_CREATE,
-                                   set_item, NULL,
-                                   NULL, NULL);
-      g_object_unref (model);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,255 +0,0 @@
-/* Lists/File browser
- *
- * This demo shows off the different layouts that are quickly achievable
- * with GtkListview and GtkGridView by implementing a file browser with
- * different views.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-static GtkWidget *window = NULL;
-
-/* Create a simple object that holds the data for the different views */
-typedef struct _FileBrowserView FileBrowserView;
-struct _FileBrowserView
-{
-  GObject parent_instance;
-
-  GtkListItemFactory *factory;
-  char *icon_name;
-  GtkOrientation orientation;
-};
-
-enum {
-  PROP_0,
-  PROP_FACTORY,
-  PROP_ICON_NAME,
-  PROP_ORIENTATION,
-
-  N_PROPS
-};
-
-#define FILE_BROWSER_TYPE_VIEW (file_browser_view_get_type ())
-G_DECLARE_FINAL_TYPE (FileBrowserView, file_browser_view, FILE_BROWSER, VIEW, GObject);
-
-G_DEFINE_TYPE (FileBrowserView, file_browser_view, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-file_browser_view_get_property (GObject    *object,
-                                guint       property_id,
-                                GValue     *value,
-                                GParamSpec *pspec)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  switch (property_id)
-    {
-    case PROP_FACTORY:
-      g_value_set_object (value, self->factory);
-      break;
-
-    case PROP_ICON_NAME:
-      g_value_set_string (value, self->icon_name);
-      break;
-
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, self->orientation);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-file_browser_view_set_property (GObject      *object,
-                                guint         prop_id,
-                                const GValue *value,
-                                GParamSpec   *pspec)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  switch (prop_id)
-    {
-    case PROP_FACTORY:
-      g_set_object (&self->factory, g_value_get_object (value));
-      break;
-
-    case PROP_ICON_NAME:
-      g_free (self->icon_name);
-      self->icon_name = g_value_dup_string (value);
-      break;
-
-    case PROP_ORIENTATION:
-      self->orientation = g_value_get_enum (value);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-file_browser_view_finalize (GObject *object)
-{
-  FileBrowserView *self = FILE_BROWSER_VIEW (object);
-
-  g_object_unref (self->factory);
-  g_free (self->icon_name);
-
-  G_OBJECT_CLASS (file_browser_view_parent_class)->dispose (object);
-}
-
-static void
-file_browser_view_class_init (FileBrowserViewClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = file_browser_view_get_property;
-  gobject_class->set_property = file_browser_view_set_property;
-  gobject_class->finalize = file_browser_view_finalize;
-
-  properties[PROP_FACTORY] =
-    g_param_spec_object ("factory",
-                         "factory",
-                         "factory to use in the main view",
-                         GTK_TYPE_LIST_ITEM_FACTORY,
-                         G_PARAM_READWRITE);
-  properties[PROP_ICON_NAME] =
-    g_param_spec_string ("icon-name",
-                         "icon name",
-                         "icon to display for selecting this view",
-                         NULL,
-                         G_PARAM_READWRITE);
-  properties[PROP_ORIENTATION] =
-    g_param_spec_enum ("orientation",
-                       "orientation",
-                       "orientation of the view",
-                       GTK_TYPE_ORIENTATION,
-                       GTK_ORIENTATION_VERTICAL,
-                       G_PARAM_READWRITE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void file_browser_view_init (FileBrowserView *self)
-{
-}
-
-char *
-filebrowser_get_display_name (GObject *object,
-                              GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_strdup (g_file_info_get_attribute_string (info, "standard::display-name"));
-}
-
-char *
-filebrowser_get_content_type (GObject *object,
-                              GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_strdup (g_file_info_get_attribute_string (info, "standard::content-type"));
-}
-
-char *
-filebrowser_get_size (GObject *object,
-                      GFileInfo *info)
-{
-  if (!info)
-    return NULL;
-
-  return g_format_size (g_file_info_get_attribute_uint64 (info, "standard::size"));
-}
-
-GIcon *
-filebrowser_get_icon (GObject *object,
-                      GFileInfo *info)
-{
-  GIcon *icon;
-
-  if (info)
-    icon = G_ICON (g_file_info_get_attribute_object (info, "standard::icon"));
-  else
-    icon = NULL;
-
-  if (icon)
-    g_object_ref (icon);
-
-  return icon;
-}
-
-void
-filebrowser_up_clicked_cb (GtkButton        *button,
-                           GtkDirectoryList *list)
-{
-  GFile *file;
-
-  file = g_file_get_parent (gtk_directory_list_get_file (list));
-  if (file == NULL)
-    return;
-
-  gtk_directory_list_set_file (list, file);
-}
-
-void
-filebrowser_view_activated_cb (GtkGridView      *view,
-                               guint             pos,
-                               GtkDirectoryList *list)
-{
-  GFileInfo *info;
-
-  info = g_list_model_get_item (gtk_grid_view_get_model (view), pos);
-  if (g_file_info_get_file_type (info) == G_FILE_TYPE_DIRECTORY)
-    gtk_directory_list_set_file (list, G_FILE (g_file_info_get_attribute_object (info, "standard::file")));
-
-  g_object_unref (info);
-}
-
-GtkWidget *
-do_listview_filebrowser (GtkWidget *do_widget)
-{
-  if (!window)
-    {
-      GtkWidget *view;
-      GtkBuilder *builder;
-      GtkDirectoryList *dirlist;
-      GFile *file;
-      char *cwd;
-
-      builder = gtk_builder_new_from_resource ("/listview_filebrowser/listview_filebrowser.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      /* Create the model and fill it with the contents of the current directory */
-      cwd = g_get_current_dir ();
-      file = g_file_new_for_path (cwd);
-      g_free (cwd);
-      dirlist = GTK_DIRECTORY_LIST (gtk_builder_get_object (builder, "dirlist"));
-      gtk_directory_list_set_file (dirlist, file);
-      g_object_unref (file);
-
-      /* grab focus in the view */
-      view = GTK_WIDGET (gtk_builder_get_object (builder, "view"));
-      gtk_widget_grab_focus (view);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,240 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GListStore" id="viewlist">
-    <property name="item-type">FileBrowserView</property>
-    <child>
-      <object class="FileBrowserView">
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkImage">
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="halign">start</property>
-            <binding name="label">
-              <closure type="gchararray" function="filebrowser_get_display_name">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="icon-name">view-list-symbolic</property>
-        <property name="orientation">horizontal</property>
-      </object>
-    </child>
-    <child>
-      <object class="FileBrowserView">
-        <property name="icon-name">view-grid-symbolic</property>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <property name="orientation">vertical</property>
-        <child>
-          <object class="GtkImage">
-            <property name="icon-size">large</property>
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkLabel">
-            <property name="wrap">1</property>
-            <property name="wrap-mode">word-char</property>
-            <property name="lines">2</property>
-            <property name="ellipsize">end</property>
-            <property name="width-chars">10</property>
-            <property name="max-width-chars">30</property>
-            <binding name="label">
-              <closure type="gchararray" function="filebrowser_get_display_name">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="orientation">vertical</property>
-      </object>
-    </child>
-    <child>
-      <object class="FileBrowserView">
-        <property name="icon-name">view-paged-symbolic</property>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkBox">
-        <child>
-          <object class="GtkImage">
-            <property name="icon-size">large</property>
-            <binding name="gicon">
-              <closure type="GIcon" function="filebrowser_get_icon">
-                <lookup name="item">GtkListItem</lookup>
-              </closure>
-            </binding>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_display_name">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_size">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-            <child>
-              <object class="GtkLabel">
-                <property name="halign">start</property>
-                <binding name="label">
-                  <closure type="gchararray" function="filebrowser_get_content_type">
-                    <lookup name="item">GtkListItem</lookup>
-                  </closure>
-                </binding>
-                <style>
-                  <class name="dim-label"/>
-                </style>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </property>
-  </template>
-</interface>
-            ]]></property>
-          </object>
-        </property>
-        <property name="orientation">horizontal</property>
-      </object>
-    </child>
-  </object>
-  <object class="GtkDirectoryList" id="dirlist">
-    <property name="attributes">standard::name,standard::display-name,standard::icon,standard::size,standard::content-type</property>
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">File browser</property>
-    <property name="default-width">600</property>
-    <property name="default-height">400</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkButton">
-            <property name="icon-name">go-up</property>
-            <signal name="clicked" handler="filebrowser_up_clicked_cb" object="dirlist" swapped="no"/>
-          </object>
-        </child>
-        <child type="end">
-          <object class="GtkListView">
-            <property name="valign">center</property>
-            <property name="orientation">horizontal</property>
-            <style>
-              <class name="linked"/>
-            </style>
-            <property name="model">
-              <object class="GtkSingleSelection" id="selected-view">
-                <property name="model">viewlist</property>
-              </object>
-            </property>
-            <property name="factory">
-              <object class="GtkBuilderListItemFactory">
-                <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkImage">
-        <binding name="icon-name">
-          <lookup type="FileBrowserView" name="icon-name">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                ]]></property>
-              </object>
-            </property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkScrolledWindow">
-        <property name="can-focus">1</property>
-        <child>
-          <object class="GtkGridView" id="view">
-            <property name="model">dirlist</property>
-            <property name="max-columns">15</property>
-            <binding name="factory">
-              <lookup name="factory" type="FileBrowserView">
-                <lookup name="selected-item">selected-view</lookup>
-              </lookup>
-            </binding>
-            <binding name="orientation">
-              <lookup name="orientation" type="FileBrowserView">
-                <lookup name="selected-item">selected-view</lookup>
-              </lookup>
-            </binding>
-            <signal name="activate" handler="filebrowser_view_activated_cb" object="dirlist" swapped="no"/>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,472 +0,0 @@
-/* Lists/Minesweeper
- *
- * This demo shows how to develop a user interface for small game using a
- * gridview.
- *
- * It demonstrates how to use the activate signal and single-press behavior
- * to implement rather different interaction behavior to a typical list.
- */
-
-#include <glib/gi18n.h>
-#include <gtk/gtk.h>
-
-/*** The cell object ***/
-
-/* Create an object that holds the data for a cell in the game */
-typedef struct _SweeperCell SweeperCell;
-struct _SweeperCell
-{
-  GObject parent_instance;
-
-  gboolean is_mine;
-  gboolean is_visible;
-  guint neighbor_mines;
-};
-
-enum {
-  CELL_PROP_0,
-  CELL_PROP_LABEL,
-
-  N_CELL_PROPS
-};
-
-#define SWEEPER_TYPE_CELL (sweeper_cell_get_type ())
-G_DECLARE_FINAL_TYPE (SweeperCell, sweeper_cell, SWEEPER, CELL, GObject);
-
-G_DEFINE_TYPE (SweeperCell, sweeper_cell, G_TYPE_OBJECT);
-static GParamSpec *cell_properties[N_CELL_PROPS] = { NULL, };
-
-static const char *
-sweeper_cell_get_label (SweeperCell *self)
-{
-  static const char *minecount_labels[10] = { "", "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-  if (!self->is_visible)
-    return "?";
-  
-  if (self->is_mine)
-    return "💣";
-
-  return minecount_labels[self->neighbor_mines];
-}
-
-static void
-sweeper_cell_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SweeperCell *self = SWEEPER_CELL (object);
-
-  switch (property_id)
-    {
-    case CELL_PROP_LABEL:
-      g_value_set_string (value, sweeper_cell_get_label (self));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-sweeper_cell_class_init (SweeperCellClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = sweeper_cell_get_property;
-
-  cell_properties[CELL_PROP_LABEL] =
-    g_param_spec_string ("label",
-                         "label",
-                         "label to display for this row",
-                         NULL,
-                         G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_CELL_PROPS, cell_properties);
-}
-
-static void
-sweeper_cell_init (SweeperCell *self)
-{
-}
-
-static void
-sweeper_cell_reveal (SweeperCell *self)
-{
-  if (self->is_visible)
-    return;
-
-  self->is_visible = TRUE;
-
-  g_object_notify_by_pspec (G_OBJECT (self), cell_properties[CELL_PROP_LABEL]);
-}
-
-static SweeperCell *
-sweeper_cell_new (void)
-{
-  return g_object_new (SWEEPER_TYPE_CELL, NULL);
-}
-
-/*** The board object ***/
-
-/* Create an object that holds the data for the game */
-typedef struct _SweeperGame SweeperGame;
-struct _SweeperGame
-{
-  GObject parent_instance;
-
-  GPtrArray *cells;
-  guint width;
-  guint height;
-  gboolean playing;
-  gboolean win;
-};
-
-enum {
-  GAME_PROP_0,
-  GAME_PROP_HEIGHT,
-  GAME_PROP_PLAYING,
-  GAME_PROP_WIDTH,
-  GAME_PROP_WIN,
-
-  N_GAME_PROPS
-};
-
-#define SWEEPER_TYPE_GAME (sweeper_game_get_type ())
-G_DECLARE_FINAL_TYPE (SweeperGame, sweeper_game, SWEEPER, GAME, GObject);
-
-static GType
-sweeper_game_list_model_get_item_type (GListModel *model)
-{
-  return SWEEPER_TYPE_GAME;
-}
-
-static guint
-sweeper_game_list_model_get_n_items (GListModel *model)
-{
-  SweeperGame *self = SWEEPER_GAME (model);
-
-  return self->width * self->height;
-}
-
-static gpointer
-sweeper_game_list_model_get_item (GListModel *model,
-                                  guint       position)
-{
-  SweeperGame *self = SWEEPER_GAME (model);
-
-  return g_object_ref (g_ptr_array_index (self->cells, position));
-}
-
-static void
-sweeper_game_list_model_init (GListModelInterface *iface)
-{
-  iface->get_item_type = sweeper_game_list_model_get_item_type;
-  iface->get_n_items = sweeper_game_list_model_get_n_items;
-  iface->get_item = sweeper_game_list_model_get_item;
-}
-
-G_DEFINE_TYPE_WITH_CODE (SweeperGame, sweeper_game, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (G_TYPE_LIST_MODEL, sweeper_game_list_model_init))
-
-static GParamSpec *game_properties[N_GAME_PROPS] = { NULL, };
-
-static void
-sweeper_game_dispose (GObject *object)
-{
-  SweeperGame *self = SWEEPER_GAME (object);
-
-  g_clear_pointer (&self->cells, g_ptr_array_unref);
-
-  G_OBJECT_CLASS (sweeper_game_parent_class)->dispose (object);
-}
-
-static void
-sweeper_game_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SweeperGame *self = SWEEPER_GAME (object);
-
-  switch (property_id)
-    {
-    case GAME_PROP_HEIGHT:
-      g_value_set_uint (value, self->height);
-      break;
-
-    case GAME_PROP_PLAYING:
-      g_value_set_boolean (value, self->playing);
-      break;
-
-    case GAME_PROP_WIDTH:
-      g_value_set_uint (value, self->width);
-      break;
-
-    case GAME_PROP_WIN:
-      g_value_set_boolean (value, self->win);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-sweeper_game_class_init (SweeperGameClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->dispose = sweeper_game_dispose;
-  gobject_class->get_property = sweeper_game_get_property;
-
-  game_properties[GAME_PROP_HEIGHT] =
-    g_param_spec_uint ("height",
-                       "height",
-                       "height of the game grid",
-                       1, G_MAXUINT, 8,
-                       G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_PLAYING] =
-    g_param_spec_boolean ("playing",
-                          "playing",
-                          "if the game is still going on",
-                          FALSE,
-                          G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_WIDTH] =
-    g_param_spec_uint ("width",
-                       "width",
-                       "width of the game grid",
-                       1, G_MAXUINT, 8,
-                       G_PARAM_READABLE);
-
-  game_properties[GAME_PROP_WIN] =
-    g_param_spec_boolean ("win",
-                          "win",
-                          "if the game was won",
-                          FALSE,
-                          G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_GAME_PROPS, game_properties);
-}
-
-static void
-sweeper_game_reset_board (SweeperGame *self,
-                          guint        width,
-                          guint        height)
-{
-  guint i;
-
-  g_ptr_array_set_size (self->cells, 0);
-
-  for (i = 0; i < width * height; i++)
-    {
-      g_ptr_array_add (self->cells, sweeper_cell_new ());
-    }
-
-  if (self->width != width)
-    {
-      self->width = width;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIDTH]);
-    }
-  if (self->height != height)
-    {
-      self->height = height;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_HEIGHT]);
-    }
-  if (!self->playing)
-    {
-      self->playing = TRUE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-    }
-  if (self->win)
-    {
-      self->win = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
-    }
-}
-
-static void
-sweeper_game_place_mines (SweeperGame *self,
-                          guint        n_mines)
-{
-  guint i;
-
-  for (i = 0; i < n_mines; i++)
-    {
-      SweeperCell *cell;
-
-      do {
-        cell = g_ptr_array_index (self->cells, g_random_int_range (0, self->cells->len));
-      } while (cell->is_mine);
-
-      cell->is_mine = TRUE;
-    }
-}
-
-static SweeperCell *
-get_cell (SweeperGame *self,
-          guint        x,
-          guint        y)
-{
-  return g_ptr_array_index (self->cells, y * self->width + x);
-}
-
-static void
-sweeper_game_count_neighbor_mines (SweeperGame *self,
-                                   guint        width,
-                                   guint        height)
-{
-  guint x, y, x2, y2;
-
-  for (y = 0; y < height; y++)
-    {
-      for (x = 0; x < width; x++)
-        {
-          SweeperCell *cell = get_cell (self, x, y);
-
-          for (y2 = MAX (1, y) - 1; y2 < MIN (height, y + 2); y2++)
-            {
-              for (x2 = MAX (1, x) - 1; x2 < MIN (width, x + 2); x2++)
-                {
-                  SweeperCell *other = get_cell (self, x2, y2);
-
-                  if (other->is_mine)
-                    cell->neighbor_mines++;
-                }
-            }
-        }
-    }
-}
-
-static void
-sweeper_game_new_game (SweeperGame *self,
-                       guint        width,
-                       guint        height,
-                       guint        n_mines)
-{
-  guint n_items_before;
-
-  g_return_if_fail (n_mines <= width * height);
-
-  n_items_before = self->width * self->height;
-
-  g_object_freeze_notify (G_OBJECT (self));
-
-  sweeper_game_reset_board (self, width, height);
-  sweeper_game_place_mines (self, n_mines);
-  sweeper_game_count_neighbor_mines (self, width, height);
-
-  g_list_model_items_changed (G_LIST_MODEL (self), 0, n_items_before, width * height);
-
-  g_object_thaw_notify (G_OBJECT (self));
-}
-
-static void
-sweeper_game_init (SweeperGame *self)
-{
-  self->cells = g_ptr_array_new_with_free_func (g_object_unref);
-
-  sweeper_game_new_game (self, 8, 8, 10);
-}
-
-static void
-sweeper_game_end (SweeperGame *self,
-                  gboolean     win)
-{
-  if (self->playing)
-    {
-      self->playing = FALSE;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_PLAYING]);
-    }
-  if (self->win != win)
-    {
-      self->win = win;
-      g_object_notify_by_pspec (G_OBJECT (self), game_properties[GAME_PROP_WIN]);
-    }
-}
-
-static void
-sweeper_game_check_finished (SweeperGame *self)
-{
-  guint i;
-
-  if (!self->playing)
-    return;
-
-  for (i = 0; i < self->cells->len; i++)
-    {
-      SweeperCell *cell = g_ptr_array_index (self->cells, i);
-
-      /* There's still a non-revealed cell that isn't a mine */
-      if (!cell->is_visible && !cell->is_mine)
-        return;
-    }
-
-  sweeper_game_end (self, TRUE);
-}
-
-static void
-sweeper_game_reveal_cell (SweeperGame *self,
-                          guint        position)
-{
-  SweeperCell *cell;
-
-  if (!self->playing)
-    return;
-
-  cell = g_ptr_array_index (self->cells, position);
-  sweeper_cell_reveal (cell);
-
-  if (cell->is_mine)
-    sweeper_game_end (self, FALSE);
-
-  sweeper_game_check_finished (self);
-}
-
-void
-minesweeper_cell_clicked_cb (GtkGridView *gridview,
-                             guint        pos,
-                             SweeperGame *game)
-{
-  sweeper_game_reveal_cell (game, pos);
-}
-
-void
-minesweeper_new_game_cb (GtkButton   *button,
-                         SweeperGame *game)
-{
-  sweeper_game_new_game (game, 8, 8, 10);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_minesweeper (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkBuilder *builder;
-
-      g_type_ensure (SWEEPER_TYPE_GAME);
-
-      builder = gtk_builder_new_from_resource ("/listview_minesweeper/listview_minesweeper.ui");
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      g_object_unref (builder);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="SweeperGame" id="game">
-  </object>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Minesweeper</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar" id="">
-        <property name="show-title-buttons">1</property>
-        <child>
-          <object class="GtkButton">
-            <property name="label">New Game</property>
-            <signal name="clicked" handler="minesweeper_new_game_cb" object="game" swapped="no"/>
-          </object>
-        </child>
-        <child type="title">
-          <object class="GtkImage">
-            <property name="icon-name">trophy-gold</property>
-            <binding name="visible">
-              <lookup name="win">game</lookup>
-            </binding>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkGridView" id="view">
-        <property name="model">
-          <object class="GtkNoSelection">
-            <property name="model">game</property>
-          </object>
-        </property>
-        <property name="single-click-activate">1</property>
-        <binding name="max-columns">
-          <lookup name="width">game</lookup>
-        </binding>
-        <binding name="min-columns">
-          <lookup name="width">game</lookup>
-        </binding>
-        <property name="factory">
-          <object class="GtkBuilderListItemFactory">
-            <property name="resource">/listview_minesweeper/listview_minesweeper_cell.ui</property>
-          </object>
-        </property>
-        <signal name="activate" handler="minesweeper_cell_clicked_cb" object="game" swapped="no"/>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="halign">center</property>
-        <property name="valign">center</property>
-        <binding name="label">
-          <lookup name="label" type="SweeperCell">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
@@ -1,333 +0,0 @@
-/* Lists/Settings
- *
- * This demo shows a settings viewer for GSettings.
- *
- * It demonstrates how to implement support for trees with GtkListView.
- * It also shows how to set up sorting and filtering for columns in a
- * GtkColumnView.
- */
-
-#include <gtk/gtk.h>
-
-/* Create an object that wraps GSettingsSchemaKey because that's a boxed type */
-typedef struct _SettingsKey SettingsKey;
-struct _SettingsKey
-{
-  GObject parent_instance;
-
-  GSettings *settings;
-  GSettingsSchemaKey *key;
-};
-
-enum {
-  PROP_0,
-  PROP_NAME,
-  PROP_SUMMARY,
-  PROP_DESCRIPTION,
-  PROP_VALUE,
-
-  N_PROPS
-};
-
-#define SETTINGS_TYPE_KEY (settings_key_get_type ())
-G_DECLARE_FINAL_TYPE (SettingsKey, settings_key, SETTINGS, KEY, GObject);
-
-G_DEFINE_TYPE (SettingsKey, settings_key, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-settings_key_get_property (GObject    *object,
-                           guint       property_id,
-                           GValue     *value,
-                           GParamSpec *pspec)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  switch (property_id)
-    {
-    case PROP_DESCRIPTION:
-      g_value_set_string (value, g_settings_schema_key_get_description (self->key));
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, g_settings_schema_key_get_name (self->key));
-      break;
-
-    case PROP_SUMMARY:
-      g_value_set_string (value, g_settings_schema_key_get_summary (self->key));
-      break;
-
-    case PROP_VALUE:
-      {
-        GVariant *variant = g_settings_get_value (self->settings, g_settings_schema_key_get_name (self->key));
-        g_value_take_string (value, g_variant_print (variant, FALSE));
-        g_variant_unref (variant);
-      }
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void
-settings_key_finalize (GObject *object)
-{
-  SettingsKey *self = SETTINGS_KEY (object);
-
-  g_object_unref (self->settings);
-  g_settings_schema_key_unref (self->key);
-
-  G_OBJECT_CLASS (settings_key_parent_class)->finalize (object);
-}
-
-static void
-settings_key_class_init (SettingsKeyClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->finalize = settings_key_finalize;
-  gobject_class->get_property = settings_key_get_property;
-
-  properties[PROP_DESCRIPTION] =
-    g_param_spec_string ("description", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_SUMMARY] =
-    g_param_spec_string ("summary", NULL, NULL, NULL, G_PARAM_READABLE);
-  properties[PROP_VALUE] =
-    g_param_spec_string ("value", NULL, NULL, NULL, G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void
-settings_key_init (SettingsKey *self)
-{
-}
-
-static SettingsKey *
-settings_key_new (GSettings          *settings,
-                  GSettingsSchemaKey *key)
-{
-  SettingsKey *result = g_object_new (SETTINGS_TYPE_KEY, NULL);
-
-  result->settings = g_object_ref (settings);
-  result->key = g_settings_schema_key_ref (key);
-
-  return result;
-}
-
-static int
-strvcmp (gconstpointer p1,
-         gconstpointer p2)
-{
-  const char * const *s1 = p1;
-  const char * const *s2 = p2;
-
-  return strcmp (*s1, *s2);
-}
-
-static GtkFilter *current_filter;
-
-static gboolean
-transform_settings_to_keys (GBinding     *binding,
-                            const GValue *from_value,
-                            GValue       *to_value,
-                            gpointer      data)
-{
-  GtkTreeListRow *treelistrow;
-  GSettings *settings;
-  GSettingsSchema *schema;
-  GListStore *store;
-  GtkSortListModel *sort_model;
-  GtkFilterListModel *filter_model;
-  GtkFilter *filter;
-  GtkExpression *expression;
-  char **keys;
-  guint i;
-
-  treelistrow = g_value_get_object (from_value);
-  if (treelistrow == NULL)
-    return TRUE;
-  settings = gtk_tree_list_row_get_item (treelistrow);
-  g_object_get (settings, "settings-schema", &schema, NULL);
-
-  store = g_list_store_new (SETTINGS_TYPE_KEY);
-
-  keys = g_settings_schema_list_keys (schema);
-
-  for (i = 0; keys[i] != NULL; i++)
-    {
-      GSettingsSchemaKey *almost_there = g_settings_schema_get_key (schema, keys[i]);
-      SettingsKey *finally = settings_key_new (settings, almost_there);
-      g_list_store_append (store, finally);
-      g_object_unref (finally);
-      g_settings_schema_key_unref (almost_there);
-    }
-
-  g_strfreev (keys);
-  g_settings_schema_unref (schema);
-  g_object_unref (settings);
-
-  sort_model = gtk_sort_list_model_new (G_LIST_MODEL (store),
-                                        gtk_column_view_get_sorter (GTK_COLUMN_VIEW (data)));
-  g_object_unref (store);
-
-  expression = gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name");
-  filter = gtk_string_filter_new ();
-  gtk_string_filter_set_expression (GTK_STRING_FILTER (filter), expression);
-  filter_model = gtk_filter_list_model_new (G_LIST_MODEL (sort_model), filter);
-  gtk_expression_unref (expression);
-  g_object_unref (sort_model);
-
-  g_set_object (&current_filter, filter);
-
-  g_object_unref (filter);
-
-  g_value_take_object (to_value, filter_model);
-
-  return TRUE;
-}
-
-static GListModel *
-create_settings_model (gpointer item,
-                       gpointer unused)
-{
-  GSettings *settings = item;
-  char **schemas;
-  GListStore *result;
-  guint i;
-
-  if (settings == NULL)
-    {
-      g_settings_schema_source_list_schemas (g_settings_schema_source_get_default (),
-                                             TRUE,
-                                             &schemas,
-                                             NULL);
-    }
-  else
-    {
-      schemas = g_settings_list_children (settings);
-    }
-
-  if (schemas == NULL || schemas[0] == NULL)
-    {
-      g_free (schemas);
-      return NULL;
-    }
-
-  qsort (schemas, g_strv_length (schemas), sizeof (char *), strvcmp);
-
-  result = g_list_store_new (G_TYPE_SETTINGS);
-  for (i = 0;  schemas[i] != NULL; i++)
-    {
-      GSettings *child;
-
-      if (settings == NULL)
-        child = g_settings_new (schemas[i]);
-      else
-        child = g_settings_get_child (settings, schemas[i]);
-
-      g_list_store_append (result, child);
-      g_object_unref (child);
-    }
-
-  g_strfreev (schemas);
-
-  return G_LIST_MODEL (result);
-}
-
-static void
-search_enabled (GtkSearchEntry *entry)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-}
-
-static void
-search_changed (GtkSearchEntry *entry,
-                gpointer data)
-{
-  const char *text = gtk_editable_get_text (GTK_EDITABLE (entry));
-
-  if (current_filter)
-    gtk_string_filter_set_search (GTK_STRING_FILTER (current_filter), text);
-}
-
-static void
-stop_search (GtkSearchEntry *entry,
-             gpointer data)
-{
-  gtk_editable_set_text (GTK_EDITABLE (entry), "");
-
-  if (current_filter)
-    gtk_string_filter_set_search (GTK_STRING_FILTER (current_filter), "");
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-do_listview_settings (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *columnview;
-      GListModel *model;
-      GtkTreeListModel *treemodel;
-      GtkSingleSelection *selection;
-      GtkBuilderScope *scope;
-      GtkBuilder *builder;
-      GtkColumnViewColumn *name_column;
-      GtkSorter *sorter;
-
-      g_type_ensure (SETTINGS_TYPE_KEY);
-
-      scope = gtk_builder_cscope_new ();
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_enabled", (GCallback)search_enabled);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "search_changed", (GCallback)search_changed);
-      gtk_builder_cscope_add_callback_symbol (GTK_BUILDER_CSCOPE (scope), "stop_search", (GCallback)stop_search);
-
-      builder = gtk_builder_new ();
-      gtk_builder_set_scope (builder, scope);
-      gtk_builder_add_from_resource (builder, "/listview_settings/listview_settings.ui", NULL);
-
-      window = GTK_WIDGET (gtk_builder_get_object (builder, "window"));
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      listview = GTK_WIDGET (gtk_builder_get_object (builder, "listview"));
-      columnview = GTK_WIDGET (gtk_builder_get_object (builder, "columnview"));
-      model = create_settings_model (NULL, NULL);
-      treemodel = gtk_tree_list_model_new (FALSE,
-                                           model,
-                                           TRUE,
-                                           create_settings_model,
-                                           NULL,
-                                           NULL);
-      selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
-      g_object_bind_property_full (selection, "selected-item",
-                                   columnview, "model",
-                                   G_BINDING_SYNC_CREATE,
-                                   transform_settings_to_keys,
-                                   NULL,
-                                   columnview, NULL);
-      gtk_list_view_set_model (GTK_LIST_VIEW (listview), G_LIST_MODEL (selection));
-      g_object_unref (selection);
-      g_object_unref (treemodel);
-      g_object_unref (model);
-
-      name_column = GTK_COLUMN_VIEW_COLUMN (gtk_builder_get_object (builder, "name_column"));
-      sorter = gtk_string_sorter_new (gtk_property_expression_new (SETTINGS_TYPE_KEY, NULL, "name"));
-      gtk_column_view_column_set_sorter (name_column, sorter);
-      g_object_unref (sorter);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <object class="GtkWindow" id="window">
-    <property name="title" translatable="yes">Settings</property>
-    <property name="default-width">640</property>
-    <property name="default-height">480</property>
-    <child type="titlebar">
-      <object class="GtkHeaderBar">
-        <property name="show-title-buttons">1</property>
-        <child type="end">
-          <object class="GtkToggleButton" id="search_button">
-            <property name="icon-name">system-search-symbolic</property>
-          </object>
-        </child>
-      </object>
-    </child>
-    <child>
-      <object class="GtkPaned">
-        <property name="position">300</property>
-        <child>
-          <object class="GtkScrolledWindow">
-            <child>
-              <object class="GtkListView" id="listview">
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkTreeExpander" id="expander">
-        <binding name="list-row">
-          <lookup name="item">GtkListItem</lookup>
-        </binding>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="xalign">0</property>
-            <binding name="label">
-              <lookup name="schema" type="GSettings">
-                <lookup name="item">expander</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-</interface>
-                    ]]></property>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="orientation">vertical</property>
-            <child>
-              <object class="GtkSearchBar">
-                <property name="search-mode-enabled" bind-source="search_button" bind-property="active" bind-flags="bidirectional"/>
-                <signal name="notify::search-mode-enabled" handler="search_enabled" object="entry"/>
-                <child>
-                  <object class="GtkSearchEntry" id="entry">
-                    <signal name="search-changed" handler="search_changed"/>
-                    <signal name="stop-search" handler="stop_search"/>
-                  </object>
-                </child>
-              </object>
-            </child>
-            <child>
-              <object class="GtkScrolledWindow">
-                <property name="hexpand">1</property>
-                <property name="vexpand">1</property>
-                <child>
-                  <object class="GtkColumnView" id="columnview">
-                    <child>
-                      <object class="GtkColumnViewColumn" id="name_column">
-                        <property name="title">Name</property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="name" type="SettingsKey">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                        ]]></property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkColumnViewColumn">
-                        <property name="title">Value</property>
-                        <property name="factory">
-                          <object class="GtkBuilderListItemFactory">
-                            <property name="bytes"><![CDATA[
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkLabel">
-        <property name="xalign">0</property>
-        <binding name="label">
-          <lookup name="value" type="SettingsKey">
-            <lookup name="item">GtkListItem</lookup>
-          </lookup>
-        </binding>
-      </object>
-    </property>
-  </template>
-</interface>
-                        ]]></property>
-                          </object>
-                        </property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </object>
-</interface>
@@ -1,326 +0,0 @@
-/* Lists/Weather
- *
- * This demo shows a few of the rarer features of GtkListView and
- * how they can be used to display weather information.
- *
- * The hourly weather info uses a horizontal listview. This is easy
- * to achieve because GtkListView implements the GtkOrientable interface.
- * To make the items in the list stand out more, the listview uses
- * separators.
- *
- * A GtkNoSelectionModel is used to make sure no item in the list can be
- * selected. All other interactions with the items is still possible.
- *
- * The dataset used here has 70000 items.
- */
-
-#include <gtk/gtk.h>
-
-#define GTK_TYPE_WEATHER_INFO (gtk_weather_info_get_type ())
-
-G_DECLARE_FINAL_TYPE (GtkWeatherInfo, gtk_weather_info, GTK, WEATHER_INFO, GObject)
-
-typedef enum {
-  GTK_WEATHER_CLEAR,
-  GTK_WEATHER_FEW_CLOUDS,
-  GTK_WEATHER_FOG,
-  GTK_WEATHER_OVERCAST,
-  GTK_WEATHER_SCATTERED_SHOWERS,
-  GTK_WEATHER_SHOWERS,
-  GTK_WEATHER_SNOW,
-  GTK_WEATHER_STORM
-} GtkWeatherType;
-
-struct _GtkWeatherInfo
-{
-  GObject parent_instance;
-
-  gint64 timestamp;
-  int temperature;
-  GtkWeatherType weather_type;
-};
-
-struct _GtkWeatherInfoClass
-{
-  GObjectClass parent_class;
-};
-
-G_DEFINE_TYPE (GtkWeatherInfo, gtk_weather_info, G_TYPE_OBJECT)
-
-static void
-gtk_weather_info_class_init (GtkWeatherInfoClass *klass)
-{
-}
-
-static void
-gtk_weather_info_init (GtkWeatherInfo *self)
-{
-}
-
-static GtkWeatherInfo *
-gtk_weather_info_new (GDateTime      *timestamp,
-                      GtkWeatherInfo *copy_from)
-{
-  GtkWeatherInfo *result;
-
-  result = g_object_new (GTK_TYPE_WEATHER_INFO, NULL);
-
-  result->timestamp = g_date_time_to_unix (timestamp);
-  if (copy_from)
-    {
-      result->temperature = copy_from->temperature;
-      result->weather_type = copy_from->weather_type;
-      g_object_unref (copy_from);
-    }
-
-  return result;
-}
-
-static GDateTime *
-parse_timestamp (const char *string,
-                 GTimeZone  *timezone)
-{
-  char *with_seconds;
-  GDateTime *result;
-
-  with_seconds = g_strconcat (string, ":00", NULL);
-  result = g_date_time_new_from_iso8601 (with_seconds, timezone);
-  g_free (with_seconds);
-
-  return result;
-}
-
-static GtkWeatherType
-parse_weather_type (const char     *clouds,
-                    const char     *precip,
-                    GtkWeatherType  fallback)
-{
-  if (strstr (precip, "SN"))
-    return GTK_WEATHER_SNOW;
-
-  if (strstr (precip, "TS"))
-    return GTK_WEATHER_STORM;
-
-  if (strstr (precip, "DZ"))
-    return GTK_WEATHER_SCATTERED_SHOWERS;
-
-  if (strstr (precip, "SH") || strstr (precip, "RA"))
-    return GTK_WEATHER_SHOWERS;
-
-  if (strstr (precip, "FG"))
-    return GTK_WEATHER_FOG;
-
-  if (g_str_equal (clouds, "M") ||
-      g_str_equal (clouds, ""))
-    return fallback;
-
-  if (strstr (clouds, "OVC") ||
-      strstr (clouds, "BKN"))
-    return GTK_WEATHER_OVERCAST;
-
-  if (strstr (clouds, "BKN") ||
-      strstr (clouds, "SCT"))
-    return GTK_WEATHER_FEW_CLOUDS;
-
-  if (strstr (clouds, "VV"))
-    return GTK_WEATHER_FOG;
-
-  return GTK_WEATHER_CLEAR;
-}
-
-static double
-parse_temperature (const char *s,
-                   double      fallback)
-{
-  char *endptr;
-  double d;
-
-  d = g_ascii_strtod (s, &endptr);
-  if (*endptr != '\0')
-    return fallback;
-
-  return d;
-}
-
-static GListModel *
-create_weather_model (void)
-{
-  GListStore *store;
-  GTimeZone *utc;
-  GDateTime *timestamp;
-  GtkWeatherInfo *info;
-  GBytes *data;
-  char **lines;
-  guint i;
-
-  store = g_list_store_new (GTK_TYPE_WEATHER_INFO);
-  data = g_resources_lookup_data ("/listview_weather/listview_weather.txt", 0, NULL);
-  lines = g_strsplit (g_bytes_get_data (data, NULL), "\n", 0);
-
-  utc = g_time_zone_new_utc ();
-  timestamp = g_date_time_new (utc, 2011, 1, 1, 0, 0, 0);
-  info = gtk_weather_info_new (timestamp, NULL);
-  g_list_store_append (store, info);
-
-  for (i = 0; lines[i] != NULL && *lines[i]; i++)
-    {
-      char **fields;
-      GDateTime *date;
-
-      fields = g_strsplit (lines[i], ",", 0);
-      date = parse_timestamp (fields[0], utc);
-      while (g_date_time_difference (date, timestamp) > 30 * G_TIME_SPAN_MINUTE)
-        {
-          GDateTime *new_timestamp = g_date_time_add_hours (timestamp, 1);
-          g_date_time_unref (timestamp);
-          timestamp = new_timestamp;
-          info = gtk_weather_info_new (timestamp, info);
-          g_list_store_append (store, info);
-        }
-
-      info->temperature = parse_temperature (fields[1], info->temperature);
-      info->weather_type = parse_weather_type (fields[2], fields[3], info->weather_type);
-      g_date_time_unref (date);
-      g_strfreev (fields);
-    }
-
-  g_strfreev (lines);
-  g_bytes_unref (data);
-  g_time_zone_unref (utc);
-
-  return G_LIST_MODEL (store);
-}
-
-static void
-setup_widget (GtkListItem *list_item,
-              gpointer     unused)
-{
-  GtkWidget *box, *child;
-
-  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_list_item_set_child (list_item, box);
-
-  child = gtk_label_new (NULL);
-  gtk_label_set_width_chars (GTK_LABEL (child), 5);
-  gtk_box_append (GTK_BOX (box), child);
-
-  child = gtk_image_new ();
-  gtk_image_set_icon_size (GTK_IMAGE (child), GTK_ICON_SIZE_LARGE);
-  gtk_box_append (GTK_BOX (box), child);
-
-  child = gtk_label_new (NULL);
-  gtk_widget_set_vexpand (child, TRUE);
-  gtk_widget_set_valign (child, GTK_ALIGN_END);
-  gtk_label_set_width_chars (GTK_LABEL (child), 4);
-  gtk_box_append (GTK_BOX (box), child);
-}
-
-static void
-bind_widget (GtkListItem *list_item,
-             gpointer     unused)
-{
-  GtkWidget *box, *child;
-  GtkWeatherInfo *info;
-  GDateTime *timestamp;
-  char *s;
-
-  box = gtk_list_item_get_child (list_item);
-  info = gtk_list_item_get_item (list_item);
-
-  child = gtk_widget_get_first_child (box);
-  timestamp = g_date_time_new_from_unix_utc (info->timestamp);
-  s = g_date_time_format (timestamp, "%R");
-  gtk_label_set_text (GTK_LABEL (child), s);
-  g_free (s);
-  g_date_time_unref (timestamp);
-
-  child = gtk_widget_get_next_sibling (child);
-  switch (info->weather_type)
-  {
-  case GTK_WEATHER_CLEAR:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-clear-symbolic");
-    break;
-  case GTK_WEATHER_FEW_CLOUDS:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-few-clouds-symbolic");
-    break;
-  case GTK_WEATHER_FOG:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-fog-symbolic");
-    break;
-  case GTK_WEATHER_OVERCAST:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-overcast-symbolic");
-    break;
-  case GTK_WEATHER_SCATTERED_SHOWERS:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-showers-scattered-symbolic");
-    break;
-  case GTK_WEATHER_SHOWERS:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-showers-symbolic");
-    break;
-  case GTK_WEATHER_SNOW:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-snow-symbolic");
-    break;
-  case GTK_WEATHER_STORM:
-    gtk_image_set_from_icon_name (GTK_IMAGE (child), "weather-storm-symbolic");
-    break;
-  default:
-    gtk_image_clear (GTK_IMAGE (child));
-    break;
-  }
-
-
-  child = gtk_widget_get_next_sibling (child);
-  s = g_strdup_printf ("%d°", info->temperature);
-  gtk_label_set_text (GTK_LABEL (child), s);
-  g_free (s);
-}
-
-static GtkWidget *window = NULL;
-
-GtkWidget *
-create_weather_view (void)
-{
-  GtkWidget *listview;
-  GListModel *model, *selection;
-
-  listview = gtk_list_view_new_with_factory (
-  gtk_functions_list_item_factory_new (setup_widget,
-                                       bind_widget,
-                                       NULL, NULL));
-  gtk_orientable_set_orientation (GTK_ORIENTABLE (listview), GTK_ORIENTATION_HORIZONTAL);
-  gtk_list_view_set_show_separators (GTK_LIST_VIEW (listview), TRUE);
-  model = create_weather_model ();
-  selection = G_LIST_MODEL (gtk_no_selection_new (model));
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview), selection);
-  g_object_unref (selection);
-  g_object_unref (model);
-
-  return listview;
-}
-
-GtkWidget *
-do_listview_weather (GtkWidget *do_widget)
-{
-  if (window == NULL)
-    {
-      GtkWidget *listview, *sw;;
-
-      window = gtk_window_new ();
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_title (GTK_WINDOW (window), "Weather");
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Weather");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
-
-      sw = gtk_scrolled_window_new (NULL, NULL);
-      gtk_window_set_child (GTK_WINDOW (window), sw);
-      listview = create_weather_view ();
-      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <template class="GtkListItem">
-    <property name="child">
-      <object class="GtkTreeExpander" id="expander">
-        <binding name="list-row">
-          <lookup name="item">GtkListItem</lookup>
-        </binding>
-        <property name="child">
-          <object class="GtkLabel">
-            <property name="halign">start</property>
-            <binding name="label">
-              <lookup name="title" type="GtkDemo">
-                <lookup name="item">expander</lookup>
-              </lookup>
-            </binding>
-          </object>
-        </property>
-      </object>
-    </property>
-  </template>
-</interface>
@@ -8,7 +8,6 @@
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>

-#include "award.h"
 #include "demos.h"

 static GtkWidget *info_view;
@@ -17,96 +16,18 @@ static GtkWidget *source_view;
 static gchar *current_file = NULL;

 static GtkWidget *notebook;
-static GtkSingleSelection *selection;
+static GtkWidget *treeview;
 static GtkWidget *toplevel;

-typedef struct _GtkDemo GtkDemo;
-struct _GtkDemo
-{
-  GObject parent_instance;
-
-  const char *name;
-  const char *title;
-  const char *filename;
-  GDoDemoFunc func;
-  GListModel *children_model;
-};
-
 enum {
-  PROP_0,
-  PROP_FILENAME,
-  PROP_NAME,
-  PROP_TITLE,
-
-  N_PROPS
+  NAME_COLUMN,
+  TITLE_COLUMN,
+  FILENAME_COLUMN,
+  FUNC_COLUMN,
+  STYLE_COLUMN,
+  NUM_COLUMNS
 };

-# define GTK_TYPE_DEMO (gtk_demo_get_type ())
-G_DECLARE_FINAL_TYPE (GtkDemo, gtk_demo, GTK, DEMO, GObject);
-
-G_DEFINE_TYPE (GtkDemo, gtk_demo, G_TYPE_OBJECT);
-static GParamSpec *properties[N_PROPS] = { NULL, };
-
-static void
-gtk_demo_get_property (GObject    *object,
-                       guint       property_id,
-                       GValue     *value,
-                       GParamSpec *pspec)
-{
-  GtkDemo *self = GTK_DEMO (object);
-
-  switch (property_id)
-    {
-    case PROP_FILENAME:
-      g_value_set_string (value, self->filename);
-      break;
-
-    case PROP_NAME:
-      g_value_set_string (value, self->name);
-      break;
-
-    case PROP_TITLE:
-      g_value_set_string (value, self->title);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-      break;
-    }
-}
-
-static void gtk_demo_class_init (GtkDemoClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-
-  gobject_class->get_property = gtk_demo_get_property;
-
-  properties[PROP_FILENAME] =
-    g_param_spec_string ("filename",
-                         "filename",
-                         "filename",
-                         NULL,
-                         G_PARAM_READABLE);
-  properties[PROP_NAME] =
-    g_param_spec_string ("name",
-                         "name",
-                         "name",
-                         NULL,
-                         G_PARAM_READABLE);
-  properties[PROP_TITLE] =
-    g_param_spec_string ("title",
-                         "title",
-                         "title",
-                         NULL,
-                         G_PARAM_READABLE);
-
-  g_object_class_install_properties (gobject_class, N_PROPS, properties);
-}
-
-static void gtk_demo_init (GtkDemo *self)
-{
-}
-
 typedef struct _CallbackData CallbackData;
 struct _CallbackData
 {
@@ -114,27 +35,6 @@ struct _CallbackData
  GtkTreePath *path;
 };

-static gboolean
-gtk_demo_run (GtkDemo   *self,
-              GtkWidget *window)
-{
-  GtkWidget *result;
-
-  if (!self->func)
-    return FALSE;
-
-  result = self->func (window);
-  if (result == NULL)
-    return FALSE;
-
-  if (GTK_IS_WINDOW (result))
-    {
-      gtk_window_set_transient_for (GTK_WINDOW (result), GTK_WINDOW (window));
-      gtk_window_set_modal (GTK_WINDOW (result), TRUE);
-    }
-  return TRUE;
-}
-              
 static void
 activate_about (GSimpleAction *action,
                GVariant      *parameter,
@@ -161,7 +61,7 @@ activate_about (GSimpleAction *action,
                          gtk_get_major_version (),
                          gtk_get_minor_version (),
                          gtk_get_micro_version ());
-  g_string_append_printf (s, "\nA link can appear here: <http://www.gtk.org>");
+  g_string_append_printf (s, "\nA link can apppear here: <http://www.gtk.org>");

  version = g_strdup_printf ("%s\nRunning against GTK %d.%d.%d",
                             PACKAGE_VERSION,
@@ -201,7 +101,7 @@ activate_quit (GSimpleAction *action,
      win = list->data;
      next = list->next;

-      gtk_window_destroy (GTK_WINDOW (win));
+      gtk_widget_destroy (GTK_WIDGET (win));

      list = next;
    }
@@ -213,18 +113,84 @@ activate_inspector (GSimpleAction *action,
                    gpointer       user_data)
 {
  gtk_window_set_interactive_debugging (TRUE);
-  award ("demo-inspector");
+}
+
+static void
+window_closed_cb (GtkWidget *window, gpointer data)
+{
+  CallbackData *cbdata = data;
+  GtkTreeIter iter;
+  PangoStyle style;
+
+  gtk_tree_model_get_iter (cbdata->model, &iter, cbdata->path);
+  gtk_tree_model_get (GTK_TREE_MODEL (cbdata->model), &iter,
+                      STYLE_COLUMN, &style,
+                      -1);
+  if (style == PANGO_STYLE_ITALIC)
+    gtk_tree_store_set (GTK_TREE_STORE (cbdata->model), &iter,
+                        STYLE_COLUMN, PANGO_STYLE_NORMAL,
+                        -1);
+
+  gtk_tree_path_free (cbdata->path);
+  g_free (cbdata);
+}
+
+static void
+run_example_for_row (GtkWidget    *window,
+                     GtkTreeModel *model,
+                     GtkTreeIter  *iter)
+{
+  PangoStyle style;
+  GDoDemoFunc func;
+  GtkWidget *demo;
+
+  gtk_tree_model_get (GTK_TREE_MODEL (model),
+                      iter,
+                      FUNC_COLUMN, &func,
+                      STYLE_COLUMN, &style,
+                      -1);
+
+  if (func)
+    {
+      gtk_tree_store_set (GTK_TREE_STORE (model),
+                          iter,
+                          STYLE_COLUMN, (style == PANGO_STYLE_ITALIC ? PANGO_STYLE_NORMAL : PANGO_STYLE_ITALIC),
+                          -1);
+      demo = (func) (window);
+
+      if (demo != NULL)
+        {
+          CallbackData *cbdata;
+
+          cbdata = g_new (CallbackData, 1);
+          cbdata->model = model;
+          cbdata->path = gtk_tree_model_get_path (model, iter);
+
+          if (GTK_IS_WINDOW (demo))
+            {
+              gtk_window_set_transient_for (GTK_WINDOW (demo), GTK_WINDOW (window));
+              gtk_window_set_modal (GTK_WINDOW (demo), TRUE);
+            }
+
+          g_signal_connect (demo, "destroy",
+                            G_CALLBACK (window_closed_cb), cbdata);
+        }
+    }
 }

 static void
 activate_run (GSimpleAction *action,
              GVariant      *parameter,
-              gpointer       window)
+              gpointer       user_data)
 {
-  GtkTreeListRow *row = gtk_single_selection_get_selected_item (selection);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
+  GtkWidget *window = user_data;
+  GtkTreeSelection *selection;
+  GtkTreeModel *model;
+  GtkTreeIter iter;

-  gtk_demo_run (demo, window);
+  selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+  if (gtk_tree_selection_get_selected (selection, &model, &iter))
+    run_example_for_row (window, model, &iter);
 }

 /* Stupid syntax highlighting.
@@ -929,93 +895,124 @@ load_file (const gchar *demoname,
 }

 static void
-activate_cb (GtkWidget *widget,
-             guint      position,
-             gpointer   window)
+selection_cb (GtkTreeSelection *selection,
+              GtkTreeModel     *model)
 {
-  GtkTreeListRow *row = g_list_model_get_item (gtk_list_view_get_model (GTK_LIST_VIEW (widget)), position);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
+  GtkTreeIter iter;
+  char *name;
+  char *filename;
+  char *title;

-  gtk_demo_run (demo, window);
+  if (! gtk_tree_selection_get_selected (selection, NULL, &iter))
+    return;

-  g_object_unref (row);
+  gtk_tree_model_get (model, &iter,
+                      NAME_COLUMN, &name,
+                      TITLE_COLUMN, &title,
+                      FILENAME_COLUMN, &filename,
+                      -1);
+
+  if (filename)
+    load_file (name, filename);
+
+  gtk_window_set_title (GTK_WINDOW (toplevel), title);
+
+  g_free (name);
+  g_free (title);
+  g_free (filename);
 }

 static void
-selection_cb (GtkSingleSelection *sel,
-              GParamSpec         *pspec,
-              gpointer            user_data)
+populate_model (GtkTreeModel *model)
 {
-  GtkTreeListRow *row = gtk_single_selection_get_selected_item (sel);
-  GtkDemo *demo = gtk_tree_list_row_get_item (row);
+  Demo *d = gtk_demos;

-  if (demo->filename)
-    load_file (demo->name, demo->filename);
-
-  gtk_window_set_title (GTK_WINDOW (toplevel), demo->title);
-}
-
-static GListModel *
-create_demo_model (void)
-{
-  GListStore *store = g_list_store_new (GTK_TYPE_DEMO);
-  DemoData *demo = gtk_demos;
-
-  while (demo->title)
+  /* this code only supports 1 level of children. If we
+   * want more we probably have to use a recursing function.
+   */
+  while (d->title)
    {
-      GtkDemo *d = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
-      DemoData *children = demo->children;
+      Demo *children = d->children;
+      GtkTreeIter iter;

-      d->name = demo->name;
-      d->title = demo->title;
-      d->filename = demo->filename;
-      d->func = demo->func;
+      gtk_tree_store_append (GTK_TREE_STORE (model), &iter, NULL);

-      g_list_store_append (store, d);
+      gtk_tree_store_set (GTK_TREE_STORE (model),
+                          &iter,
+                          NAME_COLUMN, d->name,
+                          TITLE_COLUMN, d->title,
+                          FILENAME_COLUMN, d->filename,
+                          FUNC_COLUMN, d->func,
+                          STYLE_COLUMN, PANGO_STYLE_NORMAL,
+                          -1);

-      if (children)
+      d++;
+
+      if (!children)
+        continue;
+
+      while (children->title)
        {
-          d->children_model = G_LIST_MODEL (g_list_store_new (GTK_TYPE_DEMO));
+          GtkTreeIter child_iter;

-          while (children->title)
-            {
-              GtkDemo *child = GTK_DEMO (g_object_new (GTK_TYPE_DEMO, NULL));
+          gtk_tree_store_append (GTK_TREE_STORE (model), &child_iter, &iter);

-              child->name = children->name;
-              child->title = children->title;
-              child->filename = children->filename;
-              child->func = children->func;
+          gtk_tree_store_set (GTK_TREE_STORE (model),
+                              &child_iter,
+                              NAME_COLUMN, children->name,
+                              TITLE_COLUMN, children->title,
+                              FILENAME_COLUMN, children->filename,
+                              FUNC_COLUMN, children->func,
+                              STYLE_COLUMN, PANGO_STYLE_NORMAL,
+                              -1);

-              g_list_store_append (G_LIST_STORE (d->children_model), child);
-              children++;
-            }
+          children++;
        }
-
-      demo++;
    }

-  return G_LIST_MODEL (store);
 }

-static GListModel *
-get_child_model (gpointer item,
-                 gpointer user_data)
+static void
+startup (GApplication *app)
 {
-  GtkDemo *demo = item;
+  GtkBuilder *builder;
+  GMenuModel *appmenu;
+  const char *ids[] = { "appmenu", NULL };

-  if (demo->children_model)
-    return g_object_ref (G_LIST_MODEL (demo->children_model));
+  builder = gtk_builder_new ();
+  gtk_builder_add_objects_from_resource (builder, "/ui/appmenu.ui", ids, NULL);

-  return NULL;
+  appmenu = (GMenuModel *)gtk_builder_get_object (builder, "appmenu");
+
+  gtk_application_set_app_menu (GTK_APPLICATION (app), appmenu);
+
+  g_object_unref (builder);
+}
+
+static void
+row_activated_cb (GtkWidget         *tree_view,
+                  GtkTreePath       *path,
+                  GtkTreeViewColumn *column)
+{
+  GtkTreeIter iter;
+  GtkWidget *window;
+  GtkTreeModel *model;
+
+  window = GTK_WIDGET (gtk_widget_get_root (tree_view));
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (tree_view));
+  gtk_tree_model_get_iter (model, &iter, path);
+
+  run_example_for_row (window, model, &iter);
 }

 static void
 activate (GApplication *app)
 {
  GtkBuilder *builder;
-  GListModel *listmodel;
-  GtkTreeListModel *treemodel;
-  GtkWidget *window, *listview;
+  GtkWindow *window;
+  GtkWidget *widget;
+  GtkTreeModel *model;
+  GtkTreeIter iter;

  static GActionEntry win_entries[] = {
    { "run", activate_run, NULL, NULL, NULL }
@@ -1023,35 +1020,33 @@ activate (GApplication *app)

  builder = gtk_builder_new_from_resource ("/ui/main.ui");

-  window = (GtkWidget *)gtk_builder_get_object (builder, "window");
-  gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (window));
+  window = (GtkWindow *)gtk_builder_get_object (builder, "window");
+  gtk_application_add_window (GTK_APPLICATION (app), window);
  g_action_map_add_action_entries (G_ACTION_MAP (window),
                                   win_entries, G_N_ELEMENTS (win_entries),
                                   window);

-  notebook = GTK_WIDGET (gtk_builder_get_object (builder, "notebook"));
+  notebook = (GtkWidget *)gtk_builder_get_object (builder, "notebook");

-  info_view = GTK_WIDGET (gtk_builder_get_object (builder, "info-textview"));
-  source_view = GTK_WIDGET (gtk_builder_get_object (builder, "source-textview"));
+  info_view = (GtkWidget *)gtk_builder_get_object (builder, "info-textview");
+  source_view = (GtkWidget *)gtk_builder_get_object (builder, "source-textview");
+  treeview = (GtkWidget *)gtk_builder_get_object (builder, "treeview");
+  model = gtk_tree_view_get_model (GTK_TREE_VIEW (treeview));
  toplevel = GTK_WIDGET (window);
-  listview = GTK_WIDGET (gtk_builder_get_object (builder, "listview"));
-  g_signal_connect (listview, "activate", G_CALLBACK (activate_cb), window);

  load_file (gtk_demos[0].name, gtk_demos[0].filename);

-  listmodel = create_demo_model ();
-  treemodel = gtk_tree_list_model_new (FALSE,
-                                       G_LIST_MODEL (listmodel),
-                                       FALSE,
-                                       get_child_model,
-                                       NULL,
-                                       NULL);
-  selection = gtk_single_selection_new (G_LIST_MODEL (treemodel));
-  g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
-  gtk_list_view_set_model (GTK_LIST_VIEW (listview),
-                           G_LIST_MODEL (selection));
+  populate_model (model);

-  award ("demo-start");
+  g_signal_connect (treeview, "row-activated", G_CALLBACK (row_activated_cb), model);
+
+  widget = (GtkWidget *)gtk_builder_get_object (builder, "treeview-selection");
+  g_signal_connect (widget, "changed", G_CALLBACK (selection_cb), model);
+
+  gtk_tree_model_get_iter_first (gtk_tree_view_get_model (GTK_TREE_VIEW (treeview)), &iter);
+  gtk_tree_selection_select_iter (GTK_TREE_SELECTION (widget), &iter);
+
+  gtk_tree_view_collapse_all (GTK_TREE_VIEW (treeview));

  gtk_widget_show (GTK_WIDGET (window));

@@ -1068,7 +1063,7 @@ auto_quit (gpointer data)
 static void
 list_demos (void)
 {
-  DemoData *d, *c;
+  Demo *d, *c;

  d = gtk_demos;

@@ -1095,7 +1090,7 @@ command_line (GApplication            *app,
  const gchar *name = NULL;
  gboolean autoquit = FALSE;
  gboolean list = FALSE;
-  DemoData *d, *c;
+  Demo *d, *c;
  GDoDemoFunc func = 0;
  GtkWidget *window, *demo;

@@ -1224,6 +1219,7 @@ main (int argc, char **argv)
  g_application_add_main_option (G_APPLICATION (app), "list", 0, 0, G_OPTION_ARG_NONE, "List examples", NULL);
  g_application_add_main_option (G_APPLICATION (app), "autoquit", 0, 0, G_OPTION_ARG_NONE, "Quit after a delay", NULL);

+  g_signal_connect (app, "startup", G_CALLBACK (startup), NULL);
  g_signal_connect (app, "activate", G_CALLBACK (activate), NULL);
  g_signal_connect (app, "command-line", G_CALLBACK (command_line), NULL);
  g_signal_connect (app, "handle-local-options", G_CALLBACK (local_options), NULL);
@@ -60,24 +60,43 @@
    <child>
      <object class="GtkBox">
        <child>
-          <object class="GtkScrolledWindow">
-            <property name="width-request">120</property>
-            <property name="hscrollbar-policy">never</property>
-            <property name="min-content-width">150</property>
+          <object class="GtkFrame">
            <child>
-              <object class="GtkListView" id="listview">
-                <property name="factory">
-                  <object class="GtkBuilderListItemFactory">
-                    <property name="resource">/ui/main-listitem.ui</property>
+              <object class="GtkScrolledWindow">
+                <property name="width-request">120</property>
+                <property name="hscrollbar-policy">never</property>
+                <property name="min-content-width">150</property>
+                <child>
+                  <object class="GtkTreeView" id="treeview">
+                    <property name="model">treestore</property>
+                    <property name="headers-visible">0</property>
+                    <child internal-child="selection">
+                      <object class="GtkTreeSelection" id="treeview-selection">
+                        <property name="mode">browse</property>
+                      </object>
+                    </child>
+                    <child>
+                      <object class="GtkTreeViewColumn">
+                        <child>
+                          <object class="GtkCellRendererText"/>
+                          <attributes>
+                            <attribute name="style">4</attribute>
+                            <attribute name="text">1</attribute>
+                          </attributes>
+                        </child>
+                        <child>
+                          <object class="GtkCellRendererText">
+                            <property name="text">  </property>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
                  </object>
-                </property>
+                </child>
              </object>
            </child>
          </object>
        </child>
-        <child>
-          <object class="GtkSeparator"/>
-        </child>
        <child>
          <object class="GtkNotebook" id="notebook">
            <property name="scrollable">1</property>
@@ -58,7 +58,8 @@ do_markup (GtkWidget *do_widget)
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      stack = gtk_stack_new ();
      gtk_widget_show (stack);
@@ -125,7 +126,7 @@ do_markup (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -1,39 +1,38 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <menu id="appmenu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_New</attribute>
+        <attribute name="action">app.new</attribute>
+        <attribute name="accel">&lt;Control&gt;n</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Open</attribute>
+        <attribute name="action">app.open</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_Save</attribute>
+        <attribute name="action">app.save</attribute>
+        <attribute name="accel">&lt;Control&gt;s</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">Save _As...</attribute>
+        <attribute name="action">app.save-as</attribute>
+        <attribute name="accel">&lt;Control&gt;s</attribute>
+      </item>
+    </section>
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Quit</attribute>
+        <attribute name="action">app.quit</attribute>
+        <attribute name="accel">&lt;Control&gt;q</attribute>
+      </item>
+    </section>
+  </menu>
  <menu id="menubar">
    <submenu>
-      <attribute name="label" translatable="yes">_Application</attribute>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_New</attribute>
-          <attribute name="action">app.new</attribute>
-          <attribute name="accel">&lt;Control&gt;n</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Open</attribute>
-          <attribute name="action">app.open</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">_Save</attribute>
-          <attribute name="action">app.save</attribute>
-          <attribute name="accel">&lt;Control&gt;s</attribute>
-        </item>
-        <item>
-          <attribute name="label" translatable="yes">Save _As...</attribute>
-          <attribute name="action">app.save-as</attribute>
-          <attribute name="accel">&lt;Control&gt;s</attribute>
-        </item>
-      </section>
-      <section>
-        <item>
-          <attribute name="label" translatable="yes">_Quit</attribute>
-          <attribute name="action">app.quit</attribute>
-          <attribute name="accel">&lt;Control&gt;q</attribute>
-        </item>
-      </section>
-    </submenu>
-    <submenu>
-      <attribute name="label" translatable="yes">_File</attribute>
+      <attribute name="label" translatable="yes">_Preferences</attribute>
      <section>
        <item>
          <attribute name="label" translatable="yes">_Prefer Dark Theme</attribute>
@@ -3,7 +3,6 @@
 demos = files([
  'application_demo.c',
  'assistant.c',
-  'awardview.c',
  'builder.c',
  'clipboard.c',
  'combobox.c',
@@ -42,13 +41,6 @@ demos = files([
  'listbox.c',
  'flowbox.c',
  'list_store.c',
-  'listview_applauncher.c',
-  'listview_clocks.c',
-  'listview_colors.c',
-  'listview_filebrowser.c',
-  'listview_minesweeper.c',
-  'listview_settings.c',
-  'listview_weather.c',
  'markup.c',
  'modelbutton.c',
  'overlay.c',
@@ -92,7 +84,6 @@ demos = files([
 gtkdemo_deps = [ libgtk_dep, ]

 extra_demo_sources = files(['main.c',
-                            'award.c',
                            'gtkfishbowl.c',
                            'fontplane.c',
                            'gtkgears.c',
@@ -104,7 +95,7 @@ extra_demo_sources = files(['main.c',
 if harfbuzz_dep.found() and pangoft_dep.found()
  demos += files('font_features.c')
  extra_demo_sources += files(['script-names.c', 'language-names.c'])
-  gtkdemo_deps += [ harfbuzz_dep, epoxy_dep ]
+  gtkdemo_deps += [ harfbuzz_dep, ]
 endif

 if os_unix
@@ -43,7 +43,8 @@ do_modelbutton (GtkWidget *do_widget)
      window = GTK_WIDGET (gtk_builder_get_object (builder, "window1"));
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      actions = (GActionGroup*)g_simple_action_group_new ();
      g_action_map_add_action_entries (G_ACTION_MAP (actions),
@@ -58,7 +59,7 @@ do_modelbutton (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);


  return window;
@@ -66,7 +66,7 @@ do_overlay (GtkWidget *do_widget)
      gtk_widget_set_can_target (label, FALSE);
      gtk_widget_set_margin_top (label, 8);
      gtk_widget_set_margin_bottom (label, 8);
-      gtk_box_append (GTK_BOX (vbox), label);
+      gtk_container_add (GTK_CONTAINER (vbox), label);

      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), vbox);
@@ -76,16 +76,18 @@ do_overlay (GtkWidget *do_widget)
      gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
      gtk_widget_set_margin_top (entry, 8);
      gtk_widget_set_margin_bottom (entry, 8);
-      gtk_box_append (GTK_BOX (vbox), entry);
+      gtk_container_add (GTK_CONTAINER (vbox), entry);

      gtk_window_set_child (GTK_WINDOW (window), overlay);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -60,7 +60,9 @@ do_overlay2 (GtkWidget *do_widget)
      gtk_window_set_child (GTK_WINDOW (window), overlay);
      gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), text);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      image = gtk_picture_new_for_resource ("/overlay2/decor1.png");
      gtk_overlay_add_overlay (GTK_OVERLAY (overlay), image);
@@ -95,7 +97,7 @@ do_overlay2 (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -11,7 +11,7 @@
 static void
 done_cb (GtkDialog *dialog, gint response, gpointer data)
 {
-  gtk_window_destroy (GTK_WINDOW (dialog));
+  gtk_widget_destroy (GTK_WIDGET (dialog));
 }

 GtkWidget *
@@ -22,14 +22,14 @@ do_pagesetup (GtkWidget *do_widget)
  if (!window)
    {
      window = gtk_page_setup_unix_dialog_new ("Page Setup", GTK_WINDOW (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
      g_signal_connect (window, "response", G_CALLBACK (done_cb), NULL);
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -405,13 +405,16 @@ do_paint (GtkWidget *toplevel)
      gtk_header_bar_pack_end (GTK_HEADER_BAR (headerbar), colorbutton);
      gtk_window_set_titlebar (GTK_WINDOW (window), headerbar);
      gtk_window_set_title (GTK_WINDOW (window), "Paint");
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);
+
    }

  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -171,7 +171,7 @@ do_paintable (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -203,7 +203,7 @@ do_paintable_animated (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -218,7 +218,7 @@ gtk_nuclear_media_stream_seek (GtkMediaStream *stream,
  gtk_media_stream_seek_success (stream);

  /* We also have to update our timestamp and tell the
-   * paintable interface about the seek
+   * paintable interface abbout the seek
   */
  gtk_media_stream_update (stream, nuclear->progress);
  gdk_paintable_invalidate_contents (GDK_PAINTABLE (nuclear));
@@ -263,7 +263,7 @@ gtk_nuclear_media_stream_init (GtkNuclearMediaStream *nuclear)
  /* This time, we don't have to add a timer here, because media
   * streams start paused.
   *
-   * However, media streams need to tell GTK once they are initialized,
+   * However, media streams need to tell GTK once they are intialized,
   * so we do that here.
   */
  gtk_media_stream_prepared (GTK_MEDIA_STREAM (nuclear),
@@ -306,7 +306,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -19,14 +19,32 @@ toggle_resize (GtkWidget *widget,
 {
  GtkWidget *parent;
  GtkPaned *paned;
+  gboolean is_child1;
+  gboolean resize, shrink;

  parent = gtk_widget_get_parent (child);
  paned = GTK_PANED (parent);

-  if (child == gtk_paned_get_start_child (paned))
-    gtk_paned_set_resize_start_child (paned, !gtk_paned_get_resize_start_child (paned));
+  is_child1 = (child == gtk_paned_get_child1 (paned));
+
+  if (is_child1)
+    g_object_get (paned,
+                  "resize-child1", &resize,
+                  "shrink-child1", &shrink,
+                  NULL);
  else
-    gtk_paned_set_resize_end_child (paned, !gtk_paned_get_resize_end_child (paned));
+    g_object_get (paned,
+                  "resize-child2", &resize,
+                  "shrink-child2", &shrink,
+                  NULL);
+
+  g_object_ref (child);
+  gtk_container_remove (GTK_CONTAINER (parent), child);
+  if (is_child1)
+    gtk_paned_pack1 (paned, child, !resize, shrink);
+  else
+    gtk_paned_pack2 (paned, child, !resize, shrink);
+  g_object_unref (child);
 }

 static void
@@ -35,14 +53,32 @@ toggle_shrink (GtkWidget *widget,
 {
  GtkWidget *parent;
  GtkPaned *paned;
+  gboolean is_child1;
+  gboolean resize, shrink;

  parent = gtk_widget_get_parent (child);
  paned = GTK_PANED (parent);

-  if (child == gtk_paned_get_start_child (paned))
-    gtk_paned_set_shrink_start_child (paned, !gtk_paned_get_shrink_start_child (paned));
+  is_child1 = (child == gtk_paned_get_child1 (paned));
+
+  if (is_child1)
+    g_object_get (paned,
+                  "resize-child1", &resize,
+                  "shrink-child1", &shrink,
+                  NULL);
  else
-    gtk_paned_set_shrink_end_child (paned, !gtk_paned_get_shrink_end_child (paned));
+    g_object_get (paned,
+                  "resize-child2", &resize,
+                  "shrink-child2", &shrink,
+                  NULL);
+
+  g_object_ref (child);
+  gtk_container_remove (GTK_CONTAINER (parent), child);
+  if (is_child1)
+    gtk_paned_pack1 (paned, child, resize, !shrink);
+  else
+    gtk_paned_pack2 (paned, child, resize, !shrink);
+  g_object_unref (child);
 }

 static GtkWidget *
@@ -57,8 +93,8 @@ create_pane_options (GtkPaned    *paned,
  GtkWidget *label;
  GtkWidget *check_button;

-  child1 = gtk_paned_get_start_child (paned);
-  child2 = gtk_paned_get_end_child (paned);
+  child1 = gtk_paned_get_child1 (paned);
+  child2 = gtk_paned_get_child2 (paned);

  frame = gtk_frame_new (frame_label);
  gtk_widget_set_margin_start (frame, 4);
@@ -116,7 +152,9 @@ do_panes (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");

@@ -128,35 +166,35 @@ do_panes (GtkWidget *do_widget)
      gtk_widget_set_margin_end (vpaned, 5);
      gtk_widget_set_margin_top (vpaned, 5);
      gtk_widget_set_margin_bottom (vpaned, 5);
-      gtk_box_append (GTK_BOX (vbox), vpaned);
+      gtk_container_add (GTK_CONTAINER (vbox), vpaned);

      hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_paned_set_start_child (GTK_PANED (vpaned), hpaned);
+      gtk_paned_add1 (GTK_PANED (vpaned), hpaned);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_size_request (frame, 60, 60);
-      gtk_paned_set_start_child (GTK_PANED (hpaned), frame);
+      gtk_paned_add1 (GTK_PANED (hpaned), frame);

      button = gtk_button_new_with_mnemonic ("_Hi there");
      gtk_frame_set_child (GTK_FRAME (frame), button);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_size_request (frame, 80, 60);
-      gtk_paned_set_end_child (GTK_PANED (hpaned), frame);
+      gtk_paned_add2 (GTK_PANED (hpaned), frame);

      frame = gtk_frame_new (NULL);
      gtk_widget_set_size_request (frame, 60, 80);
-      gtk_paned_set_end_child (GTK_PANED (vpaned), frame);
+      gtk_paned_add2 (GTK_PANED (vpaned), frame);

      /* Now create toggle buttons to control sizing */

-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          create_pane_options (GTK_PANED (hpaned),
                                               "Horizontal",
                                               "Left",
                                               "Right"));

-      gtk_box_append (GTK_BOX (vbox),
+      gtk_container_add (GTK_CONTAINER (vbox),
                          create_pane_options (GTK_PANED (vpaned),
                                               "Vertical",
                                               "Top",
@@ -166,7 +204,7 @@ do_panes (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
@@ -11,8 +11,6 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>

-#include "award.h"
-
 static GtkWidget *entry;
 static GtkWidget *entry2;
 static GtkWidget *button;
@@ -27,18 +25,6 @@ update_button (GObject    *object,

  gtk_widget_set_sensitive (button,
                            text[0] != '\0' && g_str_equal (text, text2));
-
-  if (g_str_equal (text, text2) &&
-      g_ascii_strcasecmp (text, "12345") == 0)
-    award ("password-best");
-}
-
-static void
-button_pressed (GtkButton *widget,
-                GtkWidget *window)
-{
-  award ("password-correct");
-  gtk_window_destroy (GTK_WINDOW (window));
 }

 GtkWidget *
@@ -59,7 +45,8 @@ do_password_entry (GtkWidget *do_widget)
      gtk_window_set_title (GTK_WINDOW (window), "Choose a Password");
      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
      gtk_window_set_deletable (GTK_WINDOW (window), FALSE);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
+      g_signal_connect (window, "destroy",
+                        G_CALLBACK (gtk_widget_destroyed), &window);

      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
      gtk_widget_set_margin_start (box, 18);
@@ -75,7 +62,7 @@ do_password_entry (GtkWidget *do_widget)
                    "activates-default", TRUE,
                    NULL);
      g_signal_connect (entry, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_box_append (GTK_BOX (box), entry);
+      gtk_container_add (GTK_CONTAINER (box), entry);

      entry2 = gtk_password_entry_new ();
      gtk_password_entry_set_show_peek_icon (GTK_PASSWORD_ENTRY (entry2), TRUE);
@@ -84,11 +71,11 @@ do_password_entry (GtkWidget *do_widget)
                    "activates-default", TRUE,
                    NULL);
      g_signal_connect (entry2, "notify::text", G_CALLBACK (update_button), NULL);
-      gtk_box_append (GTK_BOX (box), entry2);
+      gtk_container_add (GTK_CONTAINER (box), entry2);

      button = gtk_button_new_with_mnemonic ("_Done");
      gtk_widget_add_css_class (button, "suggested-action");
-      g_signal_connect (button, "clicked", G_CALLBACK (button_pressed), window);
+      g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window);
      gtk_widget_set_sensitive (button, FALSE);
      gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

@@ -98,7 +85,7 @@ do_password_entry (GtkWidget *do_widget)
  if (!gtk_widget_get_visible (window))
    gtk_widget_show (window);
  else
-    gtk_window_destroy (GTK_WINDOW (window));
+    gtk_widget_destroy (window);

  return window;
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	abcf2e3bf7	node-editor: Don't use the ::query-tooltip signal Use the vfunc, the signal is going away.	2020-05-09 23:24:59 -04:00
Matthias Clasen	a123d99fcd	inspector: Don't use the ::query-tooltip signal Use the vfunc, the signal is going away.	2020-05-09 22:49:55 -04:00
Matthias Clasen	4f760a9a2a	volumebutton: Don't use the ::query-tooltip signal Use the vfunc, the signal is going away.	2020-05-09 22:31:00 -04:00
Matthias Clasen	7e6be71d38	volumebutton: Enable the tooltips Little point in having a query-tooltip handler if we don't make sure ::query-tooltip is emitted.	2020-05-09 22:31:00 -04:00
Matthias Clasen	ed46982cc5	volumebutton: Remove broken a11y code The accessible of a button is not an AtkImage, so whatever this code was trying to do isn't working. Remove it.	2020-05-09 22:30:59 -04:00
Matthias Clasen	e92270f928	iconview: Stop using the ::query-tooltip signal Use the vfunc instead. The signal is going away.	2020-05-09 22:30:59 -04:00
Matthias Clasen	79a96b9bef	treeview: Don't use the ::query-tooltip signal Use the vfunc instead.	2020-05-09 22:30:59 -04:00
Matthias Clasen	ff55264e60	linkbutton: Don't use the ::query-tooltip signal As a subclass, GtkLinkButton should override the vfunc. The signal will be going away.	2020-05-09 22:30:59 -04:00