mirror
/
fractal
mirror of https://gitlab.gnome.org/World/fractal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

update deps 

run cargo update
merge-requests/1327/merge
Julian Sparber 5 years ago
parent
cb4bc60849
commit
b0be9d47f1
14 changed files with 188 additions and 244 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 284
      Cargo.lock
  2. 3
      Cargo.toml
  3. 6
      src/application.rs
  4. 12
      src/login.rs
  5. 2
      src/main.rs
  6. 13
      src/session/content.rs
  7. 15
      src/session/mod.rs
  8. 23
      src/session/sidebar/category.rs
  9. 6
      src/session/sidebar/category_list.rs
  10. 6
      src/session/sidebar/category_row.rs
  11. 19
      src/session/sidebar/mod.rs
  12. 21
      src/session/sidebar/room.rs
  13. 10
      src/session/sidebar/room_row.rs
  14. 12
      src/window.rs

284
Cargo.lock generated
Unescape View File

@ -88,9 +88,9 @@ dependencies = [
[[package]]
name = "anyhow"
version = "1.0.39"
version = "1.0.40"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81cddc5f91628367664cc7c69714ff08deee8a3efc54623011c772544d7b2767"
checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b"
[[package]]
name = "assign"
@ -100,19 +100,19 @@ checksum = "5f093eed78becd229346bf859eec0aa4dd7ddde0757287b2b4107a1f09c80002"
[[package]]
name = "async-io"
version = "1.3.1"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9315f8f07556761c3e48fec2e6b276004acf426e6dc068b2c2251854d65ee0fd"
checksum = "fcb9af4888a70ad78ecb5efcb0ba95d66a3cf54a88b62ae81559954c7588c7a2"
dependencies = [
"concurrent-queue",
"fastrand",
"futures-lite",
"libc",
"log",
"nb-connect",
"once_cell",
"parking",
"polling",
"socket2",
"vec-arena",
"waker-fn",
"winapi",
@ -120,9 +120,9 @@ dependencies = [
[[package]]
name = "async-trait"
version = "0.1.48"
version = "0.1.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "36ea56748e10732c49404c153638a15ec3d6211ec5ff35d9bb20e13b93576adf"
checksum = "0b98e84bbb4cbcdd97da190ba0c58a1bb0de2c1fdf67d159e192ed766aeca722"
dependencies = [
"proc-macro2",
"quote",
@ -234,11 +234,10 @@ checksum = "631ae5198c9be5e753e5cc215e1bd73c2b466a3565173db433f52bb9d3e66dba"
[[package]]
name = "cairo-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"bitflags",
"cairo-sys-rs",
"freetype",
"glib",
"libc",
"thiserror",
@ -247,7 +246,7 @@ dependencies = [
[[package]]
name = "cairo-sys-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"glib-sys",
"libc",
@ -345,9 +344,9 @@ dependencies = [
[[package]]
name = "const_fn"
version = "0.4.5"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
checksum = "402da840495de3f976eaefc3485b7f5eb5b0bf9761f9a47be27fe975b3b8c2ec"
[[package]]
name = "core-foundation"
@ -556,6 +555,7 @@ name = "fractal"
version = "0.1.0"
dependencies = [
"gettext-rs",
"glib",
"gtk-macros",
"gtk4",
"libadwaita",
@ -569,27 +569,6 @@ dependencies = [
"url",
]
[[package]]
name = "freetype"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bee38378a9e3db1cc693b4f88d166ae375338a0ff75cb8263e1c601d51f35dc6"
dependencies = [
"freetype-sys",
"libc",
]
[[package]]
name = "freetype-sys"
version = "0.13.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a37d4011c0cc628dfa766fcc195454f4b068d7afdc2adfd28861191d866e731a"
dependencies = [
"cmake",
"libc",
"pkg-config",
]
[[package]]
name = "fs2"
version = "0.4.3"
@ -602,9 +581,9 @@ dependencies = [
[[package]]
name = "futures"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
checksum = "a9d5813545e459ad3ca1bff9915e9ad7f1a47dc6a91b627ce321d5863b7dd253"
dependencies = [
"futures-channel",
"futures-core",
@ -617,9 +596,9 @@ dependencies = [
[[package]]
name = "futures-channel"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
checksum = "ce79c6a52a299137a6013061e0cf0e688fce5d7f1bc60125f520912fdb29ec25"
dependencies = [
"futures-core",
"futures-sink",
@ -627,15 +606,15 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
checksum = "098cd1c6dda6ca01650f1a37a794245eb73181d0d4d4e955e2f3c37db7af1815"
[[package]]
name = "futures-executor"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
checksum = "10f6cb7042eda00f0049b1d2080aa4b93442997ee507eb3828e8bd7577f94c9d"
dependencies = [
"futures-core",
"futures-task",
@ -644,9 +623,9 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
checksum = "365a1a1fb30ea1c03a830fdb2158f5236833ac81fa0ad12fe35b29cddc35cb04"
[[package]]
name = "futures-lite"
@ -674,9 +653,9 @@ dependencies = [
[[package]]
name = "futures-macro"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
checksum = "668c6733a182cd7deb4f1de7ba3bf2120823835b3bcfbeacf7d2c4a773c1bb8b"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@ -686,15 +665,15 @@ dependencies = [
[[package]]
name = "futures-sink"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
checksum = "5c5629433c555de3d82861a7a4e3794a4c40040390907cfbfd7143a92a426c23"
[[package]]
name = "futures-task"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
checksum = "ba7aa51095076f3ba6d9a1f702f74bd05ec65f555d70d2033d55ba8d69f581bc"
[[package]]
name = "futures-timer"
@ -708,9 +687,9 @@ dependencies = [
[[package]]
name = "futures-util"
version = "0.3.13"
version = "0.3.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
checksum = "3c144ad54d60f23927f0a6b6d816e4271278b64f005ad65e4e35291d2de9c025"
dependencies = [
"futures-channel",
"futures-core",
@ -738,7 +717,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"gdk-pixbuf-sys",
"gio",
@ -749,7 +728,7 @@ dependencies = [
[[package]]
name = "gdk-pixbuf-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"gio-sys",
"glib-sys",
@ -761,7 +740,7 @@ dependencies = [
[[package]]
name = "gdk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"bitflags",
"cairo-rs",
@ -776,7 +755,7 @@ dependencies = [
[[package]]
name = "gdk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@ -843,7 +822,7 @@ dependencies = [
[[package]]
name = "gio"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"bitflags",
"futures-channel",
@ -859,7 +838,7 @@ dependencies = [
[[package]]
name = "gio-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"glib-sys",
"gobject-sys",
@ -871,7 +850,7 @@ dependencies = [
[[package]]
name = "glib"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"bitflags",
"futures-channel",
@ -889,11 +868,11 @@ dependencies = [
[[package]]
name = "glib-macros"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"anyhow",
"heck",
"proc-macro-crate 0.1.5",
"proc-macro-crate 1.0.0",
"proc-macro-error",
"proc-macro2",
"quote",
@ -903,7 +882,7 @@ dependencies = [
[[package]]
name = "glib-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"libc",
"system-deps",
@ -925,7 +904,7 @@ dependencies = [
[[package]]
name = "gobject-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"glib-sys",
"libc",
@ -935,7 +914,7 @@ dependencies = [
[[package]]
name = "graphene-rs"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"glib",
"graphene-sys",
@ -945,7 +924,7 @@ dependencies = [
[[package]]
name = "graphene-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"glib-sys",
"libc",
@ -956,7 +935,7 @@ dependencies = [
[[package]]
name = "gsk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"bitflags",
"cairo-rs",
@ -971,7 +950,7 @@ dependencies = [
[[package]]
name = "gsk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"cairo-sys-rs",
"gdk4-sys",
@ -992,7 +971,7 @@ checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
[[package]]
name = "gtk4"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"bitflags",
"cairo-rs",
@ -1014,7 +993,7 @@ dependencies = [
[[package]]
name = "gtk4-macros"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"anyhow",
"heck",
@ -1029,7 +1008,7 @@ dependencies = [
[[package]]
name = "gtk4-sys"
version = "0.1.0"
source = "git+https://github.com/gtk-rs/gtk4-rs#2b83b9ca0ac18340b6df63f27abc0848c775590a"
source = "git+https://github.com/gtk-rs/gtk4-rs#fcb47ab8c71cee003be5396da280346fca95d072"
dependencies = [
"cairo-sys-rs",
"gdk-pixbuf-sys",
@ -1046,9 +1025,9 @@ dependencies = [
[[package]]
name = "h2"
version = "0.3.1"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d832b01df74254fe364568d6ddc294443f61cbec82816b60904303af87efae78"
checksum = "fc018e188373e2777d0ef2467ebff62a08e66c3f5857b23c8fbec3018210dc00"
dependencies = [
"bytes",
"fnv",
@ -1109,9 +1088,9 @@ dependencies = [
[[package]]
name = "http"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7245cd7449cc792608c3c8a9eaf69bd4eabbabf802713748fd739c98b82f0747"
checksum = "527e8c9ac747e28542699a951517aa9a6945af506cd1f2e1b53a576c17b6cc11"
dependencies = [
"bytes",
"fnv",
@ -1131,9 +1110,9 @@ dependencies = [
[[package]]
name = "httparse"
version = "1.3.5"
version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "615caabe2c3160b313d52ccc905335f4ed5f10881dd63dc5699d47e90be85691"
checksum = "4a1ce40d6fc9764887c2fdc7305c3dcc429ba11ff981c1509416afd5697e4437"
[[package]]
name = "httpdate"
@ -1143,9 +1122,9 @@ checksum = "494b4d60369511e7dea41cf646832512a94e542f68bb9c49e54518e0f468eb47"
[[package]]
name = "hyper"
version = "0.14.4"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8e946c2b1349055e0b72ae281b238baf1a3ea7307c7e9f9d64673bdd9c26ac7"
checksum = "8bf09f61b52cfcf4c00de50df88ae423d6c02354e385a86341133b5338630ad1"
dependencies = [
"bytes",
"futures-channel",
@ -1158,7 +1137,7 @@ dependencies = [
"httpdate",
"itoa",
"pin-project",
"socket2 0.3.19",
"socket2",
"tokio",
"tower-service",
"tracing",
@ -1180,9 +1159,9 @@ dependencies = [
[[package]]
name = "idna"
version = "0.2.2"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89829a5d69c23d348314a7ac337fe39173b61149a9864deabd260983aed48c21"
checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
dependencies = [
"matches",
"unicode-bidi",
@ -1245,9 +1224,9 @@ checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736"
[[package]]
name = "js-sys"
version = "0.3.49"
version = "0.3.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc15e39392125075f60c95ba416f5381ff6c3a948ff02ab12464715adf56c821"
checksum = "2d99f9e3e84b8f67f846ef5b4cbbc3b1c29f6c759fcbce6f01aa0e73d932a24c"
dependencies = [
"wasm-bindgen",
]
@ -1270,7 +1249,7 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]]
name = "libadwaita"
version = "0.1.0"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#6ae4d3670565064acc9da2f51434eca0a0c51ac9"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#2d09b6b566bc0fa2497612768cf0c41f582acdd7"
dependencies = [
"bitflags",
"gdk-pixbuf",
@ -1287,7 +1266,7 @@ dependencies = [
[[package]]
name = "libadwaita-sys"
version = "0.1.0"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#6ae4d3670565064acc9da2f51434eca0a0c51ac9"
source = "git+https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git#2d09b6b566bc0fa2497612768cf0c41f582acdd7"
dependencies = [
"gdk-pixbuf-sys",
"gdk4-sys",
@ -1302,9 +1281,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.91"
version = "0.2.93"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8916b1f6ca17130ec6568feccee27c156ad12037880833a3b842a823236502e7"
checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41"
[[package]]
name = "locale_config"
@ -1321,9 +1300,9 @@ dependencies = [
[[package]]
name = "lock_api"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd96ffd135b2fd7b973ac026d28085defbe8983df057ced3eb4f2130b0831312"
checksum = "5a3c91c24eae6777794bb1997ad98bbb87daf92890acab859f7eaa4320333176"
dependencies = [
"scopeguard",
]
@ -1463,9 +1442,9 @@ checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525"
[[package]]
name = "memoffset"
version = "0.6.1"
version = "0.6.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87"
checksum = "f83fb6581e8ed1f85fd45c116db8405483899489e38406156c25eb743554361d"
dependencies = [
"autocfg",
]
@ -1523,7 +1502,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a19900e7eee95eb2b3c2e26d12a874cc80aaf750e31be6fcbe743ead369fa45d"
dependencies = [
"libc",
"socket2 0.4.0",
"socket2",
]
[[package]]
@ -1733,7 +1712,7 @@ dependencies = [
[[package]]
name = "pango"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"bitflags",
"glib",
@ -1745,7 +1724,7 @@ dependencies = [
[[package]]
name = "pango-sys"
version = "0.13.0"
source = "git+https://github.com/gtk-rs/gtk-rs#6a7737fdb47afe38939ddb148e27c7f8f03ec559"
source = "git+https://github.com/gtk-rs/gtk-rs#f042a441f8bd4e1dc4de92bd8e3fa750718bf797"
dependencies = [
"glib-sys",
"gobject-sys",
@ -1816,18 +1795,18 @@ dependencies = [
[[package]]
name = "pin-project"
version = "1.0.5"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96fa8ebb90271c4477f144354485b8068bd8f6b78b428b01ba892ca26caf0b63"
checksum = "c7509cc106041c40a4518d2af7a61530e1eed0e6285296a3d8c5472806ccc4a4"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "1.0.5"
version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "758669ae3558c6f74bd2a18b41f7ac0b5a195aea6639d6a9b5e5d1ad5ba24c0b"
checksum = "48c950132583b500556b1efd71d45b319029f2b71518d979fcc208e16b42426f"
dependencies = [
"proc-macro2",
"quote",
@ -1949,9 +1928,9 @@ checksum = "bc881b2c22681370c6a780e47af9840ef841837bc98118431d4e1868bd0c1086"
[[package]]
name = "proc-macro2"
version = "1.0.24"
version = "1.0.26"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71"
checksum = "a152013215dca273577e18d2bf00fa862b89b24169fb78c4c95aeb07992c9cec"
dependencies = [
"unicode-xid",
]
@ -2007,9 +1986,9 @@ dependencies = [
[[package]]
name = "redox_syscall"
version = "0.2.5"
version = "0.2.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9"
checksum = "8270314b5ccceb518e7e578952f0b72b88222d02e8f77f5ecf7abbb673539041"
dependencies = [
"bitflags",
]
@ -2052,9 +2031,9 @@ dependencies = [
[[package]]
name = "reqwest"
version = "0.11.2"
version = "0.11.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf12057f289428dbf5c591c74bf10392e4a8003f993405a902f20117019022d4"
checksum = "2296f2fac53979e8ccbc4a1136b25dcefd37be9ed7e4a1f6b05a6029c84ff124"
dependencies = [
"base64",
"bytes",
@ -2323,9 +2302,9 @@ dependencies = [
[[package]]
name = "security-framework"
version = "2.1.2"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d"
checksum = "3670b1d2fdf6084d192bc71ead7aabe6c06aa2ea3fbd9cc3ac111fa5c2b1bd84"
dependencies = [
"bitflags",
"core-foundation",
@ -2336,9 +2315,9 @@ dependencies = [
[[package]]
name = "security-framework-sys"
version = "2.1.1"
version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dee48cdde5ed250b0d3252818f646e174ab414036edb884dde62d80a3ac6082d"
checksum = "3676258fd3cfe2c9a0ec99ce3038798d847ce3e4bb17746373eb9f0f1ac16339"
dependencies = [
"core-foundation-sys",
"libc",
@ -2467,9 +2446,9 @@ dependencies = [
[[package]]
name = "slab"
version = "0.4.2"
version = "0.4.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8"
checksum = "f173ac3d1a7e3b28003f40de0b5ce7fe2710f9b9dc3fc38664cebee46b3b6527"
[[package]]
name = "sled"
@ -2493,17 +2472,6 @@ version = "1.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
[[package]]
name = "socket2"
version = "0.3.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "122e570113d28d773067fab24266b66753f6ea915758651696b6e35e49f88d6e"
dependencies = [
"cfg-if 1.0.0",
"libc",
"winapi",
]
[[package]]
name = "socket2"
version = "0.4.0"
@ -2598,9 +2566,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2"
[[package]]
name = "syn"
version = "1.0.64"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3fd9d1e9976102a03c542daa2eff1b43f9d72306342f3f8b3ed5fb8908195d6f"
checksum = "48fe99c6bd8b1cc636890bcc071842de909d902c81ac7dab53ba33c421ab8ffb"
dependencies = [
"proc-macro2",
"quote",
@ -2621,9 +2589,9 @@ dependencies = [
[[package]]
name = "system-deps"
version = "3.1.0"
version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fbb68eac6404c4c357c4a9a0d6395b82c753815d4bc0c4e3114a97b035c6459"
checksum = "c248107ad7bc1ac07066a4d003cae9e9a7bc2e27d3418f7a9cdcdc8699dbea70"
dependencies = [
"anyhow",
"cfg-expr",
@ -2720,9 +2688,9 @@ dependencies = [
[[package]]
name = "tinyvec"
version = "1.1.1"
version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "317cca572a0e89c3ce0ca1f1bdc9369547fe318a683418e42ac8f59d14701023"
checksum = "5b5220f05bb7de7f3f53c7c065e1199b3172696fe2db9f9c4d8ad9b4ee74c342"
dependencies = [
"tinyvec_macros",
]
@ -2735,9 +2703,9 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"
[[package]]
name = "tokio"
version = "1.4.0"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "134af885d758d645f0f0505c9a8b3f9bf8a348fd822e112ab5248138348f1722"
checksum = "83f0c8e7c0addab50b663055baf787d0af7f413a46e6e7fb9559a4e4db7137a5"
dependencies = [
"autocfg",
"bytes",
@ -2772,9 +2740,9 @@ dependencies = [
[[package]]
name = "tokio-util"
version = "0.6.5"
version = "0.6.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5143d049e85af7fbc36f5454d990e62c2df705b3589f123b71f441b6b59f443f"
checksum = "940a12c99365c31ea8dd9ba04ec1be183ffe4920102bb7122c2f515437601e8e"
dependencies = [
"bytes",
"futures-core",
@ -2904,9 +2872,9 @@ checksum = "56dee185309b50d1f11bfedef0fe6d036842e3fb77413abef29f8f8d1c5d4c1c"
[[package]]
name = "unicode-bidi"
version = "0.3.4"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5"
checksum = "eeb8be209bb1c96b7c177c7420d26e04eccacb0eeae6b980e35fcb74678107e0"
dependencies = [
"matches",
]
@ -2966,9 +2934,9 @@ dependencies = [
[[package]]
name = "vcpkg"
version = "0.2.11"
version = "0.2.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b00bca6106a5e23f3eee943593759b7fcddb00554332e856d990c893966879fb"
checksum = "cbdbff6266a24120518560b5dc983096efb98462e51d0d68169895b237be3e5d"
[[package]]
name = "vec-arena"
@ -3018,9 +2986,9 @@ checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
[[package]]
name = "wasm-bindgen"
version = "0.2.72"
version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8fe8f61dba8e5d645a4d8132dc7a0a66861ed5e1045d2c0ed940fab33bac0fbe"
checksum = "83240549659d187488f91f33c0f8547cbfef0b2088bc470c116d1d260ef623d9"
dependencies = [
"cfg-if 1.0.0",
"serde",
@ -3030,9 +2998,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-backend"
version = "0.2.72"
version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "046ceba58ff062da072c7cb4ba5b22a37f00a302483f7e2a6cdc18fedbdc1fd3"
checksum = "ae70622411ca953215ca6d06d3ebeb1e915f0f6613e3b495122878d7ebec7dae"
dependencies = [
"bumpalo",
"lazy_static",
@ -3045,9 +3013,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-futures"
version = "0.4.22"
version = "0.4.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "73157efb9af26fb564bb59a009afd1c7c334a44db171d280690d0c3faaec3468"
checksum = "81b8b767af23de6ac18bf2168b690bed2902743ddf0fb39252e36f9e2bfc63ea"
dependencies = [
"cfg-if 1.0.0",
"js-sys",
@ -3057,9 +3025,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro"
version = "0.2.72"
version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0ef9aa01d36cda046f797c57959ff5f3c615c9cc63997a8d545831ec7976819b"
checksum = "3e734d91443f177bfdb41969de821e15c516931c3c3db3d318fa1b68975d0f6f"
dependencies = [
"quote",
"wasm-bindgen-macro-support",
@ -3067,9 +3035,9 @@ dependencies = [
[[package]]
name = "wasm-bindgen-macro-support"
version = "0.2.72"
version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "96eb45c1b2ee33545a813a92dbb53856418bf7eb54ab34f7f7ff1448a5b3735d"
checksum = "d53739ff08c8a68b0fdbcd54c372b8ab800b1449ab3c9d706503bc7dd1621b2c"
dependencies = [
"proc-macro2",
"quote",
@ -3080,15 +3048,15 @@ dependencies = [
[[package]]
name = "wasm-bindgen-shared"
version = "0.2.72"
version = "0.2.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7148f4696fb4960a346eaa60bbfb42a1ac4ebba21f750f75fc1375b098d5ffa"
checksum = "d9a543ae66aa233d14bb765ed9af4a33e81b8b58d1584cf1b47ff8cd0b9e4489"
[[package]]
name = "web-sys"
version = "0.3.49"
version = "0.3.50"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59fe19d70f5dacc03f6e46777213facae5ac3801575d56ca6cbd4c93dcd12310"
checksum = "a905d57e488fec8861446d3393670fb50d27a262344013181c2cdf9fff5481be"
dependencies = [
"js-sys",
"wasm-bindgen",
@ -3105,9 +3073,9 @@ dependencies = [
[[package]]
name = "wildmatch"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "07ae7ce410f81ba679081aac1d4874f3b1c328535b630209aa5b4cdaaf895e20"
checksum = "d6c48bd20df7e4ced539c12f570f937c6b4884928a87fee70a479d72f031d4e0"
[[package]]
name = "winapi"
@ -3142,9 +3110,9 @@ dependencies = [
[[package]]
name = "zbus"
version = "1.8.0"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40b4d4aa39daed4e32aed75f0c37b969184949a0fdfd5f2e1277abfda61f02a8"
checksum = "2326acc379a3ac4e34b794089f5bdb17086bf29a5fdf619b7b4cc772dc2e9dad"
dependencies = [
"async-io",
"byteorder",
@ -3165,9 +3133,9 @@ dependencies = [
[[package]]
name = "zbus_macros"
version = "1.8.0"
version = "1.9.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87cc141cda72384bef359badf1808e391d3968f9299e8f3c3cbb78dafa1e0930"
checksum = "a482c56029e48681b89b92b5db3c446db0915e8dd1052c0328a574eda38d5f93"
dependencies = [
"proc-macro-crate 0.1.5",
"proc-macro2",
@ -3177,18 +3145,18 @@ dependencies = [
[[package]]
name = "zeroize"
version = "1.2.0"
version = "1.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81a974bcdd357f0dca4d41677db03436324d45a4c9ed2d0b873a5a360ce41c36"
checksum = "4756f7db3f7b5574938c3eb1c117038b8e07f95ee6718c0efad4ac21508f1efd"
dependencies = [
"zeroize_derive",
]
[[package]]
name = "zeroize_derive"
version = "1.0.1"
version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3f369ddb18862aba61aa49bf31e74d29f0f162dec753063200e1dc084345d16"
checksum = "a2c1e130bebaeab2f23886bf9acbaca14b092408c452543c857f66399cd6dab1"
dependencies = [
"proc-macro2",
"quote",

3
Cargo.toml
Unescape View File

@ -21,6 +21,9 @@ 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"
[dependencies.adw]
package = "libadwaita"
git = "https://gitlab.gnome.org/bilelmoussaoui/libadwaita-rs.git"

6
src/application.rs
Unescape View File

@ -10,7 +10,6 @@ use gtk::{gdk, gio, glib};
use gtk_macros::action;
use log::{debug, info};
use once_cell::sync::OnceCell;
use std::env;
mod imp {
use super::*;
@ -124,7 +123,7 @@ impl Application {
fn setup_css(&self) {
let provider = gtk::CssProvider::new();
provider.load_from_resource("/org/gnome/FractalNext/style.css");
if let Some(display) = gdk::Display::get_default() {
if let Some(display) = gdk::Display::default() {
gtk::StyleContext::add_provider_for_display(
&display,
&provider,
@ -171,7 +170,6 @@ impl Application {
info!("Version: {} ({})", config::VERSION, config::PROFILE);
info!("Datadir: {}", config::PKGDATADIR);
let args: Vec<String> = env::args().collect();
ApplicationExtManual::run(self, &args);
ApplicationExtManual::run(self);
}
}

12
src/login.rs
Unescape View File

@ -96,9 +96,9 @@ impl Login {
fn enable_next_action(&self) {
let priv_ = imp::Login::from_instance(&self);
let homeserver = priv_.homeserver_entry.get_text();
let username = priv_.username_entry.get_text_length();
let password = priv_.password_entry.get_text().len();
let homeserver = priv_.homeserver_entry.text();
let username = priv_.username_entry.text_length();
let password = priv_.password_entry.text().len();
self.action_set_enabled(
"login.next",
@ -115,9 +115,9 @@ impl Login {
fn login(&self) {
let priv_ = imp::Login::from_instance(&self);
let homeserver = priv_.homeserver_entry.get_text().to_string();
let username = priv_.username_entry.get_text().to_string();
let password = priv_.password_entry.get_text().to_string();
let homeserver = priv_.homeserver_entry.text().to_string();
let username = priv_.username_entry.text().to_string();
let password = priv_.password_entry.text().to_string();
self.freeze();

2
src/main.rs
Unescape View File

@ -43,7 +43,7 @@ fn main() {
let res = gio::Resource::load(RESOURCES_FILE).expect("Could not load gresource file");
gio::resources_register(&res);
IconTheme::get_for_display(&Display::get_default().unwrap())
IconTheme::for_display(&Display::default().unwrap())
.unwrap()
.add_resource_path("/org/gnome/FractalNext/icons");

13
src/session/content.rs
Unescape View File

@ -47,7 +47,7 @@ mod imp {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![glib::ParamSpec::boolean(
vec![glib::ParamSpec::new_boolean(
"compact",
"Compact",
"Wheter a compact view is used or not",
@ -66,7 +66,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"compact" => {
let compact = value
.get()
@ -77,13 +77,8 @@ mod imp {
}
}
fn get_property(
&self,
_obj: &Self::Type,
_id: usize,
pspec: &glib::ParamSpec,
) -> glib::Value {
match pspec.get_name() {
fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
"compact" => self.compact.get().to_value(),
_ => unimplemented!(),
}

15
src/session/mod.rs
Unescape View File

@ -70,7 +70,7 @@ mod imp {
impl ObjectImpl for Session {
fn properties() -> &'static [glib::ParamSpec] {
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![glib::ParamSpec::string(
vec![glib::ParamSpec::new_string(
"homeserver",
"Homeserver",
"The matrix homeserver of this session",
@ -89,7 +89,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"homeserver" => {
let homeserver = value
.get()
@ -100,13 +100,8 @@ mod imp {
}
}
fn get_property(
&self,
_obj: &Self::Type,
_id: usize,
pspec: &glib::ParamSpec,
) -> glib::Value {
match pspec.get_name() {
fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
"homeserver" => self.homeserver.get().to_value(),
_ => unimplemented!(),
}
@ -225,7 +220,7 @@ impl Session {
>(Default::default(), 100);
receiver.attach(
None,
clone!(@weak self as obj => move |result| {
clone!(@weak self as obj => @default-return glib::Continue(false), move |result| {
match result {
Err(error) => {
let priv_ = &imp::Session::from_instance(&obj);

23
src/session/sidebar/category.rs
Unescape View File

@ -88,7 +88,7 @@ mod imp {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![
glib::ParamSpec::enum_(
glib::ParamSpec::new_enum(
"display-name",
"Display Name",
"The name of this category",
@ -96,7 +96,7 @@ mod imp {
CategoryName::default() as i32,
glib::ParamFlags::READWRITE,
),
glib::ParamSpec::boolean(
glib::ParamSpec::new_boolean(
"expanded",
"Expanded",
"Wheter this category is expanded or not",
@ -116,7 +116,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"expanded" => {
let expanded: Option<bool> = value
.get()
@ -133,13 +133,8 @@ mod imp {
}
}
fn get_property(
&self,
_obj: &Self::Type,
_id: usize,
pspec: &glib::ParamSpec,
) -> glib::Value {
match pspec.get_name() {
fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
"display-name" => self.name.get().to_value(),
"expanded" => self.expanded.get().to_value(),
_ => unimplemented!(),
@ -148,13 +143,13 @@ mod imp {
}
impl ListModelImpl for Category {
fn get_item_type(&self, _list_model: &Self::Type) -> glib::Type {
fn item_type(&self, _list_model: &Self::Type) -> glib::Type {
Room::static_type()
}
fn get_n_items(&self, _list_model: &Self::Type) -> u32 {
fn n_items(&self, _list_model: &Self::Type) -> u32 {
self.list.borrow().len() as u32
}
fn get_item(&self, _list_model: &Self::Type, position: u32) -> Option<glib::Object> {
fn item(&self, _list_model: &Self::Type, position: u32) -> Option<glib::Object> {
let list = self.list.borrow();
let room_id = list.get(position as usize);
if let Some(room_id) = room_id {
@ -168,7 +163,7 @@ mod imp {
}
}
impl SelectionModelImpl for Category {
fn get_selection_in_range(
fn selection_in_range(
&self,
_model: &Self::Type,
_position: u32,

6
src/session/sidebar/category_list.rs
Unescape View File

@ -24,13 +24,13 @@ mod imp {
impl ObjectImpl for CategoryList {}
impl ListModelImpl for CategoryList {
fn get_item_type(&self, _list_model: &Self::Type) -> glib::Type {
fn item_type(&self, _list_model: &Self::Type) -> glib::Type {
Category::static_type()
}
fn get_n_items(&self, _list_model: &Self::Type) -> u32 {
fn n_items(&self, _list_model: &Self::Type) -> u32 {
self.list.borrow().len() as u32
}
fn get_item(&self, _list_model: &Self::Type, position: u32) -> Option<glib::Object> {
fn item(&self, _list_model: &Self::Type, position: u32) -> Option<glib::Object> {
self.list
.borrow()
.get(position as usize)

6
src/session/sidebar/category_row.rs
Unescape View File

@ -45,7 +45,7 @@ mod imp {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![
glib::ParamSpec::enum_(
glib::ParamSpec::new_enum(
"display-name",
"Display Name",
"The display name of this category",
@ -53,7 +53,7 @@ mod imp {
CategoryName::default() as i32,
glib::ParamFlags::WRITABLE,
),
glib::ParamSpec::boolean(
glib::ParamSpec::new_boolean(
"expanded",
"Expanded",
"Wheter this category is expanded or not",
@ -73,7 +73,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"display-name" => {
let display_name: CategoryName = value
.get()

19
src/session/sidebar/mod.rs
Unescape View File

@ -62,7 +62,7 @@ mod imp {
fn properties() -> &'static [glib::ParamSpec] {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![glib::ParamSpec::boolean(
vec![glib::ParamSpec::new_boolean(
"compact",
"Compact",
"Wheter a compact view is used or not",
@ -81,7 +81,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"compact" => {
let compact = value
.get()
@ -92,13 +92,8 @@ mod imp {
}
}
fn get_property(
&self,
_obj: &Self::Type,
_id: usize,
pspec: &glib::ParamSpec,
) -> glib::Value {
match pspec.get_name() {
fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
match pspec.name() {
"compact" => self.compact.get().to_value(),
_ => unimplemented!(),
}
@ -125,7 +120,7 @@ impl Sidebar {
receiver.attach(
None,
clone!(@weak self as obj => move |room_id| {
clone!(@weak self as obj => @default-panic, move |room_id| {
obj.get_list_model().update(&room_id);
glib::Continue(true)
}),
@ -151,11 +146,11 @@ impl Sidebar {
fn get_list_model(&self) -> CategoryList {
imp::Sidebar::from_instance(self)
.listview
.get_model()
.model()
.unwrap()
.downcast::<gtk::NoSelection>()
.unwrap()
.get_model()
.model()
.unwrap()
.downcast::<CategoryList>()
.unwrap()

21
src/session/sidebar/room.rs
Unescape View File

@ -54,28 +54,28 @@ mod imp {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![
glib::ParamSpec::boxed(
glib::ParamSpec::new_boxed(
"room",
"Room",
"The matrix room",
BoxedRoom::static_type(),
glib::ParamFlags::WRITABLE | glib::ParamFlags::CONSTRUCT_ONLY,
),
glib::ParamSpec::string(
glib::ParamSpec::new_string(
"display-name",
"Display Name",
"The display name of this room",
None,
glib::ParamFlags::READABLE | glib::ParamFlags::EXPLICIT_NOTIFY,
),
glib::ParamSpec::object(
glib::ParamSpec::new_object(
"avatar",
"Avatar",
"The url of the avatar of this room",
gio::LoadableIcon::static_type(),
glib::ParamFlags::READABLE | glib::ParamFlags::EXPLICIT_NOTIFY,
),
glib::ParamSpec::flags(
glib::ParamSpec::new_flags(
"highlight",
"Highlight",
"How this room is highlighted",
@ -83,7 +83,7 @@ mod imp {
HighlightFlags::default().bits(),
glib::ParamFlags::READABLE | glib::ParamFlags::EXPLICIT_NOTIFY,
),
glib::ParamSpec::uint64(
glib::ParamSpec::new_uint64(
"notification-count",
"Notification count",
"The notification count of this room",
@ -106,7 +106,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"room" => {
let room = value
.get_some::<&BoxedRoom>()
@ -118,14 +118,9 @@ mod imp {
}
}
fn get_property(
&self,
_obj: &Self::Type,
_id: usize,
pspec: &glib::ParamSpec,
) -> glib::Value {
fn property(&self, _obj: &Self::Type, _id: usize, pspec: &glib::ParamSpec) -> glib::Value {
let room = self.room.get().unwrap();
match pspec.get_name() {
match pspec.name() {
"display-name" => self.name.borrow().to_value(),
"avatar" => self.avatar.borrow().to_value(),
"highlight" => {

10
src/session/sidebar/room_row.rs
Unescape View File

@ -48,21 +48,21 @@ mod imp {
use once_cell::sync::Lazy;
static PROPERTIES: Lazy<Vec<glib::ParamSpec>> = Lazy::new(|| {
vec![
glib::ParamSpec::object(
glib::ParamSpec::new_object(
"avatar",
"Avatar",
"The url of the avatar of this room",
gio::LoadableIcon::static_type(),
glib::ParamFlags::WRITABLE,
),
glib::ParamSpec::string(
glib::ParamSpec::new_string(
"display-name",
"Display Name",
"The display name of this room",
None,
glib::ParamFlags::WRITABLE,
),
glib::ParamSpec::flags(
glib::ParamSpec::new_flags(
"highlight",
"Highlight",
"What type of highligh this room needs",
@ -70,7 +70,7 @@ mod imp {
HighlightFlags::default().bits(),
glib::ParamFlags::WRITABLE,
),
glib::ParamSpec::uint64(
glib::ParamSpec::new_uint64(
"notification-count",
"Notification count",
"The notification count of this room",
@ -92,7 +92,7 @@ mod imp {
value: &glib::Value,
pspec: &glib::ParamSpec,
) {
match pspec.get_name() {
match pspec.name() {
"avatar" => {
let _avatar = value
.get::<gio::LoadableIcon>()

12
src/window.rs
Unescape View File

@ -51,7 +51,7 @@ mod imp {
self.parent_constructed(obj);
let builder = gtk::Builder::from_resource("/org/gnome/FractalNext/shortcuts.ui");
let shortcuts = builder.get_object("shortcuts").unwrap();
let shortcuts = builder.object("shortcuts").unwrap();
obj.set_help_overlay(Some(&shortcuts));
// Devel Profile
@ -108,7 +108,7 @@ impl Window {
pub fn save_window_size(&self) -> Result<(), glib::BoolError> {
let settings = &imp::Window::from_instance(self).settings;
let size = self.get_default_size();
let size = self.default_size();
settings.set_int("window-width", size.0)?;
settings.set_int("window-height", size.1)?;
@ -121,11 +121,11 @@ impl Window {
fn load_window_size(&self) {
let settings = &imp::Window::from_instance(self).settings;
let width = settings.get_int("window-width");
let height = settings.get_int("window-height");
let is_maximized = settings.get_boolean("is-maximized");
let width = settings.int("window-width");
let height = settings.int("window-height");
let is_maximized = settings.boolean("is-maximized");
self.set_default_size(width, height);
self.set_property_maximized(is_maximized);
self.set_property("maximized", &is_maximized).unwrap();
}
}

Write Preview
Loading…
Cancel
Save