diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 2ebb4cc..3ccf41e 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -4,7 +4,7 @@ use gtk::prelude::*; use hammond_data::Source; use hammond_data::utils::url_cleaner; -use podcasts_view::update_podcasts_view; +use views::podcasts::update_podcasts_view; use utils; #[derive(Debug)] diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index 5f65291..15dfb31 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -1,3 +1,5 @@ +#![allow(dead_code)] + extern crate gdk; extern crate gdk_pixbuf; extern crate gio; @@ -47,7 +49,7 @@ mod headerbar; mod utils; mod static_resource; -use views::podcasts_view; +use views::podcasts; /* THIS IS STILL A PROTOTYPE. @@ -63,7 +65,7 @@ fn build_ui(app: >k::Application) { let window = gtk::ApplicationWindow::new(app); window.set_default_size(1150, 650); // Setup the Stack that will manage the switch between podcasts_view and podcast_widget. - let stack = podcasts_view::setup_stack(); + let stack = podcasts::setup_stack(); window.add(&stack); window.connect_delete_event(|w, _| { diff --git a/hammond-gtk/src/utils.rs b/hammond-gtk/src/utils.rs index 69bd584..2799f6d 100644 --- a/hammond-gtk/src/utils.rs +++ b/hammond-gtk/src/utils.rs @@ -8,7 +8,7 @@ use std::{thread, time}; use std::cell::RefCell; use std::sync::mpsc::{channel, Receiver}; -use views::podcasts_view; +use views::podcasts; type Foo = RefCell)>>; @@ -55,7 +55,7 @@ fn refresh_podcasts_view() -> glib::Continue { GLOBAL.with(|global| { if let Some((ref stack, ref reciever)) = *global.borrow() { if reciever.try_recv().is_ok() { - podcasts_view::update_podcasts_view(stack); + podcasts::update_podcasts_view(stack); } } }); diff --git a/hammond-gtk/src/views/mod.rs b/hammond-gtk/src/views/mod.rs index 69e01ee..398798f 100644 --- a/hammond-gtk/src/views/mod.rs +++ b/hammond-gtk/src/views/mod.rs @@ -1 +1 @@ -pub mod podcasts_view; +pub mod podcasts; diff --git a/hammond-gtk/src/views/podcasts_view.rs b/hammond-gtk/src/views/podcasts.rs similarity index 100% rename from hammond-gtk/src/views/podcasts_view.rs rename to hammond-gtk/src/views/podcasts.rs diff --git a/hammond-gtk/src/widgets/podcast.rs b/hammond-gtk/src/widgets/podcast.rs index 6d765a3..1dbbf8f 100644 --- a/hammond-gtk/src/widgets/podcast.rs +++ b/hammond-gtk/src/widgets/podcast.rs @@ -9,7 +9,7 @@ use hammond_data::Podcast; use hammond_downloader::downloader; use widgets::episode::episodes_listbox; -use podcasts_view::update_podcasts_view; +use views::podcasts::update_podcasts_view; pub fn podcast_widget(stack: >k::Stack, pd: &Podcast) -> gtk::Box { // Adapted from gnome-music AlbumWidget