rebase fixes

src/app/components/now_playing/now_playing.rs

@@ -161,7 +161,7 @@ impl NowPlayingWidget {
  widget.devices.remove(&child);
  }
  for device in devices {
- let check = gtk::CheckButtonBuilder::new()
+ let check = gtk::CheckButton::builder()
  .action_name(&format!("{}.{}", ACTIONS, CONNECT_ACTION))
  .action_target(&Some(&device.id).to_variant())
  .group(&*widget.this_device_button)
@@ -198,7 +198,7 @@ impl NowPlaying {
  let playlist = Box::new(Playlist::new(
  widget.song_list_widget().clone(),
  model.clone(),
- worker
+ worker,
  ));
 
  let headerbar = Box::new(HeaderBarComponent::new(

src/app/components/now_playing/now_playing_model.rs

@@ -11,7 +11,6 @@ use crate::app::models::ConnectDevice;
 use crate::app::models::SongDescription;
 use crate::app::models::SongListModel;
 use crate::app::state::Device;
-use crate::app::state::PlaylistChange;
 use crate::app::state::SelectionContext;
 use crate::app::state::{PlaybackAction, PlaybackState, SelectionAction, SelectionState};
 use crate::app::{ActionDispatcher, AppAction, AppEvent, AppModel};

src/app/components/player_notifier.rs

@@ -5,7 +5,6 @@ use librespot::core::spotify_id::SpotifyId;
 
 use crate::api::{SpotifyApiClient, SpotifyConnectPlayer};
 use crate::app::components::EventListener;
-use crate::app::models::ConnectDevice;
 use crate::app::state::{Device, LoginAction, LoginEvent, LoginStartedEvent, PlaybackEvent};
 use crate::app::{ActionDispatcher, AppAction, AppEvent};
 use crate::player::Command;

src/app/state/playback_state.rs

@@ -290,15 +290,6 @@ impl From<PlaybackAction> for AppAction {
  }
 }
 
-#[derive(Clone, Debug)]
-pub enum PlaylistChange {
- Reset,
- InsertedAt(usize, usize),
- AppendedAt(usize),
- MovedUp(usize),
- MovedDown(usize),
-}
-
 #[derive(Clone, Debug)]
 pub enum Device {
  Local,