Cleanup patch
For whatever reasons gitlab is failing to let me fork the repository, so here is a cleanup patch I was intending to submit a PR commit.patch
diff --git a/Cargo.lock b/Cargo.lock
index 73f7946..b277367 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -13,15 +13,15 @@ dependencies = [
[[package]]
name = "anyhow"
-version = "1.0.51"
+version = "1.0.53"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
+checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
[[package]]
name = "ashpd"
-version = "0.2.0-beta-1"
+version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0e317c257d4733c44475b3cefd53adb2540771ba8bd4adf37eabef3bbf8298e"
+checksum = "7915e26e0786f91768d23de32afafa4ee5e2ea76be21c0ecd8e14441543c1655"
dependencies = [
"enumflags2",
"futures",
@@ -32,9 +32,6 @@ dependencies = [
"serde",
"serde_repr",
"zbus",
- "zbus_macros",
- "zvariant 3.0.0",
- "zvariant_derive 3.0.0",
]
[[package]]
@@ -114,9 +111,9 @@ dependencies = [
[[package]]
name = "async-task"
-version = "4.0.3"
+version = "4.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91831deabf0d6d7ec49552e489aed63b7456a7a3c46cff62adad428110b0af0"
+checksum = "677d306121baf53310a3fd342d88dc0824f6bbeace68347593658525565abee8"
[[package]]
name = "async-trait"
@@ -170,19 +167,6 @@ version = "1.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c1db59621ec70f09c5e9b597b220c7a2b43611f4710dc03ceb8748637775692c"
-[[package]]
-name = "cairo-rs"
-version = "0.14.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b5725979db0c586d98abad2193cdb612dd40ef95cd26bd99851bf93b3cb482"
-dependencies = [
- "bitflags",
- "cairo-sys-rs 0.14.9",
- "glib 0.14.8",
- "libc",
- "thiserror",
-]
-
[[package]]
name = "cairo-rs"
version = "0.15.1"
@@ -190,32 +174,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b869e97a87170f96762f9f178eae8c461147e722ba21dd8814105bf5716bf14a"
dependencies = [
"bitflags",
- "cairo-sys-rs 0.15.1",
- "glib 0.15.2",
+ "cairo-sys-rs",
+ "glib",
"libc",
"thiserror",
]
-[[package]]
-name = "cairo-sys-rs"
-version = "0.14.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b448b876970834fda82ba3aeaccadbd760206b75388fc5c1b02f1e343b697570"
-dependencies = [
- "glib-sys 0.14.0",
- "libc",
- "system-deps 3.2.0",
-]
-
[[package]]
name = "cairo-sys-rs"
version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c55d429bef56ac9172d25fecb85dc8068307d17acd74b377866b7a1ef25d3c8"
dependencies = [
- "glib-sys 0.15.1",
+ "glib-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -224,15 +197,6 @@ version = "1.0.72"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
-[[package]]
-name = "cfg-expr"
-version = "0.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b412e83326147c2bb881f8b40edfbf9905b9b8abaebd0e47ca190ba62fda8f0e"
-dependencies = [
- "smallvec",
-]
-
[[package]]
name = "cfg-expr"
version = "0.9.0"
@@ -270,15 +234,9 @@ dependencies = [
[[package]]
name = "easy-parallel"
-version = "3.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1dd4afd79212583ff429b913ad6605242ed7eec277e950b1438f300748f948f4"
-
-[[package]]
-name = "either"
-version = "1.6.1"
+version = "3.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
+checksum = "6907e25393cdcc1f4f3f513d9aac1e840eb1cc341a0fccb01171f7d14d10b946"
[[package]]
name = "enumflags2"
@@ -316,15 +274,15 @@ dependencies = [
[[package]]
name = "event-listener"
-version = "2.5.1"
+version = "2.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7531096570974c3a9dcf9e4b8e1cede1ec26cf5046219fb3b9d897503b9be59"
+checksum = "77f3309417938f28bf8228fcff79a4a37103981e3e186d2ccd19c74b38f4eb71"
[[package]]
name = "fastrand"
-version = "1.6.0"
+version = "1.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779d043b6a0b90cc4c0ed7ee380a6504394cee7efd7db050e3774eee387324b2"
+checksum = "c3fcf0cee53519c866c09b5de1f6c56ff9d647101f81c1964fa632e148896cdf"
dependencies = [
"instant",
]
@@ -452,7 +410,7 @@ dependencies = [
"bitflags",
"gdk-pixbuf-sys",
"gio",
- "glib 0.15.2",
+ "glib",
"libc",
]
@@ -463,10 +421,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413424d9818621fa3cfc8a3a915cdb89a7c3c507d56761b4ec83a9a98e587171"
dependencies = [
"gio-sys",
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -476,11 +434,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "319c74160dbe3e29cc1bf36ae4a08b9072f352b751e9e3e5501b3aa3ca633f66"
dependencies = [
"bitflags",
- "cairo-rs 0.15.1",
+ "cairo-rs",
"gdk-pixbuf",
"gdk4-sys",
"gio",
- "glib 0.15.2",
+ "glib",
"libc",
"pango",
]
@@ -491,15 +449,15 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "48a39e34abe35ee2cf54a1e29dd983accecd113ad30bdead5050418fa92f2a1b"
dependencies = [
- "cairo-sys-rs 0.15.1",
+ "cairo-sys-rs",
"gdk-pixbuf-sys",
"gio-sys",
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"libc",
"pango-sys",
"pkg-config",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -511,7 +469,7 @@ dependencies = [
"gdk4",
"gdk4-wayland-sys",
"gio",
- "glib 0.15.2",
+ "glib",
"libc",
]
@@ -521,9 +479,9 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "22cbf7fa3fc7714c72902d82229677f9291f7cceb33855c5cef868f177356c30"
dependencies = [
- "glib-sys 0.15.1",
+ "glib-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -535,7 +493,7 @@ dependencies = [
"gdk4",
"gdk4-x11-sys",
"gio",
- "glib 0.15.2",
+ "glib",
"libc",
]
@@ -546,16 +504,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1eb40aebb4f15b270df2ac2c463bf7f6d82211d9c5df1d13b84541a63a3139d7"
dependencies = [
"gdk4-sys",
- "glib-sys 0.15.1",
+ "glib-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
name = "getrandom"
-version = "0.2.3"
+version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753"
+checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
dependencies = [
"cfg-if",
"libc",
@@ -584,16 +542,16 @@ dependencies = [
[[package]]
name = "gio"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e14e0166f772d6295cfda361d227a63194497641a42da81b9e531c9f5a4d77f"
+checksum = "4f80391bd2ac4981a3433137691211775bbb37c5347f8cfb7c0980187e0300c5"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"futures-io",
"gio-sys",
- "glib 0.15.2",
+ "glib",
"libc",
"once_cell",
"thiserror",
@@ -605,46 +563,27 @@ version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04b57719ccaacf2a0d9c79f151be629f3a3ef3991658ee2af0bb66287e4ea86c"
dependencies = [
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
"winapi",
]
[[package]]
name = "glib"
-version = "0.14.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c515f1e62bf151ef6635f528d05b02c11506de986e43b34a5c920ef0b3796a4"
-dependencies = [
- "bitflags",
- "futures-channel",
- "futures-core",
- "futures-executor",
- "futures-task",
- "glib-macros 0.14.1",
- "glib-sys 0.14.0",
- "gobject-sys 0.14.0",
- "libc",
- "once_cell",
- "smallvec",
-]
-
-[[package]]
-name = "glib"
-version = "0.15.2"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a3e6b2e5ef2ecfb10c1e083074a81160b8f6408fcc08195c872e9de37a361b"
+checksum = "4a703581e2538fe699c5476cf26b456d694c5272b6e999d3ab47711c5eaa2dd2"
dependencies = [
"bitflags",
"futures-channel",
"futures-core",
"futures-executor",
"futures-task",
- "glib-macros 0.15.1",
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-macros",
+ "glib-sys",
+ "gobject-sys",
"libc",
"once_cell",
"smallvec",
@@ -653,24 +592,9 @@ dependencies = [
[[package]]
name = "glib-macros"
-version = "0.14.1"
+version = "0.15.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2aad66361f66796bfc73f530c51ef123970eb895ffba991a234fcf7bea89e518"
-dependencies = [
- "anyhow",
- "heck 0.3.3",
- "proc-macro-crate",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn",
-]
-
-[[package]]
-name = "glib-macros"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54c0c7194ee4c597b334e3ce84d22d929405e94497828e1c54da762cbe8e3d93"
+checksum = "e58b262ff65ef771003873cea8c10e0fe854f1c508d48d62a4111a1ff163f7d1"
dependencies = [
"anyhow",
"heck 0.4.0",
@@ -681,16 +605,6 @@ dependencies = [
"syn",
]
-[[package]]
-name = "glib-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c1d60554a212445e2a858e42a0e48cece1bd57b311a19a9468f70376cf554ae"
-dependencies = [
- "libc",
- "system-deps 3.2.0",
-]
-
[[package]]
name = "glib-sys"
version = "0.15.1"
@@ -698,18 +612,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c668102c6e15e0a7f6b99b59f602c2e806967bb86414f617b77e19b1de5b3fac"
dependencies = [
"libc",
- "system-deps 6.0.0",
-]
-
-[[package]]
-name = "gobject-sys"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa92cae29759dae34ab5921d73fff5ad54b3d794ab842c117e36cafc7994c3f5"
-dependencies = [
- "glib-sys 0.14.0",
- "libc",
- "system-deps 3.2.0",
+ "system-deps",
]
[[package]]
@@ -718,9 +621,9 @@ version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6edb1f0b3e4c08e2a0a490d1082ba9e902cdff8ff07091e85c6caec60d17e2ab"
dependencies = [
- "glib-sys 0.15.1",
+ "glib-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -729,7 +632,7 @@ version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c54f9fbbeefdb62c99f892dfca35f83991e2cb5b46a8dc2a715e58612f85570"
dependencies = [
- "glib 0.15.2",
+ "glib",
"graphene-sys",
"libc",
]
@@ -740,10 +643,10 @@ version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "03f311acb023cf7af5537f35de028e03706136eead7f25a31e8fd26f5011e0b3"
dependencies = [
- "glib-sys 0.15.1",
+ "glib-sys",
"libc",
"pkg-config",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -753,9 +656,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0672c63e4101e19d5e9cb4a0aed8b3278e9573529bd0b6a86d9c748c71bd9882"
dependencies = [
"bitflags",
- "cairo-rs 0.15.1",
+ "cairo-rs",
"gdk4",
- "glib 0.15.2",
+ "glib",
"graphene-rs",
"gsk4-sys",
"libc",
@@ -768,36 +671,36 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e31d21d7ce02ba261bb24c50c4ab238a10b41a2c97c32afffae29471b7cca69b"
dependencies = [
- "cairo-sys-rs 0.15.1",
+ "cairo-sys-rs",
"gdk4-sys",
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"graphene-sys",
"libc",
"pango-sys",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
name = "gtk-macros"
-version = "0.2.0"
+version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1874c48e670519ce192093ac906c08a6dde7cb2d18b28722ef237726a39c3a63"
+checksum = "da5bf7748fd4cd0b2490df8debcc911809dbcbee4ece9531b96c29a9c729de5a"
[[package]]
name = "gtk4"
-version = "0.4.4"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5020aeb559e0431930d66d85b8f16fc453fc0863466b13b7e1e1b800cf1a47b"
+checksum = "d6f9e36fb6db3d70edf5cea9f4a20928c1d08ed3f27697cfd2d21ca3d8ac4a2d"
dependencies = [
"bitflags",
- "cairo-rs 0.15.1",
+ "cairo-rs",
"field-offset",
"futures-channel",
"gdk-pixbuf",
"gdk4",
"gio",
- "glib 0.15.2",
+ "glib",
"graphene-rs",
"gsk4",
"gtk4-macros",
@@ -823,21 +726,21 @@ dependencies = [
[[package]]
name = "gtk4-sys"
-version = "0.4.2"
+version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1544614a8d44f38719a2fdfd608d644d5f385beab33e5852688f48a983a2b583"
+checksum = "c47c075e8f795c38f6e9a47b51a73eab77b325f83c0154979ed4d4245c36490d"
dependencies = [
- "cairo-sys-rs 0.15.1",
+ "cairo-sys-rs",
"gdk-pixbuf-sys",
"gdk4-sys",
"gio-sys",
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"graphene-sys",
"gsk4-sys",
"libc",
"pango-sys",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -888,15 +791,6 @@ dependencies = [
"cfg-if",
]
-[[package]]
-name = "itertools"
-version = "0.10.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3"
-dependencies = [
- "either",
-]
-
[[package]]
name = "lazy_static"
version = "1.4.0"
@@ -912,7 +806,7 @@ dependencies = [
"gdk-pixbuf",
"gdk4",
"gio",
- "glib 0.15.2",
+ "glib",
"gtk4",
"libadwaita-sys",
"libc",
@@ -928,18 +822,18 @@ checksum = "f18b6ac4cadd252a89f5cba0a5a4e99836131795d6fad37b859ac79e8cb7d2c8"
dependencies = [
"gdk4-sys",
"gio-sys",
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"gtk4-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
name = "libc"
-version = "0.2.112"
+version = "0.2.116"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
+checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
[[package]]
name = "locale_config"
@@ -969,7 +863,6 @@ version = "0.1.0"
dependencies = [
"anyhow",
"ashpd",
- "cairo-rs 0.14.9",
"gettext-rs",
"gtk-macros",
"gtk4",
@@ -977,8 +870,6 @@ dependencies = [
"log",
"once_cell",
"pretty_env_logger",
- "zbus",
- "zvariant 2.10.0",
]
[[package]]
@@ -1070,7 +961,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79211eff430c29cc38c69e0ab54bc78fa1568121ca9737707eee7f92a8417a94"
dependencies = [
"bitflags",
- "glib 0.15.2",
+ "glib",
"libc",
"once_cell",
"pango-sys",
@@ -1082,10 +973,10 @@ version = "0.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7022c2fb88cd2d9d55e1a708a8c53a3ae8678234c4a54bf623400aeb7f31fac2"
dependencies = [
- "glib-sys 0.15.1",
- "gobject-sys 0.15.1",
+ "glib-sys",
+ "gobject-sys",
"libc",
- "system-deps 6.0.0",
+ "system-deps",
]
[[package]]
@@ -1105,9 +996,9 @@ dependencies = [
[[package]]
name = "pin-project-lite"
-version = "0.2.7"
+version = "0.2.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443"
+checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c"
[[package]]
name = "pin-utils"
@@ -1136,9 +1027,9 @@ dependencies = [
[[package]]
name = "ppv-lite86"
-version = "0.2.15"
+version = "0.2.16"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba"
+checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872"
[[package]]
name = "pretty_env_logger"
@@ -1186,9 +1077,9 @@ dependencies = [
[[package]]
name = "proc-macro2"
-version = "1.0.34"
+version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f84e92c0f7c9d58328b85a78557813e4bd845130db68d7184635344399423b1"
+checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029"
dependencies = [
"unicode-xid",
]
@@ -1201,9 +1092,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
[[package]]
name = "quote"
-version = "1.0.10"
+version = "1.0.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05"
+checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145"
dependencies = [
"proc-macro2",
]
@@ -1294,18 +1185,18 @@ dependencies = [
[[package]]
name = "serde"
-version = "1.0.132"
+version = "1.0.136"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b9875c23cf305cd1fd7eb77234cbb705f21ea6a72c637a5c6db5fe4b8e7f008"
+checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
-version = "1.0.132"
+version = "1.0.136"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecc0db5cb2556c0e558887d9bbdcf6ac4471e83ff66cf696e5419024d1606276"
+checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9"
dependencies = [
"proc-macro2",
"quote",
@@ -1325,9 +1216,18 @@ dependencies = [
[[package]]
name = "sha1"
-version = "0.6.0"
+version = "0.6.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
+checksum = "c1da05c97445caa12d05e848c4a4fcbbea29e748ac28f7e80e9b010392063770"
+dependencies = [
+ "sha1_smol",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae1a47186c03a32177042e55dbc5fd5aee900b8e0069a8d70fba96a9375cd012"
[[package]]
name = "slab"
@@ -1337,15 +1237,15 @@ checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5"
[[package]]
name = "smallvec"
-version = "1.7.0"
+version = "1.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
+checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
[[package]]
name = "socket2"
-version = "0.4.2"
+version = "0.4.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516"
+checksum = "66d72b759436ae32898a2af0a14218dbf55efde3feeb170eb623637db85ee1e0"
dependencies = [
"libc",
"winapi",
@@ -1357,64 +1257,28 @@ version = "1.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
-[[package]]
-name = "strum"
-version = "0.21.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aaf86bbcfd1fa9670b7a129f64fc0c9fcbbfe4f1bc4210e9e98fe71ffc12cde2"
-
-[[package]]
-name = "strum_macros"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d06aaeeee809dbc59eb4556183dd927df67db1540de5be8d3ec0b6636358a5ec"
-dependencies = [
- "heck 0.3.3",
- "proc-macro2",
- "quote",
- "syn",
-]
-
[[package]]
name = "syn"
-version = "1.0.83"
+version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23a1dfb999630e338648c83e91c59a4e9fb7620f520c3194b6b89e276f2f1959"
+checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b"
dependencies = [
"proc-macro2",
"quote",
"unicode-xid",
]
-[[package]]
-name = "system-deps"
-version = "3.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "480c269f870722b3b08d2f13053ce0c2ab722839f472863c3e2d61ff3a1c2fa6"
-dependencies = [
- "anyhow",
- "cfg-expr 0.8.1",
- "heck 0.3.3",
- "itertools",
- "pkg-config",
- "strum",
- "strum_macros",
- "thiserror",
- "toml",
- "version-compare 0.0.11",
-]
-
[[package]]
name = "system-deps"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b1487aaddaacbc5d60a2a507ba1617c5ca66c57dd0dd07d0c5efd5b693841d4"
dependencies = [
- "cfg-expr 0.9.0",
+ "cfg-expr",
"heck 0.3.3",
"pkg-config",
"toml",
- "version-compare 0.1.0",
+ "version-compare",
]
[[package]]
@@ -1479,12 +1343,6 @@ version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3"
-[[package]]
-name = "version-compare"
-version = "0.0.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c18c859eead79d8b95d09e4678566e8d70105c4e7b251f707a03df32442661b"
-
[[package]]
name = "version-compare"
version = "0.1.0"
@@ -1493,9 +1351,9 @@ checksum = "fe88247b92c1df6b6de80ddc290f3976dbdf2f5f5d3fd049a9fb598c6dd5ca73"
[[package]]
name = "version_check"
-version = "0.9.3"
+version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
[[package]]
name = "waker-fn"
@@ -1581,7 +1439,7 @@ dependencies = [
"static_assertions",
"zbus_macros",
"zbus_names",
- "zvariant 3.0.0",
+ "zvariant",
]
[[package]]
@@ -1599,59 +1457,34 @@ dependencies = [
[[package]]
name = "zbus_names"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae1f142d242d6854815a8c5c2aea83d9508f72f5757d0a137c21ef4b07bfee66"
-dependencies = [
- "serde",
- "static_assertions",
- "zvariant 3.0.0",
-]
-
-[[package]]
-name = "zvariant"
-version = "2.10.0"
+version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a68c7b55f2074489b7e8e07d2d0a6ee6b4f233867a653c664d8020ba53692525"
+checksum = "45dfcdcf87b71dad505d30cc27b1b7b88a64b6d1c435648f48f9dbc1fdc4b7e1"
dependencies = [
- "byteorder",
- "libc",
"serde",
"static_assertions",
- "zvariant_derive 2.10.0",
+ "zvariant",
]
[[package]]
name = "zvariant"
-version = "3.0.0"
+version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a946c049b2eac1a253f98e9267a8ce7a3d93be274ea146e6dd7a0965232a911"
+checksum = "49ea5dc38b2058fae6a5b79009388143dadce1e91c26a67f984a0fc0381c8033"
dependencies = [
"byteorder",
"enumflags2",
"libc",
"serde",
"static_assertions",
- "zvariant_derive 3.0.0",
-]
-
-[[package]]
-name = "zvariant_derive"
-version = "2.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4ca5e22593eb4212382d60d26350065bf2a02c34b85bc850474a74b589a3de9"
-dependencies = [
- "proc-macro-crate",
- "proc-macro2",
- "quote",
- "syn",
+ "zvariant_derive",
]
[[package]]
name = "zvariant_derive"
-version = "3.0.0"
+version = "3.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28fce5afb8d639bff79b1e8cdb258a3ca22d458f4603b23d794b4cb4e878c990"
+checksum = "8c2cecc5a61c2a053f7f653a24cd15b3b0195d7f7ddb5042c837fb32e161fb7a"
dependencies = [
"proc-macro-crate",
"proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 5c37ffe..0babf77 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,16 +5,13 @@ edition = "2018"
[dependencies]
anyhow = "1.0.35"
-gtk-macros = "0.2.0"
+gtk-macros = "0.3.0"
log = "0.4.11"
-once_cell = "1.5.2"
+once_cell = "1.9.0"
pretty_env_logger = "0.4.0"
-zbus = "2.0.0-beta.7"
-zvariant = "2.9.0"
-cairo-rs = "0.14"
[dependencies.ashpd]
-version = "0.2.0-beta-1"
+version = "0.2.2"
features = ["feature_gtk4"]
[dependencies.gtk]
diff --git a/src/application.rs b/src/application.rs
index 9ec386b..10269e6 100644
--- a/src/application.rs
+++ b/src/application.rs
@@ -33,10 +33,8 @@ mod imp {
// The basic struct that holds our
// state and widgets
- #[derive(Debug)]
- pub struct LpApplication {
- pub gtk_settings: gtk::Settings,
- }
+ #[derive(Default, Debug)]
+ pub struct LpApplication {}
// Sets up the basics for the GObject
// The `#[glib::object_subclass] macro implements
@@ -46,14 +44,6 @@ mod imp {
const NAME: &'static str = "LpApplication";
type Type = super::LpApplication;f7151e93d14c34cccb247e39fac3785b8d43ace4
type ParentType = adw::Application;
-
- // Initialize with default values
- fn new() -> Self {
- let gtk_settings =
- gtk::Settings::default().expect("Could not get default GTK settings");
-
- Self { gtk_settings }
- }
}
// Overrides GObject vfuncs
diff --git a/src/main.rs b/src/main.rs
index 9e83087..a9c56b8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -34,8 +34,6 @@ mod deps {
use application::LpApplication;
fn main() {
- gtk::init().expect("Failed to initialize GTK.");
- adw::init();
pretty_env_logger::init();
setlocale(LocaleCategory::LcAll, "");
diff --git a/src/thumbnail.rs b/src/thumbnail.rs
index ea37bef..d304dba 100644
--- a/src/thumbnail.rs
+++ b/src/thumbnail.rs
@@ -18,7 +18,6 @@ mod imp {
impl ObjectSubclass for Thumbnail {
const NAME: &'static str = "Thumbnail";
type Type = super::Thumbnail;
- type ParentType = glib::Object;
type Interfaces = (gdk::Paintable,);
}
diff --git a/src/widgets/image.rs b/src/widgets/image.rs
index 3fa4efa..c35fbaf 100644
--- a/src/widgets/image.rs
+++ b/src/widgets/image.rs
@@ -41,15 +41,6 @@ mod imp {
const NAME: &'static str = "LpImage";
type ParentType = gtk::Widget;
type Type = super::LpImage;
-
- fn new() -> Self {
- Self {
- file: RefCell::default(),
- image_width: Cell::default(),
- image_height: Cell::default(),
- texture: RefCell::default(),
- }
- }
}
impl ObjectImpl for LpImage {