Merge branch 'main' into patch-1

Author: jimbrankelly

.github/workflows/CI.yml

@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - "master"
+      - "main"
     paths:
       - ".github/workflows/CI.yml"
       - "examples/**"
@@ -175,7 +175,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           repository: gtk-rs/checker
-          ref: master
+          ref: main
           path: checker
       - working-directory: checker
         run: cargo build --release

.github/workflows/book-deploy.yml

@@ -3,7 +3,7 @@ name: book
 on:
   push:
     branches:
-      - "master"
+      - "main"
     paths:
       - "book/**"
 

.github/workflows/docs.yml

@@ -2,7 +2,7 @@ name: docs
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - ".github/workflows/docs.yml"
       - "gdk4/**"
@@ -62,7 +62,7 @@ jobs:
       - run: python3 ./generator.py --embed-docs --yes ./
       - run: echo "RELEASE=$(echo '${{ github.event.release.tag_name }}' | grep -Po '(\d+)\.(\d+)')" >> ${GITHUB_ENV}
       - run: echo "DEST=$(if [ "$GITHUB_EVENT_NAME" == "release" ]; then echo 'stable/${{ env.RELEASE }}'; else echo 'git'; fi)" >> ${GITHUB_ENV}
-      - run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk4-rs/' --default-branch 'master' pre-docs | xargs)" >> ${GITHUB_ENV}
+      - run: echo "RUSTDOCFLAGS=$(eval python3 ./gir-rustdoc/gir-rustdoc.py --pages-url 'https://gtk-rs.org/gtk4-rs/' --default-branch 'main' pre-docs | xargs)" >> ${GITHUB_ENV}
         env:
           RUSTDOCFLAGS: >
             --extern-html-root-url=wayland_client=https://smithay.github.io/wayland-rs/
@@ -108,7 +108,7 @@ jobs:
 
           sed -i 's|section-tree-widget.html|https://docs.gtk.org/gtk4/section-tree-widget.html|g' target/doc/gtk4/struct.TreeView.html
       - name: GTK Docs Images
-        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
+        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
         run: |
           git clone --depth=1 https://gitlab.gnome.org/GNOME/gtk --no-checkout ./gtk-src
           cd ./gtk-src
@@ -117,16 +117,16 @@ jobs:
           git checkout main
           mv ./docs/reference/gtk/images/*.png ../target/doc/gtk4
       - name: Grab gtk-rs LOGO
-        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
+        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
         run: |
-          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
-          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
-          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
-          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
-          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/master/logo/gtk-rs.svg -O ./target/doc/favicon.svg
+          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-16.png -O ./target/doc/favicon-16x16.png
+          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-32.png -O ./target/doc/favicon-32x32.png
+          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs-256.png -O ./target/doc/rust-logo.png
+          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/rust-logo.svg
+          wget https://raw.githubusercontent.com/gtk-rs/gtk-rs.github.io/main/logo/gtk-rs.svg -O ./target/doc/favicon.svg
       - name: deploy
         uses: peaceiris/actions-gh-pages@v4
-        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/master') || github.event_name == 'release' }}
+        if: ${{ (github.event_name == 'push' && github.ref == 'refs/heads/main') || github.event_name == 'release' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./target/doc/
@@ -136,7 +136,7 @@ jobs:
       - run: python3 ./gir-rustdoc/gir-rustdoc.py --project-title 'GTK 4 Rust bindings' html-index --early-section 'Book' '<ul><li><a href="stable/latest/book">Latest stable</a></li></ul>'
       - name: deploy index page
         uses: peaceiris/actions-gh-pages@v4
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: ./public/

.github/workflows/image.yml

@@ -6,7 +6,7 @@ on:
     - cron: "0 1 * * 1"
   push:
     branches:
-      - "master"
+      - "main"
     paths:
       - "Dockerfile"
       - ".github/workflows/image.yml"
@@ -41,8 +41,8 @@ jobs:
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
-            # set latest tag for master branch
-            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'master') }}
+            # set latest tag for main branch
+            type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }}
 
       - name: Build and push Docker image
         uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75

.github/workflows/listings.yml

@@ -6,7 +6,7 @@ on:
       - "book/listings/**"
   push:
     branches:
-      - "master"
+      - "main"
     paths:
       - "book/listings/**"
   release:

.github/workflows/macos.yml

@@ -2,7 +2,7 @@ name: macOS
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - ".github/workflows/macos.yml"
       - "gdk4/**"

.github/workflows/typos.yml

@@ -3,7 +3,7 @@ on:
   pull_request:
   push:
     branches:
-      - "master"
+      - "main"
 jobs:
   typos:
     name: Spell Check with Typos

.github/workflows/windows-msvc.yml

@@ -2,7 +2,7 @@ name: Windows MSVC
 
 on:
   push:
-    branches: [master]
+    branches: [main]
     paths:
       - ".github/workflows/windows-msvc.yml"
       - "gdk4/**"

CHANGELOG.md

@@ -93,7 +93,7 @@ yuraiz:
 ```rust
 #[derive(Debug, Default, gtk::CompositeTemplate)]
 #[template(string = "
-template MyWidget : Widget {
+template $MyWidget : Widget {
     Label label {
         label: 'foobar';
     }