Merge branch 'matthiasc/for-master' into 'master'

Matthiasc/for master See merge request GNOME/gtk!3263
2024-12-27 06:00:22 +00:00 · 2021-03-05 20:30:54 +00:00 · 2021-03-05 20:30:54 +00:00 · 3aa89efcf4
commit 3aa89efcf4
parent 2228181b35 82f40a92c1
2 changed files with 3 additions and 3 deletions
--- a/build-aux/flatpak/org.gtk.Demo4.json
+++ b/build-aux/flatpak/org.gtk.Demo4.json
@ -35,10 +35,10 @@
    "modules" : [
        {
            "name" : "wayland",
-            "buildsystem" : "autotools",
+            "buildsystem" : "meson",
            "builddir" : true,
            "config-opts" : [
-                "--disable-documentation"
+                "-Ddocumentation=false"
            ],
            "sources" : [
                {
--- a/gtk/gtksearchentry.c
+++ b/gtk/gtksearchentry.c
@ -79,7 +79,7 @@
 * ]|
 *
 * GtkSearchEntry has a single CSS node with name entry that carries
- * a .sarch style class, and the text node is a child of that.
+ * a .search style class, and the text node is a child of that.
 *
 * # Accessibility
 *