[fractal/fractal-next] bump gtk4-rs

From: Julian Sparber <jsparber src gnome org>
To: commits-list gnome org
Cc:
Subject: [fractal/fractal-next] bump gtk4-rs
Date: Sat, 27 Mar 2021 09:01:32 +0000 (UTC)
commit 2d3aebabbb08b4d9307404309f21620f19c51381
Author: Julian Sparber <julian sparber net>
Date:   Tue Mar 23 12:30:47 2021 +0100

    bump gtk4-rs

 Cargo.lock             | 226 +++++++++++++++++++++++++------------------------
 src/application.rs     |   9 +-
 src/login.rs           |  11 +--
 src/session/content.rs |  11 +--
 src/session/mod.rs     |  11 +--
 src/session/sidebar.rs |  11 +--
 src/window.rs          |  11 +--
 7 files changed, 131 insertions(+), 159 deletions(-)
---
diff --git a/Cargo.lock b/Cargo.lock
index 421d389f..fcf36122 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.15"
@@ -11,9 +13,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.38"
+version = "1.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1"
+checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767"
 
 [[package]]
 name = "atty"
@@ -47,7 +49,7 @@ checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a"
 [[package]]
 name = "cairo-rs"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "bitflags",
  "cairo-sys-rs",
@@ -60,18 +62,27 @@ dependencies = [
 [[package]]
 name = "cairo-sys-rs"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 2.0.3",
+ "system-deps",
 ]
 
 [[package]]
 name = "cc"
-version = "1.0.66"
+version = "1.0.67"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "4c0496836a84f8d0495758516b8621a622beb77c0fed418570e50764093ced48"
+checksum = "e3c69b077ad434294d3ce9f1f6143a2a4b89a8a2d54ef813d85003a4fd1137fd"
+
+[[package]]
+name = "cfg-expr"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "30aa9e2ffbb838c6b451db14f3cd8e63ed622bf859f9956bc93845a10fafc26a"
+dependencies = [
+ "smallvec",
+]
 
 [[package]]
 name = "cfg-if"
@@ -109,9 +120,9 @@ dependencies = [
 
 [[package]]
 name = "field-offset"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c40e7a744c1d22cd64783732a287dd5d08a9f0e1d89b685bf084aab753cb20d4"
+checksum = "cf539fba70056b50f40a22e0da30639518a12ee18c35807858a63b158cb6dde7"
 dependencies = [
  "memoffset",
  "rustc_version",
@@ -153,24 +164,24 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
+checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
 dependencies = [
  "futures-core",
 ]
 
 [[package]]
 name = "futures-core"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
+checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
+checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -179,24 +190,21 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
+checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
 
 [[package]]
 name = "futures-task"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
-dependencies = [
- "once_cell",
-]
+checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
 
 [[package]]
 name = "futures-util"
-version = "0.3.12"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
+checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -208,7 +216,7 @@ dependencies = [
 [[package]]
 name = "gdk-pixbuf"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "gdk-pixbuf-sys",
  "gio",
@@ -219,19 +227,19 @@ dependencies = [
 [[package]]
 name = "gdk-pixbuf-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "gio-sys",
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 2.0.3",
+ "system-deps",
 ]
 
 [[package]]
 name = "gdk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -246,7 +254,7 @@ dependencies = [
 [[package]]
 name = "gdk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -255,7 +263,7 @@ dependencies = [
  "gobject-sys",
  "libc",
  "pango-sys",
- "system-deps 3.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -280,7 +288,7 @@ dependencies = [
 [[package]]
 name = "gio"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -296,19 +304,19 @@ dependencies = [
 [[package]]
 name = "gio-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 2.0.3",
+ "system-deps",
  "winapi",
 ]
 
 [[package]]
 name = "glib"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "bitflags",
  "futures-channel",
@@ -326,7 +334,7 @@ dependencies = [
 [[package]]
 name = "glib-macros"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "anyhow",
  "heck",
@@ -340,26 +348,26 @@ dependencies = [
 [[package]]
 name = "glib-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "libc",
- "system-deps 2.0.3",
+ "system-deps",
 ]
 
 [[package]]
 name = "gobject-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "glib-sys",
  "libc",
- "system-deps 2.0.3",
+ "system-deps",
 ]
 
 [[package]]
 name = "graphene-rs"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "glib",
  "graphene-sys",
@@ -369,18 +377,18 @@ dependencies = [
 [[package]]
 name = "graphene-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "glib-sys",
  "libc",
  "pkg-config",
- "system-deps 2.0.3",
+ "system-deps",
 ]
 
 [[package]]
 name = "gsk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -395,7 +403,7 @@ dependencies = [
 [[package]]
 name = "gsk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "cairo-sys-rs",
  "gdk4-sys",
@@ -404,7 +412,7 @@ dependencies = [
  "graphene-sys",
  "libc",
  "pango-sys",
- "system-deps 3.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -416,7 +424,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
 [[package]]
 name = "gtk4"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "bitflags",
  "cairo-rs",
@@ -438,7 +446,7 @@ dependencies = [
 [[package]]
 name = "gtk4-macros"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "anyhow",
  "heck",
@@ -453,7 +461,7 @@ dependencies = [
 [[package]]
 name = "gtk4-sys"
 version = "0.1.0"
-source = "git+https://github.com/gtk-rs/gtk4-rs#c43025157b12dba1112fad55962966769908a269";
+source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a";
 dependencies = [
  "cairo-sys-rs",
  "gdk-pixbuf-sys",
@@ -465,7 +473,7 @@ dependencies = [
  "gsk4-sys",
  "libc",
  "pango-sys",
- "system-deps 3.0.0",
+ "system-deps",
 ]
 
 [[package]]
@@ -522,7 +530,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
 [[package]]
 name = "libadwaita"
 version = "0.1.0"
-source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#771704c112d67c705c0769b53888e814aed7a4d9";
+source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#6ae4d3670565064acc9da2f51434eca0a0c51ac9";
 dependencies = [
  "bitflags",
  "gdk-pixbuf",
@@ -539,7 +547,7 @@ dependencies = [
 [[package]]
 name = "libadwaita-sys"
 version = "0.1.0"
-source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#771704c112d67c705c0769b53888e814aed7a4d9";
+source = 
"git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#6ae4d3670565064acc9da2f51434eca0a0c51ac9";
 dependencies = [
  "gdk-pixbuf-sys",
  "gdk4-sys",
@@ -549,14 +557,14 @@ dependencies = [
  "gtk4-sys",
  "libc",
  "pango-sys",
- "system-deps 2.0.3",
+ "system-deps",
 ]
 
 [[package]]
 name = "libc"
-version = "0.2.85"
+version = "0.2.91"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "7ccac4b00700875e6a07c6cde370d44d32fa01c5a65cdd2fca6858c479d28bb3"
+checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
 
 [[package]]
 name = "locale_config"
@@ -597,9 +605,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
 
 [[package]]
 name = "memoffset"
-version = "0.5.6"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa"
+checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
 dependencies = [
  "autocfg",
 ]
@@ -635,14 +643,14 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.5.2"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
+checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3"
 
 [[package]]
 name = "pango"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "bitflags",
  "glib",
@@ -654,19 +662,28 @@ dependencies = [
 [[package]]
 name = "pango-sys"
 version = "0.13.0"
-source = "git+https://github.com/gtk-rs/gtk-rs#9fa43c102f05856d3cc881cef24da48e71f316ad";
+source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559";
 dependencies = [
  "glib-sys",
  "gobject-sys",
  "libc",
- "system-deps 2.0.3",
+ "system-deps",
+]
+
+[[package]]
+name = "pest"
+version = "2.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "10f4872ae94d7b90ae48754df22fd42ad52ce740b8f370b03da4835417403e53"
+dependencies = [
+ "ucd-trie",
 ]
 
 [[package]]
 name = "pin-project-lite"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "439697af366c49a6d0a010c56a0d97685bc140ce0d377b13a2ea2aa42d64a827"
+checksum = "dc0e1f259c92177c30a4c9d177246edd0a3568b25756a977d0632cf8fa37e905"
 
 [[package]]
 name = "pin-utils"
@@ -740,60 +757,62 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
 
 [[package]]
 name = "quote"
-version = "1.0.8"
+version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "991431c3519a3f36861882da93630ce66b52918dcf1b8e2fd66b397fc96f28df"
+checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "regex"
-version = "1.4.3"
+version = "1.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a"
+checksum = "957056ecddbeba1b26965114e191d2e8589ce74db242b6ea25fc4062427a5c19"
 dependencies = [
  "aho-corasick",
  "memchr",
  "regex-syntax",
- "thread_local",
 ]
 
 [[package]]
 name = "regex-syntax"
-version = "0.6.22"
+version = "0.6.23"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581"
+checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
 
 [[package]]
 name = "rustc_version"
-version = "0.2.3"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
 dependencies = [
  "semver",
 ]
 
 [[package]]
 name = "semver"
-version = "0.9.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
 dependencies = [
  "semver-parser",
 ]
 
 [[package]]
 name = "semver-parser"
-version = "0.7.0"
+version = "0.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7"
+dependencies = [
+ "pest",
+]
 
 [[package]]
 name = "serde"
-version = "1.0.123"
+version = "1.0.125"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae"
+checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171"
 
 [[package]]
 name = "slab"
@@ -827,9 +846,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "1.0.60"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "c700597eca8a5a762beb35753ef6b94df201c81cca676604f547495a0d7f0081"
+checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -838,26 +857,12 @@ dependencies = [
 
 [[package]]
 name = "system-deps"
-version = "2.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "1b59b8aafd652f3c1469f16e6c223121e8a8dbe40c71475209c1401cff3a67ef"
-dependencies = [
- "heck",
- "pkg-config",
- "strum",
- "strum_macros",
- "thiserror",
- "toml",
- "version-compare",
-]
-
-[[package]]
-name = "system-deps"
-version = "3.0.0"
+version = "3.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "14bd4dc3cd87e19c51f550d1b421c628074b3cf4c6daebc7ccbc8a03b237c751"
+checksum = "0fbb68eac6404c4c357c4a9a0d6395b82c753815d4bc0c4e3114a97b035c6459"
 dependencies = [
  "anyhow",
+ "cfg-expr",
  "heck",
  "itertools 0.10.0",
  "pkg-config",
@@ -879,33 +884,24 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "76cc616c6abf8c8928e2fdcc0dbfab37175edd8fb49a4641066ad1364fdab146"
+checksum = "e0f4a65597094d4483ddaed134f409b2cb7c1beccf25201a9f73c719254fa98e"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.23"
+version = "1.0.24"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "9be73a2caec27583d0046ef3796c3794f868a5bc813db689eed00c7631275cd1"
+checksum = "7765189610d8241a44529806d6fd1f2e0a08734313a35d5b3a556f92b381f3c0"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
-[[package]]
-name = "thread_local"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "8018d24e04c95ac8790716a5987d0fec4f8b27249ffa0f7d33f1369bdfb88cbd"
-dependencies = [
- "once_cell",
-]
-
 [[package]]
 name = "toml"
 version = "0.5.8"
@@ -915,6 +911,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "ucd-trie"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index";
+checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
+
 [[package]]
 name = "unicode-segmentation"
 version = "1.7.1"
@@ -935,9 +937,9 @@ checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
 
 [[package]]
 name = "version_check"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed"
+checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
 
 [[package]]
 name = "winapi"
diff --git a/src/application.rs b/src/application.rs
index fa1f596a..c9e7f897 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -14,22 +14,17 @@ use std::env;
 
 mod imp {
     use super::*;
-    use glib::subclass;
 
     #[derive(Debug)]
     pub struct FrctlApplication {
         pub window: OnceCell<WeakRef<FrctlWindow>>,
     }
 
+    #[glib::object_subclass]
     impl ObjectSubclass for FrctlApplication {
         const NAME: &'static str = "FrctlApplication";
         type Type = super::FrctlApplication;
         type ParentType = gtk::Application;
-        type Interfaces = ();
-        type Instance = subclass::simple::InstanceStruct<Self>;
-        type Class = subclass::simple::ClassStruct<Self>;
-
-        glib::object_subclass!();
 
         fn new() -> Self {
             Self {
@@ -40,7 +35,7 @@ mod imp {
 
     impl ObjectImpl for FrctlApplication {}
 
-    impl gio::subclass::prelude::ApplicationImpl for FrctlApplication {
+    impl ApplicationImpl for FrctlApplication {
         fn activate(&self, app: &Self::Type) {
             debug!("GtkApplication<FrctlApplication>::activate");
 
diff --git a/src/login.rs b/src/login.rs
index 06b607ea..bd3bfe4c 100644
--- a/src/login.rs
+++ b/src/login.rs
@@ -6,7 +6,7 @@ use gtk::{glib, CompositeTemplate};
 
 mod imp {
     use super::*;
-    use glib::subclass;
+    use glib::subclass::InitializingObject;
 
     #[derive(Debug, CompositeTemplate)]
     #[template(resource = "/org/gnome/FractalNext/login.ui")]
@@ -15,15 +15,11 @@ mod imp {
         pub headerbar: TemplateChild<gtk::HeaderBar>,
     }
 
+    #[glib::object_subclass]
     impl ObjectSubclass for FrctlLogin {
         const NAME: &'static str = "FrctlLogin";
         type Type = super::FrctlLogin;
         type ParentType = adw::Bin;
-        type Interfaces = ();
-        type Instance = subclass::simple::InstanceStruct<Self>;
-        type Class = subclass::simple::ClassStruct<Self>;
-
-        glib::object_subclass!();
 
         fn new() -> Self {
             Self {
@@ -35,8 +31,7 @@ mod imp {
             Self::bind_template(klass);
         }
 
-        // You must call `Widget`'s `init_template()` within `instance_init()`.
-        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+        fn instance_init(obj: &InitializingObject<Self>) {
             obj.init_template();
         }
     }
diff --git a/src/session/content.rs b/src/session/content.rs
index 4554e3e3..112a3c48 100644
--- a/src/session/content.rs
+++ b/src/session/content.rs
@@ -6,7 +6,7 @@ use gtk::{glib, CompositeTemplate};
 
 mod imp {
     use super::*;
-    use glib::subclass;
+    use glib::subclass::InitializingObject;
     use std::cell::Cell;
 
     #[derive(Debug, CompositeTemplate)]
@@ -19,15 +19,11 @@ mod imp {
         pub room_history: TemplateChild<gtk::ListView>,
     }
 
+    #[glib::object_subclass]
     impl ObjectSubclass for FrctlContent {
         const NAME: &'static str = "FrctlContent";
         type Type = super::FrctlContent;
         type ParentType = adw::Bin;
-        type Interfaces = ();
-        type Instance = subclass::simple::InstanceStruct<Self>;
-        type Class = subclass::simple::ClassStruct<Self>;
-
-        glib::object_subclass!();
 
         fn new() -> Self {
             Self {
@@ -41,8 +37,7 @@ mod imp {
             Self::bind_template(klass);
         }
 
-        // You must call `Widget`'s `init_template()` within `instance_init()`.
-        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+        fn instance_init(obj: &InitializingObject<Self>) {
             obj.init_template();
         }
     }
diff --git a/src/session/mod.rs b/src/session/mod.rs
index adf7afdb..a387511a 100644
--- a/src/session/mod.rs
+++ b/src/session/mod.rs
@@ -11,7 +11,7 @@ use gtk::{glib, CompositeTemplate};
 
 mod imp {
     use super::*;
-    use glib::subclass;
+    use glib::subclass::InitializingObject;
 
     #[derive(Debug, CompositeTemplate)]
     #[template(resource = "/org/gnome/FractalNext/session.ui")]
@@ -22,15 +22,11 @@ mod imp {
         pub content: TemplateChild<FrctlContent>,
     }
 
+    #[glib::object_subclass]
     impl ObjectSubclass for FrctlSession {
         const NAME: &'static str = "FrctlSession";
         type Type = super::FrctlSession;
         type ParentType = adw::Bin;
-        type Interfaces = ();
-        type Instance = subclass::simple::InstanceStruct<Self>;
-        type Class = subclass::simple::ClassStruct<Self>;
-
-        glib::object_subclass!();
 
         fn new() -> Self {
             Self {
@@ -43,8 +39,7 @@ mod imp {
             Self::bind_template(klass);
         }
 
-        // You must call `Widget`'s `init_template()` within `instance_init()`.
-        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+        fn instance_init(obj: &InitializingObject<Self>) {
             obj.init_template();
         }
     }
diff --git a/src/session/sidebar.rs b/src/session/sidebar.rs
index 003fc346..10a9c4df 100644
--- a/src/session/sidebar.rs
+++ b/src/session/sidebar.rs
@@ -6,7 +6,7 @@ use gtk::{glib, CompositeTemplate};
 
 mod imp {
     use super::*;
-    use glib::subclass;
+    use glib::subclass::InitializingObject;
     use std::cell::Cell;
 
     #[derive(Debug, CompositeTemplate)]
@@ -19,15 +19,11 @@ mod imp {
         pub listview: TemplateChild<gtk::ListView>,
     }
 
+    #[glib::object_subclass]
     impl ObjectSubclass for FrctlSidebar {
         const NAME: &'static str = "FrctlSidebar";
         type Type = super::FrctlSidebar;
         type ParentType = adw::Bin;
-        type Interfaces = ();
-        type Instance = subclass::simple::InstanceStruct<Self>;
-        type Class = subclass::simple::ClassStruct<Self>;
-
-        glib::object_subclass!();
 
         fn new() -> Self {
             Self {
@@ -41,8 +37,7 @@ mod imp {
             Self::bind_template(klass);
         }
 
-        // You must call `Widget`'s `init_template()` within `instance_init()`.
-        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+        fn instance_init(obj: &InitializingObject<Self>) {
             obj.init_template();
         }
     }
diff --git a/src/window.rs b/src/window.rs
index 0f86dea3..04905606 100644
--- a/src/window.rs
+++ b/src/window.rs
@@ -11,7 +11,7 @@ use log::warn;
 
 mod imp {
     use super::*;
-    use glib::subclass;
+    use glib::subclass::InitializingObject;
 
     #[derive(Debug, CompositeTemplate)]
     #[template(resource = "/org/gnome/FractalNext/window.ui")]
@@ -27,15 +27,11 @@ mod imp {
         pub settings: gio::Settings,
     }
 
+    #[glib::object_subclass]
     impl ObjectSubclass for FrctlWindow {
         const NAME: &'static str = "FrctlWindow";
         type Type = super::FrctlWindow;
         type ParentType = adw::ApplicationWindow;
-        type Interfaces = ();
-        type Instance = subclass::simple::InstanceStruct<Self>;
-        type Class = subclass::simple::ClassStruct<Self>;
-
-        glib::object_subclass!();
 
         fn new() -> Self {
             Self {
@@ -50,8 +46,7 @@ mod imp {
             Self::bind_template(klass);
         }
 
-        // You must call `Widget`'s `init_template()` within `instance_init()`.
-        fn instance_init(obj: &glib::subclass::InitializingObject<Self::Type>) {
+        fn instance_init(obj: &InitializingObject<Self>) {
             obj.init_template();
         }
     }
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]