[rhythmbox] ipod "Remove from playlist" was deleting song completely.

[Jonathan Matthew <jmatthew src gnome org>]

commit c6ee827daacb53346e0cb1c9e2820627e1b6e6b3
Author: Ben Walsh <b wumpster com>
Date:   Tue Oct 19 07:57:32 2010 +0100

    ipod "Remove from playlist" was deleting song completely.

 plugins/ipod/rb-ipod-static-playlist-source.c |   17 ++---------------
 1 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/plugins/ipod/rb-ipod-static-playlist-source.c b/plugins/ipod/rb-ipod-static-playlist-source.c
index 36d40a9..d6b8171 100644
--- a/plugins/ipod/rb-ipod-static-playlist-source.c
+++ b/plugins/ipod/rb-ipod-static-playlist-source.c
@@ -47,7 +47,6 @@ static void rb_ipod_static_playlist_source_get_property (GObject *object,
 
 static gboolean impl_show_popup (RBSource *source);
 static void impl_delete_thyself (RBSource *source);
-static void impl_delete (RBSource *source);
 
 static void source_name_changed_cb (RBIpodStaticPlaylistSource *source,
 				    GParamSpec *spec,
@@ -89,7 +88,8 @@ rb_ipod_static_playlist_source_class_init (RBIpodStaticPlaylistSourceClass *klas
 	source_class->impl_delete_thyself = impl_delete_thyself;
 	source_class->impl_can_move_to_trash = (RBSourceFeatureFunc) rb_false_function;
 	source_class->impl_can_delete = (RBSourceFeatureFunc) rb_true_function;
-	source_class->impl_delete = impl_delete;
+
+	/* Don't override impl_delete here -- it's provided by RBStaticPlaylistSource */
 
 	g_object_class_install_property (object_class,
 					 PROP_IPOD_SOURCE,
@@ -266,16 +266,3 @@ source_name_changed_cb (RBIpodStaticPlaylistSource *source,
 	}
 	g_free (name);
 }
-
-static void
-impl_delete (RBSource *source)
-{
-	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (source);
-	GList *sel;
-	RBEntryView *songs;
-
-	songs = rb_source_get_entry_view (source);
-	sel = rb_entry_view_get_selected_entries (songs);
-	rb_media_player_source_delete_entries (RB_MEDIA_PLAYER_SOURCE (priv->ipod_source), sel, NULL, NULL, NULL);
-	rb_list_destroy_free (sel, (GDestroyNotify)rhythmdb_entry_unref);
-}