fixup: use cache dir

exampleapp9: Add state saving
This tests the GtkApplication state saving support.
2021-06-03 10:24:47 -04:00 · 2021-06-03 10:07:43 -04:00 · 2021-06-03 10:07:43 -04:00 · 2021-06-03 10:07:43 -04:00 · 2021-06-03 10:07:43 -04:00 · 2021-06-03 10:07:43 -04:00
710 changed files with 86819 additions and 87372 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,6 @@ stages:
  - analysis
  - docs
  - flatpak
-  - publish
  - deploy

 .cache-paths: &cache-paths
@@ -25,8 +24,9 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v33"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31"
  FLATPAK_IMAGE: "registry.gitlab.gnome.org/gnome/gnome-runtime-images/gnome:master"
+  DOCS_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v31"

 .only-default:
  only:
@@ -58,10 +58,8 @@ style-check-diff:
      - "${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/tools/output/*/*"
      - "${CI_PROJECT_DIR}/_build/testsuite/gsk/compare/*/*/*.png"
      - "${CI_PROJECT_DIR}/_build/testsuite/css/output/*/*.syscap"
-      - "${CI_PROJECT_DIR}/_build_hello/meson-logs"
  cache:
    key: "$CI_JOB_NAME"
    paths:
@@ -81,14 +79,9 @@ fedora-x86_64:
  script:
    - .gitlab-ci/show-info-linux.sh
    - meson subprojects update
-    - mkdir _install
-    - meson --prefix=${CI_PROJECT_DIR}/_install
-            ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
+    - meson ${COMMON_MESON_FLAGS} ${EXTRA_MESON_FLAGS} ${BACKEND_FLAGS} ${FEATURE_FLAGS}
            _build
-    - meson compile -C _build
-    - meson install -C _build
-    - PKG_CONFIG_PATH=${CI_PROJECT_DIR}/_install/lib64/pkgconfig:${CI_PROJECT_DIR}/_install/share/pkgconfig meson setup _build_hello examples/hello
-    - meson compile -C _build_hello
+    - ninja -C _build
    - .gitlab-ci/run-tests.sh _build x11
    - .gitlab-ci/run-tests.sh _build wayland
    - .gitlab-ci/run-tests.sh _build broadway
@@ -172,9 +165,6 @@ macos:
    - export MESON_FORCE_BACKTRACE=1
  script:
    - meson -Dx11-backend=false
-            -Dbroadway-backend=true
-            -Dmacos-backend=true
-            -Dmedia-gstreamer=disabled
            -Dintrospection=disabled
            -Dcpp_std=c++11
            -Dpixman:tests=disabled
@@ -312,7 +302,7 @@ asan-build:
  allow_failure: true

 reference:
-  image: $FEDORA_IMAGE
+  image: $DOCS_IMAGE
  stage: docs
  needs: []
  variables:
@@ -338,11 +328,14 @@ reference:
    paths:
      - _reference

-publish-docs:
-  stage: publish
+pages:
+  stage: deploy
  needs: ['reference']
  script:
-    - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
+    - mv _reference/ public/
+    - cp .gitlab-ci/pages/* public/
+  artifacts:
+    paths:
+      - public
  only:
-    refs:
-      - master
+    - master
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -38,6 +38,7 @@ RUN dnf -y install \
    gstreamer1-plugins-good \
    gstreamer1-plugins-bad-free-devel \
    gstreamer1-plugins-base-devel \
+    gtk-doc \
    hicolor-icon-theme \
    iso-codes \
    itstool \
@@ -48,9 +49,7 @@ RUN dnf -y install \
    libcloudproviders-devel \
    libepoxy-devel \
    libffi-devel \
-    libjpeg-turbo-devel \
    libmount-devel \
-    libpng-devel \
    librsvg2 \
    libselinux-devel \
    libubsan \
--- a/.gitlab-ci/test-docker.sh
+++ b/.gitlab-ci/test-docker.sh
@@ -15,7 +15,7 @@ meson \
        -Dx11-backend=true \
        -Dwayland-backend=true \
        -Dbroadway-backend=true \
-        -Dvulkan=enabled \
+        -Dvulkan=yes \
        -Dprofiler=true \
        --werror \
        ${EXTRA_MESON_FLAGS:-} \
--- a/.gitlab-ci/test-msvc.bat
+++ b/.gitlab-ci/test-msvc.bat
@@ -6,7 +6,7 @@ call "C:\Program Files (x86)\Microsoft Visual Studio\2017\BuildTools\VC\Auxiliar

 :: FIXME: make warnings fatal
 pip3 install --upgrade --user meson==0.56.2  || goto :error
-meson -Dmedia-gstreamer=disabled _build || goto :error
+meson _build || goto :error
 ninja -C _build || goto :error

 goto :EOF
--- a/.gitlab-ci/test-msys2.sh
+++ b/.gitlab-ci/test-msys2.sh
@@ -40,7 +40,7 @@ export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache"
 # https://gitlab.gnome.org/GNOME/gtk/-/issues/2243
 # https://gitlab.gnome.org/GNOME/gtk/-/issues/3002

-if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
+if ! pkg-config --atleast-version=2.65.0 glib-2.0; then
    git clone https://gitlab.gnome.org/GNOME/glib.git _glib
    meson setup _glib_build _glib
    meson compile -C _glib_build
@@ -48,7 +48,7 @@ if ! pkg-config --atleast-version=2.66.0 glib-2.0; then
 fi
 pkg-config --modversion glib-2.0

-if ! pkg-config --atleast-version=1.49.1 pango; then
+if ! pkg-config --atleast-version=1.47.0 pango; then
    git clone https://gitlab.gnome.org/GNOME/pango.git _pango
    meson setup _pango_build _pango
    meson compile -C _pango_build
--- a/291
+++ b/291
@@ -1,294 +1,3 @@
-Overview of Changes
-===================
-
-* gsk:
- - Drop the GL renderer in favor of NGL
-
-* css:
- - Add support for line-height
- - Add support for text-transform
-
-* GtkTextView:
- - Add support for line height
- - Add support for text transforms
-
-* Build:
- - Require Pango 1.49
-
-
-Overview of Changes in 4.4.0
-============================
-
-* Input:
- - Match IBus for display of Compose sequences
- - Match IBus for handling of mismatches
- - Handle Escape in Compose sequences
- - Allow multiple dead keys
- - Support 32bit keysyms
-
-* GtkCheckButton:
- - Activate when moving focus
-
-* GtkLabel:
- - Propertly ignore double underscores for mnemonics
-
-* GtkPopoverMenu:
- - Fix focus cycling
-
-* GtkTextView:
- - Improve word selection
- - Fix block cursors on empty lines
-
-* GdkToplevel:
- - Support the gnome-shell titlebar gesture protocol
-
-* GdkDropTarget:
- - Allow creating drop targets in ui files
-
-* gsk:
- - Handle partial color fonts correctly
- - Use harfbuzz for color font information
- - Avoid pango for glyph cache rendering
- - Shrink shadow extents
-
-* Settings:
- - Change the default for gtk-split-cursor to FALSE
-
-* Demos:
- - Small improvements to widget-factory
- - gtk-demo: Improve the hypertext demo
- - gtk-dem: Improve the clipboard demo
-
-* X11:
- - Set WM_CLASS on toplevels
-
-* Wayland:
- - Support wl_seat v7
-
-* Windows:
- - Drop the local DND protocol
- - Avoid WGL if shaders don't work
- - Use WinPointer API
-
-* Translation updates:
- Belarusian
- Friulian
- Hebrew
- Khmer
- Persian
- Polish
-
-
-Overview of Changes in 4.3.2
-============================
-
-* GtkToggleButton:
- - Fix the actionable implementation
-
-* GtkCheckButton:
- - Fix the actionable implementation
- - Cancel activation on when the pointer leaves
-
-* GtkMenuButton:
- - Make activatable again
- - Add a way to have an icon + arrow
-
-* GtkColorButton:
- - Make activatable again
-
-* GtkFontButton:
- - Make activatable again
-
-* GtkAppChooserButton:
- - Make activatable again
-
-* GtkColumnView:
- - Fix double activation
-
-* GtkLabel:
- - Fix mnemonics without markup
-
-* GtkTreeView:
- - Clip header buttons
-
-* GtkTextView:
- - Add api to get the RTL and LTR contexts
- - Fix some errors in text history grouping
-
-* GtkText:
- - Don't show placeholder text on top of entry text
- - Add api to compute the cursor extents
- - Fix y coordinates for text selection
-
-* GtkFileChooser:
- - Don't show Trash in the side bar
-
-* GtkPopoverMenu:
- - Add scrollbars to long menus
-
-* GtkActionMuxer:
- - Fix propagation of accel changes
-
-* Introspection:
- - Annotate all filename arguments
- - Rename GtkMediaStream apis to avoid name collisions
- - Rename GtkDropTarget properties to avoid name collisions
- - Make GtkPasswordEntryBuffer introspectable
-
-* Printing:
- - Remove the Google Cloud Print backend
-
-* Theme:
- - Sync included icons with the Adwaita icon theme
-
-* GSK:
- - Avoid overflowing the vertex counter
- - Handle negative scales correctly in the ngl renderer
-
-* GDK:
- - Cleanup and simplify OpenGL setup code
- - Add a GdkDisplay::init_gl vfunc and gdk_display_prepare_gl() api
- - Require EGL 1.4
- - Fix EGL + NVidia
-
-* Build:
- - Enable gstreamer by default
- - Disable Vulkan by default
- - Remove the sassc option
- - Remove options and checks for X11 extensions
-
-* X11:
- - Stop using XComposite
- - Remove the Visual cache
-
-* Wayland:
- - Fix some DND corner cases
- - Work with version 2 of pointer-gestures-v1
- - Look for cursor themes in $HOME/.icons
-
-* Windows:
- - Fix SIGILL on x64 due to popcnt
- - Fix popup placement
- - Fix drag icon placement
- - Clean up HiDPI and WGL support
- - Default to WGL
-
-* MacOs:
- - Fix input method support
- - Register known clipboard types for drop targets
- - Add initial DND support
-
-* Translation updates:
- Brazilian Portuguese
- Portuguese
- Romanian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.3.1
-============================
-
-* GtkEmojiChooser:
- - Update data from CLDR 39
- - Load Emoji data for both language and territory
-
-* GtkCalendar:
- - Fix an off-by-one error in day numbers
-
-* GtkListView:
- - Add .activatable style class to activatable items
-
-* GtkCheckButton:
- - Don't allow unchecking grouped radio buttons
-
-*GtkToggleButton:
- - Fix mnemonic activation propagation
-
-* GtkLabel:
- - Make mnemonics work even when invisible
- - Fix mnemonic activation propagation
-
-* GtkMenuButton:
- - Add a property to mark primary menus and make F10 work
-
-* GtkApplication:
- - Fix initial screensaver state async
-
-* GtkEntry:
- - Apply xalign to placeholder text (as it was in GTK 3)
-
-* GtkSpinButton:
- - Fix swipe gestures
-
-* GtkStackSwitcher:
- - Implement GtkOrientable (as it was in GTK 3)
- - Fix a use-after-free problem with drag timeouts
-
-* GtkFileChooser:
- - Add support for (case-insensitive) suffix matches in GtkFileFilter
-
-* GtkPasswordEntry:
- - Make GtkPasswordEntryBuffer public, to make it easier
-   to write your own password entry widget
-
-* Input:
- - Fix interference between various obscure XKB features
-   (e.g. overlays) and Compose sequences
-
-* Action support:
- - Fix submenu-action handling
-
-* Theme:
- - Update icons from the Adwaita icon theme
- - Fix icon names for GtkSwitch
- - Fix switch-off icon
-
-* GSK:
- - Improve transformed offscreen rendering
- - Add padding between cached glyphs
-
-* Wayland:
- - Fix monitor sizes in the presence of transforms
- - Add a getter for the EGLDisplay
- - Fix click-drag-release sequences for popovers
-
-* X11:
- - Support EGL for X11. Fall back to GLX if EGL isn't available
- - Always fall back to GLX on NVidia
- - Add a getter for the EGLDisplay
-
-* Broadway:
- - Add a setter for display scale
-
-* Windows:
- - Add a getter for the EGLDisplay
- - Make GL work for media playback
-
-* MacOS:
- - Fix menubar appearance
-
-* Tools:
- - gtk4-builder-tool: Replace can-focus with focusable in 3-to-4 conversion
-
-* Introspection:
- - Add missing annotations in a few places (e.g. gtk_free_view_row_activated)
-
-* Build:
- - Only build one source file with -mf16c
- - Fix devel styling for ci flatpak builds
- - Generate appdata for demo flatpaks
-
-* Docs:
- - Numerous fixes and additions
-
-* Translation updates:
- Friulian
- Nepali
- Norwegian Bokmål
- Ukrainian
-
-
 Overview of Changes in 4.3.0
 ============================

--- a/README.md
+++ b/README.md
@@ -157,8 +157,8 @@ Release notes
 The release notes for GTK are part of the migration guide in the API
 reference. See:

- - [3.x release notes](https://developer.gnome.org/gtk3/stable/gtk-migrating-2-to-3.html)
- - [4.x release notes](https://docs.gtk.org/gtk4/migrating-3to4.html)
+ - [3.x release notes](https://developer.gnome.org/gtk3/unstable/gtk-migrating-2-to-3.html)
+ - [4.x release notes](https://developer.gnome.org/gtk4/unstable/gtk-migrating-3-to-4.html)

 Licensing terms
 ---------------
--- a/config.h.meson
+++ b/config.h.meson
@@ -124,6 +124,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #mesondefine HAVE_UNISTD_H

+/* Have the XCOMPOSITE X extension */
+#mesondefine HAVE_XCOMPOSITE
+
 /* Have the Xcursor library */
 #mesondefine HAVE_XCURSOR

--- a/demos/gtk-demo/demo.gresource.xml
+++ b/demos/gtk-demo/demo.gresource.xml
@@ -321,7 +321,6 @@
    <file>paintable_emblem.c</file>
    <file>paintable_mediastream.c</file>
    <file>paintable_svg.c</file>
-    <file>paintable_symbolic.c</file>
    <file>panes.c</file>
    <file>password_entry.c</file>
    <file>peg_solitaire.c</file>
--- a/demos/gtk-demo/demoimage.c
+++ b/demos/gtk-demo/demoimage.c
@@ -100,11 +100,7 @@ prepare_drag (GtkDragSource *source,
  DemoImage *demo = DEMO_IMAGE (widget);
  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));

-  /* Textures can be serialized, paintables can't, so special case the textures */
-  if (GDK_IS_TEXTURE (paintable))
-    return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, paintable);
-  else
-    return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
+  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
 }

 static gboolean
@@ -133,11 +129,7 @@ copy_image (GtkWidget *widget,
  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (demo->image));
  GValue value = G_VALUE_INIT;

-  /* Textures can be serialized, paintables can't, so special case the textures */
-  if (GDK_IS_TEXTURE (paintable))
-    g_value_init (&value, GDK_TYPE_TEXTURE);
-  else
-    g_value_init (&value, GDK_TYPE_PAINTABLE);
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
  g_value_set_object (&value, paintable);
  gdk_clipboard_set_value (clipboard, &value);
  g_value_unset (&value);
@@ -146,46 +138,24 @@ copy_image (GtkWidget *widget,
    g_object_unref (paintable);
 }

-static void
-paste_image_cb (GObject      *source,
-                GAsyncResult *result,
-                gpointer      data)
-{
-  GdkClipboard *clipboard = GDK_CLIPBOARD (source);
-  DemoImage *demo = DEMO_IMAGE (data);
-  const GValue *value;
-
-  value = gdk_clipboard_read_value_finish (clipboard, result, NULL);
-  if (value == NULL)
-    {
-      gtk_widget_error_bell (GTK_WIDGET (demo));
-      g_object_unref (demo);
-      return;
-    }
-
-  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), g_value_get_object (value));
-  g_object_unref (demo);
-}
-
 static void
 paste_image (GtkWidget *widget,
             const char *action_name,
             GVariant *parameter)
 {
  GdkClipboard *clipboard = gtk_widget_get_clipboard (widget);
-  GType type;
+  DemoImage *demo = DEMO_IMAGE (widget);
+  GdkContentProvider *content = gdk_clipboard_get_content (clipboard);
+  GValue value = G_VALUE_INIT;
+  GdkPaintable *paintable;

-  if (gdk_content_formats_contain_gtype (gdk_clipboard_get_formats (clipboard), GDK_TYPE_TEXTURE))
-    type = GDK_TYPE_TEXTURE;
-  else
-    type = GDK_TYPE_PAINTABLE;
+  g_value_init (&value, GDK_TYPE_PAINTABLE);
+  if (!gdk_content_provider_get_value (content, &value, NULL))
+    return;

-  gdk_clipboard_read_value_async (clipboard, 
-                                  type,
-                                  G_PRIORITY_DEFAULT,
-                                  NULL,
-                                  paste_image_cb,
-                                  g_object_ref (widget));
+  paintable = GDK_PAINTABLE (g_value_get_object (&value));
+  gtk_image_set_from_paintable (GTK_IMAGE (demo->image), paintable);
+  g_value_unset (&value);
 }

 static void
--- a/demos/gtk-demo/fontify.c
+++ b/demos/gtk-demo/fontify.c
@@ -131,19 +131,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
    }

-#define VOID_ATTR(attr_name) \
-    { \
-      tag = gtk_text_tag_table_lookup (table, #attr_name); \
-      if (!tag) \
-        { \
-          tag = gtk_text_tag_new (#attr_name); \
-          g_object_set (tag, #attr_name, TRUE, NULL); \
-          gtk_text_tag_table_add (table, tag); \
-          g_object_unref (tag); \
-        } \
-      gtk_text_buffer_apply_tag (buffer, tag, start, end); \
-    }
-
  fg_alpha = bg_alpha = 1.;

  attrs = pango_attr_iterator_get_attrs (iter);
@@ -268,29 +255,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
          INT_ATTR (insert_hyphens);
          break;

-        case PANGO_ATTR_LINE_HEIGHT:
-          FLOAT_ATTR (line_height);
-          break;
-
-        case PANGO_ATTR_ABSOLUTE_LINE_HEIGHT:
-          break;
-
-        case PANGO_ATTR_WORD:
-          VOID_ATTR (word);
-          break;
-
-        case PANGO_ATTR_SENTENCE:
-          VOID_ATTR (sentence);
-          break;
-
-        case PANGO_ATTR_BASELINE_SHIFT:
-          INT_ATTR (baseline_shift);
-          break;
-
-        case PANGO_ATTR_FONT_SCALE:
-          INT_ATTR (font_scale);
-          break;
-
        case PANGO_ATTR_SHAPE:
        case PANGO_ATTR_ABSOLUTE_SIZE:
        case PANGO_ATTR_GRAVITY:
@@ -299,10 +263,6 @@ insert_tags_for_attributes (GtkTextBuffer     *buffer,
        case PANGO_ATTR_BACKGROUND_ALPHA:
          break;

-        case PANGO_ATTR_TEXT_TRANSFORM:
-          INT_ATTR (text_transform);
-          break;
-
        case PANGO_ATTR_INVALID:
        default:
          g_assert_not_reached ();
--- a/demos/gtk-demo/fontrendering.c
+++ b/demos/gtk-demo/fontrendering.c
@@ -1,11 +1,6 @@
 /* Pango/Font Rendering
 *
- * Demonstrates various aspects of font rendering,
- * such as hinting, antialiasing and grid alignment.
- *
- * The demo lets you explore font rendering options
- * interactively to get a feeling for they affect the
- * shape and positioning of the glyphs.
+ * Demonstrates various aspects of font rendering.
 */

 #include <gtk/gtk.h>
@@ -15,21 +10,16 @@ static GtkWidget *font_button = NULL;
 static GtkWidget *entry = NULL;
 static GtkWidget *image = NULL;
 static GtkWidget *hinting = NULL;
-static GtkWidget *anti_alias = NULL;
 static GtkWidget *hint_metrics = NULL;
 static GtkWidget *up_button = NULL;
 static GtkWidget *down_button = NULL;
 static GtkWidget *text_radio = NULL;
 static GtkWidget *show_grid = NULL;
 static GtkWidget *show_extents = NULL;
-static GtkWidget *show_pixels = NULL;
-static GtkWidget *show_outlines = NULL;

 static PangoContext *context;

-static int scale = 7;
-static double pixel_alpha = 1.0;
-static double outline_alpha = 0.0;
+static int scale = 9;

 static void
 update_image (void)
@@ -47,8 +37,6 @@ update_image (void)
  cairo_font_options_t *fopt;
  cairo_hint_style_t hintstyle;
  cairo_hint_metrics_t hintmetrics;
-  cairo_antialias_t antialias;
-  cairo_path_t *path;

  if (!context)
    context = gtk_widget_create_pango_context (image);
@@ -77,13 +65,6 @@ update_image (void)
    hintmetrics = CAIRO_HINT_METRICS_OFF;
  cairo_font_options_set_hint_metrics (fopt, hintmetrics);

-  if (gtk_check_button_get_active (GTK_CHECK_BUTTON (anti_alias)))
-    antialias = CAIRO_ANTIALIAS_GRAY;
-  else
-    antialias = CAIRO_ANTIALIAS_NONE;
-  cairo_font_options_set_antialias (fopt, antialias);
-
-  pango_context_set_round_glyph_positions (context, hintmetrics == CAIRO_HINT_METRICS_ON);
  pango_cairo_context_set_font_options (context, fopt);
  cairo_font_options_destroy (fopt);
  pango_context_changed (context);
@@ -104,14 +85,10 @@ update_image (void)
      cairo_set_source_rgb (cr, 1, 1, 1);
      cairo_paint (cr);

-      cairo_set_source_rgba (cr, 0, 0, 0, pixel_alpha);
-
+      cairo_set_source_rgb (cr, 0, 0, 0);
      cairo_move_to (cr, 10, 10);
      pango_cairo_show_layout (cr, layout);

-      pango_cairo_layout_path (cr, layout);
-      path = cairo_copy_path (cr);
-
      cairo_destroy (cr);
      g_object_unref (layout);

@@ -150,7 +127,7 @@ update_image (void)

      if (gtk_check_button_get_active (GTK_CHECK_BUTTON (show_extents)))
        {
-          cairo_set_source_rgb (cr, 0, 0, 1);
+          cairo_set_source_rgba (cr, 0, 0, 1, 1);

          cairo_rectangle (cr,
                           scale * (10 + pango_units_to_double (logical.x)) - 0.5,
@@ -163,7 +140,7 @@ update_image (void)
          cairo_line_to (cr, scale * (10 + pango_units_to_double (logical.x + logical.width)) + 1,
                             scale * (10 + pango_units_to_double (baseline)) - 0.5);
          cairo_stroke (cr);
-          cairo_set_source_rgb (cr, 1, 0, 0);
+          cairo_set_source_rgba (cr, 1, 0, 0, 1);
          cairo_rectangle (cr,
                           scale * (10 + pango_units_to_double (pink.x)) + 0.5,
                           scale * (10 + pango_units_to_double (pink.y)) + 0.5,
@@ -172,36 +149,8 @@ update_image (void)
          cairo_stroke (cr);
        }

-      for (int i = 0; i < path->num_data; i += path->data[i].header.length)
-        {
-          cairo_path_data_t *data = &path->data[i];
-          switch (data->header.type)
-            {
-            case CAIRO_PATH_CURVE_TO:
-              data[3].point.x *= scale; data[3].point.y *= scale;
-              data[2].point.x *= scale; data[2].point.y *= scale;
-              data[1].point.x *= scale; data[1].point.y *= scale;
-              break;
-            case CAIRO_PATH_LINE_TO:
-            case CAIRO_PATH_MOVE_TO:
-              data[1].point.x *= scale; data[1].point.y *= scale;
-              break;
-            case CAIRO_PATH_CLOSE_PATH:
-              break;
-            default:
-              g_assert_not_reached ();
-            }
-        }
-
-      cairo_set_source_rgba (cr, 0, 0, 1, outline_alpha);
-      cairo_move_to (cr, scale * 20 - 0.5, scale * 20 - 0.5);
-      cairo_append_path (cr, path);
-      cairo_stroke (cr);
-
      cairo_surface_destroy (surface);
      cairo_destroy (cr);
-
-      cairo_path_destroy (path);
    }
  else
    {
@@ -209,26 +158,10 @@ update_image (void)
      PangoLayoutRun *run;
      PangoGlyphInfo *g;
      int i, j;
-      GString *str;
-      gunichar ch;
-
-      if (*text == '\0')
-        text = " ";
-
-      ch = g_utf8_get_char (text);
-
-      str = g_string_new ("");
-
-      for (i = 0; i < 4; i++)
-        {
-          g_string_append_unichar (str, ch);
-          g_string_append_unichar (str, 0x200c);
-        }

      layout = pango_layout_new (context);
      pango_layout_set_font_description (layout, desc);
-      pango_layout_set_text (layout, str->str, -1);
-      g_string_free (str, TRUE);
+      pango_layout_set_text (layout, "aaaa", -1);
      pango_layout_get_extents (layout, &ink, &logical);
      pango_extents_to_pixels (&logical, NULL);

@@ -243,7 +176,7 @@ update_image (void)
      cairo_set_source_rgb (cr, 0, 0, 0);
      for (i = 0; i < 4; i++)
        {
-          g = &(run->glyphs->glyphs[2*i]);
+          g = &(run->glyphs->glyphs[i]);
          g->geometry.width = PANGO_UNITS_ROUND (g->geometry.width * 3 / 2);
        }

@@ -251,7 +184,7 @@ update_image (void)
        {
          for (i = 0; i < 4; i++)
            {
-              g = &(run->glyphs->glyphs[2*i]);
+              g = &(run->glyphs->glyphs[i]);
              g->geometry.x_offset = i * (PANGO_SCALE / 4);
              g->geometry.y_offset = j * (PANGO_SCALE / 4);
            }
@@ -270,6 +203,7 @@ update_image (void)
      cairo_surface_destroy (surface);
    }

+
  gtk_picture_set_pixbuf (GTK_PICTURE (image), pixbuf2);

  g_object_unref (pixbuf2);
@@ -277,78 +211,6 @@ update_image (void)
  pango_font_description_free (desc);
 }

-static gboolean fading = FALSE;
-static double start_pixel_alpha;
-static double end_pixel_alpha;
-static double start_outline_alpha;
-static double end_outline_alpha;
-static gint64 start_time;
-static gint64 end_time;
-
-static double
-ease_out_cubic (double t)
-{
-  double p = t - 1;
-  return p * p * p + 1;
-}
-
-static gboolean
-change_alpha (GtkWidget     *widget,
-              GdkFrameClock *clock,
-              gpointer       user_data)
-{
-  gint64 now = g_get_monotonic_time ();
-  double t;
-
-  t = ease_out_cubic ((now - start_time) / (double) (end_time - start_time));
-
-  pixel_alpha = start_pixel_alpha + (end_pixel_alpha - start_pixel_alpha) * t;
-  outline_alpha = start_outline_alpha + (end_outline_alpha - start_outline_alpha) * t;
-
-  update_image ();
-
-  if (now >= end_time)
-    {
-      fading = FALSE;
-      return G_SOURCE_REMOVE;
-    }
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-start_alpha_fade (void)
-{
-  gboolean pixels;
-  gboolean outlines;
-
-  if (fading)
-    return;
-
-  pixels = gtk_check_button_get_active (GTK_CHECK_BUTTON (show_pixels));
-  outlines = gtk_check_button_get_active (GTK_CHECK_BUTTON (show_outlines));
-
-  start_pixel_alpha = pixel_alpha;
-  if (pixels && outlines)
-    end_pixel_alpha = 0.5;
-  else if (pixels)
-    end_pixel_alpha = 1;
-  else
-    end_pixel_alpha = 0;
-
-  start_outline_alpha = outline_alpha;
-  if (outlines)
-    end_outline_alpha = 1.0;
-  else
-    end_outline_alpha = 0.0;
-
-  start_time = g_get_monotonic_time ();
-  end_time = start_time + G_TIME_SPAN_SECOND / 2;
-
-  fading = TRUE;
-  gtk_widget_add_tick_callback (window, change_alpha, NULL, NULL);
-}
-
 static void
 update_buttons (void)
 {
@@ -356,26 +218,20 @@ update_buttons (void)
  gtk_widget_set_sensitive (down_button, scale > 1);
 }

-static gboolean
-scale_up (GtkWidget *widget,
-          GVariant  *args,
-          gpointer   user_data)
+static void
+scale_up (void)
 {
  scale += 1;
  update_buttons ();
  update_image ();
-  return TRUE;
 }

-static gboolean
-scale_down (GtkWidget *widget,
-            GVariant  *args,
-            gpointer   user_data)
+static void
+scale_down (void)
 {
  scale -= 1;
  update_buttons ();
  update_image ();
-  return TRUE;
 }

 GtkWidget *
@@ -396,26 +252,20 @@ do_fontrendering (GtkWidget *do_widget)
      entry = GTK_WIDGET (gtk_builder_get_object (builder, "entry"));
      image = GTK_WIDGET (gtk_builder_get_object (builder, "image"));
      hinting = GTK_WIDGET (gtk_builder_get_object (builder, "hinting"));
-      anti_alias = GTK_WIDGET (gtk_builder_get_object (builder, "antialias"));
      hint_metrics = GTK_WIDGET (gtk_builder_get_object (builder, "hint_metrics"));
      text_radio = GTK_WIDGET (gtk_builder_get_object (builder, "text_radio"));
      show_grid = GTK_WIDGET (gtk_builder_get_object (builder, "show_grid"));
      show_extents = GTK_WIDGET (gtk_builder_get_object (builder, "show_extents"));
-      show_pixels = GTK_WIDGET (gtk_builder_get_object (builder, "show_pixels"));
-      show_outlines = GTK_WIDGET (gtk_builder_get_object (builder, "show_outlines"));

      g_signal_connect (up_button, "clicked", G_CALLBACK (scale_up), NULL);
      g_signal_connect (down_button, "clicked", G_CALLBACK (scale_down), NULL);
      g_signal_connect (entry, "notify::text", G_CALLBACK (update_image), NULL);
      g_signal_connect (font_button, "notify::font-desc", G_CALLBACK (update_image), NULL);
      g_signal_connect (hinting, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (anti_alias, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (hint_metrics, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (text_radio, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (show_grid, "notify::active", G_CALLBACK (update_image), NULL);
      g_signal_connect (show_extents, "notify::active", G_CALLBACK (update_image), NULL);
-      g_signal_connect (show_pixels, "notify::active", G_CALLBACK (start_alpha_fade), NULL);
-      g_signal_connect (show_outlines, "notify::active", G_CALLBACK (start_alpha_fade), NULL);

      update_image ();

--- a/demos/gtk-demo/fontrendering.ui
+++ b/demos/gtk-demo/fontrendering.ui
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <object class="GtkAdjustment" id="scale_adj">
+    <property name="upper">24</property>
+    <property name="step-increment">1</property>
+    <property name="page-increment">4</property>
+  </object>
  <object class="GtkWindow" id="window">
-    <property name="default-width">1024</property>
-    <property name="default-height">768</property>
+    <property name="default-width">1080</property>
+    <property name="default-height">430</property>
    <child type="titlebar">
      <object class="GtkHeaderBar">
        <child type="title">
@@ -82,94 +87,57 @@
              </object>
            </child>
            <child>
-              <object class="GtkCheckButton" id="show_pixels">
-                <property name="label">Show _Pixels</property>
-                <property name="use-underline">1</property>
-                <property name="active">1</property>
+              <object class="GtkLabel">
+                <property name="label">Hinting</property>
+                <property name="xalign">1</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
                <layout>
                  <property name="column">3</property>
-                  <property name="row">0</property>
                </layout>
              </object>
            </child>
            <child>
-              <object class="GtkCheckButton" id="show_outlines">
-                <property name="label">Show _Outline</property>
-                <property name="use-underline">1</property>
-                <layout>
-                  <property name="column">3</property>
-                  <property name="row">1</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkBox">
-                <property name="spacing">6</property>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label">_Hinting</property>
-                    <property name="use-underline">1</property>
-                    <property name="mnemonic-widget">hinting</property>
-                    <style>
-                      <class name="dim-label"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkComboBoxText" id="hinting">
-                    <property name="active">0</property>
-                    <property name="valign">center</property>
-                    <items>
-                      <item translatable="yes" id="none">None</item>
-                      <item translatable="yes" id="slight">Slight</item>
-                      <item translatable="yes" id="medium">Medium</item>
-                      <item translatable="yes" id="full">Full</item>
-                    </items>
-                  </object>
-                </child>
+              <object class="GtkComboBoxText" id="hinting">
+                <property name="active">0</property>
+                <property name="valign">center</property>
+                <items>
+                  <item translatable="yes" id="none">None</item>
+                  <item translatable="yes" id="slight">Slight</item>
+                  <item translatable="yes" id="medium">Medium</item>
+                  <item translatable="yes" id="full">Full</item>
+                </items>
                <layout>
                  <property name="column">4</property>
-                  <property name="column-span">2</property>
-                </layout>
-              </object>
-            </child>
-            <child>
-              <object class="GtkCheckButton" id="antialias">
-                <property name="label">_Antialias</property>
-                <property name="use-underline">1</property>
-                <property name="active">1</property>
-                <layout>
-                  <property name="column">4</property>
-                  <property name="row">1</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="hint_metrics">
-                <property name="label">Hint _Metrics</property>
-                <property name="use-underline">1</property>
+                <property name="label">Hint Metrics</property>
                <layout>
-                  <property name="column">5</property>
+                  <property name="column">4</property>
                  <property name="row">1</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="show_extents">
-                <property name="label">Show _Extents</property>
-                <property name="use-underline">1</property>
+                <property name="label">Show Extents</property>
+                <property name="active">1</property>
                <layout>
-                  <property name="column">6</property>
+                  <property name="column">5</property>
                  <property name="row">0</property>
                </layout>
              </object>
            </child>
            <child>
              <object class="GtkCheckButton" id="show_grid">
-                <property name="label">Show _Grid</property>
-                <property name="use-underline">1</property>
+                <property name="active">1</property>
+                <property name="label">Show Grid</property>
                <layout>
-                  <property name="column">6</property>
+                  <property name="column">5</property>
                  <property name="row">1</property>
                </layout>
              </object>
@@ -180,19 +148,8 @@
                <style>
                  <class name="circular"/>
                </style>
-                <child>
-                  <object class="GtkShortcutController">
-                    <property name="scope">managed</property>
-                    <child>
-                      <object class="GtkShortcut">
-                        <property name="trigger">&lt;Control&gt;plus</property>
-                        <property name="action">activate</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <layout>
-                  <property name="column">7</property>
+                  <property name="column">6</property>
                  <property name="row">0</property>
                </layout>
              </object>
@@ -203,19 +160,8 @@
                <style>
                  <class name="circular"/>
                </style>
-                <child>
-                  <object class="GtkShortcutController">
-                    <property name="scope">managed</property>
-                    <child>
-                      <object class="GtkShortcut">
-                        <property name="trigger">&lt;Control&gt;minus</property>
-                        <property name="action">activate</property>
-                      </object>
-                    </child>
-                  </object>
-                </child>
                <layout>
-                  <property name="column">7</property>
+                  <property name="column">6</property>
                  <property name="row">1</property>
                </layout>
              </object>
@@ -224,7 +170,7 @@
              <object class="GtkLabel">
                <property name="hexpand">1</property>
                <layout>
-                  <property name="column">8</property>
+                  <property name="column">7</property>
                </layout>
              </object>
            </child>
--- a/demos/gtk-demo/gtkshadertoy.c
+++ b/demos/gtk-demo/gtkshadertoy.c
@@ -163,8 +163,8 @@ drag_update_cb (GtkGestureDrag *drag,

 static void
 drag_end_cb (GtkGestureDrag *drag,
-             double          dx,
-             double          dy,
+             gdouble         dx,
+             gdouble         dy,
             gpointer        user_data)
 {
  GtkShadertoy *shadertoy = GTK_SHADERTOY (user_data);
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -61,26 +61,12 @@ show_page (GtkTextView *text_view,
           int          page)
 {
  GtkTextBuffer *buffer;
-  GtkTextIter iter, start;
-  GtkTextMark *mark;
+  GtkTextIter iter;
  GtkWidget *child;
  GtkTextChildAnchor *anchor;
  GtkEventController *controller;
-  GtkTextTag *bold, *mono, *nobreaks;

  buffer = gtk_text_view_get_buffer (text_view);
-
-  bold = gtk_text_buffer_create_tag (buffer, NULL,
-                                     "weight", PANGO_WEIGHT_BOLD,
-                                     "scale", PANGO_SCALE_X_LARGE,
-                                     NULL);
-  mono = gtk_text_buffer_create_tag (buffer, NULL,
-                                     "family", "monospace",
-                                     NULL);
-  nobreaks = gtk_text_buffer_create_tag (buffer, NULL,
-                                         "allow-breaks", FALSE,
-                                         NULL);
-
  gtk_text_buffer_set_text (buffer, "", 0);
  gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
  gtk_text_buffer_begin_irreversible_action (buffer);
@@ -118,22 +104,17 @@ show_page (GtkTextView *text_view,
    }
  else if (page == 2)
    {
-      mark = gtk_text_buffer_create_mark (buffer, "mark", &iter, TRUE);
+      GtkTextTag *tag;

-      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, bold, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
-
-      gtk_text_buffer_move_mark (buffer, mark, &iter);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, mono, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "weight", PANGO_WEIGHT_BOLD,
+                                        "scale", PANGO_SCALE_X_LARGE,
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "tag", -1, tag, NULL);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "family", "monospace",
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, " / tag / ", -1, tag, NULL);

      anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
      child = gtk_image_new_from_icon_name ("audio-volume-high-symbolic");
@@ -151,26 +132,20 @@ show_page (GtkTextView *text_view,
          "behavior of mouse and key presses, “lock” a range of text so the "
          "user can't edit it, or countless other things.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
-
-      gtk_text_buffer_delete_mark (buffer, mark);
    }
  else if (page == 3)
    {
-      mark = gtk_text_buffer_create_mark (buffer, "mark", &iter, TRUE);
+      GtkTextTag *tag;

-      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext", -1, bold, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
-
-      gtk_text_buffer_move_mark (buffer, mark, &iter);
-      gtk_text_buffer_insert_with_tags (buffer, &iter, "ˈhaɪ pərˌtɛkst", -1, mono, NULL);
-      gtk_text_buffer_insert (buffer, &iter, " /", -1);
-      gtk_text_buffer_get_iter_at_mark (buffer, &start, mark);
-      gtk_text_buffer_apply_tag (buffer, nobreaks, &start, &iter);
-      gtk_text_buffer_insert (buffer, &iter, " ", -1);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "weight", PANGO_WEIGHT_BOLD,
+                                        "scale", PANGO_SCALE_X_LARGE,
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, "hypertext", -1, tag, NULL);
+      tag = gtk_text_buffer_create_tag (buffer, NULL,
+                                        "family", "monospace",
+                                        NULL);
+      gtk_text_buffer_insert_with_tags (buffer, &iter, " / ˈhaɪ pərˌtɛkst / ", -1, tag, NULL);

      anchor = gtk_text_buffer_create_child_anchor (buffer, &iter);
      child = gtk_image_new_from_icon_name ("audio-volume-high-symbolic");
@@ -184,8 +159,6 @@ show_page (GtkTextView *text_view,
          "Machine-readable text that is not sequential but is organized "
          "so that related items of information are connected.\n", -1);
      insert_link (buffer, &iter, "Go back", 1);
-
-      gtk_text_buffer_delete_mark (buffer, mark);
    }
  gtk_text_buffer_end_irreversible_action (buffer);
 }
@@ -385,7 +358,7 @@ do_hypertext (GtkWidget *do_widget)

      sw = gtk_scrolled_window_new ();
      gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
-                                      GTK_POLICY_NEVER,
+                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
      gtk_window_set_child (GTK_WINDOW (window), sw);
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view);
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -58,7 +58,7 @@ do_markup (GtkWidget *do_widget)
      window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (do_widget));
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 680);
+      gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

      stack = gtk_stack_new ();
--- a/demos/gtk-demo/markup.txt
+++ b/demos/gtk-demo/markup.txt
@@ -1,9 +1,5 @@

-Text sizes: <span size="xx-small">tiny </span><span size="x-small">very small </span><span size="small">small </span><span size="medium">normal </span><span size="large">large </span><span size="x-large">very large </span><span size="xx-large">huge</span>
-
-Text styles: <span style="normal">Normal</span> <span style="italic">Italic</span> <span style="oblique">Olique</span>
-
-Text weights: <span weight="thin">thin</span> <span weight="light">light</span> <span weight="normal">normal</span> <span weight="bold">bold</span> <span weight="ultraheavy">ultraheavy</span>
+Text sizes: <span size="xx-small">tiny</span> <span size="x-small">very small</span> <span size="small">small</span> <span size="medium">normal</span> <span size="large">large</span> <span size="x-large">very large</span> <span size="xx-large">huge</span>

 Text <span color="gray">c<span color="green">o</span>l<span color="tomato">o</span>rs</span> and <span background="pink">backgrounds</span>

@@ -19,12 +15,6 @@ OpenType font features: <span font_desc="sans regular" font_features="dlig=0">fe

 Shortcuts: <tt>Monospace</tt> – <b>Bold</b> – <i>Italic</i> – <big>Big</big> – <small>Small</small> – <u>Underlined</u> – <s>Strikethrough</s> – Super<sup>script</sup> – Sub<sub>script</sub>

-hyphenation algorithm is a <span allow_breaks="false" style="italic">set of rules</span>, especially one codified for implementation in a computer program, that decides at which points a word can be broken over two lines with a hyphen. For example, a hyphenation algorithm might decide that impeachment can be broken as impeach‧ment or im‧peachment but not impe‧achment.
+<span allow_breaks="false">A</span> hyphenation algorithm is a set of rules, especially one codified for implementation in a computer program, that decides at which points a word can be broken over two lines with a hyphen. For example, a hyphenation algorithm might decide that impeachment can be broken as <span allow_breaks="false">impeach‧ment</span> or <span allow_breaks="false">im‧peachment</span> but not <span allow_breaks="false">impe‧achment.</span>

 <span insert_hyphens="false">one/two three/four five/six seven/eight nine/ten</span>
-
-<span line_height='1.33'>Line height: This is an example of widely spaced text. It was achieved by setting the line-height factor to 1.33. You can set the line-height factor to any value between 0 and 10.
-Note that the line height affects the spacing between paragraphs as well as between the wrapped lines inside a paragraph.</span>
-
-Transforms: <span text_transform='uppercase'>straße</span> <span text_transform='capitalize'>up, up and away</span>
-
--- a/demos/gtk-demo/menu.c
+++ b/demos/gtk-demo/menu.c
@@ -21,10 +21,8 @@ do_menu (GtkWidget *do_widget)

  if (!window)
    {
-      GtkWidget *box;
      GtkWidget *sw;
      GtkWidget *widget;
-      GtkWidget *scale;

      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Menu");
@@ -33,23 +31,11 @@ do_menu (GtkWidget *do_widget)
                              gtk_widget_get_display (do_widget));
      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);

-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
      sw = gtk_scrolled_window_new ();
-      gtk_widget_set_vexpand (sw, TRUE);
-      gtk_box_append (GTK_BOX (box), sw);
+      gtk_window_set_child (GTK_WINDOW (window), sw);

      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 1.0);
-      gtk_box_append (GTK_BOX (box), scale);
-
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
-                              widget, "scale",
-                              G_BINDING_BIDIRECTIONAL);
    }

  if (!gtk_widget_get_visible (window))
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -67,7 +67,6 @@ demos = files([
  'paintable_animated.c',
  'paintable_emblem.c',
  'paintable_mediastream.c',
-  'paintable_symbolic.c',
  'panes.c',
  'password_entry.c',
  'peg_solitaire.c',
--- a/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
+++ b/demos/gtk-demo/org.gtk.Demo4.appdata.xml.in
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.Demo4</id>
-  <launchable type="desktop-id">org.gtk.Demo4.desktop</launchable>
+  <id>org.gtk.Demo4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Demo</name>
  <summary>Program to demonstrate GTK functions</summary>
  <description>
@@ -31,7 +30,6 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
      <description>
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -45,27 +45,26 @@ struct _GtkNuclearIconClass
 * so that it can be called from all the other demos, too.
 */
 void
-gtk_nuclear_snapshot (GtkSnapshot   *snapshot,
-                      const GdkRGBA *foreground,
-                      const GdkRGBA *background,
-                      double         width,
-                      double         height,
-                      double         rotation)
+gtk_nuclear_snapshot (GtkSnapshot *snapshot,
+                      double       width,
+                      double       height,
+                      double       rotation,
+                      gboolean     draw_background)
 {
 #define RADIUS 0.3
  cairo_t *cr;
  double size;

-  gtk_snapshot_append_color (snapshot,
-                             background,
-                             &GRAPHENE_RECT_INIT (0, 0, width, height));
+  if (draw_background)
+    gtk_snapshot_append_color (snapshot,
+                               &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 },
+                               &GRAPHENE_RECT_INIT (0, 0, width, height));

  size = MIN (width, height);
  cr = gtk_snapshot_append_cairo (snapshot,
                                  &GRAPHENE_RECT_INIT ((width - size) / 2.0,
                                                       (height - size) / 2.0,
                                                       size, size));
-  gdk_cairo_set_source_rgba (cr, foreground);
  cairo_translate (cr, width / 2.0, height / 2.0);
  cairo_scale (cr, size, size);
  cairo_rotate (cr, rotation);
@@ -95,10 +94,9 @@ gtk_nuclear_icon_snapshot (GdkPaintable *paintable,
   */

  gtk_nuclear_snapshot (snapshot,
-                        &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
-                        &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                        width, height,
-                        nuclear->rotation);
+                        nuclear->rotation,
+                        TRUE);
 }

 static GdkPaintableFlags
--- a/demos/gtk-demo/paintable.h
+++ b/demos/gtk-demo/paintable.h
@@ -4,11 +4,10 @@
 #include <gtk/gtk.h>

 void            gtk_nuclear_snapshot           (GtkSnapshot     *snapshot,
-                                                const GdkRGBA   *foreground,
-                                                const GdkRGBA   *background,
                                                double           width,
                                                double           height,
-                                                double           rotation);
+                                                double           rotation,
+                                                gboolean         draw_background);

 GdkPaintable *  gtk_nuclear_icon_new            (double          rotation);
 GdkPaintable *  gtk_nuclear_animation_new       (gboolean        draw_background);
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -65,12 +65,9 @@ gtk_nuclear_animation_snapshot (GdkPaintable *paintable,

  /* We call the function from the previous example here. */
  gtk_nuclear_snapshot (snapshot,
-                        &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
-                        nuclear->draw_background
-                          ? &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 } /* yellow */
-                          : &(GdkRGBA) { 0, 0, 0, 0 }, /* transparent */
                        width, height,
-                        2 * G_PI * nuclear->progress / MAX_PROGRESS);
+                        2 * G_PI * nuclear->progress / MAX_PROGRESS,
+                        nuclear->draw_background);
 }

 static GdkPaintable *
--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -73,10 +73,9 @@ gtk_nuclear_media_stream_snapshot (GdkPaintable *paintable,

  /* We call the function from the previous example here. */
  gtk_nuclear_snapshot (snapshot,
-                        &(GdkRGBA) { 0, 0, 0, 1 }, /* black */
-                        &(GdkRGBA) { 0.9, 0.75, 0.15, 1.0 }, /* yellow */
                        width, height,
-                        2 * G_PI * nuclear->progress / DURATION);
+                        2 * G_PI * nuclear->progress / DURATION,
+                        TRUE);
 }

 static GdkPaintable *
@@ -151,7 +150,7 @@ gtk_nuclear_media_stream_step (gpointer data)
   * call our pause function to pause the stream.
   */
  if (nuclear->progress >= DURATION)
-    gtk_media_stream_stream_ended (GTK_MEDIA_STREAM (nuclear));
+    gtk_media_stream_ended (GTK_MEDIA_STREAM (nuclear));

  /* The timeout function is removed by the pause function,
   * so we can just always return this value.
@@ -268,11 +267,11 @@ gtk_nuclear_media_stream_init (GtkNuclearMediaStream *nuclear)
   * However, media streams need to tell GTK once they are initialized,
   * so we do that here.
   */
-  gtk_media_stream_stream_prepared (GTK_MEDIA_STREAM (nuclear),
-                                    FALSE,
-                                    TRUE,
-                                    TRUE,
-                                    DURATION);
+  gtk_media_stream_prepared (GTK_MEDIA_STREAM (nuclear),
+                             FALSE,
+                             TRUE,
+                             TRUE,
+                             DURATION);
 }

 /* And finally, we add the simple constructor we declared in the header. */
--- a/demos/gtk-demo/paintable_symbolic.c
+++ b/demos/gtk-demo/paintable_symbolic.c
@@ -1,208 +0,0 @@
-/* Paintable/Symbolic Paintable
- *
- * GdkPaintables can be made to follow the theme's colors. GTK calls
- * icons that do this symbolic icons, paintables that want to have
- * the same effect can implement the GtkSymbolicPaintable interface.
- *
- * We will adapt the original paintable example by adding the ability
- * to recolor the paintable based on the symbolic colors.
- */
-
-#include <gtk/gtk.h>
-
-#include "paintable.h"
-
-static GtkWidget *window = NULL;
-
-/* First, add the boilerplate for the object itself.
- * This part would normally go in the header.
- */
-#define GTK_TYPE_NUCLEAR_SYMBOLIC (gtk_nuclear_symbolic_get_type ())
-G_DECLARE_FINAL_TYPE (GtkNuclearSymbolic, gtk_nuclear_symbolic, GTK, NUCLEAR_SYMBOLIC, GObject)
-
-/* Declare a few warning levels, so we can pick colors based on them */
-typedef enum
-{
-  WARNING_NONE,
-  WARNING_ALERT,
-  WARNING_EMERGENCY
-} WarningLevel;
-
-/* Declare the struct. */
-struct _GtkNuclearSymbolic
-{
-  GObject parent_instance;
-
-  WarningLevel warning_level;
-};
-
-struct _GtkNuclearSymbolicClass
-{
-  GObjectClass parent_class;
-};
-
-/* Add a function to draw the nuclear icon in the given colors */
-static void
-gtk_nuclear_symbolic_snapshot_symbolic (GtkSymbolicPaintable *paintable,
-                                        GdkSnapshot          *snapshot,
-                                        double                width,
-                                        double                height,
-                                        const GdkRGBA        *colors,
-                                        gsize                 n_colors)
-{
-  GtkNuclearSymbolic *self = GTK_NUCLEAR_SYMBOLIC (paintable);
-  static const GdkRGBA transparent = { 0, };
-  const GdkRGBA *bg_color;
-
-  /* select the right background color from the warning level */
-  switch (self->warning_level)
-  {
-    case WARNING_NONE:
-      bg_color = &transparent;
-      break;
-    case WARNING_ALERT:
-      bg_color = &colors[GTK_SYMBOLIC_COLOR_WARNING];
-      break;
-    case WARNING_EMERGENCY:
-      bg_color = &colors[GTK_SYMBOLIC_COLOR_ERROR];
-      break;
-    default:
-      /* This should never happen, but we better do defensive coding
-       * with this critical icon */
-      g_assert_not_reached ();
-      bg_color = &transparent;
-      break;
-  }
-
-  /* Draw the icon with the selected warning color */
-  gtk_nuclear_snapshot (snapshot,
-                        &colors[GTK_SYMBOLIC_COLOR_FOREGROUND],
-                        bg_color,
-                        width, height,
-                        0);
-}
-
-static void
-gtk_nuclear_symbolic_symbolic_paintable_init (GtkSymbolicPaintableInterface *iface)
-{
-  iface->snapshot_symbolic = gtk_nuclear_symbolic_snapshot_symbolic;
-}
-
-/* We need to implement the functionality required by the GdkPaintable interface */
-static void
-gtk_nuclear_symbolic_snapshot (GdkPaintable *paintable,
-                                GdkSnapshot  *snapshot,
-                                double        width,
-                                double        height)
-{
-  /* Calling this function without passing a color is a neat trick
-   * to make GTK use default colors and otherwise forward the call
-   * to the snapshotting function above.
-   */
-  gtk_symbolic_paintable_snapshot_symbolic (GTK_SYMBOLIC_PAINTABLE (paintable),
-                                            snapshot,
-                                            width, height,
-                                            NULL, 0);
-}
-
-static GdkPaintableFlags
-gtk_nuclear_symbolic_get_flags (GdkPaintable *paintable)
-{
-  /* This image has a static size, but the contents may change:
-   * We draw different things when the warning level changes.
-   */
-  return GDK_PAINTABLE_STATIC_SIZE;
-}
-
-static void
-gtk_nuclear_symbolic_paintable_init (GdkPaintableInterface *iface)
-{
-  iface->snapshot = gtk_nuclear_symbolic_snapshot;
-  iface->get_flags = gtk_nuclear_symbolic_get_flags;
-}
-
-/* When defining the GType, we need to implement bot the GdkPaintable
- * and the GtkSymbolicPaintable interface */
-G_DEFINE_TYPE_WITH_CODE (GtkNuclearSymbolic, gtk_nuclear_symbolic, G_TYPE_OBJECT,
-                         G_IMPLEMENT_INTERFACE (GDK_TYPE_PAINTABLE,
-                                                gtk_nuclear_symbolic_paintable_init)
-                         G_IMPLEMENT_INTERFACE (GTK_TYPE_SYMBOLIC_PAINTABLE,
-                                                gtk_nuclear_symbolic_symbolic_paintable_init))
-
-static void
-gtk_nuclear_symbolic_class_init (GtkNuclearSymbolicClass *klass)
-{
-}
-
-static void
-gtk_nuclear_symbolic_init (GtkNuclearSymbolic *nuclear)
-{
-}
-
-/* And finally, we add the simple constructor we declared in the header. */
-GdkPaintable *
-gtk_nuclear_symbolic_new (void)
-{
-  return g_object_new (GTK_TYPE_NUCLEAR_SYMBOLIC, NULL);
-}
-
-/* Add some fun feature to the button */
-static void
-nuclear_button_clicked (GtkButton          *button,
-                        GtkNuclearSymbolic *nuclear)
-{
-  if (nuclear->warning_level >= WARNING_EMERGENCY)
-    {
-      /* On maximum warning level, reset the warning */
-      nuclear->warning_level = WARNING_NONE;
-      /* And sometimes (but not always to confuse people)
-       * close the window.
-       */
-      if (g_random_boolean ())
-        gtk_window_close (GTK_WINDOW (window));
-    }
-  else
-    {
-      /* Otherwise just increase the warning level */
-      nuclear->warning_level++;
-    }
-
-  /* Don't forget to emit the signal causing the paintable to redraw.
-   * Changing the warning level changes the background color after all.
-   */
-  gdk_paintable_invalidate_contents (GDK_PAINTABLE (nuclear));
-}
-
-GtkWidget *
-do_paintable_symbolic (GtkWidget *do_widget)
-{
-  GdkPaintable *nuclear;
-  GtkWidget *image, *button;
-
-  if (!window)
-    {
-      window = gtk_window_new ();
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      gtk_window_set_title (GTK_WINDOW (window), "Don't click!");
-      gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      button = gtk_button_new ();
-      gtk_window_set_child (GTK_WINDOW (window), button);
-
-      nuclear = gtk_nuclear_symbolic_new ();
-      image = gtk_image_new_from_paintable (nuclear);
-
-      gtk_button_set_child (GTK_BUTTON (button), image);
-      g_signal_connect (button, "clicked", G_CALLBACK (nuclear_button_clicked), nuclear);
-      g_object_unref (nuclear);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
--- a/demos/gtk-demo/peg_solitaire.c
+++ b/demos/gtk-demo/peg_solitaire.c
@@ -1,7 +1,7 @@
 /* Peg Solitaire
 * #Keywords: GtkGridView, game
 *
- * This demo demonstrates how to use drag-and-drop to implement peg solitaire.
+ * This demo demonstrates how to use drag'n'drop to implement peg solitaire.
 *
 */

@@ -98,7 +98,7 @@ solitaire_peg_init (SolitairePeg *peg)

 /* Add a little setter for the peg's position.
 * We want to track those so that we can check for legal moves
- * during drag-and-drop operations.
+ * during drag'n'drop operations.
 */
 static void
 solitaire_peg_set_position (SolitairePeg *peg,
--- a/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
+++ b/demos/icon-browser/org.gtk.IconBrowser4.appdata.xml.in
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.IconBrowser4</id>
-  <launchable type="desktop-id">org.gtk.IconBrowser4.desktop</launchable>
+  <id>org.gtk.IconBrowser4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Icon Browser</name>
  <summary>Program to browse themed icons</summary>
  <description>
@@ -30,7 +29,6 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
      <description>
--- a/demos/node-editor/node-editor-window.c
+++ b/demos/node-editor/node-editor-window.c
@@ -24,6 +24,7 @@
 #include "gtkrendererpaintableprivate.h"

 #include "gsk/gskrendernodeparserprivate.h"
+#include "gsk/gl/gskglrenderer.h"
 #include "gsk/ngl/gsknglrenderer.h"
 #ifdef GDK_WINDOWING_BROADWAY
 #include "gsk/broadway/gskbroadwayrenderer.h"
@@ -60,7 +61,7 @@ struct _NodeEditorWindow

  GtkWidget *renderer_listbox;
  GListStore *renderers;
-  GskRenderNode *node;
+  GdkPaintable *paintable;

  GFileMonitor *file_monitor;

@@ -167,6 +168,7 @@ static void
 text_changed (GtkTextBuffer    *buffer,
              NodeEditorWindow *self)
 {
+  GskRenderNode *node;
  char *text;
  GBytes *bytes;
  GtkTextIter iter;
@@ -177,12 +179,10 @@ text_changed (GtkTextBuffer    *buffer,
  text_buffer_remove_all_tags (self->text_buffer);
  bytes = g_bytes_new_take (text, strlen (text));

-  g_clear_pointer (&self->node, gsk_render_node_unref);
-
  /* If this is too slow, go fix the parser performance */
-  self->node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
+  node = gsk_render_node_deserialize (bytes, deserialize_error_func, self);
  g_bytes_unref (bytes);
-  if (self->node)
+  if (node)
    {
      /* XXX: Is this code necessary or can we have API to turn nodes into paintables? */
      GtkSnapshot *snapshot;
@@ -191,9 +191,10 @@ text_changed (GtkTextBuffer    *buffer,
      guint i;

      snapshot = gtk_snapshot_new ();
-      gsk_render_node_get_bounds (self->node, &bounds);
+      gsk_render_node_get_bounds (node, &bounds);
      gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (- bounds.origin.x, - bounds.origin.y));
-      gtk_snapshot_append_node (snapshot, self->node);
+      gtk_snapshot_append_node (snapshot, node);
+      gsk_render_node_unref (node);
      paintable = gtk_snapshot_free_to_paintable (snapshot, &bounds.size);
      gtk_picture_set_paintable (GTK_PICTURE (self->picture), paintable);
      for (i = 0; i < g_list_model_get_n_items (G_LIST_MODEL (self->renderers)); i++)
@@ -337,9 +338,15 @@ text_view_query_tooltip_cb (GtkWidget        *widget,
 }

 static gboolean
-load_bytes (NodeEditorWindow *self,
-            GBytes           *bytes)
+load_file_contents (NodeEditorWindow *self,
+                    GFile            *file)
 {
+  GBytes *bytes;
+
+  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
+  if (bytes == NULL)
+    return FALSE;
+
  if (!g_utf8_validate (g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes), NULL))
    {
      g_bytes_unref (bytes);
@@ -355,105 +362,6 @@ load_bytes (NodeEditorWindow *self,
  return TRUE;
 }

-static gboolean
-load_file_contents (NodeEditorWindow *self,
-                    GFile            *file)
-{
-  GBytes *bytes;
-
-  bytes = g_file_load_bytes (file, NULL, NULL, NULL);
-  if (bytes == NULL)
-    return FALSE;
-
-  return load_bytes (self, bytes);
-}
-
-static GdkContentProvider *
-on_picture_drag_prepare_cb (GtkDragSource    *source,
-                            double            x,
-                            double            y,
-                            NodeEditorWindow *self)
-{
-  if (self->node == NULL)
-    return NULL;
-
-  return gdk_content_provider_new_typed (GSK_TYPE_RENDER_NODE, self->node);
-}
-
-static void
-on_picture_drop_read_done_cb (GObject      *source,
-                              GAsyncResult *res,
-                              gpointer      data)
-{
-  NodeEditorWindow *self = data;
-  GOutputStream *stream = G_OUTPUT_STREAM (source);
-  GdkDrop *drop = g_object_get_data (source, "drop");
-  GdkDragAction action = 0;
-  GBytes *bytes;
-
-  if (g_output_stream_splice_finish (stream, res, NULL) >= 0)
-    {
-      bytes = g_memory_output_stream_steal_as_bytes (G_MEMORY_OUTPUT_STREAM (stream));
-      if (load_bytes (self, bytes))
-        action = GDK_ACTION_COPY;
-    }
-
-  g_object_unref (self);
-  gdk_drop_finish (drop, action);
-  g_object_unref (drop);
-  return;
-}
-
-static void
-on_picture_drop_read_cb (GObject      *source,
-                         GAsyncResult *res,
-                         gpointer      data)
-{
-  NodeEditorWindow *self = data;
-  GdkDrop *drop = GDK_DROP (source);
-  GInputStream *input;
-  GOutputStream *output;
-
-  input = gdk_drop_read_finish (drop, res, NULL, NULL);
-  if (input == NULL)
-    {
-      g_object_unref (self);
-      gdk_drop_finish (drop, 0);
-      return;
-    }
-
-  output = g_memory_output_stream_new_resizable ();
-  g_object_set_data (G_OBJECT (output), "drop", drop);
-  g_object_ref (drop);
-
-  g_output_stream_splice_async (output,
-                                input,
-                                G_OUTPUT_STREAM_SPLICE_CLOSE_SOURCE | G_OUTPUT_STREAM_SPLICE_CLOSE_TARGET,
-                                G_PRIORITY_DEFAULT,
-                                NULL,
-                                on_picture_drop_read_done_cb,
-                                self);
-  g_object_unref (output);
-  g_object_unref (input);
-}
-
-static gboolean
-on_picture_drop_cb (GtkDropTargetAsync *dest,
-                    GdkDrop            *drop,
-                    double              x,
-                    double              y,
-                    NodeEditorWindow   *self)
-{
-  gdk_drop_read_async (drop,
-                       (const char *[2]) { "application/x-gtk-render-node", NULL },
-                       G_PRIORITY_DEFAULT,
-                       NULL,
-                       on_picture_drop_read_cb,
-                       g_object_ref (self));
-
-  return TRUE;
-}
-
 static void
 file_changed_cb (GFileMonitor      *monitor,
                 GFile             *file,
@@ -828,7 +736,6 @@ node_editor_window_finalize (GObject *object)

  g_array_free (self->errors, TRUE);

-  g_clear_pointer (&self->node, gsk_render_node_unref);
  g_clear_object (&self->renderers);

  G_OBJECT_CLASS (node_editor_window_parent_class)->finalize (object);
@@ -872,8 +779,11 @@ node_editor_window_realize (GtkWidget *widget)
                                   "Default");
 #endif
  node_editor_window_add_renderer (self,
-                                   gsk_ngl_renderer_new (),
+                                   gsk_gl_renderer_new (),
                                   "OpenGL");
+  node_editor_window_add_renderer (self,
+                                   gsk_ngl_renderer_new (),
+                                   "NGL");
 #ifdef GDK_RENDERING_VULKAN
  node_editor_window_add_renderer (self,
                                   gsk_vulkan_renderer_new (),
@@ -938,8 +848,6 @@ node_editor_window_class_init (NodeEditorWindowClass *class)
  gtk_widget_class_bind_template_callback (widget_class, testcase_save_clicked_cb);
  gtk_widget_class_bind_template_callback (widget_class, testcase_name_entry_changed_cb);
  gtk_widget_class_bind_template_callback (widget_class, dark_mode_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_picture_drag_prepare_cb);
-  gtk_widget_class_bind_template_callback (widget_class, on_picture_drop_cb);
 }

 static GtkWidget *
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -200,19 +200,6 @@
                        <property name="can-shrink">0</property>
                        <property name="halign">center</property>
                        <property name="valign">center</property>
-                        <child>
-                          <object class="GtkDragSource">
-                            <property name="actions">copy</property>
-                            <signal name="prepare" handler="on_picture_drag_prepare_cb" swapped="no"/>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkDropTargetAsync">
-                        <property name="actions">copy</property>
-                        <property name="formats">application/x-gtk-render-node</property>
-                        <signal name="drop" handler="on_picture_drop_cb" swapped="no"/>
                      </object>
                    </child>
                  </object>
--- a/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
+++ b/demos/print-editor/org.gtk.PrintEditor4.appdata.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.PrintEditor4</id>
-  <launchable type="desktop-id">org.gtk.PrintEditor4.desktop</launchable>
+  <id>org.gtk.PrintEditor4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Print Editor</name>
  <summary>Program to demonstrate GTK printing</summary>
  <description>
@@ -25,7 +24,6 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
    <release version="3.99.0" date="2020-07-30">
      <description>
--- a/demos/print-editor/print-editor.c
+++ b/demos/print-editor/print-editor.c
@@ -721,6 +721,7 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_New</attribute>"
  "          <attribute name='action'>app.new</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;n</attribute>"
  "        </item>"
  "        <item>"
  "          <attribute name='label'>_Open</attribute>"
@@ -729,10 +730,12 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_Save</attribute>"
  "          <attribute name='action'>app.save</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;s</attribute>"
  "        </item>"
  "        <item>"
  "          <attribute name='label'>Save _As...</attribute>"
  "          <attribute name='action'>app.save-as</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;s</attribute>"
  "        </item>"
  "      </section>"
  "      <section>"
@@ -753,6 +756,7 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_Quit</attribute>"
  "          <attribute name='action'>app.quit</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;q</attribute>"
  "        </item>"
  "      </section>"
  "    </submenu>"
@@ -762,6 +766,7 @@ static const char ui_info[] =
  "        <item>"
  "          <attribute name='label'>_About Print Editor</attribute>"
  "          <attribute name='action'>app.about</attribute>"
+  "          <attribute name='accel'>&lt;Primary&gt;a</attribute>"
  "        </item>"
  "      </section>"
  "    </submenu>"
@@ -789,15 +794,6 @@ startup (GApplication *app)
 {
  GtkBuilder *builder;
  GMenuModel *menubar;
-  struct {
-    const char *action_and_target;
-    const char *accelerators[2];
-  } accels[] = {
-    { "app.new", { "<Control>n", NULL } },
-    { "app.quit", { "<Control>q", NULL } },
-    { "app.save", { "<Control>s", NULL } },
-    { "app.about", { "<Control>a", NULL } },
-  };

  builder = gtk_builder_new ();
  gtk_builder_add_from_string (builder, ui_info, -1, NULL);
@@ -806,9 +802,6 @@ startup (GApplication *app)

  gtk_application_set_menubar (GTK_APPLICATION (app), menubar);

-  for (int i = 0; i < G_N_ELEMENTS (accels); i++)
-    gtk_application_set_accels_for_action (GTK_APPLICATION (app), accels[i].action_and_target, accels[i].accelerators);
-
  g_object_unref (builder);
 }

--- a/demos/widget-factory/beach.jpg
+++ b/demos/widget-factory/beach.jpg
--- a/demos/widget-factory/nyc.jpg
+++ b/demos/widget-factory/nyc.jpg
--- a/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
+++ b/demos/widget-factory/org.gtk.WidgetFactory4.appdata.xml.in
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-  <id>org.gtk.WidgetFactory4</id>
-  <launchable type="desktop-id">org.gtk.WidgetFactory4.desktop</launchable>
+  <id>org.gtk.WidgetFactory4.desktop</id>
  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>LGPL-2.1-or-later</project_license>
+  <project_license>LGPL-2.0+</project_license>
  <name>GTK Widget Factory</name>
  <summary>Program to demonstrate GTK functions</summary>
  <description>
@@ -32,7 +31,6 @@
  <translation type="gettext">gtk-4.0</translation>
  <update_contact>matthias.clasen_at_gmail.com</update_contact>
  <developer_name>Matthias Clasen and others</developer_name>
-  <content_rating type="oars-1.1"/>
  <releases>
    <release version="@BUILD_VERSION@" date="@BUILD_DATE@">
      <description>
--- a/demos/widget-factory/snowy.jpg
+++ b/demos/widget-factory/snowy.jpg
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -696,37 +696,6 @@ on_range_to_changed (GtkSpinButton *to)
    gtk_spin_button_set_value (from, v2);
 }

-static GdkContentProvider *
-on_picture_drag_prepare (GtkDragSource *source,
-                         double         x,
-                         double         y,
-                         gpointer       unused)
-{
-  GtkWidget *picture;
-
-  picture = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
-
-  return gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, gtk_picture_get_paintable (GTK_PICTURE (picture)));
-}
-
-static gboolean
-on_picture_drop (GtkDropTarget *dest,
-                 const GValue  *value,
-                 double         x,
-                 double         y,
-                 gpointer       unused)
-{
-  GtkWidget *picture;
-  GdkPaintable *paintable;
-
-  picture = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (dest));
-  paintable = g_value_get_object (value);
-
-  gtk_picture_set_paintable (GTK_PICTURE (picture), paintable);
-
-  return TRUE;
-}
-
 static void
 info_bar_response (GtkWidget *infobar, int response_id)
 {
@@ -1213,7 +1182,7 @@ populate_flowbox (GtkWidget *flowbox)
  GtkWidget *child;
  int i;
  const char *resources[] = {
-    "sunset.jpg", "portland-rose.jpg", "beach.jpg", "nyc.jpg"
+    "sunset.jpg", "snowy.jpg", "portland-rose.jpg"
  };

  if (GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (flowbox), "populated")))
@@ -2028,7 +1997,6 @@ activate (GApplication *app)
    const char *accelerators[2];
  } accels[] = {
    { "app.about", { "F1", NULL } },
-    { "app.shortcuts", { "<Control>question", NULL } },
    { "app.quit", { "<Control>q", NULL } },
    { "app.open-in", { "<Control>n", NULL } },
    { "win.dark", { "<Control>d", NULL } },
@@ -2071,8 +2039,6 @@ activate (GApplication *app)
          "on_page_combo_changed", (GCallback)on_page_combo_changed,
          "on_range_from_changed", (GCallback)on_range_from_changed,
          "on_range_to_changed", (GCallback)on_range_to_changed,
-          "on_picture_drag_prepare", (GCallback)on_picture_drag_prepare,
-          "on_picture_drop", (GCallback)on_picture_drop,
          "tab_close_cb", (GCallback)tab_close_cb,
          "increase_icon_size", (GCallback)increase_icon_size,
          "decrease_icon_size", (GCallback)decrease_icon_size,
--- a/demos/widget-factory/widget-factory.gresource.xml
+++ b/demos/widget-factory/widget-factory.gresource.xml
@@ -115,8 +115,7 @@
  <gresource prefix="/org/gtk/WidgetFactory4">
    <file>gtk-logo.webm</file>
    <file>sunset.jpg</file>
+    <file>snowy.jpg</file>
    <file>portland-rose.jpg</file>
-    <file>nyc.jpg</file>
-    <file>beach.jpg</file>
  </gresource>
 </gresources>
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -1051,9 +1051,22 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <property name="spacing">10</property>
                            <property name="hexpand">1</property>
                            <child>
-                              <object class="GtkFrame">
+                              <object class="GtkFrame" id="frame1">
+                                <property name="valign">start</property>
+                                <child type="label">
+                                  <object class="GtkLabel" id="label1">
+                                    <property name="label" translatable="yes">&lt;b&gt;Video&lt;/b&gt;</property>
+                                    <property name="use-markup">1</property>
+                                  </object>
+                                </child>
                                <child>
                                  <object class="GtkVideo">
+                                    <property name="halign">center</property>
+                                    <property name="valign">center</property>
+                                    <property name="margin-start">6</property>
+                                    <property name="margin-end">6</property>
+                                    <property name="margin-top">6</property>
+                                    <property name="margin-bottom">6</property>
                                    <property name="autoplay">1</property>
                                    <property name="loop">1</property>
                                    <property name="file">resource:///org/gtk/WidgetFactory4/gtk-logo.webm</property>
@@ -1062,78 +1075,66 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                              </object>
                            </child>
                            <child>
-                              <object class="GtkFrame">
-                                <child type="label">
-                                  <object class="GtkLabel" id="label1">
-                                    <property name="label" translatable="yes">&lt;b&gt;Text Styles&lt;/b&gt;</property>
-                                    <property name="use-markup">1</property>
-                                  </object>
-                                </child>
+                              <object class="GtkScrolledWindow">
+                                <property name="vexpand">1</property>
+                                <property name="hscrollbar-policy">never</property>
+                                <property name="vscrollbar-policy">automatic</property>
                                <child>
-                                  <object class="GtkScrolledWindow">
-                                    <property name="vexpand">1</property>
-                                    <property name="hscrollbar-policy">never</property>
-                                    <property name="vscrollbar-policy">automatic</property>
-                                    <property name="propagate-natural-height">1</property>
-                                    <property name="propagate-natural-width">1</property>
+                                  <object class="GtkBox">
+                                    <property name="orientation">vertical</property>
+                                    <property name="spacing">10</property>
                                    <child>
-                                      <object class="GtkBox">
-                                        <property name="orientation">vertical</property>
-                                        <property name="spacing">10</property>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Large Title</property>
-                                            <style><class name="large-title"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 1</property>
-                                            <style><class name="title-1"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 2</property>
-                                            <style><class name="title-2"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 3</property>
-                                            <style><class name="title-3"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Title 4</property>
-                                            <style><class name="title-4"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Heading</property>
-                                            <style><class name="heading"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Body</property>
-                                            <style><class name="body"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Caption Heading</property>
-                                            <style><class name="caption-heading"/></style>
-                                          </object>
-                                        </child>
-                                        <child>
-                                          <object class="GtkLabel">
-                                            <property name="label">Caption</property>
-                                            <style><class name="caption"/></style>
-                                          </object>
-                                        </child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Large Title</property>
+                                        <style><class name="large-title"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 1</property>
+                                        <style><class name="title-1"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 2</property>
+                                        <style><class name="title-2"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 3</property>
+                                        <style><class name="title-3"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Title 4</property>
+                                        <style><class name="title-4"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Heading</property>
+                                        <style><class name="heading"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Body</property>
+                                        <style><class name="body"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Caption Heading</property>
+                                        <style><class name="caption-heading"/></style>
+                                      </object>
+                                    </child>
+                                    <child>
+                                      <object class="GtkLabel">
+                                        <property name="label">Caption</property>
+                                        <style><class name="caption"/></style>
                                      </object>
                                    </child>
                                  </object>
@@ -1250,21 +1251,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <child>
                              <object class="GtkNotebookPage">
                                <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/sunset.jpg</property>
-                                    <child>
-                                      <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
-                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropTarget">
-                                        <property name="actions">copy</property>
-                                        <property name="formats">GdkTexture</property>
-                                        <signal name="drop" handler="on_picture_drop" swapped="no"/>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box6">
+                                    <property name="orientation">vertical</property>
                                  </object>
                                </property>
                                <property name="tab">
@@ -1277,21 +1265,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <child>
                              <object class="GtkNotebookPage">
                                <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/nyc.jpg</property>
-                                    <child>
-                                      <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
-                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropTarget">
-                                        <property name="actions">copy</property>
-                                        <property name="formats">GdkTexture</property>
-                                        <signal name="drop" handler="on_picture_drop" swapped="no"/>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box7">
+                                    <property name="orientation">vertical</property>
                                  </object>
                                </property>
                                <property name="tab">
@@ -1303,22 +1278,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            </child>
                            <child>
                              <object class="GtkNotebookPage">
+                                <property name="position">2</property>
                                <property name="child">
-                                  <object class="GtkPicture">
-                                    <property name="file">resource:///org/gtk/WidgetFactory4/beach.jpg</property>
-                                    <child>
-                                      <object class="GtkDragSource">
-                                        <property name="actions">copy</property>
-                                        <signal name="prepare" handler="on_picture_drag_prepare" swapped="no"/>
-                                      </object>
-                                    </child>
-                                    <child>
-                                      <object class="GtkDropTarget">
-                                        <property name="actions">copy</property>
-                                        <property name="formats">GdkTexture</property>
-                                        <signal name="drop" handler="on_picture_drop" swapped="no"/>
-                                      </object>
-                                    </child>
+                                  <object class="GtkBox" id="box8">
+                                    <property name="orientation">vertical</property>
                                  </object>
                                </property>
                                <property name="tab">
@@ -1336,7 +1299,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                            <child>
                              <object class="GtkNotebookPage">
                                <property name="child">
-                                  <object class="GtkBox" id="box8">
+                                  <object class="GtkBox" id="box9">
                                    <property name="orientation">vertical</property>
                                  </object>
                                </property>
@@ -2939,7 +2902,7 @@ bad things might happen.</property>

    <action-widgets>
      <action-widget response="cancel">cancel_info_dialog</action-widget>
-      <action-widget response="ok" default="true">doit_info_dialog</action-widget>
+      <action-widget response="ok">doit_info_dialog</action-widget>
    </action-widgets>
  </object>
  <object class="GtkDialog" id="action_dialog">
--- a/docs/reference/gdk/gdk4-wayland.toml.in
+++ b/docs/reference/gdk/gdk4-wayland.toml.in
@@ -13,7 +13,7 @@ devhelp = true
  [dependencies."GObject-2.0"]
  name = "GObject"
  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"

 [theme]
 name = "basic"
--- a/docs/reference/gdk/gdk4-x11.toml.in
+++ b/docs/reference/gdk/gdk4-x11.toml.in
@@ -13,7 +13,7 @@ devhelp = true
  [dependencies."GObject-2.0"]
  name = "GObject"
  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"

 [theme]
 name = "basic"
--- a/docs/reference/gdk/gdk4.toml.in
+++ b/docs/reference/gdk/gdk4.toml.in
@@ -5,7 +5,7 @@ repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
-license = "LGPL-2.1-or-later"
+license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
 dependencies = [ "GObject-2.0", "cairo-1.0", "Pango-1.0", "GdkWayland-4.0",  "GdkX11-4.0" ]
 devhelp = true
@@ -14,7 +14,7 @@ search_index = true
  [dependencies."GObject-2.0"]
  name = "GObject"
  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"

  [dependencies."cairo-1.0"]
  name = "Cairo"
--- a/docs/reference/gdk/meson.build
+++ b/docs/reference/gdk/meson.build
@@ -1,15 +1,11 @@
 expand_content_md_files = [
 ]

-if get_option('gtk_doc')
-  gdk4_toml = configure_file(
-    input: 'gdk4.toml.in',
-    output: 'gdk4.toml',
-    configuration: toml_conf,
-    install: true,
-    install_dir: docs_dir / 'gdk4',
-  )
+gdk4_toml = configure_file(input: 'gdk4.toml.in', output: 'gdk4.toml', configuration: toml_conf)
+gdk4x11_toml = configure_file(input: 'gdk4-x11.toml.in', output: 'gdk4-x11.toml', configuration: toml_conf)
+gdk4wayland_toml = configure_file(input: 'gdk4-wayland.toml.in', output: 'gdk4-wayland.toml', configuration: toml_conf)

+if get_option('gtk_doc')
  custom_target('gdk4-doc',
    input: [ gdk4_toml, gdk_gir[0] ],
    output: 'gdk4',
@@ -32,14 +28,6 @@ if get_option('gtk_doc')
  )

  if x11_enabled
-    gdk4x11_toml = configure_file(
-      input: 'gdk4-x11.toml.in',
-      output: 'gdk4-x11.toml',
-      configuration: toml_conf,
-      install: true,
-      install_dir: docs_dir / 'gdk4-x11',
-    )
-
    custom_target('gdk4-x11-doc',
      input: [ gdk4x11_toml, gdk_x11_gir[0] ],
      output: 'gdk4-x11',
@@ -64,14 +52,6 @@ if get_option('gtk_doc')
  endif

  if wayland_enabled
-    gdk4wayland_toml = configure_file(
-      input: 'gdk4-wayland.toml.in',
-      output: 'gdk4-wayland.toml',
-      configuration: toml_conf,
-      install: true,
-      install_dir: docs_dir / 'gdk4-wayland',
-    )
-
    custom_target('gdk4-wayland-doc',
      input: [ gdk4wayland_toml, gdk_wayland_gir[0] ],
      output: 'gdk4-wayland',
--- a/docs/reference/gdk/urlmap.js
+++ b/docs/reference/gdk/urlmap.js
@@ -3,14 +3,11 @@

 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'GLib', 'https://docs.gtk.org/glib/' ],
-    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
-    [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
-    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
-    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
-    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
-    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
-    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
+    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
+    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
+    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
+    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
+    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
+    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
 ]
--- a/docs/reference/gsk/gsk4.toml.in
+++ b/docs/reference/gsk/gsk4.toml.in
@@ -5,7 +5,7 @@ repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
-license = "LGPL-2.1-or-later"
+license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
 dependencies = [ "GObject-2.0", "Graphene-1.0", "Pango-1.0", "Gdk-4.0" ]
 devhelp = true
@@ -14,7 +14,7 @@ search_index = true
  [dependencies."GObject-2.0"]
  name = "GObject"
  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable/"

  [dependencies."Graphene-1.0"]
  name = "Graphene"
--- a/docs/reference/gsk/meson.build
+++ b/docs/reference/gsk/meson.build
@@ -1,12 +1,6 @@
-if get_option('gtk_doc')
-  gsk4_toml = configure_file(
-    input: 'gsk4.toml.in',
-    output: 'gsk4.toml',
-    configuration: toml_conf,
-    install: true,
-    install_dir: docs_dir / 'gsk4',
-  )
+gsk4_toml = configure_file(input: 'gsk4.toml.in', output: 'gsk4.toml', configuration: toml_conf)

+if get_option('gtk_doc')
  custom_target('gsk4-doc',
    input: [ gsk4_toml, gsk_gir[0] ],
    output: 'gsk4',
--- a/docs/reference/gsk/urlmap.js
+++ b/docs/reference/gsk/urlmap.js
@@ -3,14 +3,11 @@

 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'GLib', 'https://docs.gtk.org/glib/' ],
-    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
-    [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
-    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
-    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
-    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
-    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
-    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
+    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
+    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
+    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
+    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
+    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
+    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
 ]
--- a/docs/reference/gtk/css-properties.md
+++ b/docs/reference/gtk/css-properties.md
@@ -162,8 +162,6 @@ done with
 |caret-color|[CSS Basic User Interface Level 3](https://www.w3.org/TR/css3-ui/#caret-color) | CSS allows an auto value |
 |-gtk-secondary-caret-color|[Color](https://www.w3.org/TR/css-color-3/#valuea-def-color) | used for the secondary caret in bidirectional text |
 |letter-spacing| [CSS Text Level 3](https://www.w3.org/TR/css3-text/#letter-spacing) | |
-|text-transform| [CSS Text Level 3](https://www.w3.org/TR/css-text-3/#text-transform-property) | CSS allows full-width and full-size-kana. Since 4.6 |
-|line-height| [CSS Inline Layout Level 3](https://www.w3.org/TR/css-inline-3/#line-height-property) | Since 4.6 |
 |text-decoration-line| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property) | |
 |text-decoration-color| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-color-property) | |
 |text-decoration-style| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-style-property) | CSS allows dashed and dotted |
--- a/docs/reference/gtk/drag-and-drop.md
+++ b/docs/reference/gtk/drag-and-drop.md
@@ -1,54 +0,0 @@
-Title: Drag-and-Drop in GTK
-
-Drag-and-Drop (DND) is a user interaction pattern where users drag a UI element
-from one place to another, either inside a single application or between
-different application windows.
-
-When the element is 'dropped', data is transferred from the source to the
-destination, according to the drag action that is negotiated between both
-sides. Most commonly, that is a _copy_, but it can also be a _move_ or a
-_link_, depending on the kind of data and how the drag operation has been
-set up.
-
-This chapter gives an overview over how Drag-and-Drop is handled with event
-controllers in GTK.
-
-## Drag sources
-
-To make data available via DND, you create a [class@Gtk.DragSource]. Drag sources
-are event controllers, which initiate a Drag-and-Drop operation when the user clicks
-and drags the widget.
-
-A drag source can be set up ahead of time, with the desired drag action(s) and the data
-to be transferred. But it is also possible to provide the data when a drag operation
-is about to begin, by connecting to the [signal@Gtk.DragSource::prepare] signal.
-
-The GtkDragSource emits the [signal@Gtk.DragSource::drag-begin] signal when the DND
-operation starts, and the [signal@Gtk.DragSource::drag-end] signal when it is done.
-But it is not normally necessary to handle these signals. One case in which a ::drag-end
-handler is necessary is to implement `GDK_ACTION_MOVE`.
-
-## Drop targets
-
-To receive data via DND, you create a [class@Gtk.DropTarget], and tell it what kind of
-data to accept. You need to connect to the [signal@Gtk.DropTarget::drop] signal to receive
-the data when a DND operation occurs.
-
-While a DND operation is ongoing, GTK provides updates when the pointer moves over
-the widget to which the drop target is associated. The [signal@Gtk.DropTarget::enter],
-[signal@Gtk.DropTarget::leave] and [signal@Gtk.DropTarget::motion] signals get emitted
-for this purpose.
-
-GtkDropTarget provides a simple API, and only provides the data when it has been completely
-transferred. If you need to handle the data transfer yourself (for example to provide progress
-information during the transfer), you can use the more complicated [class@Gtk.DropTargetAsync].
-
-## Other considerations
-
-It is sometimes necessary to update the UI of the destination while a DND operation is ongoing,
-say to scroll or expand a view, or to switch pages. Typically, such UI changes are triggered
-by hovering over the widget in question.
-
-[class@Gtk.DropControllerMotion] is an event controller that can help with implementing such
-behaviors. It is very similar to [class@Gtk.EventControllerMotion], but provides events during
-a DND operation.
--- a/docs/reference/gtk/getting_started.md
+++ b/docs/reference/gtk/getting_started.md
@@ -161,19 +161,19 @@ activate (GtkApplication *app,
 {
  GtkWidget *window;
  GtkWidget *button;
+  GtkWidget *box;

  window = gtk_application_window_new (app);
  gtk_window_set_title (GTK_WINDOW (window), "Window");
  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);

-  button = gtk_button_new_with_label ("Hello World");
-  gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_window_set_child (GTK_WINDOW (window), box);

+  button = gtk_button_new_with_label ("Hello World");
  g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
-
-  gtk_window_set_child (GTK_WINDOW (window), button);
+  gtk_box_append (GTK_BOX (box), button);

  gtk_widget_show (window);
 }
--- a/docs/reference/gtk/gtk4-launch.xml
+++ b/docs/reference/gtk/gtk4-launch.xml
@@ -46,8 +46,7 @@ display, unless specified otherwise.
 <para>
 <command>gtk4-launch</command> takes at least one argument, the name of
 the application to launch. The name should match application desktop file name,
-as residing in the applications subdirectories of the XDG data directories, with
-or without the '.desktop' suffix.
+as residing in /usr/share/application, with or without the '.desktop' suffix.
 </para>
 <para>
 If called with more than one argument, the rest of them besides the application
@@ -72,14 +71,4 @@ application.
  </variablelist>
 </refsect1>

-<refsect1><title>Environment</title>
-  <para>Some environment variables affect the behavior of <command>gtk4-launch</command>.</para>
-  <variablelist>
-    <varlistentry>
-    <term><option>XDG_DATA_HOME</option>, <option>XDG_DATA_DIRS</option></term>
-      <listitem><para>The environment variables specifying the XDG dta directories.</para></listitem>
-    </varlistentry>
-  </variablelist>
-</refsect1>
-
 </refentry>
--- a/docs/reference/gtk/gtk4.toml.in
+++ b/docs/reference/gtk/gtk4.toml.in
@@ -5,7 +5,7 @@ repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
 website_url = "https://www.gtk.org"
 authors = "GTK Development Team"
 logo_url = "gtk-logo.svg"
-license = "LGPL-2.1-or-later"
+license = "GPL-2.1-or-later"
 description = "The GTK toolkit"
 dependencies = [ "GObject-2.0", "Graphene-1.0", "Pango-1.0", "Gdk-4.0", "Gsk-4.0" ]
 devhelp = true
@@ -14,7 +14,7 @@ search_index = true
  [dependencies."GObject-2.0"]
  name = "GObject"
  description = "The base type system library"
-  docs_url = "https://docs.gtk.org/gobject/"
+  docs_url = "https://developer.gnome.org/gobject/stable"

  [dependencies."Graphene-1.0"]
  name = "Graphene"
@@ -57,7 +57,6 @@ content_files = [
  "initialization.md",
  "actions.md",
  "input-handling.md",
-  "drag-and-drop.md",
  "drawing-model.md",
  "css-overview.md",
  "css-properties.md",
--- a/docs/reference/gtk/input-handling.md
+++ b/docs/reference/gtk/input-handling.md
@@ -137,14 +137,6 @@ capture phase, and key bindings locally, during the target phase.
 Under the hood, all shortcuts are represented as instances of `GtkShortcut`,
 and they are managed by `GtkShortcutController`.

-## Text input
-
-When actual text input is needed (i.e. not just keyboard shortcuts),
-input method support can be added to a widget by connecting an input
-method context and listening to its `::commit` signal. To create a new
-input method context, use gtk_im_multicontext_new(), to provide it with
-input, use gtk_event_controller_key_set_im_context().
-
 ## Event controllers and gestures

 Event controllers are standalone objects that can perform
--- a/docs/reference/gtk/meson.build
+++ b/docs/reference/gtk/meson.build
@@ -27,15 +27,9 @@ expand_content_md_files = [
  'visual_index.md'
 ]

-if get_option('gtk_doc')
-  gtk4_toml = configure_file(
-    input: 'gtk4.toml.in',
-    output: 'gtk4.toml',
-    configuration: toml_conf,
-    install: true,
-    install_dir: docs_dir / 'gtk4',
-  )
+gtk4_toml = configure_file(input: 'gtk4.toml.in', output: 'gtk4.toml', configuration: toml_conf)

+if get_option('gtk_doc')
  custom_target('gtk4-doc',
    input: [ gtk4_toml, gtk_gir[0] ],
    output: 'gtk4',
--- a/docs/reference/gtk/migrating-3to4.md
+++ b/docs/reference/gtk/migrating-3to4.md
@@ -99,12 +99,6 @@ you should stop using `GdkVisual` APIs, since this object not longer
 exists in GTK 4. Most of its APIs are deprecated already and not
 useful when dealing with RGBA visuals.

-### Stop using `gtk_widget_set_app_paintable`
-
-This is gone in GTK4 with no direct replacement. But for some usecases there
-are alternatives. If you want to make the background transparent, you can set
-the background color to, for example, `rgba(255, 255, 255, 0)` using CSS instead.
-
 ### Stop using `GtkBox` padding, fill and expand child properties

 GTK 4 removes these [class@Gtk.Box] child properties, so you should stop using
@@ -139,7 +133,7 @@ or `gtk_style_context_get_color()` only accept the context's current
 state for their state argument. You should update all callers to pass
 the current state.

-### Stop using `gdk_pixbuf_get_from_window()` and `gdk_cairo_set_source_window()`
+### Stop using `gdk_pixbuf_get_from_window()` and `gdk_cairo_set_source_surface()`

 These functions are not supported in GTK 4. Instead, either use
 backend-specific APIs, or render your widgets using
@@ -193,22 +187,11 @@ for this change.
 | ::grab-broken-event | - |

 Event signals which are not directly related to input have to be dealt with
-on a one-by-one basis:
-
- - If you were using `::configure-event` and `::window-state-event` to save
-   window state, you should use property notification for corresponding
-   [class@Gtk.Window] properties, such as [property@Gtk.Window:default-width],
-   [property@Gtk.Window:default-height], [property@Gtk.Window:maximized] or
-   [property@Gtk.Window:fullscreened].
- - If you were using `::delete-event` to present a confirmation when using
-   the close button of a window, you should use the
-   [signal@Gtk.Window::close-request] signal.
- - If you were using `::map-event` and `::unmap-event` to track a window
-   being mapped, you should use property notification for the
-   [property@Gdk.Surface:mapped] property instead.
- - The `::damage-event` signal has no replacement, as the only consumer
-   of damage events were the offscreen GDK surfaces, which have no
-   replacement in GTK 4.x.
+on a one-by-one basis. If you were using `::configure-event` and
+`::window-state-event` to save window state, you should use property
+notification for corresponding [class@Gtk.Window] properties, such as
+[property@Gtk.Window:default-width], [property@Gtk.Window:default-height],
+[property@Gtk.Window:maximized] or [property@Gtk.Window:fullscreened].

 ### Set a proper application ID

@@ -249,10 +232,6 @@ in GTK 3, you can prepare for the switch by using `gtk_widget_destroy()`
 only on toplevel windows, and replace all other uses with
 `gtk_container_remove()` or `g_object_unref()`.

-### Stop using the GtkWidget.destroy vfunc
-
-Instead of implementing GtkWidget.destroy, you can implement GObject.dispose.
-
 ### Reduce the use of generic container APIs

 GTK 4 removes `gtk_container_add()` and `gtk_container_remove()`. While there
@@ -625,9 +604,6 @@ from `FALSE` to `TRUE`. In addition, there is a [property@Gtk.Widget:focusable]
 property, which controls whether an individual widget can receive
 the input focus.

-The `gtk4-builder-tool` utility, when called with the `--3to4` option of the
-`simplify` command, will replace `:can-focus` by `:focusable`.
-
 The feature to automatically keep the focus widget scrolled into view with
 `gtk_container_set_focus_vadjustment()` has been removed together with
 `GtkContainer`, and is provided by scrollable widgets instead. In the common
@@ -764,7 +740,7 @@ The abstract base class `GtkBin` for single-child containers has been
 removed. The former subclasses are now derived directly from `GtkWidget`,
 and have a "child" property for their child widget. To add a child, use
 the setter for the "child" property (e.g. [method@Gtk.Frame.set_child]) instead
-of `gtk_container_add()`. Adding a child in a ui file with `<child>` still works.
+of `gtk_container_add()`. Adding a child in a ui file with <child> still works.

 The affected classes are:

@@ -790,7 +766,7 @@ expand flags) and [vfunc@Gtk.Widget.get_request_mode] (if you want your
 container to support height-for-width).

 You may also want to implement the [iface@Gtk.Buildable] interface, to support
-adding children with `<child>` in ui files.
+adding children with <child> in ui files.

 ### Adapt to GtkContainer removal

@@ -801,7 +777,7 @@ and have class-specific add() and remove() functions.
 The most noticeable change is the use of [method@Gtk.Box.append] or [method@Gtk.Box.prepend]
 instead of `gtk_container_add()` for adding children to `GtkBox`, and the change
 to use container-specific remove functions, such as [method@Gtk.Stack.remove] instead
-of `gtk_container_remove()`. Adding a child in a ui file with `<child>` still works.
+of `gtk_container_remove()`. Adding a child in a ui file with <child> still works.

 The affected classes are:

@@ -828,11 +804,6 @@ by a layout manager (if they are layout-related), or handled in some
 other way. One possibility is to use child meta objects, as seen with
 [class@Gtk.AssistantPage], [class@Gtk.StackPage] and the like.

-If you used to define child properties with `<packing>` in ui files, you have
-to switch to using `<layout>` for the corresponding layout properties.
-`gtk4-builder-tool` can help with this conversion, with the `--3to4` option
-of the `simplify` command.
-
 The replacements for gtk_container_add() are:

 | Widget | Replacement |
@@ -1359,4 +1330,3 @@ of tree models, and widgets instead of cell renderers.

 To learn more about the new list widgets, you can read the [List Widget
 Overview](#ListWidget).
-
--- a/docs/reference/gtk/urlmap.js
+++ b/docs/reference/gtk/urlmap.js
@@ -3,14 +3,11 @@

 // A map between namespaces and base URLs for their online documentation
 baseURLs = [
-    [ 'GLib', 'https://docs.gtk.org/glib/' ],
-    [ 'GObject', 'https://docs.gtk.org/gobject/' ],
-    [ 'Gio', 'https://docs.gtk.org/gio/' ],
-    [ 'Gdk', 'https://docs.gtk.org/gdk4/' ],
-    [ 'GdkWayland', 'https://docs.gtk.org/gdk4-wayland/' ],
-    [ 'GdkX11', 'https://docs.gtk.org/gdk4-x11/' ],
-    [ 'Gsk', 'https://docs.gtk.org/gsk4/' ],
-    [ 'Gtk', 'https://docs.gtk.org/gtk4/' ],
-    [ 'Pango', 'https://docs.gtk.org/Pango/' ],
-    [ 'PangoCairo', 'https://docs.gtk.org/PangoCairo/' ],
+    [ 'Gdk', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4/' ],
+    [ 'GdkWayland', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-wayland/' ],
+    [ 'GdkX11', 'https://gnome.pages.gitlab.gnome.org/gtk/gdk4-x11/' ],
+    [ 'Gsk', 'https://gnome.pages.gitlab.gnome.org/gtk/gsk4/' ],
+    [ 'Gtk', 'https://gnome.pages.gitlab.gnome.org/gtk/gtk4/' ],
+    [ 'Pango', 'https://gnome.pages/gitlab.gnome.org/pango/pango/' ],
+    [ 'PangoCairo', 'https://gnome.pages.gitlab.gnome.org/pango/pangocairo/' ],
 ]
--- a/docs/reference/gtk/windows.md
+++ b/docs/reference/gtk/windows.md
@@ -14,19 +14,14 @@ instructions, binary downloads, etc, can be found
 The Win32 GDK backend can be influenced with some additional environment
 variables.

-### GDK_WIN32_TABLET_INPUT_API
+### GDK_IGNORE_WINTAB

-If this variable is set, it determines the API that GTK uses for tablet support.
-The possible values are:
+If this variable is set, GTK doesn't use the Wintab API for tablet support.

-`none`
-: Disables tablet support
+### GDK_USE_WINTAB

-`wintab`
-: Use the Wintab API
-
-`winpointer`
-: Use the Windows Pointer Input Stack API. This is the default.
+If this variable is set, GTK uses the Wintab API for tablet support.
+This is the default.

 ## Windows-specific handling of cursors

--- a/docs/reference/meson.build
+++ b/docs/reference/meson.build
@@ -5,10 +5,6 @@ gidocgen = find_program('gi-docgen', required: get_option('gtk_doc'))

 docs_dir = gtk_datadir / 'doc'

-if get_option('gtk_doc') and not build_gir
-  error('API reference requires introspection.')
-endif
-
 subdir('gdk')
 subdir('gsk')
 subdir('gtk')
--- a/examples/application9/exampleapp.c
+++ b/examples/application9/exampleapp.c
@@ -59,12 +59,14 @@ example_app_startup (GApplication *app)
 }

 static void
-example_app_activate (GApplication *app)
+example_app_create_window (GtkApplication *app,
+                           const char     *save_id)
 {
  ExampleAppWindow *win;

  win = example_app_window_new (EXAMPLE_APP (app));
-  gtk_window_present (GTK_WINDOW (win));
+  gtk_widget_set_save_id (GTK_WIDGET (win), save_id);
+  /* FIXME: differentiate save ids */
 }

 static void
@@ -93,8 +95,8 @@ static void
 example_app_class_init (ExampleAppClass *class)
 {
  G_APPLICATION_CLASS (class)->startup = example_app_startup;
-  G_APPLICATION_CLASS (class)->activate = example_app_activate;
  G_APPLICATION_CLASS (class)->open = example_app_open;
+  GTK_APPLICATION_CLASS (class)->create_window = example_app_create_window;
 }

 ExampleApp *
@@ -103,5 +105,7 @@ example_app_new (void)
  return g_object_new (EXAMPLE_APP_TYPE,
                       "application-id", "org.gtk.exampleapp",
                       "flags", G_APPLICATION_HANDLES_OPEN,
+                       "register-session", TRUE,
+                       "save-state", TRUE,
                       NULL);
 }
--- a/examples/application9/exampleappprefs.c
+++ b/examples/application9/exampleappprefs.c
@@ -7,6 +7,10 @@
 struct _ExampleAppPrefs
 {
  GtkDialog parent;
+
+  GSettings *settings;
+  GtkWidget *font;
+  GtkWidget *transition;
 };

 G_DEFINE_TYPE (ExampleAppPrefs, example_app_prefs, GTK_TYPE_DIALOG)
@@ -15,20 +19,41 @@ static void
 example_app_prefs_init (ExampleAppPrefs *prefs)
 {
  gtk_widget_init_template (GTK_WIDGET (prefs));
+  prefs->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (prefs->settings, "font",
+                   prefs->font, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+  g_settings_bind (prefs->settings, "transition",
+                   prefs->transition, "active-id",
+                   G_SETTINGS_BIND_DEFAULT);
+}
+
+static void
+example_app_prefs_dispose (GObject *object)
+{
+  ExampleAppPrefs *prefs;
+
+  prefs = EXAMPLE_APP_PREFS (object);
+
+  g_clear_object (&prefs->settings);
+
+  G_OBJECT_CLASS (example_app_prefs_parent_class)->dispose (object);
 }

 static void
 example_app_prefs_class_init (ExampleAppPrefsClass *class)
 {
+  G_OBJECT_CLASS (class)->dispose = example_app_prefs_dispose;
+
  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                               "/org/gtk/exampleapp/prefs.ui");
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, font);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppPrefs, transition);
 }

 ExampleAppPrefs *
 example_app_prefs_new (ExampleAppWindow *win)
 {
-  return g_object_new (EXAMPLE_APP_PREFS_TYPE,
-                       "transient-for", win,
-                       "use-header-bar", TRUE,
-                       NULL);
+  return g_object_new (EXAMPLE_APP_PREFS_TYPE, "transient-for", win, "use-header-bar", TRUE, NULL);
 }
--- a/examples/application9/exampleappwin.c
+++ b/examples/application9/exampleappwin.c
@@ -17,6 +17,8 @@ struct _ExampleAppWindow
  GtkWidget *words;
  GtkWidget *lines;
  GtkWidget *lines_label;
+
+  GList *files;
 };

 G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
@@ -211,14 +213,68 @@ example_app_window_dispose (GObject *object)

  g_clear_object (&win->settings);

+  g_list_free_full (win->files, g_object_unref);
+  win->files = NULL;
+
  G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
 }

+static gboolean
+example_app_window_save_state (GtkWidget    *widget,
+                               GVariantDict *dict,
+                               gboolean     *save_children)
+{
+  ExampleAppWindow *win = EXAMPLE_APP_WINDOW (widget);
+  GVariantBuilder builder;
+
+  g_variant_builder_init (&builder, G_VARIANT_TYPE ("as"));
+  for (GList *l = win->files; l; l = l->next)
+    {
+      g_variant_builder_add (&builder, "s", g_file_peek_path (G_FILE (l->data)));
+    }
+
+  g_variant_dict_insert_value (dict, "files", g_variant_builder_end (&builder));
+
+  /* Save window state */
+  GTK_WIDGET_CLASS (example_app_window_parent_class)->save_state (widget, dict, save_children);
+
+  *save_children = TRUE;
+  return TRUE;
+}
+
+static gboolean
+example_app_window_restore_state (GtkWidget *widget,
+                                  GVariant  *state)
+{
+  ExampleAppWindow *win = EXAMPLE_APP_WINDOW (widget);
+  GVariantIter *iter;
+
+  /* Restore window state */
+  GTK_WIDGET_CLASS (example_app_window_parent_class)->restore_state (widget, state);
+
+  if (g_variant_lookup (state, "files", "as", &iter))
+    {
+       const char *path;
+
+       while (g_variant_iter_next (iter, "&s", &path))
+         {
+           GFile *file = g_file_new_for_path (path);
+           example_app_window_open (win, file);
+           g_object_unref (file);
+         }
+    }
+
+  return TRUE;
+}
+
 static void
 example_app_window_class_init (ExampleAppWindowClass *class)
 {
  G_OBJECT_CLASS (class)->dispose = example_app_window_dispose;

+  GTK_WIDGET_CLASS (class)->save_state = example_app_window_save_state;
+  GTK_WIDGET_CLASS (class)->restore_state = example_app_window_restore_state;
+
  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
                                               "/org/gtk/exampleapp/window.ui");

@@ -288,4 +344,6 @@ example_app_window_open (ExampleAppWindow *win,

  update_words (win);
  update_lines (win);
+
+  win->files = g_list_append (win->files, g_object_ref (file));
 }
--- a/examples/application9/prefs.ui
+++ b/examples/application9/prefs.ui
@@ -28,7 +28,6 @@
            </child>
            <child>
              <object class="GtkFontButton" id="font">
-              <property name="font" bind-settings-schema="org.gtk.exampleapp" bind-settings-key="font"/>
                <layout>
                  <property name="column">1</property>
                  <property name="row">0</property>
@@ -49,7 +48,6 @@
            </child>
            <child>
              <object class="GtkComboBoxText" id="transition">
-                <property name="active-id" bind-settings-schema="org.gtk.exampleapp" bind-settings-key="transition"/>
                <items>
                  <item translatable="yes" id="none">None</item>
                  <item translatable="yes" id="crossfade">Fade</item>
--- a/examples/application9/window.ui
+++ b/examples/application9/window.ui
@@ -4,6 +4,7 @@
    <property name="title" translatable="yes">Example Application</property>
    <property name="default-width">600</property>
    <property name="default-height">400</property>
+    <property name="save-id">window</property>
    <child type="titlebar">
      <object class="GtkHeaderBar" id="header">
        <child>
@@ -26,6 +27,7 @@
          <object class="GtkToggleButton" id="search">
            <property name="sensitive">0</property>
            <property name="icon-name">edit-find-symbolic</property>
+            <property name="save-id">search</property>
          </object>
        </child>
        <child type="end">
@@ -38,6 +40,7 @@
    <child>
      <object class="GtkBox" id="content_box">
        <property name="orientation">vertical</property>
+        <property name="save-id">content_box</property>
        <child>
          <object class="GtkSearchBar" id="searchbar">
            <child>
@@ -49,8 +52,10 @@
        </child>
        <child>
          <object class="GtkBox" id="hbox">
+            <property name="save-id">hbox</property>
            <child>
              <object class="GtkRevealer" id="sidebar">
+                <property name="save-id">sidebar</property>
                <property name="transition-type">slide-right</property>
                <child>
                  <object class="GtkScrolledWindow" id="sidebar-sw">
@@ -66,6 +71,7 @@
            </child>
            <child>
              <object class="GtkStack" id="stack">
+                <property name="save-id">stack</property>
                <signal name="notify::visible-child" handler="visible_child_changed"/>
              </object>
            </child>
--- a/examples/bp/bloatpad.c
+++ b/examples/bp/bloatpad.c
@@ -197,17 +197,6 @@ text_buffer_changed_cb (GtkTextBuffer *buffer,
    }
 }

-static void
-fullscreen_changed (GObject    *object,
-                    GParamSpec *pspec,
-                    gpointer    user_data)
-{
-  if (gtk_window_is_fullscreen (GTK_WINDOW (object)))
-    gtk_button_set_icon_name (GTK_BUTTON (user_data), "view-restore-symbolic");
-  else
-    gtk_button_set_icon_name (GTK_BUTTON (user_data), "view-fullscreen-symbolic");
-}
-
 static GActionEntry win_entries[] = {
  { "copy", window_copy, NULL, NULL, NULL },
  { "paste", window_paste, NULL, NULL, NULL },
@@ -225,18 +214,17 @@ new_window (GApplication *app,
  GtkWidget *window, *grid, *scrolled, *view;
  GtkWidget *toolbar;
  GtkWidget *button;
+  GtkWidget *sw, *box, *label;

  window = gtk_application_window_new (GTK_APPLICATION (app));
  gtk_window_set_default_size ((GtkWindow*)window, 640, 480);
  g_action_map_add_action_entries (G_ACTION_MAP (window), win_entries, G_N_ELEMENTS (win_entries), window);
  gtk_window_set_title (GTK_WINDOW (window), "Bloatpad");
-  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (window), TRUE);

  grid = gtk_grid_new ();
  gtk_window_set_child (GTK_WINDOW (window), grid);

  toolbar = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_widget_add_css_class (toolbar, "toolbar");
  button = gtk_toggle_button_new ();
  gtk_button_set_icon_name (GTK_BUTTON (button), "format-justify-left");
  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button), "win.justify::left");
@@ -252,18 +240,21 @@ new_window (GApplication *app,
  gtk_actionable_set_detailed_action_name (GTK_ACTIONABLE (button), "win.justify::right");
  gtk_box_append (GTK_BOX (toolbar), button);

-  button = gtk_toggle_button_new ();
-  gtk_button_set_icon_name (GTK_BUTTON (button), "view-fullscreen-symbolic");
-  gtk_actionable_set_action_name (GTK_ACTIONABLE (button), "win.fullscreen");
-  gtk_box_append (GTK_BOX (toolbar), button);
-  g_signal_connect (window, "notify::fullscreened", G_CALLBACK (fullscreen_changed), button);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_widget_set_halign (box, GTK_ALIGN_END);
+  label = gtk_label_new ("Fullscreen:");
+  gtk_box_append (GTK_BOX (box), label);
+  sw = gtk_switch_new ();
+  gtk_widget_set_valign (sw, GTK_ALIGN_CENTER);
+  gtk_actionable_set_action_name (GTK_ACTIONABLE (sw), "win.fullscreen");
+  gtk_box_append (GTK_BOX (box), sw);
+  gtk_box_append (GTK_BOX (toolbar), box);

  gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 1, 1);

  scrolled = gtk_scrolled_window_new ();
  gtk_widget_set_hexpand (scrolled, TRUE);
  gtk_widget_set_vexpand (scrolled, TRUE);
-  gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled), TRUE);
  view = gtk_text_view_new ();

  g_object_set_data ((GObject*)window, "bloatpad-text", view);
@@ -353,7 +344,6 @@ static void
 combo_changed (GtkComboBox *combo,
               gpointer     user_data)
 {
-  GtkDialog *dialog = user_data;
  GtkEntry *entry = g_object_get_data (user_data, "entry");
  const char *action;
  char **accels;
@@ -369,17 +359,6 @@ combo_changed (GtkComboBox *combo,
  g_strfreev (accels);

  gtk_editable_set_text (GTK_EDITABLE (entry), str);
-  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
-}
-
-static void
-entry_changed (GtkEntry   *entry,
-               GParamSpec *pspec,
-               gpointer    user_data)
-{
-  GtkDialog *dialog = user_data;
-
-  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, TRUE);
 }

 static void
@@ -393,7 +372,7 @@ response (GtkDialog *dialog,
  const char *str;
  char **accels;

-  if (response_id == GTK_RESPONSE_CANCEL)
+  if (response_id == GTK_RESPONSE_CLOSE)
    {
      gtk_window_destroy (GTK_WINDOW (dialog));
      return;
@@ -409,8 +388,6 @@ response (GtkDialog *dialog,

  gtk_application_set_accels_for_action (gtk_window_get_application (user_data), action, (const char **) accels);
  g_strfreev (accels);
-
-  gtk_dialog_set_response_sensitive (dialog, GTK_RESPONSE_APPLY, FALSE);
 }

 static void
@@ -425,41 +402,22 @@ edit_accels (GSimpleAction *action,
  GtkWidget *dialog;
  int i;

-  dialog = gtk_dialog_new_with_buttons ("Accelerators",
-                                        NULL,
-                                        GTK_DIALOG_USE_HEADER_BAR,
-                                        "Close", GTK_RESPONSE_CANCEL,
-                                        "Set", GTK_RESPONSE_APPLY,
-                                        NULL);
-
+  dialog = gtk_dialog_new ();
  gtk_window_set_application (GTK_WINDOW (dialog), app);
  actions = gtk_application_list_action_descriptions (app);
-
  combo = gtk_combo_box_text_new ();
-  g_object_set (gtk_dialog_get_content_area (GTK_DIALOG (dialog)),
-                "margin-top", 10,
-                "margin-bottom", 10,
-                "margin-start", 10,
-                "margin-end", 10,
-                "spacing", 10,
-                NULL);
-
  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), combo);
  for (i = 0; actions[i]; i++)
    gtk_combo_box_text_append (GTK_COMBO_BOX_TEXT (combo), actions[i], actions[i]);
  g_signal_connect (combo, "changed", G_CALLBACK (combo_changed), dialog);
-
  entry = gtk_entry_new ();
-  gtk_widget_set_hexpand (entry, TRUE);
-  g_signal_connect (entry, "notify::text", G_CALLBACK (entry_changed), dialog);
-
  gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), entry);
+  gtk_dialog_add_button (GTK_DIALOG (dialog), "Close", GTK_RESPONSE_CLOSE);
+  gtk_dialog_add_button (GTK_DIALOG (dialog), "Set", GTK_RESPONSE_APPLY);
  g_signal_connect (dialog, "response", G_CALLBACK (response), dialog);
  g_object_set_data (G_OBJECT (dialog), "combo", combo);
  g_object_set_data (G_OBJECT (dialog), "entry", entry);

-  gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
-
  gtk_widget_show (dialog);
 }

@@ -578,7 +536,7 @@ bloat_pad_startup (GApplication *application)

  menu = gtk_application_get_menu_by_id (GTK_APPLICATION (application), "icon-menu");

-  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/insert-image.png");
+  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/gtk-select-color.png");
  icon = g_file_icon_new (file);
  item = g_menu_item_new ("File Icon", NULL);
  g_menu_item_set_icon (item, icon);
@@ -594,7 +552,7 @@ bloat_pad_startup (GApplication *application)
  g_object_unref (item);
  g_object_unref (icon);

-  bytes = g_resources_lookup_data ("/org/gtk/libgtk/icons/16x16/actions/media-eject.png", 0, NULL);
+  bytes = g_resources_lookup_data ("/org/gtk/libgtk/icons/16x16/actions/gtk-select-font.png", 0, NULL);
  icon = g_bytes_icon_new (bytes);
  item = g_menu_item_new ("Bytes Icon", NULL);
  g_menu_item_set_icon (item, icon);
@@ -603,19 +561,19 @@ bloat_pad_startup (GApplication *application)
  g_object_unref (icon);
  g_bytes_unref (bytes);

-  icon = G_ICON (gdk_pixbuf_new_from_resource ("/org/gtk/libgtk/icons/16x16/actions/folder-new.png", NULL));
+  icon = G_ICON (gdk_pixbuf_new_from_resource ("/org/gtk/libgtk/icons/16x16/actions/gtk-preferences.png", NULL));
  item = g_menu_item_new ("Pixbuf", NULL);
  g_menu_item_set_icon (item, icon);
  g_menu_append_item (menu, item);
  g_object_unref (item);
  g_object_unref (icon);

-  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/bookmark-new.png");
+  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/gtk-page-setup.png");
  icon = g_file_icon_new (file);
  emblem = g_emblem_new (icon);
  g_object_unref (icon);
  g_object_unref (file);
-  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/dialog-warning.png");
+  file = g_file_new_for_uri ("resource:///org/gtk/libgtk/icons/16x16/actions/gtk-orientation-reverse-portrait.png");
  icon2 = g_file_icon_new (file);
  icon = g_emblemed_icon_new (icon2, emblem);
  item = g_menu_item_new ("Emblemed Icon", NULL);
--- a/examples/bp/bloatpad.gresources.xml
+++ b/examples/bp/bloatpad.gresources.xml
@@ -4,10 +4,5 @@
  <gresource prefix="/org/gtk/bloatpad">
    <file preprocess="xml-stripblanks">gtk/menus.ui</file>
    <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
-    <file>icons/16x16/actions/format-justify-center-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/format-justify-left-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/format-justify-right-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/view-fullscreen-symbolic.symbolic.png</file>
-    <file>icons/16x16/actions/view-restore-symbolic.symbolic.png</file>
  </gresource>
 </gresources>
--- a/examples/bp/icons/16x16/actions/format-justify-center-symbolic.symbolic.png
+++ b/examples/bp/icons/16x16/actions/format-justify-center-symbolic.symbolic.png
--- a/examples/bp/icons/16x16/actions/format-justify-left-symbolic.symbolic.png
+++ b/examples/bp/icons/16x16/actions/format-justify-left-symbolic.symbolic.png
--- a/examples/bp/icons/16x16/actions/format-justify-right-symbolic.symbolic.png
+++ b/examples/bp/icons/16x16/actions/format-justify-right-symbolic.symbolic.png
--- a/examples/bp/icons/16x16/actions/view-fullscreen-symbolic.symbolic.png
+++ b/examples/bp/icons/16x16/actions/view-fullscreen-symbolic.symbolic.png
--- a/examples/bp/icons/16x16/actions/view-restore-symbolic.symbolic.png
+++ b/examples/bp/icons/16x16/actions/view-restore-symbolic.symbolic.png
--- a/examples/drawing.c
+++ b/examples/drawing.c
@@ -132,6 +132,7 @@ activate (GtkApplication *app,
          gpointer        user_data)
 {
  GtkWidget *window;
+  GtkWidget *frame;
  GtkWidget *drawing_area;
  GtkGesture *drag;
  GtkGesture *press;
@@ -141,11 +142,14 @@ activate (GtkApplication *app,

  g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);

+  frame = gtk_frame_new (NULL);
+  gtk_window_set_child (GTK_WINDOW (window), frame);
+
  drawing_area = gtk_drawing_area_new ();
  /* set a minimum size */
  gtk_widget_set_size_request (drawing_area, 100, 100);

-  gtk_window_set_child (GTK_WINDOW (window), drawing_area);
+  gtk_frame_set_child (GTK_FRAME (frame), drawing_area);

  gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (drawing_area), draw_cb, NULL, NULL);

--- a/examples/hello/hello-world.c
+++ b/examples/hello/hello-world.c
@@ -13,19 +13,19 @@ activate (GtkApplication *app,
 {
  GtkWidget *window;
  GtkWidget *button;
+  GtkWidget *box;

  window = gtk_application_window_new (app);
  gtk_window_set_title (GTK_WINDOW (window), "Window");
  gtk_window_set_default_size (GTK_WINDOW (window), 200, 200);

-  button = gtk_button_new_with_label ("Hello World");
-  gtk_widget_set_halign (button, GTK_ALIGN_CENTER);
-  gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_window_set_child (GTK_WINDOW (window), box);

+  button = gtk_button_new_with_label ("Hello World");
  g_signal_connect (button, "clicked", G_CALLBACK (print_hello), NULL);
  g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
-
-  gtk_window_set_child (GTK_WINDOW (window), button);
+  gtk_box_append (GTK_BOX (box), button);

  gtk_widget_show (window);
 }
--- a/examples/hello/meson.build
+++ b/examples/hello/meson.build
@@ -1,10 +0,0 @@
-project('hello', 'c',
-          version: '4.3.0',
-          meson_version: '>= 0.50.0',
-)
-
-executable('hello',
-  [ 'hello-world.c' ],
-  dependencies: [ dependency('gtk4') ],
-  install: false
-)
--- a/examples/labels.js
+++ b/examples/labels.js
@@ -1,50 +0,0 @@
-#!/usr/bin/env -S GI_TYPELIB_PATH=${PWD}/build/gtk:${GI_TYPELIB_PATH} LD_PRELOAD=${LD_PRELOAD}:${PWD}/build/gtk/libgtk-4.so gjs
-
-imports.gi.versions['Gtk'] = '4.0';
-
-const GObject = imports.gi.GObject;
-const Gtk = imports.gi.Gtk;
-
-const DemoWidget = GObject.registerClass({
-  GTypeName: 'DemoWidget',
-  }, class DemoWidget extends Gtk.Widget {
-
-  _init(params = {}) {
-       super._init(params);
-
-       let layout_manager = new Gtk.GridLayout ();
-       this.set_layout_manager (layout_manager);
-       this.label1 = new Gtk.Label({ label: "Red",
-                                     hexpand: true,
-                                     vexpand: true });
-       this.label1.set_parent (this);
-       let child1 = layout_manager.get_layout_child (this.label1);
-       child1.set_row (0);
-       child1.set_column (0);
-
-       this.label2 = new Gtk.Label({ label: "Green",
-                                     hexpand: true,
-                                     vexpand: true });
-       this.label2.set_parent (this);
-       let child2 = layout_manager.get_layout_child (this.label2);
-       child2.set_row (0);
-       child2.set_column (1);
-    }
-});
-
-// Create a new application
-let app = new Gtk.Application({ application_id: 'org.gtk.exampleapp' });
-
-// When the application is launched…
-app.connect('activate', () => {
-    // … create a new window …
-    let win = new Gtk.ApplicationWindow({ application: app });
-    // … with a button in it …
-    let widget = new DemoWidget();
-    win.set_child(widget);
-    win.present();
-});
-
-// Run the application
-app.run([]);
-
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -2,6 +2,7 @@ examples = [
  'builder',
  'drawing',
  'grid-packing',
+  'hello-world',
  'plugman',
  'search-bar',
  'sunny',
--- a/examples/squares.py
+++ b/examples/squares.py
@@ -1,61 +0,0 @@
-#!/usr/bin/env -S GI_TYPELIB_PATH=${PWD}/build/gtk:${GI_TYPELIB_PATH} LD_PRELOAD=${LD_PRELOAD}:${PWD}/build/gtk/libgtk-4.so python3
-
-import gi
-
-gi.require_version('Gdk', '4.0')
-gi.require_version('Gtk', '4.0')
-
-from gi.repository import Gdk
-from gi.repository import Gtk
-from gi.repository import Graphene
-
-
-class DemoWidget(Gtk.Widget):
-
-    __gtype_name__ = "DemoWidget"
-
-    def __init__(self):
-        super().__init__()
-
-    def do_measure(self, orientation, for_size: int):
-        # We need some space to draw
-        return 100, 200, -1, -1
-
-    def do_snapshot(self, snapshot):
-        # Draw four color squares
-        color = Gdk.RGBA()
-        rect = Graphene.Rect.alloc()
-
-        width = self.get_width() / 2
-        height = self.get_height() / 2
-
-        Gdk.RGBA.parse(color, "red")
-        rect.init(0, 0, width, height)
-        snapshot.append_color(color, rect)
-
-        Gdk.RGBA.parse(color, "green")
-        rect.init(width, 0, width, height)
-        snapshot.append_color(color, rect)
-
-        Gdk.RGBA.parse(color, "yellow")
-        rect.init(0, height, width, height)
-        snapshot.append_color(color, rect)
-
-        Gdk.RGBA.parse(color, "blue")
-        rect.init(width, height, width, height)
-        snapshot.append_color(color, rect)
-
-def on_activate(app):
-    # Create a new window
-    win = Gtk.ApplicationWindow(application=app)
-    win.set_title("Squares")
-    icon = DemoWidget()
-    win.set_child(icon)
-    win.present()
-
-# Create a new application
-app = Gtk.Application(application_id='org.gtk.exampleapp')
-app.connect('activate', on_activate)
-
-# Run the application
-app.run(None)
--- a/examples/sunny.c
+++ b/examples/sunny.c
@@ -12,7 +12,7 @@ new_window (GApplication *app,
  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (window), TRUE);
  gtk_window_set_default_size ((GtkWindow*)window, 640, 480);
  gtk_window_set_title (GTK_WINDOW (window), "Sunny");
-  gtk_window_set_icon_name (GTK_WINDOW (window), "weather-clear-symbolic");
+  gtk_window_set_icon_name (GTK_WINDOW (window), "sunny");

  header = gtk_header_bar_new ();
  gtk_window_set_titlebar (GTK_WINDOW (window), header);
@@ -78,7 +78,7 @@ show_about (GSimpleAction *action,
  gtk_show_about_dialog (NULL,
                         "program-name", "Sunny",
                         "title", "About Sunny",
-                         "logo-icon-name", "weather-clear-symbolic",
+                         "logo-icon-name", "sunny",
                         "comments", "A cheap Bloatpad clone.",
                         NULL);
 }
--- a/gdk/broadway/gdkbroadwaydisplay.h
+++ b/gdk/broadway/gdkbroadwaydisplay.h
@@ -48,8 +48,6 @@ void                    gdk_broadway_display_show_keyboard       (GdkBroadwayDis
 GDK_AVAILABLE_IN_ALL
 void                    gdk_broadway_display_hide_keyboard       (GdkBroadwayDisplay *display);

-GDK_AVAILABLE_IN_4_4
-int                     gdk_broadway_display_get_surface_scale   (GdkDisplay *display);
 GDK_AVAILABLE_IN_4_4
 void                    gdk_broadway_display_set_surface_scale   (GdkDisplay *display,
                                                                  int         scale);
--- a/gdk/broadway/gdkdisplay-broadway.c
+++ b/gdk/broadway/gdkdisplay-broadway.c
@@ -33,7 +33,6 @@
 #include "gdkinternals.h"
 #include "gdkdeviceprivate.h"
 #include <gdk/gdktextureprivate.h>
-#include "gdk-private.h"

 #include <glib.h>
 #include <glib/gprintf.h>
@@ -362,29 +361,6 @@ gdk_broadway_display_set_surface_scale (GdkDisplay *display,
  gdk_monitor_set_scale_factor (self->monitor, scale);
 }

-/**
- * gdk_broadway_display_get_surface_scale:
- * @display: (type GdkBroadwayDisplay): the display
- *
- * Gets the surface scale that was previously set by the client or
- * gdk_broadway_display_set_surface_scale().
- *
- * Returns: the scale for surfaces
- *
- * Since: 4.4
- */
-int
-gdk_broadway_display_get_surface_scale (GdkDisplay *display)
-{
-  GdkBroadwayDisplay *self;
-
-  g_return_val_if_fail (GDK_IS_BROADWAY_DISPLAY (display), 1);
-
-  self = GDK_BROADWAY_DISPLAY (display);
-
-  return self->scale_factor;
-}
-
 static GListModel *
 gdk_broadway_display_get_monitors (GdkDisplay *display)
 {
@@ -464,7 +440,7 @@ gdk_broadway_display_flush_in_idle (GdkDisplay *display)
  if (broadway_display->idle_flush_id == 0)
    {
      broadway_display->idle_flush_id = g_idle_add (flush_idle, g_object_ref (display));
-      gdk_source_set_static_name_by_id (broadway_display->idle_flush_id, "[gtk] flush_idle");
+      g_source_set_name_by_id (broadway_display->idle_flush_id, "[gtk] flush_idle");
    }
 }

--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -57,11 +57,4 @@ guint gdk_parse_debug_var (const char        *variable,
 # define g_memdup2(mem,size)    g_memdup((mem),(size))
 #endif

-void gdk_source_set_static_name_by_id (guint       tag,
-                                       const char *name);
-
-#if !GLIB_CHECK_VERSION(2, 69, 1)
-#define g_source_set_static_name(source, name) g_source_set_name ((source), (name))
-#endif
-
 #endif /* __GDK__PRIVATE_H__ */
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -127,12 +127,10 @@ static const GdkDebugKey gdk_debug_keys[] = {
  { "gl-legacy",       GDK_DEBUG_GL_LEGACY, "Use a legacy OpenGL context" },
  { "gl-gles",         GDK_DEBUG_GL_GLES, "Use a GLES OpenGL context" },
  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
-  { "gl-egl",          GDK_DEBUG_GL_EGL, "Use EGL on X11 or Windows" },
  { "gl-glx",          GDK_DEBUG_GL_GLX, "Use GLX on X11" },
-  { "gl-wgl",          GDK_DEBUG_GL_WGL, "Use WGL on Windows" },
  { "vulkan-disable",  GDK_DEBUG_VULKAN_DISABLE, "Disable Vulkan support" },
  { "vulkan-validate", GDK_DEBUG_VULKAN_VALIDATE, "Load the Vulkan validation layer" },
-  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings", TRUE },
+  { "default-settings",GDK_DEBUG_DEFAULT_SETTINGS, "Force default values for xsettings" },
 };


@@ -332,13 +330,14 @@ gdk_display_open_default (void)
 }

 /*< private >
- * gdk_get_startup_notification_id:
+ *
+ * gdk_get_startup_notification_id
 *
 * Returns the original value of the DESKTOP_STARTUP_ID environment
 * variable if it was defined and valid, or %NULL otherwise.
 *
 * Returns: (nullable) (transfer none): the original value of the
- *   DESKTOP_STARTUP_ID environment variable
+ *   DESKTOP_STARTUP_ID environment variable, or %NULL.
 */
 const char *
 gdk_get_startup_notification_id (void)
@@ -414,17 +413,3 @@ gdk_find_base_dir (const char *text,
  return dir;
 }

-void
-gdk_source_set_static_name_by_id (guint           tag,
-                                  const char     *name)
-{
-  GSource *source;
-
-  g_return_if_fail (tag > 0);
-
-  source = g_main_context_find_source_by_id (NULL, tag);
-  if (source == NULL)
-    return;
-
-  g_source_set_static_name (source, name);
-}
--- a/gdk/gdkclipboard.c
+++ b/gdk/gdkclipboard.c
@@ -635,7 +635,7 @@ gdk_clipboard_read_internal (GdkClipboard        *clipboard,
 /**
 * gdk_clipboard_read_async:
 * @clipboard: a `GdkClipboard`
- * @mime_types: (array zero-terminated=1): a %NULL-terminated array of mime types to choose from
+ * @mime_types: a %NULL-terminated array of mime types to choose from
 * @io_priority: the I/O priority of the request
 * @cancellable: (nullable): optional `GCancellable` object
 * @callback: (scope async): callback to call when the request is satisfied
@@ -1253,15 +1253,9 @@ gdk_clipboard_set_content (GdkClipboard       *clipboard,
 * @...: value contents conforming to @type
 *
 * Sets the clipboard to contain the value collected from the given varargs.
- * 
- * Values should be passed the same way they are passed to other value
- * collecting APIs, such as [`method@GObject.Object.set`] or
- * [`id@g_signal_emit`].
 *
 * ```c
- * gdk_clipboard_set (clipboard, GTK_TYPE_STRING, "Hello World");
- * 
- * gdk_clipboard_set (clipboard, GDK_TYPE_TEXTURE, some_texture);
+ * gdk_clipboard_set (clipboard, GTK_TYPE_TEXT_BUFFER, buffer);
 * ```
 */
 void
--- a/gdk/gdkcontentdeserializer.c
+++ b/gdk/gdkcontentdeserializer.c
@@ -553,8 +553,6 @@ gdk_content_deserialize_async (GInputStream        *stream,
  Deserializer *deserializer;

  g_return_if_fail (G_IS_INPUT_STREAM (stream));
-  g_return_if_fail (mime_type != NULL);
-  g_return_if_fail (G_TYPE_IS_VALUE_TYPE (type));
  g_return_if_fail (cancellable == NULL || G_IS_CANCELLABLE (cancellable));
  g_return_if_fail (callback != NULL);

@@ -593,10 +591,7 @@ gdk_content_deserialize_finish (GAsyncResult  *result,
  g_return_val_if_fail (GDK_IS_CONTENT_DESERIALIZER (result), FALSE);
  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
  deserializer = GDK_CONTENT_DESERIALIZER (result);
-  if (G_VALUE_TYPE (value) == 0)
-    g_value_init (value, G_VALUE_TYPE (&deserializer->value));
-  else
-    g_return_val_if_fail (G_VALUE_HOLDS (value, G_VALUE_TYPE (&deserializer->value)), FALSE);
+  g_return_val_if_fail (G_VALUE_HOLDS (value, G_VALUE_TYPE (&deserializer->value)), FALSE);

  if (deserializer->error)
    {
--- a/gdk/gdkcontentformats.c
+++ b/gdk/gdkcontentformats.c
@@ -179,76 +179,6 @@ gdk_content_formats_new_for_gtype (GType type)
  return gdk_content_formats_new_take (data, 1, NULL, 0);
 }

-/**
- * gdk_content_formats_parse:
- * @string: the string to parse
- *
- * Parses the given @string into `GdkContentFormats` and
- * returns the formats. 
- *
- * Strings printed via [method@Gdk.ContentFormats.to_string]
- * can be read in again successfully using this function.
- *
- * If @string does not describe valid content formats, %NULL
- * is returned.
- *
- * Returns: (nullable): the content formats if @string is valid
- *
- * Since: 4.4
- */
-GdkContentFormats *
-gdk_content_formats_parse (const char *string)
-{
-  GdkContentFormatsBuilder *builder;
-  char **split;
-  gsize i;
-
-  g_return_val_if_fail (string != NULL, NULL);
-
-  split = g_strsplit_set (string, "\t\n\f\r ", -1); /* same as g_ascii_isspace() */
-  builder = gdk_content_formats_builder_new ();
-
-  /* first the GTypes */
-  for (i = 0; split[i] != NULL; i++)
-    {
-      GType type;
-
-      if (split[i][0] == 0)
-        continue;
-
-      type = g_type_from_name (split[i]);
-      if (type != 0)
-        gdk_content_formats_builder_add_gtype (builder, type);
-      else
-        break;
-    }
-
-  /* then the mime types */
-  for (; split[i] != NULL; i++)
-    {
-      const char *mime_type;
-
-      if (split[i][0] == 0)
-        continue;
-
-      mime_type = gdk_intern_mime_type (split[i]);
-      if (mime_type)
-        gdk_content_formats_builder_add_mime_type (builder, mime_type);
-      else
-        break;
-    }
-
-  if (split[i] != NULL)
-    {
-      g_strfreev (split);
-      gdk_content_formats_builder_unref (builder);
-      return NULL;
-    }
-
-  g_strfreev (split);
-  return gdk_content_formats_builder_free_to_formats (builder);
-}
-
 /**
 * gdk_content_formats_ref:
 * @formats:  a `GdkContentFormats`
@@ -297,8 +227,10 @@ gdk_content_formats_unref (GdkContentFormats *formats)
 *
 * Prints the given @formats into a string for human consumption.
 *
- * The result of this function can later be parsed with
- * [func@Gdk.ContentFormats.parse].
+ * This is meant for debugging and logging.
+ *
+ * The form of the representation may change at any time and is
+ * not guaranteed to stay identical.
 */
 void
 gdk_content_formats_print (GdkContentFormats *formats,
@@ -309,18 +241,20 @@ gdk_content_formats_print (GdkContentFormats *formats,
  g_return_if_fail (formats != NULL);
  g_return_if_fail (string != NULL);

+  g_string_append (string, "{ ");
  for (i = 0; i < formats->n_gtypes; i++)
    {
      if (i > 0)
-        g_string_append (string, " ");
+        g_string_append (string, ", ");
      g_string_append (string, g_type_name (formats->gtypes[i]));
    }
  for (i = 0; i < formats->n_mime_types; i++)
    {
      if (i > 0 || formats->n_gtypes > 0)
-        g_string_append (string, " ");
+        g_string_append (string, ", ");
      g_string_append (string, formats->mime_types[i]);
    }
+  g_string_append (string, " }");
 }

 /**
@@ -329,8 +263,6 @@ gdk_content_formats_print (GdkContentFormats *formats,
 *
 * Prints the given @formats into a human-readable string.
 *
- * The resulting string can be parsed with [func@Gdk.ContentFormats.parse].
- *
 * This is a small wrapper around [method@Gdk.ContentFormats.print]
 * to help when debugging.
 *
--- a/gdk/gdkcontentformats.h
+++ b/gdk/gdkcontentformats.h
@@ -40,8 +40,6 @@ GdkContentFormats *     gdk_content_formats_new                 (const char
                                                                 guint                           n_mime_types);
 GDK_AVAILABLE_IN_ALL
 GdkContentFormats *     gdk_content_formats_new_for_gtype       (GType                           type);
-GDK_AVAILABLE_IN_4_4
-GdkContentFormats *     gdk_content_formats_parse               (const char                     *string);
 GDK_AVAILABLE_IN_ALL
 GdkContentFormats *     gdk_content_formats_ref                 (GdkContentFormats              *formats);
 GDK_AVAILABLE_IN_ALL
--- a/gdk/gdkcontentproviderimpl.c
+++ b/gdk/gdkcontentproviderimpl.c
@@ -80,7 +80,7 @@ gdk_content_provider_value_get_value (GdkContentProvider  *provider,
 {
  GdkContentProviderValue *content = GDK_CONTENT_PROVIDER_VALUE (provider);

-  if (G_VALUE_HOLDS (&content->value, G_VALUE_TYPE (value)))
+  if (G_VALUE_HOLDS (value, G_VALUE_TYPE (&content->value)))
    {
      g_value_copy (&content->value, value);
      return TRUE;
--- a/gdk/gdkcursor.c
+++ b/gdk/gdkcursor.c
@@ -340,7 +340,7 @@ gdk_cursor_new_from_name (const char *name,
 * @texture: the texture providing the pixel data
 * @hotspot_x: the horizontal offset of the “hotspot” of the cursor
 * @hotspot_y: the vertical offset of the “hotspot” of the cursor
- * @fallback: (nullable): the `GdkCursor` to fall back to when
+ * @fallback: (nullable): %NULL or the `GdkCursor` to fall back to when
 *   this one cannot be supported
 *
 * Creates a new cursor from a `GdkTexture`.
--- a/gdk/gdkdebug.h
+++ b/gdk/gdkdebug.h
@@ -41,12 +41,10 @@ typedef enum {
  GDK_DEBUG_GL_LEGACY       = 1 << 15,
  GDK_DEBUG_GL_GLES         = 1 << 16,
  GDK_DEBUG_GL_DEBUG        = 1 << 17,
-  GDK_DEBUG_GL_EGL          = 1 << 18,
-  GDK_DEBUG_GL_GLX          = 1 << 19,
-  GDK_DEBUG_GL_WGL          = 1 << 20,
-  GDK_DEBUG_VULKAN_DISABLE  = 1 << 21,
-  GDK_DEBUG_VULKAN_VALIDATE = 1 << 22,
-  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 23,
+  GDK_DEBUG_GL_GLX          = 1 << 18,
+  GDK_DEBUG_VULKAN_DISABLE  = 1 << 19,
+  GDK_DEBUG_VULKAN_VALIDATE = 1 << 20,
+  GDK_DEBUG_DEFAULT_SETTINGS= 1 << 21
 } GdkDebugFlags;

 extern guint _gdk_debug_flags;
--- a/gdk/gdkdisplay.c
+++ b/gdk/gdkdisplay.c
@@ -77,23 +77,6 @@ enum {
  LAST_SIGNAL
 };

-typedef struct _GdkDisplayPrivate GdkDisplayPrivate;
-
-struct _GdkDisplayPrivate {
-  /* The base context that all other contexts inherit from.
-   * This context is never exposed to public API and is
-   * allowed to have a %NULL surface.
-   */
-  GdkGLContext *gl_context;
-  GError *gl_error;
-
-  guint rgba : 1;
-  guint composited : 1;
-  guint input_shapes : 1;
-
-  GdkDebugFlags debug_flags;
-};
-
 static void gdk_display_dispose     (GObject         *object);
 static void gdk_display_finalize    (GObject         *object);

@@ -102,7 +85,7 @@ static GdkAppLaunchContext *gdk_display_real_get_app_launch_context (GdkDisplay

 static guint signals[LAST_SIGNAL] = { 0 };

-G_DEFINE_TYPE_WITH_PRIVATE (GdkDisplay, gdk_display, G_TYPE_OBJECT)
+G_DEFINE_TYPE (GdkDisplay, gdk_display, G_TYPE_OBJECT)

 static void
 gdk_display_get_property (GObject    *object,
@@ -136,14 +119,10 @@ gdk_display_real_make_default (GdkDisplay *display)
 {
 }

-static GdkGLContext *
-gdk_display_default_init_gl (GdkDisplay  *display,
-                             GError     **error)
+static void
+gdk_display_real_opened (GdkDisplay *display)
 {
-  g_set_error_literal (error, GDK_GL_ERROR, GDK_GL_ERROR_NOT_AVAILABLE,
-                       _("The current backend does not support OpenGL"));
-
-  return NULL;
+  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
 }

 static GdkSeat *
@@ -155,12 +134,6 @@ gdk_display_real_get_default_seat (GdkDisplay *display)
  return display->seats->data;
 }

-static void
-gdk_display_real_opened (GdkDisplay *display)
-{
-  _gdk_display_manager_add_display (gdk_display_manager_get (), display);
-}
-
 static void
 gdk_display_class_init (GdkDisplayClass *class)
 {
@@ -170,11 +143,10 @@ gdk_display_class_init (GdkDisplayClass *class)
  object_class->dispose = gdk_display_dispose;
  object_class->get_property = gdk_display_get_property;

-  class->make_default = gdk_display_real_make_default;
  class->get_app_launch_context = gdk_display_real_get_app_launch_context;
-  class->init_gl = gdk_display_default_init_gl;
-  class->get_default_seat = gdk_display_real_get_default_seat;
  class->opened = gdk_display_real_opened;
+  class->make_default = gdk_display_real_make_default;
+  class->get_default_seat = gdk_display_real_get_default_seat;

  /**
   * GdkDisplay:composited: (attributes org.gtk.Property.get=gdk_display_is_composited)
@@ -322,8 +294,6 @@ free_device_grabs_foreach (gpointer key,
 static void
 gdk_display_init (GdkDisplay *display)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  display->double_click_time = 250;
  display->double_click_distance = 5;

@@ -334,26 +304,22 @@ gdk_display_init (GdkDisplay *display)

  g_queue_init (&display->queued_events);

-  priv->debug_flags = _gdk_debug_flags;
+  display->debug_flags = _gdk_debug_flags;

-  priv->composited = TRUE;
-  priv->rgba = TRUE;
-  priv->input_shapes = TRUE;
+  display->composited = TRUE;
+  display->rgba = TRUE;
+  display->input_shapes = TRUE;
 }

 static void
 gdk_display_dispose (GObject *object)
 {
  GdkDisplay *display = GDK_DISPLAY (object);
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);

  _gdk_display_manager_remove_display (gdk_display_manager_get (), display);

  g_queue_clear (&display->queued_events);

-  g_clear_object (&priv->gl_context);
-  g_clear_error (&priv->gl_error);
-
  G_OBJECT_CLASS (gdk_display_parent_class)->dispose (object);
 }

@@ -418,11 +384,11 @@ gdk_display_is_closed  (GdkDisplay  *display)
 * gdk_display_get_event:
 * @display: a `GdkDisplay`
 *
- * Gets the next `GdkEvent` to be processed for @display,
- * fetching events from the windowing system if necessary.
+ * Gets the next `GdkEvent` to be processed for @display, fetching events from the
+ * windowing system if necessary.
 *
- * Returns: (nullable) (transfer full): the next `GdkEvent`
- *   to be processed
+ * Returns: (nullable) (transfer full): the next `GdkEvent` to be processed,
+ *   or %NULL if no events are pending
 */
 GdkEvent *
 gdk_display_get_event (GdkDisplay *display)
@@ -1032,25 +998,21 @@ gdk_display_get_primary_clipboard (GdkDisplay *display)
 gboolean
 gdk_display_supports_input_shapes (GdkDisplay *display)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);

-  return priv->input_shapes;
+  return display->input_shapes;
 }

 void
 gdk_display_set_input_shapes (GdkDisplay *display,
                              gboolean    input_shapes)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  g_return_if_fail (GDK_IS_DISPLAY (display));

-  if (priv->input_shapes == input_shapes)
+  if (display->input_shapes == input_shapes)
    return;

-  priv->input_shapes = input_shapes;
+  display->input_shapes = input_shapes;

  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_INPUT_SHAPES]);
 }
@@ -1195,136 +1157,32 @@ gdk_display_get_keymap (GdkDisplay *display)
  return GDK_DISPLAY_GET_CLASS (display)->get_keymap (display);
 }

-static void
-gdk_display_init_gl (GdkDisplay *self)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
-  GdkGLContext *context;
-  gint64 before G_GNUC_UNUSED;
-  gint64 before2 G_GNUC_UNUSED;
-
-  before = GDK_PROFILER_CURRENT_TIME;
-
-  if (GDK_DISPLAY_DEBUG_CHECK (self, GL_DISABLE))
-    {
-      g_set_error_literal (&priv->gl_error, GDK_GL_ERROR,
-                           GDK_GL_ERROR_NOT_AVAILABLE,
-                           _("GL support disabled via GDK_DEBUG"));
-      return;
-    }
-
-  context = GDK_DISPLAY_GET_CLASS (self)->init_gl (self, &priv->gl_error);
-  if (context == NULL)
-    return;
-
-  before2 = GDK_PROFILER_CURRENT_TIME;
-
-  if (!gdk_gl_context_realize (context, &priv->gl_error))
-    {
-      g_object_unref (context);
-      return;
-    }
-
-  gdk_profiler_end_mark (before2, "realize OpenGL context", NULL);
-
-  /* Only assign after realize, so GdkGLContext::realize() can use
-   * gdk_display_get_gl_context() == NULL to differentiate between
-   * the display's context and any other context.
-   */
-  priv->gl_context = context;
-
-  gdk_profiler_end_mark (before, "initialize OpenGL", NULL);
-}
-
-/**
- * gdk_display_prepare_gl:
- * @self: a `GdkDisplay`
- * @error: return location for a `GError`
- *
- * Checks that OpenGL is available for @self and ensures that it is
- * properly initialized.
- * When this fails, an @error will be set describing the error and this
- * function returns %FALSE.
- *
- * Note that even if this function succeeds, creating a `GdkGLContext`
- * may still fail.
- *
- * This function is idempotent. Calling it multiple times will just 
- * return the same value or error.
- *
- * You never need to call this function, GDK will call it automatically
- * as needed. But you can use it as a check when setting up code that
- * might make use of OpenGL.
- *
- * Returns: %TRUE if the display supports OpenGL
- *
- * Since: 4.4
- **/
-gboolean
-gdk_display_prepare_gl (GdkDisplay  *self,
-                        GError     **error)
-{
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
-
-  g_return_val_if_fail (GDK_IS_DISPLAY (self), FALSE);
-  g_return_val_if_fail (error == NULL || *error == NULL, FALSE);
-
-  for (;;)
-    {
-      if (priv->gl_context)
-        return TRUE;
-
-      if (priv->gl_error != NULL)
-        {
-          if (error)
-            *error = g_error_copy (priv->gl_error);
-
-
-          return FALSE;
-        }
-
-      gdk_display_init_gl (self);
-
-      /* try again */
-    }
-}
-
 /*< private >
- * gdk_display_get_gl_context:
- * @self: the `GdkDisplay`
+ * gdk_display_make_gl_context_current:
+ * @display: a `GdkDisplay`
+ * @context: (optional): a `GdkGLContext`
 *
- * Gets the GL context returned from [vfunc@Gdk.Display.init_gl]
- * previously.
- *
- * If that function has not been called yet or did fail, %NULL is
- * returned.
- * Call [method@Gdk.Display.prepare_gl] to avoid this.
- *
- * Returns: The `GdkGLContext`
+ * Makes the given @context the current GL context, or unsets
+ * the current GL context if @context is %NULL.
 */
-GdkGLContext *
-gdk_display_get_gl_context (GdkDisplay *self)
+gboolean
+gdk_display_make_gl_context_current (GdkDisplay   *display,
+                                     GdkGLContext *context)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (self);
-
-  return priv->gl_context;
+  return GDK_DISPLAY_GET_CLASS (display)->make_gl_context_current (display, context);
 }

 GdkDebugFlags
 gdk_display_get_debug_flags (GdkDisplay *display)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
-  return display ? priv->debug_flags : _gdk_debug_flags;
+  return display ? display->debug_flags : _gdk_debug_flags;
 }

 void
 gdk_display_set_debug_flags (GdkDisplay    *display,
                             GdkDebugFlags  flags)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
-  priv->debug_flags = flags;
+  display->debug_flags = flags;
 }

 /**
@@ -1349,25 +1207,21 @@ gdk_display_set_debug_flags (GdkDisplay    *display,
 gboolean
 gdk_display_is_composited (GdkDisplay *display)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);

-  return priv->composited;
+  return display->composited;
 }

 void
 gdk_display_set_composited (GdkDisplay *display,
                            gboolean    composited)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  g_return_if_fail (GDK_IS_DISPLAY (display));

-  if (priv->composited == composited)
+  if (display->composited == composited)
    return;

-  priv->composited = composited;
+  display->composited = composited;

  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_COMPOSITED]);
 }
@@ -1394,25 +1248,21 @@ gdk_display_set_composited (GdkDisplay *display,
 gboolean
 gdk_display_is_rgba (GdkDisplay *display)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  g_return_val_if_fail (GDK_IS_DISPLAY (display), FALSE);

-  return priv->rgba;
+  return display->rgba;
 }

 void
 gdk_display_set_rgba (GdkDisplay *display,
                      gboolean    rgba)
 {
-  GdkDisplayPrivate *priv = gdk_display_get_instance_private (display);
-
  g_return_if_fail (GDK_IS_DISPLAY (display));

-  if (priv->rgba == rgba)
+  if (display->rgba == rgba)
    return;

-  priv->rgba = rgba;
+  display->rgba = rgba;

  g_object_notify_by_pspec (G_OBJECT (display), props[PROP_RGBA]);
 }
--- a/gdk/gdkdisplay.h
+++ b/gdk/gdkdisplay.h
@@ -68,10 +68,6 @@ gboolean    gdk_display_is_rgba            (GdkDisplay  *display);
 GDK_AVAILABLE_IN_ALL
 gboolean    gdk_display_supports_input_shapes (GdkDisplay    *display);

-GDK_AVAILABLE_IN_4_4
-gboolean    gdk_display_prepare_gl         (GdkDisplay  *self,
-                                            GError     **error);
-
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *gdk_display_get_default (void);

--- a/gdk/gdkdisplaymanager.c
+++ b/gdk/gdkdisplaymanager.c
@@ -323,8 +323,7 @@ gdk_display_manager_get_default_display (GdkDisplayManager *manager)
 * Gets the default `GdkDisplay`.
 *
 * This is a convenience function for:
- *
- *     gdk_display_manager_get_default_display (gdk_display_manager_get ())
+ * `gdk_display_manager_get_default_display (gdk_display_manager_get ())`.
 *
 * Returns: (nullable) (transfer none): a `GdkDisplay`, or %NULL if
 *   there is no default display
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -102,6 +102,11 @@ struct _GdkDisplay

  guint vulkan_refcount;
 #endif /* GDK_RENDERING_VULKAN */
+  guint rgba : 1;
+  guint composited : 1;
+  guint input_shapes : 1;
+
+  GdkDebugFlags debug_flags;

  GList *seats;
 };
@@ -140,8 +145,8 @@ struct _GdkDisplayClass

  GdkKeymap *                (*get_keymap)         (GdkDisplay    *display);

-  GdkGLContext *         (*init_gl)                    (GdkDisplay        *display,
-                                                        GError           **error);
+  gboolean               (*make_gl_context_current)    (GdkDisplay        *display,
+                                                        GdkGLContext      *context);

  GdkSeat *              (*get_default_seat)           (GdkDisplay     *display);

@@ -206,7 +211,8 @@ GdkSurface *        gdk_display_create_surface        (GdkDisplay       *display
                                                       int               width,
                                                       int               height);

-GdkGLContext *      gdk_display_get_gl_context        (GdkDisplay       *display);
+gboolean            gdk_display_make_gl_context_current  (GdkDisplay        *display,
+                                                          GdkGLContext      *context);

 void                gdk_display_set_rgba              (GdkDisplay       *display,
                                                       gboolean          rgba);
--- a/gdk/gdkdrawcontext.c
+++ b/gdk/gdkdrawcontext.c
@@ -43,7 +43,6 @@
 typedef struct _GdkDrawContextPrivate GdkDrawContextPrivate;

 struct _GdkDrawContextPrivate {
-  GdkDisplay *display;
  GdkSurface *surface;

  cairo_region_t *frame_region;
@@ -78,7 +77,6 @@ gdk_draw_context_dispose (GObject *gobject)
      priv->surface->draw_contexts = g_slist_remove (priv->surface->draw_contexts, context);
      g_clear_object (&priv->surface);
    }
-  g_clear_object (&priv->display);

  G_OBJECT_CLASS (gdk_draw_context_parent_class)->dispose (gobject);
 }
@@ -94,31 +92,10 @@ gdk_draw_context_set_property (GObject      *gobject,

  switch (prop_id)
    {
-    case PROP_DISPLAY:
-      if (priv->display != NULL)
-        {
-          g_assert (g_value_get_object (value) == NULL);
-        }
-      else
-        {
-          priv->display = g_value_dup_object (value);
-        }
-      break;
-
    case PROP_SURFACE:
      priv->surface = g_value_dup_object (value);
-      if (priv->surface)
-        {
-          priv->surface->draw_contexts = g_slist_prepend (priv->surface->draw_contexts, context);
-          if (priv->display)
-            {
-              g_assert (priv->display == gdk_surface_get_display (priv->surface));
-            }
-          else
-            {
-              priv->display = g_object_ref (gdk_surface_get_display (priv->surface));
-            }
-        }
+      g_assert (priv->surface != NULL);
+      priv->surface->draw_contexts = g_slist_prepend (priv->surface->draw_contexts, context);
      break;

    default:
@@ -171,8 +148,7 @@ gdk_draw_context_class_init (GdkDrawContextClass *klass)
                         P_("Display"),
                         P_("The GDK display used to create the context"),
                         GDK_TYPE_DISPLAY,
-                         G_PARAM_READWRITE |
-                         G_PARAM_CONSTRUCT_ONLY |
+                         G_PARAM_READABLE |
                         G_PARAM_STATIC_STRINGS);

  /**
@@ -252,7 +228,7 @@ gdk_draw_context_get_display (GdkDrawContext *context)

  g_return_val_if_fail (GDK_IS_DRAW_CONTEXT (context), NULL);

-  return priv->display;
+  return priv->surface ? gdk_surface_get_display (priv->surface) : NULL;
 }

 /**
--- a/gdk/gdkdrop.c
+++ b/gdk/gdkdrop.c
@@ -294,11 +294,8 @@ gdk_drop_finalize (GObject *object)

  /* someone forgot to send a LEAVE signal */
  g_warn_if_fail (!priv->entered);
-
  /* Should we emit finish() here if necessary?
-   * For now that's the backends' job
-   */
-  g_warn_if_fail (priv->state != GDK_DROP_STATE_DROPPING);
+   * For now that's the backends' job */

  g_clear_object (&priv->device);
  g_clear_object (&priv->drag);
@@ -574,7 +571,7 @@ gdk_drop_get_drag (GdkDrop *self)
 * the ones provided by [method@Gdk.Drop.get_actions]. Those actions may
 * change in the future, even depending on the actions you provide here.
 *
- * The @preferred action is a hint to the drag-and-drop mechanism about which
+ * The @preferred action is a hint to the drag'n'drop mechanism about which
 * action to use when multiple actions are possible.
 *
 * This function should be called by drag destinations in response to
@@ -865,7 +862,7 @@ gdk_drop_read_value_internal (GdkDrop             *self,
 * then call [method@Gdk.Drop.read_value_finish] to get the resulting
 * `GValue`.
 *
- * For local drag-and-drop operations that are available in the given
+ * For local drag'n'drop operations that are available in the given
 * `GType`, the value will be copied directly. Otherwise, GDK will
 * try to use [func@Gdk.content_deserialize_async] to convert the data.
 */
--- a/gdk/gdkframeclock.c
+++ b/gdk/gdkframeclock.c
@@ -481,11 +481,11 @@ _gdk_frame_clock_begin_frame (GdkFrameClock *frame_clock)
 * for the current frame or a recent frame.
 *
 * The `GdkFrameTimings` object may not yet be complete: see
- * [method@Gdk.FrameTimings.get_complete] and
- * [method@Gdk.FrameClock.get_history_start].
+ * [method@Gdk.FrameTimings.get_complete].
 *
 * Returns: (nullable) (transfer none): the `GdkFrameTimings` object
- *   for the specified frame, or %NULL if it is not available
+ *   for the specified frame, or %NULL if it is not available. See
+ *   [method@Gdk.FrameClock.get_history_start].
 */
 GdkFrameTimings *
 gdk_frame_clock_get_timings (GdkFrameClock *frame_clock,
--- a/gdk/gdkframeclockidle.c
+++ b/gdk/gdkframeclockidle.c
@@ -29,7 +29,6 @@
 #include "gdkinternals.h"
 #include "gdkframeclockprivate.h"
 #include "gdk.h"
-#include "gdk-private.h"
 #include "gdkprofilerprivate.h"

 #ifdef G_OS_WIN32
@@ -308,15 +307,12 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle,

      if (priv->flush_idle_id == 0 && RUN_FLUSH_IDLE (priv))
        {
-          GSource *source;
-
          priv->flush_idle_id = g_timeout_add_full (GDK_PRIORITY_EVENTS + 1,
                                                    min_interval,
                                                    gdk_frame_clock_flush_idle,
                                                    g_object_ref (clock_idle),
                                                    (GDestroyNotify) g_object_unref);
-          source = g_main_context_find_source_by_id (NULL, priv->flush_idle_id);
-          g_source_set_static_name (source, "[gtk] gdk_frame_clock_flush_idle");
+          g_source_set_name_by_id (priv->flush_idle_id, "[gtk] gdk_frame_clock_flush_idle");
        }

      if (!priv->in_paint_idle &&
@@ -328,7 +324,7 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle,
                                                    gdk_frame_clock_paint_idle,
                                                    g_object_ref (clock_idle),
                                                    (GDestroyNotify) g_object_unref);
-          gdk_source_set_static_name_by_id (priv->paint_idle_id, "[gtk] gdk_frame_clock_paint_idle");
+          g_source_set_name_by_id (priv->paint_idle_id, "[gtk] gdk_frame_clock_paint_idle");
        }
    }
 }
--- a/gdk/gdkglcontext.c
+++ b/gdk/gdkglcontext.c
@@ -89,6 +89,8 @@
 #include <epoxy/gl.h>

 typedef struct {
+  GdkGLContext *shared_context;
+
  int major;
  int minor;
  int gl_version;
@@ -125,28 +127,7 @@ G_DEFINE_QUARK (gdk-gl-error-quark, gdk_gl_error)

 G_DEFINE_ABSTRACT_TYPE_WITH_PRIVATE (GdkGLContext, gdk_gl_context, GDK_TYPE_DRAW_CONTEXT)

-typedef struct _MaskedContext MaskedContext;
-
-static inline MaskedContext *
-mask_context (GdkGLContext *context,
-              gboolean      surfaceless)
-{
-  return (MaskedContext *) GSIZE_TO_POINTER (GPOINTER_TO_SIZE (context) | (surfaceless ? 1 : 0));
-}
-
-static inline GdkGLContext *
-unmask_context (MaskedContext *mask)
-{
-  return GDK_GL_CONTEXT (GSIZE_TO_POINTER (GPOINTER_TO_SIZE (mask) & ~(gsize) 1));
-}
-
-static void
-unref_unmasked (gpointer data)
-{
-  g_object_unref (unmask_context (data));
-}
-
-static GPrivate thread_current_context = G_PRIVATE_INIT (unref_unmasked);
+static GPrivate thread_current_context = G_PRIVATE_INIT (g_object_unref);

 static void
 gdk_gl_context_clear_old_updated_area (GdkGLContext *context)
@@ -163,14 +144,17 @@ static void
 gdk_gl_context_dispose (GObject *gobject)
 {
  GdkGLContext *context = GDK_GL_CONTEXT (gobject);
-  MaskedContext *current;
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
+  GdkGLContext *current;

  gdk_gl_context_clear_old_updated_area (context);

  current = g_private_get (&thread_current_context);
-  if (unmask_context (current) == context)
+  if (current == context)
    g_private_replace (&thread_current_context, NULL);

+  g_clear_object (&priv->shared_context);
+
  G_OBJECT_CLASS (gdk_gl_context_parent_class)->dispose (gobject);
 }

@@ -190,10 +174,17 @@ gdk_gl_context_set_property (GObject      *gobject,
                             const GValue *value,
                             GParamSpec   *pspec)
 {
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private ((GdkGLContext *) gobject);
+
  switch (prop_id)
    {
    case PROP_SHARED_CONTEXT:
-      g_assert (g_value_get_object (value) == NULL);
+      {
+        GdkGLContext *context = g_value_get_object (value);
+
+        if (context != NULL)
+          priv->shared_context = g_object_ref (context);
+      }
      break;

    default:
@@ -207,10 +198,12 @@ gdk_gl_context_get_property (GObject    *gobject,
                             GValue     *value,
                             GParamSpec *pspec)
 {
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private ((GdkGLContext *) gobject);
+
  switch (prop_id)
    {
    case PROP_SHARED_CONTEXT:
-      g_value_set_object (value, NULL);
+      g_value_set_object (value, priv->shared_context);
      break;

    default:
@@ -340,27 +333,23 @@ gdk_gl_context_real_get_damage (GdkGLContext *context)
                                        });
 }

-static gboolean
-gdk_gl_context_real_is_shared (GdkGLContext *self,
-                               GdkGLContext *other)
-{
-  if (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (self)) != gdk_draw_context_get_display (GDK_DRAW_CONTEXT (other)))
-    return FALSE;
-
-  /* XXX: Should we check es or legacy here? */
-
-  return TRUE;
-}
-
 static void
 gdk_gl_context_real_begin_frame (GdkDrawContext *draw_context,
                                 cairo_region_t *region)
 {
  GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
  GdkSurface *surface;
+  GdkGLContext *shared;
  cairo_region_t *damage;
  int ww, wh;

+  shared = gdk_gl_context_get_shared_context (context);
+  if (shared)
+    {
+      GDK_DRAW_CONTEXT_GET_CLASS (GDK_DRAW_CONTEXT (shared))->begin_frame (GDK_DRAW_CONTEXT (shared), region);
+      return;
+    }
+
  damage = GDK_GL_CONTEXT_GET_CLASS (context)->get_damage (context);

  if (context->old_updated_area[1])
@@ -390,6 +379,15 @@ static void
 gdk_gl_context_real_end_frame (GdkDrawContext *draw_context,
                               cairo_region_t *painted)
 {
+  GdkGLContext *context = GDK_GL_CONTEXT (draw_context);
+  GdkGLContext *shared;
+
+  shared = gdk_gl_context_get_shared_context (context);
+  if (shared)
+    {
+      GDK_DRAW_CONTEXT_GET_CLASS (GDK_DRAW_CONTEXT (shared))->end_frame (GDK_DRAW_CONTEXT (shared), painted);
+      return;
+    }
 }

 static void
@@ -408,7 +406,6 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)

  klass->realize = gdk_gl_context_real_realize;
  klass->get_damage = gdk_gl_context_real_get_damage;
-  klass->is_shared = gdk_gl_context_real_is_shared;

  draw_context_class->begin_frame = gdk_gl_context_real_begin_frame;
  draw_context_class->end_frame = gdk_gl_context_real_end_frame;
@@ -417,13 +414,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
  /**
   * GdkGLContext:shared-context: (attributes org.gtk.Property.get=gdk_gl_context_get_shared_context)
   *
-   * Always %NULL
-   *
-   * As many contexts can share data now and no single shared context exists
-   * anymore, this function has been deprecated and now always returns %NULL.
-   *
-   * Deprecated: 4.4: Use [method@Gdk.GLContext.is_shared] to check if contexts
-   *   can be shared.
+   * The `GdkGLContext` that this context is sharing data with, or %NULL
   */
  obj_pspecs[PROP_SHARED_CONTEXT] =
    g_param_spec_object ("shared-context",
@@ -432,8 +423,7 @@ gdk_gl_context_class_init (GdkGLContextClass *klass)
                         GDK_TYPE_GL_CONTEXT,
                         G_PARAM_READWRITE |
                         G_PARAM_CONSTRUCT_ONLY |
-                         G_PARAM_STATIC_STRINGS |
-                         G_PARAM_DEPRECATED);
+                         G_PARAM_STATIC_STRINGS);

  gobject_class->set_property = gdk_gl_context_set_property;
  gobject_class->get_property = gdk_gl_context_get_property;
@@ -451,21 +441,6 @@ gdk_gl_context_init (GdkGLContext *self)
  priv->use_es = -1;
 }

-/* Must have called gdk_display_prepare_gl() before */
-GdkGLContext *
-gdk_gl_context_new_for_surface (GdkSurface *surface)
-{
-  GdkDisplay *display = gdk_surface_get_display (surface);
-  GdkGLContext *shared = gdk_display_get_gl_context (display);
-
-  /* assert gdk_display_prepare_gl() had been called */
-  g_assert (shared);
-
-  return g_object_new (G_OBJECT_TYPE (shared),
-                       "surface", surface,
-                       NULL);
-}
-
 GdkGLContextPaintData *
 gdk_gl_context_get_paint_data (GdkGLContext *context)
 {
@@ -837,44 +812,6 @@ gdk_gl_context_set_is_legacy (GdkGLContext *context,
  priv->is_legacy = !!is_legacy;
 }

-/**
- * gdk_gl_context_is_shared:
- * @self: a `GdkGLContext`
- * @other: the `GdkGLContext` that should be compatible with @self
- *
- * Checks if the two GL contexts can share resources.
- *
- * When they can, the texture IDs from @other can be used in @self. This
- * is particularly useful when passing `GdkGLTexture` objects between
- * different contexts.
- *
- * Contexts created for the same display with the same properties will
- * always be compatible, even if they are created for different surfaces.
- * For other contexts it depends on the GL backend.
- *
- * Both contexts must be realized for this check to succeed. If either one
- * is not, this function will return %FALSE.
- *
- * Returns: %TRUE if the two GL contexts are compatible.
- *
- * Since: 4.4
- */
-gboolean
-gdk_gl_context_is_shared (GdkGLContext *self,
-                          GdkGLContext *other)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
-  GdkGLContextPrivate *priv_other = gdk_gl_context_get_instance_private (other);
-
-  g_return_val_if_fail (GDK_IS_GL_CONTEXT (self), FALSE);
-  g_return_val_if_fail (GDK_IS_GL_CONTEXT (other), FALSE);
-
-  if (!priv->realized || !priv_other->realized)
-    return FALSE;
-
-  return GDK_GL_CONTEXT_GET_CLASS (self)->is_shared (self, other);
-}
-
 /**
 * gdk_gl_context_set_use_es:
 * @context: a `GdkGLContext`
@@ -1155,16 +1092,12 @@ void
 gdk_gl_context_make_current (GdkGLContext *context)
 {
  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
-  MaskedContext *current, *masked_context;
-  gboolean surfaceless;
+  GdkGLContext *current;

  g_return_if_fail (GDK_IS_GL_CONTEXT (context));

-  surfaceless = !gdk_draw_context_is_in_frame (GDK_DRAW_CONTEXT (context));
-  masked_context = mask_context (context, surfaceless);
-
  current = g_private_get (&thread_current_context);
-  if (current == masked_context)
+  if (current == context)
    return;

  /* we need to realize the GdkGLContext if it wasn't explicitly realized */
@@ -1181,15 +1114,11 @@ gdk_gl_context_make_current (GdkGLContext *context)
        }
    }

-  if (!GDK_GL_CONTEXT_GET_CLASS (context)->make_current (context, surfaceless))
+  if (gdk_display_make_gl_context_current (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context)), context))
    {
-      g_warning ("gdk_gl_context_make_current() failed");
-      return;
+      g_private_replace (&thread_current_context, g_object_ref (context));
+      gdk_gl_context_check_extensions (context);
    }
-
-  g_object_ref (context);
-  g_private_replace (&thread_current_context, masked_context);
-  gdk_gl_context_check_extensions (context);
 }

 /**
@@ -1228,22 +1157,18 @@ gdk_gl_context_get_surface (GdkGLContext *context)
 * gdk_gl_context_get_shared_context: (attributes org.gtk.Method.get_property=shared-context)
 * @context: a `GdkGLContext`
 *
- * Used to retrieves the `GdkGLContext` that this @context share data with.
+ * Retrieves the `GdkGLContext` that this @context share data with.
 *
- * As many contexts can share data now and no single shared context exists
- * anymore, this function has been deprecated and now always returns %NULL.
- *
- * Returns: (nullable) (transfer none): %NULL
- *
- * Deprecated: 4.4: Use [method@Gdk.GLContext.is_shared] to check if contexts
- *   can be shared.
+ * Returns: (nullable) (transfer none): a `GdkGLContext`
 */
 GdkGLContext *
 gdk_gl_context_get_shared_context (GdkGLContext *context)
 {
+  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context);
+
  g_return_val_if_fail (GDK_IS_GL_CONTEXT (context), NULL);

-  return NULL;
+  return priv->shared_context;
 }

 /**
@@ -1283,14 +1208,12 @@ gdk_gl_context_get_version (GdkGLContext *context,
 void
 gdk_gl_context_clear_current (void)
 {
-  MaskedContext *current;
+  GdkGLContext *current;

  current = g_private_get (&thread_current_context);
  if (current != NULL)
    {
-      GdkGLContext *context = unmask_context (current);
-
-      if (GDK_GL_CONTEXT_GET_CLASS (context)->clear_current (context))
+      if (gdk_display_make_gl_context_current (gdk_draw_context_get_display (GDK_DRAW_CONTEXT (current)), NULL))
        g_private_replace (&thread_current_context, NULL);
    }
 }
@@ -1305,11 +1228,11 @@ gdk_gl_context_clear_current (void)
 GdkGLContext *
 gdk_gl_context_get_current (void)
 {
-  MaskedContext *current;
+  GdkGLContext *current;

  current = g_private_get (&thread_current_context);

-  return unmask_context (current);
+  return current;
 }

 gboolean
--- a/gdk/gdkglcontext.h
+++ b/gdk/gdkglcontext.h
@@ -45,8 +45,8 @@ GType gdk_gl_context_get_type (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GdkDisplay *            gdk_gl_context_get_display              (GdkGLContext  *context);
 GDK_AVAILABLE_IN_ALL
-GdkSurface *            gdk_gl_context_get_surface               (GdkGLContext  *context);
-GDK_DEPRECATED_IN_4_4_FOR(gdk_gl_context_is_shared)
+GdkSurface *             gdk_gl_context_get_surface               (GdkGLContext  *context);
+GDK_AVAILABLE_IN_ALL
 GdkGLContext *          gdk_gl_context_get_shared_context       (GdkGLContext  *context);
 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_context_get_version              (GdkGLContext  *context,
@@ -54,9 +54,6 @@ void                    gdk_gl_context_get_version              (GdkGLContext  *
                                                                 int           *minor);
 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_gl_context_is_legacy                (GdkGLContext  *context);
-GDK_AVAILABLE_IN_4_4
-gboolean                gdk_gl_context_is_shared                (GdkGLContext  *self,
-                                                                 GdkGLContext  *other);

 GDK_AVAILABLE_IN_ALL
 void                    gdk_gl_context_set_required_version     (GdkGLContext  *context,
--- a/gdk/gdkglcontextprivate.h
+++ b/gdk/gdkglcontextprivate.h
@@ -27,13 +27,6 @@

 G_BEGIN_DECLS

-/* Version requirements for EGL contexts.
- *
- * If you add support for EGL to your backend, please require this.
- */
-#define GDK_EGL_MIN_VERSION_MAJOR (1)
-#define GDK_EGL_MIN_VERSION_MINOR (4)
-
 #define GDK_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_CAST ((klass), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
 #define GDK_IS_GL_CONTEXT_CLASS(klass)	(G_TYPE_CHECK_CLASS_TYPE ((klass), GDK_TYPE_GL_CONTEXT))
 #define GDK_GL_CONTEXT_GET_CLASS(obj)	(G_TYPE_INSTANCE_GET_CLASS ((obj), GDK_TYPE_GL_CONTEXT, GdkGLContextClass))
@@ -52,16 +45,10 @@ struct _GdkGLContextClass
 {
  GdkDrawContextClass parent_class;

-  gboolean              (* realize)                             (GdkGLContext          *context,
-                                                                 GError               **error);
+  gboolean (* realize) (GdkGLContext *context,
+                        GError **error);

-  gboolean              (* make_current)                        (GdkGLContext          *context,
-                                                                 gboolean               surfaceless);
-  gboolean              (* clear_current)                       (GdkGLContext          *context);
-  cairo_region_t *      (* get_damage)                          (GdkGLContext          *context);
-
-  gboolean              (* is_shared)                           (GdkGLContext          *self,
-                                                                 GdkGLContext          *other);
+  cairo_region_t * (* get_damage) (GdkGLContext *context);
 };

 typedef struct {
@@ -86,8 +73,6 @@ typedef struct {
  guint use_es : 1;
 } GdkGLContextPaintData;

-GdkGLContext *          gdk_gl_context_new_for_surface          (GdkSurface      *surface);
-
 void                    gdk_gl_context_set_is_legacy            (GdkGLContext    *context,
                                                                 gboolean         is_legacy);

--- a/gdk/gdkmemorytexture.h
+++ b/gdk/gdkmemorytexture.h
@@ -53,8 +53,8 @@ G_BEGIN_DECLS
 * CAIRO_FORMAT_ARGB32 is represented by different `GdkMemoryFormats`
 * on architectures with different endiannesses.
 *
- * Its naming is modelled after
- * [VkFormat](https://www.khronos.org/registry/vulkan/specs/1.0/html/vkspec.html#VkFormat)
+ * Its naming is modelled after VkFormat (see
+ * https://www.khronos.org/registry/vulkan/specs/1.0/html/vkspec.html#VkFormat
 * for details).
 */
 typedef enum {
--- a/gdk/gdkpaintable.h
+++ b/gdk/gdkpaintable.h
@@ -70,17 +70,17 @@ typedef enum {
 *   snapshot at or 0 if none. This is purely a hint. The object must still
 *   be able to render at any size.
 * @get_intrinsic_aspect_ratio: The preferred aspect ratio for this object
- *   or 0 if none. If both [vfunc@Gdk.Paintable.get_intrinsic_width]
- *   and [vfunc@Gdk.Paintable.get_intrinsic_height] return non-zero
+ *   or 0 if none. If both [vfunc@Gdk.PaintableInterface.get_intrinsic_width]
+ *   and [vfunc@Gdk.PaintableInterface.get_intrinsic_height] return non-zero
 *   values, this function should return the aspect ratio computed from those.
 *
 * The list of functions that can be implemented for the `GdkPaintable`
 * interface.
 *
- * Note that apart from the [vfunc@Gdk.Paintable.snapshot] function,
+ * Note that apart from the [vfunc@Gdk.PaintableInterface.snapshot] function,
 * no virtual function of this interface is mandatory to implement, though it
- * is a good idea to implement [vfunc@Gdk.Paintable.get_current_image]
- * for non-static paintables and [vfunc@Gdk.Paintable.get_flags] if the
+ * is a good idea to implement [vfunc@Gdk.PaintableInterface.get_current_image]
+ * for non-static paintables and [vfunc@Gdk.PaintableInterface.get_flags] if the
 * image is not dynamic as the default implementation returns no flags and
 * that will make the implementation likely quite slow.
 */
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Matthias Clasen	e9ce1959b4	fixup: use cache dir	2021-06-03 10:24:47 -04:00
Matthias Clasen	a7edd0992e	exampleapp9: Add state saving This tests the GtkApplication state saving support.	2021-06-03 10:07:43 -04:00
Matthias Clasen	9f35250330	application: Add state saving Add the necessary plumbing to save and restore application windows and their state.	2021-06-03 10:07:43 -04:00
Matthias Clasen	7e8dfd5bda	Add a state-saving test	2021-06-03 10:07:43 -04:00
Matthias Clasen	aa0df60606	window: Add default state saving This is somewhat temporary, since need compositor support to do this properly.	2021-06-03 10:07:43 -04:00
Matthias Clasen	9ee07d3974	togglebutton: Add default state saving	2021-06-03 10:07:43 -04:00
Matthias Clasen	1f7ca109c9	checkbutton: Add default state saving	2021-06-03 10:07:43 -04:00
Matthias Clasen	bc2d8bfa33	passwordentry: Add default state saving In addition to the text, save the visibility.	2021-06-03 10:07:43 -04:00
Matthias Clasen	ee0e82610c	stack: Add default state saving Save the current child.	2021-06-03 10:07:43 -04:00
Matthias Clasen	26c5240dcb	paned: Add default state saving Save the paned position.	2021-06-03 10:07:43 -04:00
Matthias Clasen	ecf6c354b5	switch: Add default state saving	2021-06-03 10:07:43 -04:00
Matthias Clasen	fd499188bd	colorchooserwidget: Add default state saving Save the rgba and the show-editor state. We currently don't save the contents of the entry.	2021-06-03 10:07:43 -04:00
Matthias Clasen	0c6fb610e6	text: Add default state saving Add default handlers for ::save/restore-state. Also, since GtkText is usually used inside other widgets, set a save-id.	2021-06-03 10:07:43 -04:00
Matthias Clasen	1962f535e8	range: Add default state saving Add default handlers for ::save/restore-state. All that is needed to make state saving work now is setting save-id.	2021-06-03 10:07:43 -04:00
Matthias Clasen	8db1b89ace	widget: Add state saving plumbing Add ::save-state and ::restore signals that let widgets save and restore their state to a GVariant.	2021-06-03 10:07:43 -04:00