vv
/
fractal
1
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

bump deps

This commit is contained in:
Julian Sparber 2021-05-07 00:24:54 +02:00
parent 4d93119299
commit 8a3150f6fa
7 changed files with 143 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

198
Cargo.lock generated
View File

@ -70,9 +70,9 @@ dependencies = [
[[package]]
name = "aho-corasick"
version = "0.7.15"
version = "0.7.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7404febffaa47dac81aa44dba71523c9d069b1bdc50a77db41195149e17f68e5"
checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
dependencies = [
"memchr",
]
@ -296,7 +296,7 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "cairo-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"bitflags",
"cairo-sys-rs",
@ -308,7 +308,7 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"glib-sys",
"libc",
@ -413,9 +413,9 @@ dependencies = [
[[package]]
name = "comrak"
version = "0.10.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ac96caba4b5b55c21c9efd51d498225ce9448d06d9d5c17bbd357522c71bacfd"
checksum = "b423acba50d5016684beaf643f9991e622633a4c858be6885653071c2da2b0c6"
dependencies = [
"clap",
"entities",
@ -462,10 +462,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea221b5284a47e40033bf9b66f35f984ec0ea2931eb03505246cd27a963f981b"
[[package]]
name = "cpuid-bool"
version = "0.1.2"
name = "cpufeatures"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8aebca1129a03dc6dc2b127edd729435bbc4a37e1d5f4d7513165089ceb02634"
checksum = "5cd5a7748210e7ec1a9696610b1015e6e31fbf58f77a160801f124bd1c36592a"
[[package]]
name = "cpuid-bool"
@ -484,9 +484,9 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.3"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12"
checksum = "52fb27eab85b17fbb9f6fd667089e07d6a2eb8743d02639ee7f6a7a7729c9c94"
dependencies = [
"cfg-if 1.0.0",
"crossbeam-utils",
@ -497,9 +497,9 @@ dependencies = [
[[package]]
name = "crossbeam-utils"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49"
checksum = "4feb231f0d4d6af81aed15928e58ecf5816aa62a2393e2c82f46973e92a9a278"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
@ -850,7 +850,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@ -861,7 +861,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"gio-sys",
"glib-sys",
@ -873,7 +873,7 @@ dependencies = [
[[package]]
name = "gdk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"bitflags",
"cairo-rs",
@ -888,7 +888,7 @@ dependencies = [
[[package]]
name = "gdk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@ -976,7 +976,7 @@ dependencies = [
[[package]]
name = "gio"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"bitflags",
"futures-channel",
@ -992,7 +992,7 @@ dependencies = [
[[package]]
name = "gio-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"glib-sys",
"gobject-sys",
@ -1004,7 +1004,7 @@ dependencies = [
[[package]]
name = "glib"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"bitflags",
"futures-channel",
@ -1022,7 +1022,7 @@ dependencies = [
[[package]]
name = "glib-macros"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"anyhow",
"heck",
@ -1036,7 +1036,7 @@ dependencies = [
[[package]]
name = "glib-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"libc",
"system-deps",
@ -1058,7 +1058,7 @@ dependencies = [
[[package]]
name = "gobject-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"glib-sys",
"libc",
@ -1068,7 +1068,7 @@ dependencies = [
[[package]]
name = "graphene-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"glib",
"graphene-sys",
@ -1078,7 +1078,7 @@ dependencies = [
[[package]]
name = "graphene-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"glib-sys",
"libc",
@ -1089,7 +1089,7 @@ dependencies = [
[[package]]
name = "gsk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"bitflags",
"cairo-rs",
@ -1104,7 +1104,7 @@ dependencies = [
[[package]]
name = "gsk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@ -1125,7 +1125,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
[[package]]
name = "gtk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"bitflags",
"cairo-rs",
@ -1147,7 +1147,7 @@ dependencies = [
[[package]]
name = "gtk4-macros"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"anyhow",
"heck",
@ -1162,7 +1162,7 @@ dependencies = [
[[package]]
name = "gtk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#9ace190c946f83f9ef9ab70fb2b07e1fa8186ae9"
source = "git+https://github.com/gtk-rs/gtk4-rs#26f15fa2d2298869d5dfdc4bef68e8daf337718e"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@ -1179,9 +1179,9 @@ dependencies = [
[[package]]
name = "h2"
version = "0.3.2"
version = "0.3.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"
checksum = "825343c4eef0b63f541f8903f395dc5beb362a979b5799a84062527ef1e37726"
dependencies = [
"bytes",
"fnv",
@ -1424,7 +1424,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libadwaita"
version = "0.1.0"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#da8b0fe0c606e00432bd150d6f2162a85e7b1c74"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#ddc44f4616de5b8820783cf5bf21565d3caab096"
dependencies = [
"gdk-pixbuf",
"gdk4",
@ -1439,7 +1439,7 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
version = "0.1.0"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#da8b0fe0c606e00432bd150d6f2162a85e7b1c74"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#ddc44f4616de5b8820783cf5bf21565d3caab096"
dependencies = [
"gdk-pixbuf-sys",
"gdk4-sys",
@ -1482,9 +1482,9 @@ dependencies = [
[[package]]
name = "lock_api"
version = "0.4.3"
version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
checksum = "0382880606dff6d15c9476c416d18690b72742aa7b605bb6dd6ec9030fbf07eb"
dependencies = [
"scopeguard",
]
@ -1563,9 +1563,10 @@ checksum = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
[[package]]
name = "matrix-sdk"
version = "0.2.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b5de20349945afcde13a78f023b906f421bb9764#b5de20349945afcde13a78f023b906f421bb9764"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
dependencies = [
"backoff",
"bytes",
"dashmap",
"futures",
"futures-timer",
@ -1586,7 +1587,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-base"
version = "0.2.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b5de20349945afcde13a78f023b906f421bb9764#b5de20349945afcde13a78f023b906f421bb9764"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
dependencies = [
"chacha20poly1305",
"dashmap",
@ -1609,7 +1610,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-common"
version = "0.2.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b5de20349945afcde13a78f023b906f421bb9764#b5de20349945afcde13a78f023b906f421bb9764"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
dependencies = [
"async-trait",
"futures",
@ -1625,7 +1626,7 @@ dependencies = [
[[package]]
name = "matrix-sdk-crypto"
version = "0.2.0"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git?rev=b5de20349945afcde13a78f023b906f421bb9764#b5de20349945afcde13a78f023b906f421bb9764"
source = "git+https://github.com/matrix-org/matrix-rust-sdk.git#5df9ae350c30e89d7b2116c7750ec051395e21ac"
dependencies = [
"aes-ctr",
"aes-gcm",
@ -1650,9 +1651,9 @@ dependencies = [
[[package]]
name = "memchr"
version = "2.3.4"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
[[package]]
name = "memoffset"
@ -1711,9 +1712,9 @@ dependencies = [
[[package]]
name = "nb-connect"
version = "1.1.0"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d"
checksum = "b1bb540dc6ef51cfe1916ec038ce7a620daf3a111e2502d745197cd53d6bca15"
dependencies = [
"libc",
"socket2",
@ -1904,9 +1905,9 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
[[package]]
name = "openssl"
version = "0.10.33"
version = "0.10.34"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a61075b62a23fef5a29815de7536d940aa35ce96d18ce0cc5076272db678a577"
checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8"
dependencies = [
"bitflags",
"cfg-if 1.0.0",
@ -1924,9 +1925,9 @@ checksum = "77af24da69f9d9341038eba93a073b1fdaaa1b788221b00a69bce9e762cb32de"
[[package]]
name = "openssl-sys"
version = "0.9.61"
version = "0.9.63"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "313752393519e876837e09e1fa183ddef0be7735868dced3196f4472d536277f"
checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98"
dependencies = [
"autocfg",
"cc",
@ -1938,7 +1939,7 @@ dependencies = [
[[package]]
name = "pango"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"bitflags",
"glib",
@ -1950,7 +1951,7 @@ dependencies = [
[[package]]
name = "pango-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#63f9f2fa16577dc7699354fb2643d7fd531310c5"
source = "git+https://github.com/gtk-rs/gtk-rs#c632ed3341a6fe835a1d5e8209a4c347f2f13b2c"
dependencies = [
"glib-sys",
"gobject-sys",
@ -2148,7 +2149,7 @@ version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b7456bc1ad2d4cf82b3a016be4c2ac48daf11bf990c1603ebd447fe6f30fca8"
dependencies = [
"cpuid-bool 0.2.0",
"cpuid-bool",
"universal-hash",
]
@ -2158,7 +2159,7 @@ version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "eebcc4aa140b9abd2bc40d9c3f7ccec842679cd79045ac3a7ac698c1a064b7cd"
dependencies = [
"cpuid-bool 0.2.0",
"cpuid-bool",
"opaque-debug 0.3.0",
"universal-hash",
]
@ -2341,18 +2342,18 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.2.6"
version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"
checksum = "742739e41cd49414de871ea5e549afb7e2a3ac77b589bcbebe8c82fab37147fc"
dependencies = [
"bitflags",
]
[[package]]
name = "regex"
version = "1.4.6"
version = "1.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2a26af418b574bd56588335b3a3659a65725d4e636eb1016c2f9e3b38c7cc759"
checksum = "ce5f1ceb7f74abbce32601642fcf8e8508a8a8991e0621c7d750295b9095702b"
dependencies = [
"aho-corasick",
"memchr",
@ -2371,9 +2372,9 @@ dependencies = [
[[package]]
name = "regex-syntax"
version = "0.6.23"
version = "0.6.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548"
checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b"
[[package]]
name = "remove_dir_all"
@ -2421,8 +2422,8 @@ dependencies = [
[[package]]
name = "ruma"
version = "0.0.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.0.3"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"assign",
"js_int",
@ -2437,9 +2438,10 @@ dependencies = [
[[package]]
name = "ruma-api"
version = "0.17.0-alpha.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.17.0-alpha.4"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"bytes",
"http",
"percent-encoding",
"ruma-api-macros",
@ -2452,8 +2454,8 @@ dependencies = [
[[package]]
name = "ruma-api-macros"
version = "0.17.0-alpha.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.17.0-alpha.4"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@ -2463,10 +2465,11 @@ dependencies = [
[[package]]
name = "ruma-client-api"
version = "0.10.0-alpha.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.10.0-alpha.3"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"assign",
"bytes",
"http",
"js_int",
"maplit",
@ -2482,8 +2485,8 @@ dependencies = [
[[package]]
name = "ruma-common"
version = "0.3.1"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.5.0"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"indexmap",
"js_int",
@ -2498,8 +2501,8 @@ dependencies = [
[[package]]
name = "ruma-events"
version = "0.22.0-alpha.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.22.0-alpha.3"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"js_int",
"ruma-common",
@ -2512,8 +2515,8 @@ dependencies = [
[[package]]
name = "ruma-events-macros"
version = "0.22.0-alpha.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.22.0-alpha.3"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@ -2523,8 +2526,8 @@ dependencies = [
[[package]]
name = "ruma-federation-api"
version = "0.1.0-alpha.1"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.1.0-alpha.2"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"js_int",
"ruma-api",
@ -2538,8 +2541,8 @@ dependencies = [
[[package]]
name = "ruma-identifiers"
version = "0.18.1"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.19.0"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"paste",
"ruma-identifiers-macros",
@ -2551,8 +2554,8 @@ dependencies = [
[[package]]
name = "ruma-identifiers-macros"
version = "0.18.1"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.19.0"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"proc-macro2",
"quote",
@ -2562,14 +2565,15 @@ dependencies = [
[[package]]
name = "ruma-identifiers-validation"
version = "0.2.2"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
version = "0.3.0"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
[[package]]
name = "ruma-serde"
version = "0.3.1"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"bytes",
"form_urlencoded",
"itoa",
"js_int",
@ -2581,7 +2585,7 @@ dependencies = [
[[package]]
name = "ruma-serde-macros"
version = "0.3.1"
source = "git+https://github.com/ruma/ruma?rev=2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25#2f1b9f097930bf7908ca539f2ab7bb0ccf5d8b25"
source = "git+https://github.com/ruma/ruma?rev=1e005f576e4640ee5ce6e357bcf33293819502d1#1e005f576e4640ee5ce6e357bcf33293819502d1"
dependencies = [
"proc-macro-crate 1.0.0",
"proc-macro2",
@ -2791,13 +2795,13 @@ checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "sha2"
version = "0.9.3"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa827a14b29ab7f44778d14a88d3cb76e949c45083f7dbfa507d0cb699dc12de"
checksum = "d8f6b75b17576b792bef0db1bcc4b8b8bcdf9506744cf34b974195487af6cff2"
dependencies = [
"block-buffer 0.9.0",
"cfg-if 1.0.0",
"cpuid-bool 0.1.2",
"cpufeatures",
"digest 0.9.0",
"opaque-debug 0.3.0",
]
@ -2864,7 +2868,7 @@ dependencies = [
[[package]]
name = "sourceview5"
version = "0.1.0"
source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#85fd0d9ed2c6a00b8540a330310e521817ab27c7"
source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#12538aac057128d94bd720d9fe391d9233dd9eb1"
dependencies = [
"bitflags",
"gdk-pixbuf",
@ -2880,7 +2884,7 @@ dependencies = [
[[package]]
name = "sourceview5-sys"
version = "0.1.0"
source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#85fd0d9ed2c6a00b8540a330310e521817ab27c7"
source = "git+https://gitlab.gnome.org/World/Rust/sourceview5-rs.git?branch=main#12538aac057128d94bd720d9fe391d9233dd9eb1"
dependencies = [
"gdk-pixbuf-sys",
"gdk4-sys",
@ -3008,9 +3012,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
version = "1.0.70"
version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b9505f307c872bab8eb46f77ae357c8eba1fdacead58ee5a850116b1d7f82883"
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
dependencies = [
"proc-macro2",
"quote",
@ -3241,9 +3245,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
version = "0.1.25"
version = "0.1.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
checksum = "09adeb8c97449311ccd28a427f96fb563e7fd31aabf994189879d9da2394b89d"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite",
@ -3264,9 +3268,9 @@ dependencies = [
[[package]]
name = "tracing-core"
version = "0.1.17"
version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f50de3927f93d202783f4513cda820ab47ef17f624b03c096e86ef00c67e6b5f"
checksum = "a9ff14f98b1a4b289c6248a023c1c2fa1491062964e9fed67ab29c4e4da4a052"
dependencies = [
"lazy_static",
]
@ -3304,9 +3308,9 @@ dependencies = [
[[package]]
name = "tracing-subscriber"
version = "0.2.17"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "705096c6f83bf68ea5d357a6aa01829ddbdac531b357b45abeca842938085baa"
checksum = "aa5553bf0883ba7c9cbe493b085c29926bd41b66afc31ff72cf17ff4fb60dcd5"
dependencies = [
"ansi_term 0.12.1",
"chrono",
@ -3396,9 +3400,9 @@ checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3"
[[package]]
name = "unicode-xid"
version = "0.2.1"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
[[package]]
name = "unicode_categories"

5
Cargo.toml
View File

@ -27,8 +27,6 @@ git = "https://gitlab.gnome.org/World/Rust/sourceview5-rs.git"
[dependencies.gtk]
package = "gtk4"
git = "https://github.com/gtk-rs/gtk4-rs"
# We need to use the same version as libadwaita does
#rev = "abea0c9980bc083494eceb30dfab5eeb99a73118"
[dependencies.glib]
git = "https://github.com/gtk-rs/gtk-rs"
@ -39,5 +37,4 @@ git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git"
[dependencies.matrix-sdk]
git = "https://github.com/matrix-org/matrix-rust-sdk.git"
rev = "b5de20349945afcde13a78f023b906f421bb9764"
features = ["unstable-synapse-quirks", "socks", "encryption", "sled_cryptostore", "sled_state_store"]
features = ["socks", "encryption", "sled_cryptostore", "sled_state_store"]

8
src/session/content/content.rs
View File

@ -127,12 +127,12 @@ mod imp {
Inhibit(false)
}
}));
self.message_entry.buffer().connect_property_text_notify(
clone!(@weak obj => move |buffer| {
self.message_entry
.buffer()
.connect_text_notify(clone!(@weak obj => move |buffer| {
let (start_iter, end_iter) = buffer.bounds();
obj.action_set_enabled("content.send-text-message", start_iter != end_iter);
}),
);
}));
let (start_iter, end_iter) = self.message_entry.buffer().bounds();
obj.action_set_enabled("content.send-text-message", start_iter != end_iter);

2
src/session/content/message_row.rs
View File

@ -14,6 +14,7 @@ use matrix_sdk::events::{
room::redaction::RedactionEventContent,
AnyMessageEvent, AnyMessageEventContent, AnyRoomEvent,
};
use sourceview::prelude::*;
use crate::session::room::Event;
@ -385,7 +386,6 @@ fn create_widget_for_html_block(block: &HtmlBlock) -> gtk::Widget {
bx.upcast::<gtk::Widget>()
}
HtmlBlock::Code(s) => {
use sourceview::BufferExt;
let scrolled = gtk::ScrolledWindow::new();
scrolled.set_policy(gtk::PolicyType::Automatic, gtk::PolicyType::Never);
let buffer = sourceview::Buffer::new(None);

32
src/session/mod.rs
View File

@ -30,6 +30,7 @@ use matrix_sdk::{
Client, ClientConfig, RequestConfig, SyncSettings,
};
use std::time::Duration;
use url::Url;
use crate::session::categories::Categories;
@ -177,11 +178,18 @@ impl Session {
fn set_homeserver(&self, homeserver: String) {
let priv_ = imp::Session::from_instance(self);
let config = ClientConfig::new().request_config(RequestConfig::new().retry_limit(2));
// Please note the homeserver needs to be a valid url or the client will panic!
let client = Client::new_with_config(homeserver.as_str(), config).unwrap();
priv_.homeserver.set(homeserver.clone()).unwrap();
priv_.homeserver.set(homeserver).unwrap();
let config = ClientConfig::new().request_config(RequestConfig::new().retry_limit(2));
let homeserver = match Url::parse(homeserver.as_str()) {
Ok(homeserver) => homeserver,
Err(_error) => {
// TODO: hanlde parse error
panic!();
}
};
let client = Client::new_with_config(homeserver, config).unwrap();
priv_.client.set(client).unwrap();
}
@ -380,6 +388,14 @@ impl Session {
.timeline
.events
.into_iter()
.filter_map(|event| {
if let Ok(event) = event.event.deserialize() {
Some(event)
} else {
error!("Couldn't deserialize event: {:?}", event);
None
}
})
.map(|event| event_from_sync_event!(event, room_id))
.collect(),
);
@ -397,6 +413,14 @@ impl Session {
.timeline
.events
.into_iter()
.filter_map(|event| {
if let Ok(event) = event.event.deserialize() {
Some(event)
} else {
error!("Couldn't deserialize event: {:?}", event);
None
}
})
.map(|event| event_from_sync_event!(event, room_id))
.collect(),
);

2
src/session/sidebar/row.rs
View File

@ -1,4 +1,4 @@
use adw::{subclass::prelude::BinImpl, BinExt};
use adw::{prelude::*, subclass::prelude::*};
use gtk::{glib, prelude::*, subclass::prelude::*};
use crate::session::sidebar::{CategoryRow, RoomRow};

17
src/session/sidebar/sidebar.rs
View File

@ -162,17 +162,13 @@ impl Sidebar {
});
let room_expression = gtk::ClosureExpression::new(
String::static_type(),
|value| {
Some(
value[0]
.get::<gtk::TreeListRow>()
.unwrap()
.item()
.and_then(|o| o.downcast::<Room>().ok())
.map_or(String::new(), |o| o.display_name())
.to_value(),
)
value[0]
.get::<gtk::TreeListRow>()
.unwrap()
.item()
.and_then(|o| o.downcast::<Room>().ok())
.map_or(String::new(), |o| o.display_name())
},
&[],
);
@ -181,6 +177,7 @@ impl Sidebar {
.expression(&room_expression)
.ignore_case(true)
.build();
let filter_model = gtk::FilterListModel::new(Some(&tree_model), Some(&filter));
priv_
.room_search_entry