diff --git a/Cargo.lock b/Cargo.lock index e449b1f..e2caa5a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1066,7 +1066,7 @@ dependencies = [ [[package]] name = "libhandy" version = "0.4.0" -source = "git+https://gitlab.gnome.org/BrainBlasted/libhandy-rs/?branch=wip/christopherdavis/update-0-0-10#e387966d826ea8370596e60cef43b9d461fe9bb7" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)", "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1080,14 +1080,14 @@ dependencies = [ "gtk-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)", - "libhandy-sys 0.3.1 (git+https://gitlab.gnome.org/BrainBlasted/libhandy-rs/?branch=wip/christopherdavis/update-0-0-10)", + "libhandy-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "pango 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libhandy-sys" version = "0.3.1" -source = "git+https://gitlab.gnome.org/BrainBlasted/libhandy-rs/?branch=wip/christopherdavis/update-0-0-10#e387966d826ea8370596e60cef43b9d461fe9bb7" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gdk 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "gdk-sys 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1329,7 +1329,7 @@ dependencies = [ [[package]] name = "mpris-player" version = "0.4.0" -source = "git+https://gitlab.gnome.org/ZanderBrown/mpris-player#e3ca52f3d013fa8fad1c230f2880a40bd099b0ce" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "dbus 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)", "glib 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1625,10 +1625,10 @@ dependencies = [ "html2text 0.1.8 (git+https://github.com/jugglerchris/rust-html2text)", "humansize 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libhandy 0.4.0 (git+https://gitlab.gnome.org/BrainBlasted/libhandy-rs/?branch=wip/christopherdavis/update-0-0-10)", + "libhandy 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", "loggerv 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "mpris-player 0.4.0 (git+https://gitlab.gnome.org/ZanderBrown/mpris-player)", + "mpris-player 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "open 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "podcasts-data 0.1.0", "podcasts-downloader 0.1.0", @@ -2732,8 +2732,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum libc 0.2.54 (registry+https://github.com/rust-lang/crates.io-index)" = "c6785aa7dd976f5fbf3b71cfd9cd49d7f783c1ff565a858d71031c6c313aa5c6" "checksum libdbus-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "18cb88963258d00f4962205dbb5933d82780d9962c8c8a064b651d2ad7189210" -"checksum libhandy 0.4.0 (git+https://gitlab.gnome.org/BrainBlasted/libhandy-rs/?branch=wip/christopherdavis/update-0-0-10)" = "" -"checksum libhandy-sys 0.3.1 (git+https://gitlab.gnome.org/BrainBlasted/libhandy-rs/?branch=wip/christopherdavis/update-0-0-10)" = "" +"checksum libhandy 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7195919b261667e13240c14004c3fdc1a07a77ee865a9e0da5c2a4e134171c25" +"checksum libhandy-sys 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "17019593005fd387b0d2f6e5b29533796e3206e9f433dbf74846a609ceeb5fbf" "checksum libsqlite3-sys 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d3711dfd91a1081d2458ad2d06ea30a8755256e74038be2ad927d94e1c955ca8" "checksum locale_config 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "14fbee0e39bc2dd6a2427c4fdea66e9826cc1fd09b0a0b7550359f5f6efe1dab" "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" @@ -2758,7 +2758,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432" "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -"checksum mpris-player 0.4.0 (git+https://gitlab.gnome.org/ZanderBrown/mpris-player)" = "" +"checksum mpris-player 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaeb531079f21d3490202da4058c015346e92dcfd908616bf86a283f35d4154d" "checksum muldiv 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "451a9a05d2a32c566c897835e0ea95cf79ed2fdfe957924045a1721a36c9980f" "checksum native-tls 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4b2df1a4c22fd44a62147fd8f13dd0f95c9d8ca7b2610299b2a2f9cf8964274e" "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" diff --git a/podcasts-gtk/Cargo.toml b/podcasts-gtk/Cargo.toml index 128b4cd..ff66c6b 100644 --- a/podcasts-gtk/Cargo.toml +++ b/podcasts-gtk/Cargo.toml @@ -46,13 +46,12 @@ features = ["v2_50"] version = "0.7.0" [dependencies.libhandy] -git = "https://gitlab.gnome.org/BrainBlasted/libhandy-rs/" -branch = "wip/christopherdavis/update-0-0-10" +version = "0.4.0" features = [ "v0_0_10"] [dependencies.mpris-player] version = "0.4.0" -git = "https://gitlab.gnome.org/ZanderBrown/mpris-player" +# git = "https://gitlab.gnome.org/World/Rust/mpris-player" [dependencies.podcasts-data] path = "../podcasts-data" diff --git a/podcasts-gtk/src/app.rs b/podcasts-gtk/src/app.rs index ddb28d6..c985c3a 100644 --- a/podcasts-gtk/src/app.rs +++ b/podcasts-gtk/src/app.rs @@ -20,7 +20,6 @@ #![allow(new_without_default)] -use glib; use glib::subclass; use glib::subclass::prelude::*; use glib::translate::*; diff --git a/podcasts-gtk/src/widgets/shows_view.rs b/podcasts-gtk/src/widgets/shows_view.rs index d9a76b2..15ad678 100644 --- a/podcasts-gtk/src/widgets/shows_view.rs +++ b/podcasts-gtk/src/widgets/shows_view.rs @@ -99,8 +99,6 @@ fn populate_flowbox(shows: &Rc, vadj: Option) -> Result<( } fn on_child_activate(child: >k::FlowBoxChild, sender: &Sender) -> Result<(), Error> { - use gtk::WidgetExt; - // This is such an ugly hack... let id = WidgetExt::get_name(child) .ok_or_else(|| format_err!("Failed to get \"episodes\" child from the stack."))?