diff --git a/Cargo.lock b/Cargo.lock index 1fc965e7..ad468414 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -92,9 +92,9 @@ checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "aperture" -version = "0.11.0" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39543e57b291db9184ca483c1cd8d01b73ebe8ab124f20a2cdf487cdfbef2c13" +checksum = "1cce6fe96b98907e9f76be93952a32cb5669f6fdf7c751e31fa1289327cd470a" dependencies = [ "futures-channel", "gstreamer", @@ -469,9 +469,9 @@ checksum = "6bd91ee7b2422bcb158d90ef4d14f75ef67f340943fc4149891dcce8f8b972a3" [[package]] name = "cairo-rs" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b01fe135c0bd16afe262b6dea349bd5ea30e6de50708cec639aae7c5c14cc7e4" +checksum = "5cc8d9aa793480744cd9a0524fef1a2e197d9eaa0f739cde19d16aba530dcb95" dependencies = [ "bitflags", "cairo-sys-rs", @@ -481,9 +481,9 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c28280c6b12055b5e39e4554271ae4e6630b27c0da9148c4cf6485fc6d245c" +checksum = "f8b4985713047f5faee02b8db6a6ef32bbb50269ff53c1aee716d1d195b76d54" dependencies = [ "glib-sys", "libc", @@ -501,9 +501,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.56" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "jobserver", @@ -513,9 +513,9 @@ dependencies = [ [[package]] name = "cfg-expr" -version = "0.20.6" +version = "0.20.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cef5b5a1a6827c7322ae2a636368a573006b27cfa76c7ebd53e834daeaab6a" +checksum = "3c6b04e07d8080154ed4ac03546d9a2b303cc2fe1901ba0b35b301516e289368" dependencies = [ "smallvec", "target-lexicon", @@ -1313,9 +1313,9 @@ checksum = "312d2295c7302019c395cfb90dacd00a82a2eabd700429bba9c7a3f38dbbe11b" [[package]] name = "gdk-pixbuf" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "debb0d39e3cdd84626edfd54d6e4a6ba2da9a0ef2e796e691c4e9f8646fda00c" +checksum = "25f420376dbee041b2db374ce4573892a36222bb3f6c0c43e24f0d67eae9b646" dependencies = [ "gdk-pixbuf-sys", "gio", @@ -1325,9 +1325,9 @@ dependencies = [ [[package]] name = "gdk-pixbuf-sys" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd95ad50b9a3d2551e25dd4f6892aff0b772fe5372d84514e9d0583af60a0ce7" +checksum = "48f31b37b1fc4b48b54f6b91b7ef04c18e00b4585d98359dd7b998774bbd91fb" dependencies = [ "gio-sys", "glib-sys", @@ -1338,9 +1338,9 @@ dependencies = [ [[package]] name = "gdk4" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "756564212bbe4a4ce05d88ffbd2582581ac6003832d0d32822d0825cca84bfbf" +checksum = "fa528049fd8726974a7aa1a6e1421f891e7579bea6cc6d54056ab4d1a1b937e7" dependencies = [ "cairo-rs", "gdk-pixbuf", @@ -1353,9 +1353,9 @@ dependencies = [ [[package]] name = "gdk4-sys" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6d4e5b3ccf591826a4adcc83f5f57b4e59d1925cb4bf620b0d645f79498b034" +checksum = "3dd48b1b03dce78ab52805ac35cfb69c48af71a03af5723231d8583718738377" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -1395,9 +1395,9 @@ dependencies = [ [[package]] name = "geo-uri" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "731c1c82aaa1ecc44ed35de1274e7073da761792e022e206131e8867910b94f3" +checksum = "951577f365723b622bfa73389a8def7393d56c28a3fc9aff3de17fae98fc868c" dependencies = [ "thiserror 2.0.18", ] @@ -1431,20 +1431,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", + "js-sys", "libc", - "r-efi", + "r-efi 5.3.0", "wasip2", + "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.4.1" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139ef39800118c7683f2fd3c98c1b23c09ae076556b435f8e9064ae108aaeeec" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", "libc", - "r-efi", + "r-efi 6.0.0", "wasip2", "wasip3", ] @@ -1471,9 +1473,9 @@ dependencies = [ [[package]] name = "gio" -version = "0.21.5" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5ff48bf600c68b476e61dc6b7c762f2f4eb91deef66583ba8bb815c30b5811a" +checksum = "816b6743c46b217aa8fba679095ac6f2162fd53259dc8f186fcdbff9c555db03" dependencies = [ "futures-channel", "futures-core", @@ -1488,9 +1490,9 @@ dependencies = [ [[package]] name = "gio-sys" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0071fe88dba8e40086c8ff9bbb62622999f49628344b1d1bf490a48a29d80f22" +checksum = "64729ba2772c080448f9f966dba8f4456beeb100d8c28a865ef8a0f2ef4987e1" dependencies = [ "glib-sys", "gobject-sys", @@ -1501,9 +1503,9 @@ dependencies = [ [[package]] name = "glib" -version = "0.21.5" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16de123c2e6c90ce3b573b7330de19be649080ec612033d397d72da265f1bd8b" +checksum = "039f93465ac17e6cb02d16f16572cd3e43a77e736d5ecc461e71b9c9c5c0569c" dependencies = [ "bitflags", "futures-channel", @@ -1522,12 +1524,11 @@ dependencies = [ [[package]] name = "glib-macros" -version = "0.21.5" +version = "0.22.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf59b675301228a696fe01c3073974643365080a76cc3ed5bc2cbc466ad87f17" +checksum = "bda575994e3689b1bc12f89c3df621ead46ff292623b76b4710a3a5b79be54bb" dependencies = [ "heck", - "proc-macro-crate", "proc-macro2", "quote", "syn 2.0.117", @@ -1535,9 +1536,9 @@ dependencies = [ [[package]] name = "glib-sys" -version = "0.21.5" +version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d95e1a3a19ae464a7286e14af9a90683c64d70c02532d88d87ce95056af3e6c" +checksum = "1eb23a616a3dbc7fc15bbd26f58756ff0b04c8a894df3f0680cd21011db6a642" dependencies = [ "libc", "system-deps", @@ -1576,9 +1577,9 @@ dependencies = [ [[package]] name = "gobject-sys" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dca35da0d19a18f4575f3cb99fe1c9e029a2941af5662f326f738a21edaf294" +checksum = "18eda93f09d3778f38255b231b17ef67195013a592c91624a4daf8bead875565" dependencies = [ "glib-sys", "libc", @@ -1587,9 +1588,9 @@ dependencies = [ [[package]] name = "graphene-rs" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2730030ac9db663fd8bfe1e7093742c1cafb92db9c315c9417c29032341fe2f9" +checksum = "c7d1b7881f96869f49808b6adfe906a93a57a34204952253444d68c3208d71f1" dependencies = [ "glib", "graphene-sys", @@ -1598,9 +1599,9 @@ dependencies = [ [[package]] name = "graphene-sys" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915e32091ea9ad241e4b044af62b7351c2d68aeb24f489a0d7f37a0fc484fd93" +checksum = "517f062f3fd6b7fd3e57a3f038a74b3c23ca32f51199ff028aa704609943f79c" dependencies = [ "glib-sys", "libc", @@ -1622,9 +1623,9 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e755de9d8c5896c5beaa028b89e1969d067f1b9bf1511384ede971f5983aa153" +checksum = "53c912dfcbd28acace5fc99c40bb9f25e1dcb73efb1f2608327f66a99acdcb62" dependencies = [ "cairo-rs", "gdk4", @@ -1637,9 +1638,9 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ce91472391146f482065f1041876d8f869057b195b95399414caa163d72f4f7" +checksum = "d7d54bbc7a9d8b6ffe4f0c95eede15ccfb365c8bf521275abe6bcfb57b18fb8a" dependencies = [ "cairo-sys-rs", "gdk4-sys", @@ -1653,9 +1654,9 @@ dependencies = [ [[package]] name = "gstreamer" -version = "0.24.4" +version = "0.25.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bed73742c5d54cb48533be608b67d89f96e1ebbba280be7823f1ef995e3a9d7" +checksum = "ad8d6d77fae07708536f86a34ac15fc36c7e958ef7930b75119dba0242936f08" dependencies = [ "cfg-if", "futures-channel", @@ -1678,9 +1679,9 @@ dependencies = [ [[package]] name = "gstreamer-app" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895753fb0f976693f321e6b9d68f746ef9095f1a5b8277c11d85d807a949fbfc" +checksum = "714874829f75e805192ddc2bd130b9d7669ebc3ed0e8b106039dd3416cb82916" dependencies = [ "futures-core", "futures-sink", @@ -1693,9 +1694,9 @@ dependencies = [ [[package]] name = "gstreamer-app-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7719cee28afda1a48ab1ee93769628bd0653d3c5be1923bce9a8a4550fcc980" +checksum = "7a74a8211e5d7df2f45b612c284ddf56b92bdf4e879e8ed72e7c46dd0842e158" dependencies = [ "glib-sys", "gstreamer-base-sys", @@ -1706,9 +1707,9 @@ dependencies = [ [[package]] name = "gstreamer-audio" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92829dbca7c59ed4bf0c9154dd8c0cf3185d6bf9dad821b058b801d9671fa763" +checksum = "46e64660e1963ff3b6a4a5175f917524254a6ae36ac7b83e29b760d879a33073" dependencies = [ "cfg-if", "glib", @@ -1721,9 +1722,9 @@ dependencies = [ [[package]] name = "gstreamer-audio-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6acd80847b78122c45983597f74a29071d63273c1eded14be5f7381301711475" +checksum = "b5111bd07d0e22cc66ec9b4b4ef5408beefb148af19944fbe4602983a043f34c" dependencies = [ "glib-sys", "gobject-sys", @@ -1735,9 +1736,9 @@ dependencies = [ [[package]] name = "gstreamer-base" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dd15c7e37d306573766834a5cbdd8ee711265f217b060f40a9a8eda45298488" +checksum = "c08353a8a382be9a49b15fb9c46b3abd6f8a6e6439e1eaedc87d08f1abdcfad1" dependencies = [ "atomic_refcell", "cfg-if", @@ -1749,9 +1750,9 @@ dependencies = [ [[package]] name = "gstreamer-base-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27a2eda2c61e13c11883bf19b290d07ea6b53d04fd8bfeb7af64b6006c6c9ee6" +checksum = "6569606feeb89cfcf95a6476a64a0f0aec83fadcef0e91c24e576f7851ceac3a" dependencies = [ "glib-sys", "gobject-sys", @@ -1762,9 +1763,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abeb8d02480ba2d2c5b3c1471da269e62f1499b5362d546b7d7bed7ce10baa93" +checksum = "0592df4998340706ab324148ea83dee758ca3233f9bce378d1d32167205c2f4d" dependencies = [ "glib", "gstreamer", @@ -1777,9 +1778,9 @@ dependencies = [ [[package]] name = "gstreamer-pbutils-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c557362427c9686168e1466cff312eac9ab2757f6ae1eb591ebf4f1422fcf563" +checksum = "3fc3025e83ceaa645aec615db27c3052ed29a856b38adc0405f70b92423c0f23" dependencies = [ "glib-sys", "gobject-sys", @@ -1792,9 +1793,9 @@ dependencies = [ [[package]] name = "gstreamer-play" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a951f36a40a454cfa14528830a058b6089f9618e676e77b270abe8e6b563ac07" +checksum = "3355c2c37bfd824cbd974bf0b8c004d71ca3755f825065957bc16356d79e6e34" dependencies = [ "glib", "gstreamer", @@ -1805,9 +1806,9 @@ dependencies = [ [[package]] name = "gstreamer-play-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83c4b0f8932515efd790c88d8d501edd2e1de16030cf59eeacc705ae071086d3" +checksum = "33810c828e426122ca8268071a090e08a9fbcc96e104f94c76353547c4c98a6f" dependencies = [ "glib-sys", "gobject-sys", @@ -1819,9 +1820,9 @@ dependencies = [ [[package]] name = "gstreamer-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d88630697e757c319e7bcec7b13919ba80492532dd3238481c1c4eee05d4904" +checksum = "85d09343b4c23d64b3ef35f1f644598860cc9a4617e7ccded141de97cd528608" dependencies = [ "cfg-if", "glib-sys", @@ -1832,9 +1833,9 @@ dependencies = [ [[package]] name = "gstreamer-video" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33987f6a6a99750a07b0341d6288bac89b9b301be4672a209935203d4608d547" +checksum = "51809937ed7f6fa3974b2730a39623d59fd7415ede882d08d5ecef5de39d758d" dependencies = [ "cfg-if", "futures-channel", @@ -1848,9 +1849,9 @@ dependencies = [ [[package]] name = "gstreamer-video-sys" -version = "0.24.4" +version = "0.25.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00c28faad96cd40a7b7592433051199691b131b08f622ed5d51c54e049792d3" +checksum = "458f82631a5063057c10583a57ba0fbce689e67122cfdb5eddbeaa43eb812e75" dependencies = [ "glib-sys", "gobject-sys", @@ -1862,9 +1863,9 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acb21d53cfc6f7bfaf43549731c43b67ca47d87348d81c8cfc4dcdd44828e1a4" +checksum = "87f671029e3f5288fd35e03a6e6b19e1ce643b10a3d261d33d183e453f6c52fe" dependencies = [ "cairo-rs", "field-offset", @@ -1883,9 +1884,9 @@ dependencies = [ [[package]] name = "gtk4-macros" -version = "0.10.3" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ccfb5a14a3d941244815d5f8101fa12d4577b59cc47245778d8d907b0003e42" +checksum = "3581b242ba62fdff122ebb626ea641582ec326031622bd19d60f85029c804a87" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1895,9 +1896,9 @@ dependencies = [ [[package]] name = "gtk4-sys" -version = "0.10.3" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "842577fe5a1ee15d166cd3afe804ce0cab6173bc789ca32e21308834f20088dd" +checksum = "d0786e7e8e0550d0ab2df4d0d90032f22033e07d5ed78b6a1b2e51b05340339e" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", @@ -2373,9 +2374,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.11.0" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" +checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" [[package]] name = "iri-string" @@ -2423,9 +2424,9 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.90" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14dc6f6450b3f6d4ed5b16327f38fed626d375a886159ca555bd7822c0c3a5a6" +checksum = "b49715b7073f385ba4bc528e5747d02e66cb39c6146efb66b781f131f0fb399c" dependencies = [ "once_cell", "wasm-bindgen", @@ -2501,9 +2502,9 @@ checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" [[package]] name = "libadwaita" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb09e12bf8f73342b3315c839d0a7668cc0ccebd78490c49fec48bab15d5484b" +checksum = "bc0da4e27b20d3e71f830e5b0f0188d22c257986bf421c02cfde777fe07932a4" dependencies = [ "gdk4", "gio", @@ -2516,9 +2517,9 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7f94227ba87eb596fecada2491f04e357d507324142f77bf76d9e6be4a3e31" +checksum = "aaee067051c5d3c058d050d167688b80b67de1950cfca77730549aa761fc5d7d" dependencies = [ "gdk4-sys", "gio-sys", @@ -2532,14 +2533,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.182" +version = "0.2.183" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6800badb6cb2082ffd7b6a67e6125bb39f18782f793520caee8cb8846be06112" +checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" [[package]] name = "libglycin-gtk4-rebind" -version = "0.0.1" -source = "git+https://gitlab.gnome.org/GNOME/glycin?rev=0865d33a7870a1cb8bf35c89f75d2cfab4129ee8#0865d33a7870a1cb8bf35c89f75d2cfab4129ee8" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f06eb8570574e13c83b856f422a559704e6c1ed471c20f163e2ca05e505bfa7a" dependencies = [ "gdk4", "gio", @@ -2551,8 +2553,9 @@ dependencies = [ [[package]] name = "libglycin-gtk4-rebind-sys" -version = "0.0.1" -source = "git+https://gitlab.gnome.org/GNOME/glycin?rev=0865d33a7870a1cb8bf35c89f75d2cfab4129ee8#0865d33a7870a1cb8bf35c89f75d2cfab4129ee8" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d5942c92d31c0a2a79cc2f64890c46952c91bccf0263d7ac4558bbdd116bab51" dependencies = [ "gdk4-sys", "glib-sys", @@ -2563,8 +2566,9 @@ dependencies = [ [[package]] name = "libglycin-rebind" -version = "0.0.1" -source = "git+https://gitlab.gnome.org/GNOME/glycin?rev=0865d33a7870a1cb8bf35c89f75d2cfab4129ee8#0865d33a7870a1cb8bf35c89f75d2cfab4129ee8" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a080d11cbd053f65de1a9c7efd096fe2a0fde6244185bd452bb11fdeb98db3" dependencies = [ "gio", "glib", @@ -2574,8 +2578,9 @@ dependencies = [ [[package]] name = "libglycin-rebind-sys" -version = "0.0.1" -source = "git+https://gitlab.gnome.org/GNOME/glycin?rev=0865d33a7870a1cb8bf35c89f75d2cfab4129ee8#0865d33a7870a1cb8bf35c89f75d2cfab4129ee8" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65fecb1928f26a984b937deadbb0998f1a0f3c3db7fa2b9a493322e80b1f9f4b" dependencies = [ "gio-sys", "glib-sys", @@ -2592,9 +2597,9 @@ checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" [[package]] name = "libshumate" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "606b36a3e209108320570eb5878883fded7ae936e9fe4fd7fb78aff5503e0d0f" +checksum = "c1e13ace1192296107c2c4646d7b8f232b290b57241090ed0ed3b5be24347321" dependencies = [ "gdk-pixbuf", "gdk4", @@ -2607,9 +2612,9 @@ dependencies = [ [[package]] name = "libshumate-sys" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d397f1c0e73ff929acd042fa47babd3ce0ef6d9a8579bec03ca6bfd45d3696" +checksum = "e3aa13ff6eba6aeaa3026f08794596a1a3eb4895e93f1643219b514722da42ba" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -2844,7 +2849,7 @@ dependencies = [ [[package]] name = "matrix-sdk" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "anymap2", "aquamarine", @@ -2877,6 +2882,7 @@ dependencies = [ "mime", "mime2ext", "oauth2", + "oauth2-reqwest", "percent-encoding", "pin-project-lite", "rand 0.8.5", @@ -2902,7 +2908,7 @@ dependencies = [ [[package]] name = "matrix-sdk-base" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "as_variant", "async-trait", @@ -2928,7 +2934,7 @@ dependencies = [ [[package]] name = "matrix-sdk-common" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "eyeball-im", "futures-core", @@ -2951,7 +2957,7 @@ dependencies = [ [[package]] name = "matrix-sdk-crypto" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "aes", "aquamarine", @@ -2992,12 +2998,12 @@ dependencies = [ [[package]] name = "matrix-sdk-indexeddb" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "async-trait", "base64", "futures-util", - "getrandom 0.2.17", + "getrandom 0.3.4", "gloo-utils", "hkdf", "js-sys", @@ -3023,7 +3029,7 @@ dependencies = [ [[package]] name = "matrix-sdk-qrcode" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "byteorder", "qrcode", @@ -3035,7 +3041,7 @@ dependencies = [ [[package]] name = "matrix-sdk-sqlite" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "as_variant", "async-trait", @@ -3062,12 +3068,12 @@ dependencies = [ [[package]] name = "matrix-sdk-store-encryption" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "base64", "blake3", "chacha20poly1305", - "getrandom 0.2.17", + "getrandom 0.3.4", "hmac", "pbkdf2", "rand 0.8.5", @@ -3082,7 +3088,7 @@ dependencies = [ [[package]] name = "matrix-sdk-ui" version = "0.16.0" -source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=029148ef6e45d51e6325a4f5aadcdee7ec9385cc#029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=74c1044b7dd384cf6436598713c12c915b331d73#74c1044b7dd384cf6436598713c12c915b331d73" dependencies = [ "as_variant", "async-rx", @@ -3375,7 +3381,6 @@ dependencies = [ "getrandom 0.2.17", "http", "rand 0.8.5", - "reqwest", "serde", "serde_json", "serde_path_to_error", @@ -3384,6 +3389,16 @@ dependencies = [ "url", ] +[[package]] +name = "oauth2-reqwest" +version = "0.1.0-alpha.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "234fb5c965bbce983ee5de636a7a51d6a3223da8067ea02f9ab2d2d78ac08be2" +dependencies = [ + "oauth2", + "reqwest", +] + [[package]] name = "objc" version = "0.2.7" @@ -3415,9 +3430,9 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "oo7" @@ -3450,9 +3465,9 @@ checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" -version = "0.10.75" +version = "0.10.76" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08838db121398ad17ab8531ce9de97b244589089e290a384c900cb9ff7434328" +checksum = "951c002c75e16ea2c65b8c7e4d3d51d5530d8dfa7d060b4776828c88cfb18ecf" dependencies = [ "bitflags", "cfg-if", @@ -3482,9 +3497,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "openssl-sys" -version = "0.9.111" +version = "0.9.112" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82cab2d520aa75e3c58898289429321eb788c3106963d0dc886ec7a5f4adc321" +checksum = "57d55af3b3e226502be1526dfdba67ab0e9c96fc293004e79576b2b9edb0dbdb" dependencies = [ "cc", "libc", @@ -3513,9 +3528,9 @@ dependencies = [ [[package]] name = "pango" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52d1d85e2078077a065bb7fc072783d5bcd4e51b379f22d67107d0a16937eb69" +checksum = "25d8f224eddef627b896d2f7b05725b3faedbd140e0e8343446f0d34f34238ee" dependencies = [ "gio", "glib", @@ -3525,9 +3540,9 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.21.5" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4f06627d36ed5ff303d2df65211fc2e52ba5b17bf18dd80ff3d9628d6e06cfd" +checksum = "bbd111a20ca90fedf03e09c59783c679c00900f1d8491cca5399f5e33609d5d6" dependencies = [ "glib-sys", "gobject-sys", @@ -3643,9 +3658,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.16" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" +checksum = "a89322df9ebe1c1578d689c92318e070967d1042b512afbe49518723f4e6d5cd" [[package]] name = "pin-utils" @@ -3722,9 +3737,9 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983" +checksum = "e67ba7e9b2b56446f1d419b1d807906278ffa1a658a8a5d8a39dcb1f5a78614f" dependencies = [ "toml_edit", ] @@ -3809,9 +3824,9 @@ checksum = "d68782463e408eb1e668cf6152704bd856c78c5b6417adaee3203d8f4c1fc9ec" [[package]] name = "quick_cache" -version = "0.6.18" +version = "0.6.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ada44a88ef953a3294f6eb55d2007ba44646015e18613d2f213016379203ef3" +checksum = "530e84778a55de0f52645a51d4e3b9554978acd6a1e7cd50b6a6784692b3029e" dependencies = [ "ahash", "equivalent", @@ -3821,9 +3836,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.44" +version = "1.0.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21b2ebcf727b7760c461f091f9f0f539b77b8e87f2fd88131e7f1b433b3cece4" +checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" dependencies = [ "proc-macro2", ] @@ -3834,6 +3849,12 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" +[[package]] +name = "r-efi" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" + [[package]] name = "rand" version = "0.8.5" @@ -3957,9 +3978,9 @@ checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" [[package]] name = "reqwest" -version = "0.12.28" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" dependencies = [ "base64", "bytes", @@ -3979,9 +4000,6 @@ dependencies = [ "percent-encoding", "pin-project-lite", "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", "sync_wrapper", "tokio", "tokio-native-tls", @@ -4042,7 +4060,7 @@ dependencies = [ [[package]] name = "ruma" version = "0.14.1" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "assign", "js_int", @@ -4058,7 +4076,7 @@ dependencies = [ [[package]] name = "ruma-client-api" version = "0.22.1" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "as_variant", "assign", @@ -4081,7 +4099,7 @@ dependencies = [ [[package]] name = "ruma-common" version = "0.17.1" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "as_variant", "base64", @@ -4090,7 +4108,6 @@ dependencies = [ "getrandom 0.2.17", "http", "indexmap", - "js-sys", "js_int", "konst", "percent-encoding", @@ -4114,24 +4131,20 @@ dependencies = [ [[package]] name = "ruma-events" version = "0.32.1" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "as_variant", "indexmap", "js_int", "js_option", - "percent-encoding", "pulldown-cmark", - "regex", "ruma-common", "ruma-html", - "ruma-identifiers-validation", "ruma-macros", "serde", "serde_json", "thiserror 2.0.18", "tracing", - "url", "web-time", "wildmatch", "zeroize", @@ -4140,7 +4153,7 @@ dependencies = [ [[package]] name = "ruma-federation-api" version = "0.13.1" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "headers", "http", @@ -4159,7 +4172,7 @@ dependencies = [ [[package]] name = "ruma-html" version = "0.6.0" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "as_variant", "html5ever", @@ -4171,7 +4184,7 @@ dependencies = [ [[package]] name = "ruma-identifiers-validation" version = "0.12.0" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "js_int", "thiserror 2.0.18", @@ -4180,7 +4193,7 @@ dependencies = [ [[package]] name = "ruma-macros" version = "0.17.1" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "as_variant", "cfg-if", @@ -4196,7 +4209,7 @@ dependencies = [ [[package]] name = "ruma-signatures" version = "0.19.0" -source = "git+https://github.com/ruma/ruma.git?rev=4a0ae80fbf42d1b759e108d7315537d13583c144#4a0ae80fbf42d1b759e108d7315537d13583c144" +source = "git+https://github.com/ruma/ruma.git?rev=2455c71ec8bd16318397865d9c6e231e792cb15e#2455c71ec8bd16318397865d9c6e231e792cb15e" dependencies = [ "base64", "ed25519-dalek", @@ -4291,9 +4304,9 @@ checksum = "9774ba4a74de5f7b1c1451ed6cd5285a32eddb5cccb8cc655a4e50009e06477f" [[package]] name = "schannel" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1" +checksum = "91c1b7e4904c873ef0710c1f407dde2e6287de2bebc1bbbf7d430bb7cbffd939" dependencies = [ "windows-sys 0.61.2", ] @@ -4564,19 +4577,19 @@ dependencies = [ [[package]] name = "socket2" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" dependencies = [ "libc", - "windows-sys 0.60.2", + "windows-sys 0.61.2", ] [[package]] name = "sourceview5" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e4acb02162917d7b689c84f4ed710c22302c67c7e61da28a4e8ac548c04442c" +checksum = "523d92c25045879b653b3b1233649cb3bb0050c37c0b7ccee4e2a8e9be7f17e4" dependencies = [ "futures-channel", "futures-core", @@ -4592,9 +4605,9 @@ dependencies = [ [[package]] name = "sourceview5-sys" -version = "0.10.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c1529de5df2653788828ef71d44b113bb80e496bc17315f4122106bd6eebae" +checksum = "d4a3b9d9ee17549b78bf4ebaa460f066835e73ba470bf9cfcf01df41249eb862" dependencies = [ "gdk-pixbuf-sys", "gdk4-sys", @@ -4735,12 +4748,12 @@ checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964" [[package]] name = "tempfile" -version = "3.26.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82a72c767771b47409d2345987fda8628641887d5466101319899796367354a0" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.1", + "getrandom 0.4.2", "once_cell", "rustix", "windows-sys 0.61.2", @@ -4849,9 +4862,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.10.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" dependencies = [ "tinyvec_macros", ] @@ -4874,9 +4887,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.49.0" +version = "1.50.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +checksum = "27ad5e34374e03cfffefc301becb44e9dc3c17584f414349ebe29ed26661822d" dependencies = [ "bytes", "libc", @@ -4891,9 +4904,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.6.0" +version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5" +checksum = "5c55a2eff8b69ce66c84f85e1da1c233edc36ceb85a2058d11b0d6a3c7e7569c" dependencies = [ "proc-macro2", "quote", @@ -4954,7 +4967,7 @@ dependencies = [ "indexmap", "serde_core", "serde_spanned", - "toml_datetime", + "toml_datetime 0.7.5+spec-1.1.0", "toml_parser", "toml_writer", "winnow", @@ -4969,14 +4982,23 @@ dependencies = [ "serde_core", ] +[[package]] +name = "toml_datetime" +version = "1.0.0+spec-1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e" +dependencies = [ + "serde_core", +] + [[package]] name = "toml_edit" -version = "0.23.10+spec-1.0.0" +version = "0.25.4+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c8b9f757e028cee9fa244aea147aab2a9ec09d5325a9b01e0a49730c2b5269" +checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2" dependencies = [ "indexmap", - "toml_datetime", + "toml_datetime 1.0.0+spec-1.1.0", "toml_parser", "winnow", ] @@ -5093,9 +5115,9 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f30143827ddab0d256fd843b7a66d164e9f271cfa0dde49142c5ca0ca291f1e" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" dependencies = [ "matchers", "nu-ansi-term", @@ -5138,13 +5160,13 @@ checksum = "e36a83ea2b3c704935a01b4642946aadd445cea40b10935e3f8bd8052b8193d6" [[package]] name = "uds_windows" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89daebc3e6fd160ac4aa9fc8b3bf71e1f74fbf92367ae71fb83a037e8bf164b9" +checksum = "f2f6fb2847f6742cd76af783a2a2c49e9375d0a111c7bef6f71cd9e738c72d6e" dependencies = [ "memoffset", "tempfile", - "winapi", + "windows-sys 0.61.2", ] [[package]] @@ -5245,11 +5267,11 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] name = "uuid" -version = "1.21.0" +version = "1.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b672338555252d43fd2240c714dc444b8c6fb0a5c5335e65a07bba7742735ddb" +checksum = "a68d3c8f01c0cfa54a75291d83601161799e4a89a39e0929f4b0354d88757a37" dependencies = [ - "getrandom 0.4.1", + "getrandom 0.4.2", "js-sys", "serde_core", "wasm-bindgen", @@ -5344,9 +5366,9 @@ dependencies = [ [[package]] name = "wasm-bindgen" -version = "0.2.113" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60722a937f594b7fde9adb894d7c092fc1bb6612897c46368d18e7a20208eff2" +checksum = "6532f9a5c1ece3798cb1c2cfdba640b9b3ba884f5db45973a6f442510a87d38e" dependencies = [ "cfg-if", "once_cell", @@ -5357,9 +5379,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-futures" -version = "0.4.63" +version = "0.4.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a89f4650b770e4521aa6573724e2aed4704372151bd0de9d16a3bbabb87441a" +checksum = "e9c5522b3a28661442748e09d40924dfb9ca614b21c00d3fd135720e48b67db8" dependencies = [ "cfg-if", "futures-util", @@ -5371,9 +5393,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.113" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fac8c6395094b6b91c4af293f4c79371c163f9a6f56184d2c9a85f5a95f3950" +checksum = "18a2d50fcf105fb33bb15f00e7a77b772945a2ee45dcf454961fd843e74c18e6" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -5381,9 +5403,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.113" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3fabce6159dc20728033842636887e4877688ae94382766e00b180abac9d60" +checksum = "03ce4caeaac547cdf713d280eda22a730824dd11e6b8c3ca9e42247b25c631e3" dependencies = [ "bumpalo", "proc-macro2", @@ -5394,9 +5416,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.113" +version = "0.2.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0e091bdb824da87dc01d967388880d017a0a9bc4f3bdc0d86ee9f9336e3bb5" +checksum = "75a326b8c223ee17883a4251907455a2431acc2791c98c26279376490c378c16" dependencies = [ "unicode-ident", ] @@ -5425,9 +5447,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" dependencies = [ "futures-util", "js-sys", @@ -5468,9 +5490,9 @@ dependencies = [ [[package]] name = "web-sys" -version = "0.3.90" +version = "0.3.91" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "705eceb4ce901230f8625bd1d665128056ccbe4b7408faa625eec1ba80f59a97" +checksum = "854ba17bb104abfb26ba36da9729addc7ce7f06f5c0f90f3c391f8461cca21f9" dependencies = [ "js-sys", "wasm-bindgen", @@ -5601,16 +5623,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -5628,31 +5641,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -5661,101 +5657,53 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" -version = "0.7.14" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a5364e9d77fcdeeaa6062ced926ee3381faa2ee02d3eb83a5c27a8825540829" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" dependencies = [ "memchr", ] @@ -5953,18 +5901,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.40" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a789c6e490b576db9f7e6b6d661bcc9799f7c0ac8352f56ea20193b2681532e5" +checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.40" +version = "0.8.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f65c489a7071a749c849713807783f70672b28094011623e200cb86dcb835953" +checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" dependencies = [ "proc-macro2", "quote", diff --git a/Cargo.toml b/Cargo.toml index a1c6cccd..27319b13 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -63,38 +63,49 @@ webp = { version = "0.3", default-features = false } zeroize = "1" # gtk-rs project and dependents. These usually need to be updated together. -adw = { version = "0.8", features = ["v1_8"], package = "libadwaita" } -glycin = { git = "https://gitlab.gnome.org/GNOME/glycin", rev = "0865d33a7870a1cb8bf35c89f75d2cfab4129ee8", package = "libglycin-rebind" } -glycin-gtk4 = { git = "https://gitlab.gnome.org/GNOME/glycin", rev = "0865d33a7870a1cb8bf35c89f75d2cfab4129ee8", package = "libglycin-gtk4-rebind" } -gst = { version = "0.24", package = "gstreamer" } -gst_app = { version = "0.24", package = "gstreamer-app" } -gst_pbutils = { version = "0.24", package = "gstreamer-pbutils" } -gst_play = { version = "0.24", package = "gstreamer-play" } -gst_video = { version = "0.24", package = "gstreamer-video" } -gtk = { version = "0.10", features = ["gnome_49"], package = "gtk4" } -shumate = { version = "0.7", features = ["v1_1"], package = "libshumate" } -sourceview = { version = "0.10", package = "sourceview5" } +adw = { version = "0.9", features = ["v1_8"], package = "libadwaita" } +glycin = { version = "0.1", package = "libglycin-rebind" } +glycin-gtk4 = { version = "0.1", package = "libglycin-gtk4-rebind" } +gst = { version = "0.25", package = "gstreamer" } +gst_app = { version = "0.25", package = "gstreamer-app" } +gst_pbutils = { version = "0.25", package = "gstreamer-pbutils" } +gst_play = { version = "0.25", package = "gstreamer-play" } +gst_video = { version = "0.25", package = "gstreamer-video" } +gtk = { version = "0.11", features = ["gnome_49"], package = "gtk4" } +shumate = { version = "0.8", features = ["v1_1"], package = "libshumate" } +sourceview = { version = "0.11", package = "sourceview5" } [dependencies.matrix-sdk] # version = "0.14" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "029148ef6e45d51e6325a4f5aadcdee7ec9385cc" -features = ["socks", "sso-login", "markdown", "qrcode"] +rev = "74c1044b7dd384cf6436598713c12c915b331d73" +default-features = false +features = [ + "automatic-room-key-forwarding", + "e2e-encryption", + "markdown", + "native-tls", + "qrcode", + "socks", + "sqlite", + "sso-login", +] [dependencies.matrix-sdk-store-encryption] # version = "0.14" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +rev = "74c1044b7dd384cf6436598713c12c915b331d73" [dependencies.matrix-sdk-ui] # version = "0.14" git = "https://github.com/matrix-org/matrix-rust-sdk.git" -rev = "029148ef6e45d51e6325a4f5aadcdee7ec9385cc" +rev = "74c1044b7dd384cf6436598713c12c915b331d73" +default-features = false [dependencies.ruma] # version = "0.14" git = "https://github.com/ruma/ruma.git" -rev = "4a0ae80fbf42d1b759e108d7315537d13583c144" +rev = "2455c71ec8bd16318397865d9c6e231e792cb15e" features = [ "client-api-c", "markdown", @@ -111,7 +122,7 @@ features = [ # Linux-only dependencies. [target.'cfg(target_os = "linux")'.dependencies] -aperture = "0.11" +aperture = "0.12" ashpd = { version = "0.12", default-features = false, features = [ "tracing", "tokio", diff --git a/build-aux/org.gnome.Fractal.Devel.json b/build-aux/org.gnome.Fractal.Devel.json index f1a39df3..18b99b65 100644 --- a/build-aux/org.gnome.Fractal.Devel.json +++ b/build-aux/org.gnome.Fractal.Devel.json @@ -83,8 +83,8 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/libshumate.git", - "tag": "1.5.0.1", - "commit": "ed5fe31377c050610d5932903a5217e1c7d1d0e4" + "tag": "1.6.0", + "commit": "b4ca104a0bad8682ad51540867a1783f7db47473" } ] }, diff --git a/deny.toml b/deny.toml index a89d599d..8b560d3f 100644 --- a/deny.toml +++ b/deny.toml @@ -28,6 +28,5 @@ required-git-spec = "rev" allow-git = [ "https://github.com/ruma/ruma", "https://github.com/matrix-org/matrix-rust-sdk", - "https://gitlab.gnome.org/GNOME/glycin", ] unused-allowed-source = "allow" diff --git a/src/components/media/animated_image_paintable.rs b/src/components/media/animated_image_paintable.rs index e89678a3..53f8ef83 100644 --- a/src/components/media/animated_image_paintable.rs +++ b/src/components/media/animated_image_paintable.rs @@ -75,7 +75,7 @@ mod imp { } fn flags(&self) -> gdk::PaintableFlags { - gdk::PaintableFlags::SIZE + gdk::PaintableFlags::STATIC_SIZE } fn current_image(&self) -> gdk::Paintable { diff --git a/src/login/in_browser_page.rs b/src/login/in_browser_page.rs index 382c5f06..1feae20a 100644 --- a/src/login/in_browser_page.rs +++ b/src/login/in_browser_page.rs @@ -3,8 +3,11 @@ use gettextrs::gettext; use gtk::glib; use matrix_sdk::{ Error, - authentication::oauth::{OAuthAuthorizationData, UrlOrQuery}, - utils::local_server::{LocalServerRedirectHandle, QueryString}, + authentication::oauth::OAuthAuthorizationData, + utils::{ + UrlOrQuery, + local_server::{LocalServerRedirectHandle, QueryString}, + }, }; use tokio::task::AbortHandle; use tracing::{error, warn}; @@ -130,8 +133,8 @@ mod imp { match data { LoginInBrowserData::Oauth(_) => self.finish_oauth_login(query_string).await, - LoginInBrowserData::Matrix(url) => { - self.finish_matrix_login(url, query_string).await; + LoginInBrowserData::Matrix(_) => { + self.finish_matrix_login(query_string).await; } } } @@ -174,7 +177,7 @@ mod imp { } /// Finish the Matrix SSO login process. - async fn finish_matrix_login(&self, mut url: Url, query_string: QueryString) { + async fn finish_matrix_login(&self, query_string: QueryString) { let Some(login) = self.login.upgrade() else { return; }; @@ -185,12 +188,9 @@ mod imp { .expect("login client should be constructed"); let matrix_auth = client.matrix_auth(); - // We need to rebuild the URL to use the SDK's method. - url.set_query(Some(&query_string.0)); - let handle = spawn_tokio!(async move { matrix_auth - .login_with_sso_callback(url) + .login_with_sso_callback(query_string.into()) .map_err(|error| Error::UnknownError(error.into()))? .initial_device_display_name(APP_NAME) .await diff --git a/src/session/room/mod.rs b/src/session/room/mod.rs index d95cd7c2..1e96b265 100644 --- a/src/session/room/mod.rs +++ b/src/session/room/mod.rs @@ -18,7 +18,7 @@ use matrix_sdk::{ use ruma::{ EventId, MatrixToUri, OwnedEventId, OwnedRoomId, OwnedUserId, RoomId, UserId, api::client::{ - error::{ErrorKind, RetryAfter}, + error::{ErrorKind, LimitExceededErrorData, RetryAfter}, receipt::create_receipt::v3::ReceiptType as ApiReceiptType, }, events::room::{ @@ -1573,9 +1573,12 @@ mod imp { } let duration = match error.client_api_error_kind() { - Some(ErrorKind::LimitExceeded { - retry_after: Some(retry_after), - }) => match retry_after { + Some(ErrorKind::LimitExceeded( + LimitExceededErrorData { + retry_after: Some(retry_after), + .. + }, + )) => match retry_after { RetryAfter::Delay(duration) => Some(*duration), RetryAfter::DateTime(time) => { time.duration_since(SystemTime::now()).ok() @@ -1965,7 +1968,7 @@ impl Room { let handle = spawn_tokio!(async move { let futures = events_clone .into_iter() - .map(|(event_id, reason)| matrix_room.report_content(event_id, None, reason)); + .map(|(event_id, reason)| matrix_room.report_content(event_id, reason)); futures_util::future::join_all(futures).await }); diff --git a/src/session/room/timeline/event/mod.rs b/src/session/room/timeline/event/mod.rs index 6c6b7c2b..835d0794 100644 --- a/src/session/room/timeline/event/mod.rs +++ b/src/session/room/timeline/event/mod.rs @@ -3,7 +3,7 @@ use std::sync::Arc; use gtk::{gio, glib, glib::closure_local, prelude::*, subclass::prelude::*}; use indexmap::IndexMap; use matrix_sdk_ui::timeline::{ - AnyOtherFullStateEventContent, EmbeddedEvent, Error as TimelineError, EventSendState, + AnyOtherStateEventContentChange, EmbeddedEvent, Error as TimelineError, EventSendState, EventTimelineItem, MembershipChange, Message, MsgLikeKind, TimelineDetails, TimelineEventItemId, TimelineItemContent, }; @@ -666,7 +666,7 @@ impl Event { // so we do not group it. !matches!( other_state.content(), - AnyOtherFullStateEventContent::RoomCreate(_) + AnyOtherStateEventContentChange::RoomCreate(_) ) } _ => false, @@ -679,7 +679,7 @@ impl Event { TimelineItemContent::OtherState(other_state) => { matches!( other_state.content(), - AnyOtherFullStateEventContent::RoomCreate(_), + AnyOtherStateEventContentChange::RoomCreate(_), ) } _ => false, diff --git a/src/session_view/room_history/state/content.rs b/src/session_view/room_history/state/content.rs index 7d412c95..675ca708 100644 --- a/src/session_view/room_history/state/content.rs +++ b/src/session_view/room_history/state/content.rs @@ -2,12 +2,12 @@ use adw::{prelude::*, subclass::prelude::*}; use gettextrs::gettext; use gtk::{glib, glib::clone, pango}; use matrix_sdk_ui::timeline::{ - AnyOtherFullStateEventContent, MemberProfileChange, MembershipChange, OtherState, + AnyOtherStateEventContentChange, MemberProfileChange, MembershipChange, OtherState, RoomMembershipChange, TimelineItemContent, }; use ruma::{ UserId, - events::{FullStateEventContent, room::member::MembershipState}, + events::{StateEventContentChange, room::member::MembershipState}, }; use tracing::warn; @@ -93,21 +93,21 @@ mod imp { /// Update this row with the given [`OtherState`]. fn update_with_other_state(&self, other_state: &OtherState, sender: &Member) { let widget = match other_state.content() { - AnyOtherFullStateEventContent::RoomCreate(content) => { + AnyOtherStateEventContentChange::RoomCreate(content) => { WidgetType::Creation(StateCreation::new(content)) } - AnyOtherFullStateEventContent::RoomEncryption(_) => { + AnyOtherStateEventContentChange::RoomEncryption(_) => { WidgetType::Text(gettext("This room is encrypted from this point on.")) } - AnyOtherFullStateEventContent::RoomThirdPartyInvite(content) => { + AnyOtherStateEventContentChange::RoomThirdPartyInvite(content) => { let display_name = match content { - FullStateEventContent::Original { content, .. } => { + StateEventContentChange::Original { content, .. } => { match &content.display_name { s if s.is_empty() => other_state.state_key(), s => s, } } - FullStateEventContent::Redacted(_) => other_state.state_key(), + StateEventContentChange::Redacted(_) => other_state.state_key(), }; WidgetType::Text(gettext_f( // Translators: Do NOT translate the content between '{' and '}', this is a @@ -146,11 +146,11 @@ mod imp { ) { let sender_display_name = sender.disambiguated_name(); let target_display_name = match membership_change.content() { - FullStateEventContent::Original { content, .. } => content + StateEventContentChange::Original { content, .. } => content .displayname .clone() .unwrap_or_else(|| membership_change.user_id().to_string()), - FullStateEventContent::Redacted(_) => membership_change.user_id().to_string(), + StateEventContentChange::Redacted(_) => membership_change.user_id().to_string(), }; let supported_membership_change = @@ -294,8 +294,8 @@ mod imp { MembershipChange::KnockDenied => MembershipChange::KnockDenied, _ => { let membership = match membership_change.content() { - FullStateEventContent::Original { content, .. } => &content.membership, - FullStateEventContent::Redacted(content) => &content.membership, + StateEventContentChange::Original { content, .. } => &content.membership, + StateEventContentChange::Redacted(content) => &content.membership, }; match membership { diff --git a/src/session_view/room_history/state/creation.rs b/src/session_view/room_history/state/creation.rs index 1d910537..06f513f2 100644 --- a/src/session_view/room_history/state/creation.rs +++ b/src/session_view/room_history/state/creation.rs @@ -2,7 +2,7 @@ use adw::{prelude::*, subclass::prelude::*}; use gettextrs::gettext; use gtk::glib; use matrix_sdk::ruma::events::room::create::RoomCreateEventContent; -use ruma::events::FullStateEventContent; +use ruma::events::StateEventContentChange; mod imp { use glib::subclass::InitializingObject; @@ -39,10 +39,10 @@ mod imp { impl StateCreation { /// Set the room create state event to display. - pub(super) fn set_event(&self, event: &FullStateEventContent) { + pub(super) fn set_event(&self, event: &StateEventContentChange) { let predecessor = match event { - FullStateEventContent::Original { content, .. } => content.predecessor.as_ref(), - FullStateEventContent::Redacted(_) => None, + StateEventContentChange::Original { content, .. } => content.predecessor.as_ref(), + StateEventContentChange::Redacted(_) => None, }; if let Some(predecessor) = &predecessor { @@ -71,7 +71,7 @@ glib::wrapper! { } impl StateCreation { - pub fn new(event: &FullStateEventContent) -> Self { + pub fn new(event: &StateEventContentChange) -> Self { let obj: Self = glib::Object::new(); obj.imp().set_event(event); obj diff --git a/src/user_facing_error.rs b/src/user_facing_error.rs index 57c9d2f1..61f0c08c 100644 --- a/src/user_facing_error.rs +++ b/src/user_facing_error.rs @@ -23,10 +23,10 @@ impl UserFacingError for HttpError { self.as_client_api_error().map(|error| &error.body) { match kind { - ErrorKind::Forbidden { .. } => gettext("Invalid credentials."), + ErrorKind::Forbidden => gettext("Invalid credentials."), ErrorKind::UserDeactivated => gettext("Account deactivated."), - ErrorKind::LimitExceeded { retry_after } => { - if let Some(retry_after) = retry_after { + ErrorKind::LimitExceeded(limit_exceeded) => { + if let Some(retry_after) = &limit_exceeded.retry_after { let duration = match retry_after { RetryAfter::Delay(duration) => *duration, RetryAfter::DateTime(until) => until