diff --git a/Cargo.lock b/Cargo.lock index 27175fb..54dba63 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -52,9 +52,9 @@ checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "ashpd" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31688b40eb5d739049f721d8405c33d3796b3f51f2bea84421a542dafe397e41" +checksum = "7370b58af1d7e96df3ca0f454b57e69acf9aa42ed2d7337bd206923bae0d5754" dependencies = [ "async-std", "enumflags2", @@ -324,13 +324,13 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" [[package]] name = "cairo-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3603c4028a5e368d09b51c8b624b9a46edcd7c3778284077a6125af73c9f0a" +checksum = "d859b656775a6b1dd078d3e5924884e6ea88aa649a7fdde03d5b2ec56ffcc10b" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.3.3", "cairo-sys-rs", - "glib", + "glib 0.18.1", "libc", "once_cell", "thiserror", @@ -338,11 +338,11 @@ dependencies = [ [[package]] name = "cairo-sys-rs" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "691d0c66b1fb4881be80a760cb8fe76ea97218312f9dfe2c9cc0f496ca279cb1" +checksum = "bd4d115132e01c0165e3bf5f56aedee8980b0b96ede4eb000b693c05a8adb8ff" dependencies = [ - "glib-sys", + "glib-sys 0.18.1", "libc", "system-deps", ] @@ -833,58 +833,56 @@ dependencies = [ [[package]] name = "gdk-pixbuf" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "695d6bc846438c5708b07007537b9274d883373dd30858ca881d7d71b5540717" +checksum = "bbc9c2ed73a81d556b65d08879ba4ee58808a6b1927ce915262185d6d547c6f3" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf-sys", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "libc", "once_cell", ] [[package]] name = "gdk-pixbuf-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9285ec3c113c66d7d0ab5676599176f1f42f4944ca1b581852215bf5694870cb" +checksum = "3f9839ea644ed9c97a34d129ad56d38a25e6756f99f3a88e15cd39c20629caf7" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps", ] [[package]] name = "gdk4" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3abf96408a26e3eddf881a7f893a1e111767137136e347745e8ea6ed12731ff" +checksum = "8965ed5455cbfa1eb45c14a3b971cbacb43481913a3a5b9078b2ef0d9a01bd4b" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk-pixbuf", "gdk4-sys", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "libc", "pango", ] [[package]] name = "gdk4-sys" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bc92aa1608c089c49393d014c38ac0390d01e4841e1fedaa75dbcef77aaed64" +checksum = "aeffd4a7d68046c28666d817071bf025254aaed4df35099443f0c306ca6177f3" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "pango-sys", "pkg-config", @@ -893,49 +891,49 @@ dependencies = [ [[package]] name = "gdk4-wayland" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fa73894ed86fe10157436123d8baae5f2924ebc4fa48a11d8f093e07b9ecbbd" +checksum = "25effea07ee7e272b93a896e4d7610362e784196f7e574d0d743af65eb086228" dependencies = [ "gdk4", "gdk4-wayland-sys", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "libc", ] [[package]] name = "gdk4-wayland-sys" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af41c5a9cd7e06f612b91ec45ecb423ab57921bbd92f56e46a67b962be198e0c" +checksum = "ea5f1c96c42eed419a1ab3957b3200e6fb9e8200975f631b40628785252bfbe3" dependencies = [ - "glib-sys", + "glib-sys 0.18.1", "libc", "system-deps", ] [[package]] name = "gdk4-x11" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17de2c3554d5127b9dfacd4d1801e2e3c9163bce01c6e1c407c054e9b771f2ee" +checksum = "708033576e27bfda6c2ab1be59f19369721e90b1ea15d1538f8c598c54aebbab" dependencies = [ "gdk4", "gdk4-x11-sys", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "libc", ] [[package]] name = "gdk4-x11-sys" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ca6c03d5019467d21671936edeba09f908039900af8ce4b834c19646031c72" +checksum = "0275444de1a02ecc8d30fe2a9d8f060e9bece2c43331a19fbf3cdef8cb496820" dependencies = [ "gdk4-sys", - "glib-sys", + "glib-sys 0.18.1", "libc", "system-deps", ] @@ -1009,8 +1007,27 @@ dependencies = [ "futures-core", "futures-io", "futures-util", - "gio-sys", - "glib", + "gio-sys 0.17.10", + "glib 0.17.10", + "libc", + "once_cell", + "pin-project-lite", + "smallvec", + "thiserror", +] + +[[package]] +name = "gio" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7884cba6b1c5db1607d970cadf44b14a43913d42bc68766eea6a5e2fe0891524" +dependencies = [ + "futures-channel", + "futures-core", + "futures-io", + "futures-util", + "gio-sys 0.18.1", + "glib 0.18.1", "libc", "once_cell", "pin-project-lite", @@ -1024,8 +1041,21 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ccf87c30a12c469b6d958950f6a9c09f2be20b7773f7e70d20b867fdf2628c3" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", + "libc", + "system-deps", + "winapi", +] + +[[package]] +name = "gio-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37566df850baf5e4cb0dfb78af2e4b9898d817ed9263d1090a2df958c64737d2" +dependencies = [ + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps", "winapi", @@ -1043,10 +1073,33 @@ dependencies = [ "futures-executor", "futures-task", "futures-util", - "gio-sys", - "glib-macros", - "glib-sys", - "gobject-sys", + "gio-sys 0.17.10", + "glib-macros 0.17.10", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", + "libc", + "memchr", + "once_cell", + "smallvec", + "thiserror", +] + +[[package]] +name = "glib" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "331156127e8166dd815cf8d2db3a5beb492610c716c03ee6db4f2d07092af0a7" +dependencies = [ + "bitflags 2.3.3", + "futures-channel", + "futures-core", + "futures-executor", + "futures-task", + "futures-util", + "gio-sys 0.18.1", + "glib-macros 0.18.0", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "memchr", "once_cell", @@ -1069,6 +1122,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "glib-macros" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "179643c50bf28d20d2f6eacd2531a88f2f5d9747dd0b86b8af1e8bb5dd0de3c0" +dependencies = [ + "heck", + "proc-macro-crate", + "proc-macro-error", + "proc-macro2", + "quote", + "syn 2.0.23", +] + [[package]] name = "glib-sys" version = "0.17.10" @@ -1079,6 +1146,16 @@ dependencies = [ "system-deps", ] +[[package]] +name = "glib-sys" +version = "0.18.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "063ce2eb6a8d0ea93d2bf8ba1957e78dbab6be1c2220dd3daca57d5a9d869898" +dependencies = [ + "libc", + "system-deps", +] + [[package]] name = "gloo-timers" version = "0.2.6" @@ -1093,15 +1170,15 @@ dependencies = [ [[package]] name = "glycin" -version = "0.1.0-alpha.4" +version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf7b231b1f126c75a1b4907c78490f57ac214294367b62e7978aaa7d03f6527" +checksum = "ad7a7e9beffe42d34cbf72aef9ab3d0b30580957394f34ad40b450afa5e70ae2" dependencies = [ "anyhow", "async-std", "futures", "gdk4", - "gio", + "gio 0.18.1", "glycin-utils", "lcms2", "memfd", @@ -1114,9 +1191,9 @@ dependencies = [ [[package]] name = "glycin-utils" -version = "0.1.0-alpha.4" +version = "0.1.0-beta.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8896bded9f0dbc5e6883758e61636817d8fb8f2ad57be16354c8406289d7d95" +checksum = "e3492aafc241df55b23dfc4b167fb05e0548bfc252eef65077de22e2ed3541d4" dependencies = [ "anyhow", "async-std", @@ -1133,29 +1210,40 @@ version = "0.17.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd34c3317740a6358ec04572c1bcfd3ac0b5b6529275fae255b237b314bb8062" dependencies = [ - "glib-sys", + "glib-sys 0.17.10", + "libc", + "system-deps", +] + +[[package]] +name = "gobject-sys" +version = "0.18.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0850127b514d1c4a4654ead6dedadb18198999985908e6ffe4436f53c785ce44" +dependencies = [ + "glib-sys 0.18.1", "libc", "system-deps", ] [[package]] name = "graphene-rs" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "def4bb01265b59ed548b05455040d272d989b3012c42d4c1bbd39083cb9b40d9" +checksum = "3b2228cda1505613a7a956cca69076892cfbda84fc2b7a62b94a41a272c0c401" dependencies = [ - "glib", + "glib 0.18.1", "graphene-sys", "libc", ] [[package]] name = "graphene-sys" -version = "0.17.10" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1856fc817e6a6675e36cea0bd9a3afe296f5d9709d1e2d3182803ac77f0ab21d" +checksum = "cc4144cee8fc8788f2a9b73dc5f1d4e1189d1f95305c4cb7bd9c1af1cfa31f59" dependencies = [ - "glib-sys", + "glib-sys 0.18.1", "libc", "pkg-config", "system-deps", @@ -1163,14 +1251,13 @@ dependencies = [ [[package]] name = "gsk4" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f01ef44fa7cac15e2da9978529383e6bee03e570ba5bf7036b4c10a15cc3a3c" +checksum = "53b3b9e8090acb325d08cde84b30fc29b963a75fbac93160e9c5a30d2b335742" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "gdk4", - "glib", + "glib 0.18.1", "graphene-rs", "gsk4-sys", "libc", @@ -1179,14 +1266,14 @@ dependencies = [ [[package]] name = "gsk4-sys" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c07a84fb4dcf1323d29435aa85e2f5f58bef564342bef06775ec7bd0da1f01b0" +checksum = "0770d1ede7189092748c4ef5b6921264eb945fd2318a58e8f59dc273000810f8" dependencies = [ "cairo-sys-rs", "gdk4-sys", - "glib-sys", - "gobject-sys", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "graphene-sys", "libc", "pango-sys", @@ -1195,54 +1282,52 @@ dependencies = [ [[package]] name = "gtk4" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b28a32a04cd75cef14a0983f8b0c669e0fe152a0a7725accdeb594e2c764c88b" +checksum = "0973f9b9ade10fc22403810b7283d47b533033715f2aaa36288cd3bf90d63efc" dependencies = [ - "bitflags 1.3.2", "cairo-rs", "field-offset", "futures-channel", "gdk-pixbuf", "gdk4", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "graphene-rs", "gsk4", "gtk4-macros", "gtk4-sys", "libc", - "once_cell", "pango", ] [[package]] name = "gtk4-macros" -version = "0.6.6" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a4d6b61570f76d3ee542d984da443b1cd69b6105264c61afec3abed08c2500f" +checksum = "ae9f2c4530f3168fe506b0be7bc15f7a93ef38d020edb27d81a921a26cbca851" dependencies = [ "anyhow", "proc-macro-crate", "proc-macro-error", "proc-macro2", - "quick-xml 0.27.1", + "quick-xml 0.28.2", "quote", "syn 1.0.109", ] [[package]] name = "gtk4-sys" -version = "0.6.3" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f8283f707b07e019e76c7f2934bdd4180c277e08aa93f4c0d8dd07b7a34e22f" +checksum = "19fde71ef2e78ac8fb18073c345b5f29609048d4045a345613645aa1163243c1" dependencies = [ "cairo-sys-rs", "gdk-pixbuf-sys", "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "graphene-sys", "gsk4-sys", "libc", @@ -1284,9 +1369,9 @@ version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41af4f90e89ac1e4018e3b5e4f323bd673234894fd06deef3bd2beda62251fff" dependencies = [ - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.17.10", + "glib-sys 0.17.10", + "gobject-sys 0.17.10", "libc", "system-deps", ] @@ -1459,15 +1544,14 @@ dependencies = [ [[package]] name = "libadwaita" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ab9c0843f9f23ff25634df2743690c3a1faffe0a190e60c490878517eb81abf" +checksum = "06444f4ca05a60693da6e9e2b591bd40a298e65a118a8d5e830771718b3e0253" dependencies = [ - "bitflags 1.3.2", "gdk-pixbuf", "gdk4", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "gtk4", "libadwaita-sys", "libc", @@ -1476,14 +1560,14 @@ dependencies = [ [[package]] name = "libadwaita-sys" -version = "0.4.4" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4231cb2499a9f0c4cdfa4885414b33e39901ddcac61150bc0bb4ff8a57ede404" +checksum = "021cfe3d1fcfa82411765a791f7e9b32f35dd98ce88d2e3fa10e7320f5cc8ce7" dependencies = [ "gdk4-sys", - "gio-sys", - "glib-sys", - "gobject-sys", + "gio-sys 0.18.1", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "gtk4-sys", "libc", "pango-sys", @@ -1503,49 +1587,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e0d9898e3f8ce0a49a978f7818b29dc63083a83e640c12f16bb3c7eb94338379" dependencies = [ "bitflags 1.3.2", - "gio", - "glib", + "gio 0.17.10", + "glib 0.17.10", "gweather-sys", "libc", ] -[[package]] -name = "librsvg" -version = "2.56.0" -source = "git+https://gitlab.gnome.org/GNOME/librsvg.git?rev=51c80502b8474ec10c315da3559a049bdf4fe8f1#51c80502b8474ec10c315da3559a049bdf4fe8f1" -dependencies = [ - "byteorder", - "cairo-rs", - "cast", - "cssparser", - "data-url", - "encoding_rs", - "float-cmp", - "gdk-pixbuf", - "gio", - "glib", - "itertools", - "language-tags", - "libc", - "locale_config", - "markup5ever", - "nalgebra", - "num-traits", - "once_cell", - "pango", - "pangocairo", - "rayon", - "rctree", - "regex", - "rgb", - "selectors", - "string_cache", - "system-deps", - "tinyvec", - "url", - "xml5ever", -] - [[package]] name = "linux-raw-sys" version = "0.3.8" @@ -1611,7 +1658,7 @@ dependencies = [ "futures", "gettext-rs", "gettext-sys", - "gio", + "gio 0.18.1", "glycin", "gtk4", "gvdb-macros", @@ -1619,9 +1666,9 @@ dependencies = [ "kamadak-exif", "libadwaita", "libgweather", - "librsvg", "log", "once_cell", + "rsvg", "url", ] @@ -1885,13 +1932,12 @@ dependencies = [ [[package]] name = "pango" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35be456fc620e61f62dff7ff70fbd54dcbaf0a4b920c0f16de1107c47d921d48" +checksum = "06a9e54b831d033206160096b825f2070cf5fda7e35167b1c01e9e774f9202d1" dependencies = [ - "bitflags 1.3.2", - "gio", - "glib", + "gio 0.18.1", + "glib 0.18.1", "libc", "once_cell", "pango-sys", @@ -1899,25 +1945,24 @@ dependencies = [ [[package]] name = "pango-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3da69f9f3850b0d8990d462f8c709561975e95f689c1cdf0fecdebde78b35195" +checksum = "436737e391a843e5933d6d9aa102cb126d501e815b83601365a948a518555dc5" dependencies = [ - "glib-sys", - "gobject-sys", + "glib-sys 0.18.1", + "gobject-sys 0.18.0", "libc", "system-deps", ] [[package]] name = "pangocairo" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86bf29cb1c2e73817944f66011fb12135e1c6d268e8e4c5cfc689101c25822cf" +checksum = "57036589a9cfcacf83f9e606d15813fc6bf03f0e9e69aa2b5e3bb85af86b38a5" dependencies = [ - "bitflags 1.3.2", "cairo-rs", - "glib", + "glib 0.18.1", "libc", "pango", "pangocairo-sys", @@ -1925,12 +1970,12 @@ dependencies = [ [[package]] name = "pangocairo-sys" -version = "0.17.10" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94dfd38d9bf8ff5f881be2107ba49fcb22090d247aa00133f8dadf96b122b97a" +checksum = "fc3c8ff676a37e7a72ec1d5fc029f91c407278083d2752784ff9f5188c108833" dependencies = [ "cairo-sys-rs", - "glib-sys", + "glib-sys 0.18.1", "libc", "pango-sys", "system-deps", @@ -2166,9 +2211,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.27.1" +version = "0.28.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc053f057dd768a56f62cd7e434c42c831d296968997e9ac1f76ea7c2d14c41" +checksum = "0ce5e73202a820a31f8a0ee32ada5e21029c81fd9e3ebf668a40832e4219d9d1" dependencies = [ "memchr", ] @@ -2354,6 +2399,43 @@ dependencies = [ "bytemuck", ] +[[package]] +name = "rsvg" +version = "2.56.91" +source = "git+https://gitlab.gnome.org/GNOME/librsvg.git?rev=81b58cc1368ab10f6de3439c8b1276c40b8d4286#81b58cc1368ab10f6de3439c8b1276c40b8d4286" +dependencies = [ + "byteorder", + "cairo-rs", + "cast", + "cssparser", + "data-url", + "encoding_rs", + "float-cmp", + "gdk-pixbuf", + "gio 0.18.1", + "glib 0.18.1", + "itertools", + "language-tags", + "libc", + "locale_config", + "markup5ever", + "nalgebra", + "num-traits", + "once_cell", + "pango", + "pangocairo", + "rayon", + "rctree", + "regex", + "rgb", + "selectors", + "string_cache", + "system-deps", + "tinyvec", + "url", + "xml5ever", +] + [[package]] name = "rustc-demangle" version = "0.1.23" diff --git a/Cargo.toml b/Cargo.toml index a418877..3888dcf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -27,26 +27,26 @@ once_cell = "1.16.0" url = "2.3.1" # decoders -librsvg = { git = "https://gitlab.gnome.org/GNOME/librsvg.git", rev = "51c80502b8474ec10c315da3559a049bdf4fe8f1" } -glycin = "0.1.0-alpha.4" +rsvg = { git = "https://gitlab.gnome.org/GNOME/librsvg.git", rev = "81b58cc1368ab10f6de3439c8b1276c40b8d4286" } +glycin = "0.1.0-beta.0" [dependencies.ashpd] -version = "0.4.0" +version = "0.5.0" features = ["gtk4"] [dependencies.gtk] package = "gtk4" -version = "0.6.2" +version = "0.7.1" features = ["v4_10", "xml_validation"] [dependencies.gio] package = "gio" -version = "0.17.0" +version = "0.18.1" features = ["v2_74"] [dependencies.adw] package = "libadwaita" -version = "0.4.1" +version = "0.5.2" features = ["v1_4"] [dependencies.gettext-rs] diff --git a/build-aux/flatpak/org.gnome.Loupe.Devel.json b/build-aux/flatpak/org.gnome.Loupe.Devel.json index 39f1738..d863a8e 100644 --- a/build-aux/flatpak/org.gnome.Loupe.Devel.json +++ b/build-aux/flatpak/org.gnome.Loupe.Devel.json @@ -156,7 +156,7 @@ { "type" : "git", "url" : "https://gitlab.gnome.org/sophie-h/glycin.git", - "commit" : "ab8c7ae22d9905a33eaa06c8246474525ca9720e" + "commit" : "897032e50f38370881fb2eb07c3425084c188eff" } ] }, diff --git a/src/widgets/image.rs b/src/widgets/image.rs index a548e81..d318a75 100644 --- a/src/widgets/image.rs +++ b/src/widgets/image.rs @@ -341,13 +341,13 @@ mod imp { let scroll_controller = gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::VERTICAL); - scroll_controller.connect_scroll(glib::clone!(@weak obj => @default-return gtk::Inhibit(false), move |event, _, y| { + scroll_controller.connect_scroll(glib::clone!(@weak obj => @default-return glib::Propagation::Proceed, move |event, _, y| { // use Ctrl key as modifier for vertical scrolling if event.current_event_state().contains(gdk::ModifierType::CONTROL_MASK) || event.current_event_state().contains(gdk::ModifierType::SHIFT_MASK) { // propagate event to scrolled window - return gtk::Inhibit(false); + return glib::Propagation::Proceed; } // touchpads do zoom via gestures only @@ -355,7 +355,7 @@ mod imp { == Some(gdk::InputSource::Touchpad) { // propagate event to scrolled window - return gtk::Inhibit(false); + return glib::Propagation::Proceed; } // Use exponential scaling since zoom is always multiplicative with the existing value @@ -379,7 +379,7 @@ mod imp { } // do not propagate event to scrolled window - gtk::Inhibit(true) + glib::Propagation::Stop })); obj.add_controller(scroll_controller); @@ -837,7 +837,7 @@ impl LpImage { } DecoderUpdate::Animated => { let callback_id = self - .add_tick_callback(glib::clone!(@weak self as obj => @default-return glib::Continue(false), move |_, clock| obj.tick_callback(clock))); + .add_tick_callback(glib::clone!(@weak self as obj => @default-return glib::ControlFlow::Break, move |_, clock| obj.tick_callback(clock))); imp.tick_callback.replace(Some(callback_id)); } DecoderUpdate::UnsupportedFormat => { @@ -852,10 +852,10 @@ impl LpImage { /// Roughly called for every frame if image is visible /// /// We handle advancing to the next frame for animated GIFs etc here. - fn tick_callback(&self, clock: &gdk::FrameClock) -> glib::Continue { + fn tick_callback(&self, clock: &gdk::FrameClock) -> glib::ControlFlow { // Do not animate if not visible if !self.is_mapped() { - return glib::Continue(true); + return glib::ControlFlow::Continue; } let elapsed = clock.frame_time() - self.imp().last_animated_frame.get(); @@ -872,7 +872,7 @@ impl LpImage { } } - glib::Continue(true) + glib::ControlFlow::Continue } pub fn is_loaded(&self) -> bool { diff --git a/src/widgets/image_view.rs b/src/widgets/image_view.rs index 2cb3da8..a6e7f6f 100644 --- a/src/widgets/image_view.rs +++ b/src/widgets/image_view.rs @@ -139,7 +139,7 @@ mod imp { // Manually mange widget layout, see `WidgetImpl` for details obj.set_layout_manager(None::); - let signal_group = glib::SignalGroup::new(LpImage::static_type()); + let signal_group = glib::SignalGroup::new::(); obj.connect_notify_local( Some("current-page"), clone!(@weak signal_group => move |obj, _| { diff --git a/src/widgets/sliding_view.rs b/src/widgets/sliding_view.rs index 36a81e4..51c53ad 100644 --- a/src/widgets/sliding_view.rs +++ b/src/widgets/sliding_view.rs @@ -132,22 +132,30 @@ mod imp { gtk::EventControllerScroll::new(gtk::EventControllerScrollFlags::HORIZONTAL); scroll_controller.connect_scroll( - glib::clone!(@weak obj => @default-return gtk::Inhibit(false), move |_, x, _| { + glib::clone!(@weak obj => @default-return glib::Propagation::Proceed, move |_, x, _| { let direction_sign = if obj.imp().is_rtl() { -1. } else { 1. }; if x * direction_sign > 0. { // check end if let Some(max) = obj.imp().snap_points().last() { - gtk::Inhibit(obj.position() >= *max) + if obj.position() >= *max { + glib::Propagation::Stop + } else { + glib::Propagation::Proceed + } } else { - gtk::Inhibit(true) + glib::Propagation::Stop } } else { //check beginning if let Some(min) = obj.imp().snap_points().first() { - gtk::Inhibit(obj.position() <= *min) + if obj.position() <= *min { + glib::Propagation::Stop + } else { + glib::Propagation::Proceed + } } else { - gtk::Inhibit(true) + glib::Propagation::Stop } } }), diff --git a/src/window.rs b/src/window.rs index d35098e..70af229 100644 --- a/src/window.rs +++ b/src/window.rs @@ -473,7 +473,7 @@ impl LpWindow { } async fn pick_file(&self) { - let filter_list = gio::ListStore::new(gtk::FileFilter::static_type()); + let filter_list = gio::ListStore::new::(); let filter_supported_formats = gtk::FileFilter::new(); filter_supported_formats.set_name(Some(&gettext("Supported image formats")));