[gnome-music] playlistview: Refactor pl_todelete to a dict

[Marinus Schraal <mschraal src gnome org>]

commit e378c25dfc335655ed49b42f5a11162855587e20
Author: Jean Felder <jean felder gmail com>
Date:   Mon Jan 29 23:38:29 2018 +0100

    playlistview: Refactor pl_todelete to a dict

 gnomemusic/views/playlistview.py | 15 ++++++++-------
 gnomemusic/window.py             |  5 +++--
 2 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/gnomemusic/views/playlistview.py b/gnomemusic/views/playlistview.py
index bf3176f..6eec267 100644
--- a/gnomemusic/views/playlistview.py
+++ b/gnomemusic/views/playlistview.py
@@ -132,8 +132,7 @@ class PlaylistView(BaseView):
         self._iter_to_clean_model = None
         self.current_playlist = None
         self._current_playlist_index = None
-        self.pl_todelete = None
-        self._pl_todelete_index = None
+        self.pl_todelete = {}
         self._songs_count = 0
         self._handler_rename_done_button = 0
         self._handler_rename_entry = 0
@@ -450,7 +449,8 @@ class PlaylistView(BaseView):
         model, _iter = self._view.get_selection().get_selected()
         song = model[_iter][5]
 
-        playlist_dialog = PlaylistDialog(self._window, self.pl_todelete)
+        playlist_dialog = PlaylistDialog(
+            self._window, self.pl_todelete.get('playlist'))
         if playlist_dialog.run() == Gtk.ResponseType.ACCEPT:
             playlists.add_to_playlist(playlist_dialog.get_selected(), [song])
         playlist_dialog.destroy()
@@ -634,9 +634,10 @@ class PlaylistView(BaseView):
         self.model.clear()
         selection = self._sidebar.get_selected_row()
         index = selection.get_index()
-        self._pl_todelete_index = index
-        self.pl_todelete = selection.playlist
-
+        self.pl_todelete = {
+            'playlist': selection.playlist,
+            'index': index
+        }
         row_next = (self._sidebar.get_row_at_index(index + 1)
                     or self._sidebar.get_row_at_index(index - 1))
         self._sidebar.remove(selection)
@@ -649,7 +650,7 @@ class PlaylistView(BaseView):
     def undo_playlist_deletion(self):
         """Revert the last playlist removal"""
         self._add_playlist_to_sidebar(
-            self.pl_todelete, self._pl_todelete_index)
+            self.pl_todelete['playlist'], self.pl_todelete['index'])
 
     @log
     def _on_delete_activated(self, menuitem, data=None):
diff --git a/gnomemusic/window.py b/gnomemusic/window.py
index 4d61e63..a7e7dc2 100644
--- a/gnomemusic/window.py
+++ b/gnomemusic/window.py
@@ -369,7 +369,8 @@ class Window(Gtk.ApplicationWindow):
         # Callback to remove playlists
         def remove_playlist_timeout_cb(self):
             # Remove the playlist
-            playlist.delete_playlist(self.views[View.PLAYLIST].pl_todelete)
+            playlist.delete_playlist(
+                self.views[View.PLAYLIST].pl_todelete['playlist'])
 
             # Hide the notification
             self._playlist_notification.set_reveal_child(False)
@@ -565,7 +566,7 @@ class Window(Gtk.ApplicationWindow):
                 return
 
             playlist_dialog = PlaylistDialog(
-                self, self.views[View.PLAYLIST].pl_todelete)
+                self, self.views[View.PLAYLIST].pl_todelete.get('playlist'))
             if playlist_dialog.run() == Gtk.ResponseType.ACCEPT:
                 playlist.add_to_playlist(playlist_dialog.get_selected(),
                                          selected_songs)