Merge lp:~laney/rhythmbox/rb-2.97-update into lp:~ubuntu-desktop/rhythmbox/ubuntu

[Iain Lane]

Update to 2.97

=== modified file 'debian/changelog'
--- debian/changelog	2012-05-17 23:12:21 +0000
+++ debian/changelog	2012-06-04 10:19:20 +0000
@@ -1,3 +1,24 @@
+rhythmbox (2.97-0ubuntu1) UNRELEASED; urgency=low
+
+  * New upstream release 2.97 (LP: #1008406)
+   - New more compact header layout, including album art
+   - Deprecated artdisplay plugin
+   - Fixed buffering for network streams
+   - Configurable encoding settings for the library, using GStreamer presets or
+     simple quality settings
+   - Doesn't preserve mtime on metadata updates
+   - Fixed audio CD extraction speed
+   - New podcast subscription interface, including iTunes and Miroguide
+     searching and auditioning before subscription
+  * Drop all git backported packages; in this release. 
+  * Drop debian/patches/06_manual_connect_daap_host.patch: upstream and not
+    in series. 
+  * Refresh other patches.
+  * Add BD on libxml2-dev, as required by configure.
+  * Adjust packaging for removal of artdisplay. 
+
+ -- Iain Lane <[e-mail]>  Mon, 04 Jun 2012 10:02:09 +0100
+
 rhythmbox (2.96-0ubuntu6) quantal; urgency=low
 
   * debian/rhythmbox.install:
 
=== modified file 'debian/control'
--- debian/control	2012-05-14 04:30:50 +0000
+++ debian/control	2012-06-04 10:19:20 +0000
@@ -47,6 +47,7 @@
                libgnome-keyring-dev,
                libpeas-dev (>= 0.7.3),
                zlib1g-dev,
+               libxml2-dev (>= 2.7.8),
                libxt-dev,
                x11proto-core-dev,
                libgconf2-dev,
 
=== modified file 'debian/control.in'
--- debian/control.in	2012-05-14 04:30:50 +0000
+++ debian/control.in	2012-06-04 10:19:20 +0000
@@ -42,6 +42,7 @@
                libgnome-keyring-dev,
                libpeas-dev (>= 0.7.3),
                zlib1g-dev,
+               libxml2-dev (>= 2.7.8),
                libxt-dev,
                x11proto-core-dev,
                libgconf2-dev,
 
=== modified file 'debian/patches/02_use_escaped_podcast_uri.patch'
--- debian/patches/02_use_escaped_podcast_uri.patch	2012-03-14 09:14:08 +0000
+++ debian/patches/02_use_escaped_podcast_uri.patch	2012-06-04 10:19:20 +0000
@@ -1,6 +1,8 @@
 === modified file 'podcast/rb-podcast-manager.c'
---- old/podcast/rb-podcast-manager.c	2012-03-08 20:38:49 +0000
-+++ new/podcast/rb-podcast-manager.c	2012-03-08 21:02:02 +0000
+Index: rhythmbox-2.97/podcast/rb-podcast-manager.c
+===================================================================
+--- rhythmbox-2.97.orig/podcast/rb-podcast-manager.c	2012-06-04 10:24:44.591435382 +0100
++++ rhythmbox-2.97/podcast/rb-podcast-manager.c	2012-06-04 10:24:55.207434915 +0100
 @@ -29,6 +29,7 @@
  #include "config.h"
  
@@ -9,7 +11,7 @@
  #define __USE_XOPEN
  #include <time.h>
  
-@@ -865,9 +866,15 @@ download_podcast (GFileInfo *src_info, R
+@@ -859,9 +860,15 @@
  	}
  
  	if (local_file_name == NULL) {
@@ -28,4 +30,3 @@
  	}
  
  	/* if the filename ends with the query string from the original URI,
-
 
=== modified file 'debian/patches/03_magnatune_partner.patch'
--- debian/patches/03_magnatune_partner.patch	2012-03-14 09:14:08 +0000
+++ debian/patches/03_magnatune_partner.patch	2012-06-04 10:19:20 +0000
@@ -1,7 +1,9 @@
 === modified file 'plugins/magnatune/MagnatuneSource.py'
---- old/plugins/magnatune/MagnatuneSource.py	2012-03-08 20:38:49 +0000
-+++ new/plugins/magnatune/MagnatuneSource.py	2012-03-08 21:03:17 +0000
-@@ -44,7 +44,7 @@ import MagnatuneAccount
+Index: rhythmbox-2.97/plugins/magnatune/MagnatuneSource.py
+===================================================================
+--- rhythmbox-2.97.orig/plugins/magnatune/MagnatuneSource.py	2012-06-04 10:24:44.559435384 +0100
++++ rhythmbox-2.97/plugins/magnatune/MagnatuneSource.py	2012-06-04 10:24:55.411434906 +0100
+@@ -44,7 +44,7 @@
  import gettext
  gettext.install('rhythmbox', RB.locale_dir())
  
@@ -10,4 +12,3 @@
  
  # URIs
  magnatune_song_info_uri = "http://magnatune.com/info/song_info_xml.zip"
-
 
=== modified file 'debian/patches/04_pause_button.patch'
--- debian/patches/04_pause_button.patch	2011-08-03 15:25:12 +0000
+++ debian/patches/04_pause_button.patch	2012-06-04 10:19:20 +0000
@@ -5,11 +5,11 @@
 Author: Bilal Akhtar <[e-mail]>
 Bug-Ubuntu: https://bugs.edge.launchpad.net/hundredpapercuts/+bug/71228
 Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=326066
-Index: rhythmbox-2.90.1~20110802/shell/rb-shell-player.c
+Index: rhythmbox-2.97/shell/rb-shell-player.c
 ===================================================================
---- rhythmbox-2.90.1~20110802.orig/shell/rb-shell-player.c
-+++ rhythmbox-2.90.1~20110802/shell/rb-shell-player.c
-@@ -291,6 +291,9 @@
+--- rhythmbox-2.97.orig/shell/rb-shell-player.c	2012-06-04 10:24:44.511435386 +0100
++++ rhythmbox-2.97/shell/rb-shell-player.c	2012-06-04 10:24:55.611434898 +0100
+@@ -294,6 +294,9 @@
  
  static GtkActionEntry rb_shell_player_actions [] =
  {
@@ -19,7 +19,7 @@
  	{ "ControlPrevious", GTK_STOCK_MEDIA_PREVIOUS, N_("Pre_vious"), "<alt>Left",
  	  N_("Start playing the previous song"),
  	  G_CALLBACK (rb_shell_player_cmd_previous) },
-@@ -308,9 +311,6 @@
+@@ -311,9 +314,6 @@
  
  static GtkToggleActionEntry rb_shell_player_toggle_entries [] =
  {
@@ -29,17 +29,17 @@
  	{ "ControlShuffle", GNOME_MEDIA_SHUFFLE, N_("Sh_uffle"), "<control>U",
  	  N_("Play songs in a random order"),
  	  G_CALLBACK (rb_shell_player_shuffle_changed_cb) },
-@@ -697,9 +697,6 @@
- 			 action, "active",
- 			 G_SETTINGS_BIND_INVERT_BOOLEAN | G_SETTINGS_BIND_NO_SENSITIVITY);
+@@ -705,9 +705,6 @@
+ 	player_settings_changed_cb (player->priv->settings, "transition-time", player);
+ 	player_settings_changed_cb (player->priv->settings, "play-order", player);
  
 -	action = gtk_action_group_get_action (player->priv->actiongroup,
 -					      "ControlPlay");
 -	g_object_set (action, "is-important", TRUE, NULL);
  
- 	player->priv->syncing_state = TRUE;
- 	rb_shell_player_set_playing_source (player, NULL);
-@@ -3777,7 +3774,6 @@
+ 	action = gtk_action_group_get_action (player->priv->actiongroup, "ControlPrevious");
+ 	g_object_bind_property (player, "has-prev", action, "sensitive", G_BINDING_DEFAULT);
+@@ -3825,7 +3822,6 @@
  
  	/* sync the active state of the action again */
  	g_object_get (player, "playing", &playing, NULL);
@@ -47,7 +47,7 @@
  
  	g_signal_handlers_unblock_by_func (action, rb_shell_player_cmd_play, player);
  
-@@ -3800,11 +3796,17 @@
+@@ -3848,11 +3844,17 @@
  	if (playing) {
  		if (rb_source_can_pause (player->priv->source)) {
  			tooltip = g_strdup (_("Pause playback"));
@@ -65,7 +65,7 @@
  	}
  	g_object_set (action, "tooltip", tooltip, NULL);
  	g_free (tooltip);
-@@ -3816,7 +3818,6 @@
+@@ -3864,7 +3866,6 @@
  	if (player->priv->unblock_play_id == 0) {
  		g_signal_handlers_block_by_func (action, rb_shell_player_cmd_play, player);
  	}
 
=== modified file 'debian/patches/05_hide_on_quit.patch'
--- debian/patches/05_hide_on_quit.patch	2011-08-03 15:25:12 +0000
+++ debian/patches/05_hide_on_quit.patch	2012-06-04 10:19:20 +0000
@@ -5,11 +5,11 @@
 Author: Didier Roche
 Bug-Ubuntu: https://bugs.launchpad.net/bugs/526552
 
-Index: rhythmbox-2.90.1~20110802/shell/rb-shell.c
+Index: rhythmbox-2.97/shell/rb-shell.c
 ===================================================================
---- rhythmbox-2.90.1~20110802.orig/shell/rb-shell.c
-+++ rhythmbox-2.90.1~20110802/shell/rb-shell.c
-@@ -1915,11 +1915,42 @@
+--- rhythmbox-2.97.orig/shell/rb-shell.c	2012-06-04 10:24:44.475435388 +0100
++++ rhythmbox-2.97/shell/rb-shell.c	2012-06-04 10:24:55.827434888 +0100
+@@ -2276,11 +2276,42 @@
  	return FALSE;
  }
  
@@ -52,11 +52,11 @@
  	if (shell->priv->party_mode) {
  		return TRUE;
  	}
-Index: rhythmbox-2.90.1~20110802/shell/rb-shell.h
+Index: rhythmbox-2.97/shell/rb-shell.h
 ===================================================================
---- rhythmbox-2.90.1~20110802.orig/shell/rb-shell.h
-+++ rhythmbox-2.90.1~20110802/shell/rb-shell.h
-@@ -183,6 +183,8 @@
+--- rhythmbox-2.97.orig/shell/rb-shell.h	2012-06-04 10:24:44.475435388 +0100
++++ rhythmbox-2.97/shell/rb-shell.h	2012-06-04 10:24:55.827434888 +0100
+@@ -160,6 +160,8 @@
  
  gboolean        rb_shell_get_party_mode (RBShell *shell);
  
 
=== removed file 'debian/patches/06_manual_connect_daap_host.patch'
--- debian/patches/06_manual_connect_daap_host.patch	2011-05-26 16:45:50 +0000
+++ debian/patches/06_manual_connect_daap_host.patch	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-From e710ae5e83a965147b63af9ad6179338de81f20b Mon Sep 17 00:00:00 2001
-From: W. Michael Petullo <[e-mail]>
-Date: Wed, 04 May 2011 17:18:44 +0000
-Subject: DAAP: allow a user to provide a port for specified server
-
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=649288
-Bug-Ubuntu: https://launchpad.net/bugs/665168
----
-Index: rhythmbox-0.13.3/plugins/daap/rb-daap-plugin.c
-===================================================================
---- rhythmbox-0.13.3.orig/plugins/daap/rb-daap-plugin.c	2011-01-16 10:10:40.000000000 +0100
-+++ rhythmbox-0.13.3/plugins/daap/rb-daap-plugin.c	2011-05-05 07:27:37.536527475 +0200
-@@ -723,7 +723,7 @@
- 
- 	rb_debug ("adding manually specified DAAP share at %s", location);
- 	service.name = (char *) location;
--	service.host = (char *) location;
-+	service.host = (char *) host;
- 	service.port = port;
- 	service.password_protected = FALSE;
- 	mdns_service_added (NULL,
 
=== modified file 'debian/patches/07_quicklists.patch'
--- debian/patches/07_quicklists.patch	2012-03-20 12:01:59 +0000
+++ debian/patches/07_quicklists.patch	2012-06-04 10:19:20 +0000
@@ -1,8 +1,8 @@
 === modified file 'a/data/rhythmbox.desktop.in.in'
-Index: rhythmbox-2.95.5/data/rhythmbox.desktop.in.in
+Index: rhythmbox-2.97/data/rhythmbox.desktop.in.in
 ===================================================================
---- rhythmbox-2.95.5.orig/data/rhythmbox.desktop.in.in	2012-02-12 01:13:10.000000000 -0500
-+++ rhythmbox-2.95.5/data/rhythmbox.desktop.in.in	2012-03-15 15:08:33.263349627 -0400
+--- rhythmbox-2.97.orig/data/rhythmbox.desktop.in.in	2012-06-04 10:24:44.407435390 +0100
++++ rhythmbox-2.97/data/rhythmbox.desktop.in.in	2012-06-04 10:24:56.031434879 +0100
 @@ -16,3 +16,20 @@
  X-GNOME-Bugzilla-Component=general
  X-GNOME-Bugzilla-OtherBinaries=rhythmbox-client;rhythmbox-metadata;
 
=== removed file 'debian/patches/git_ipod_no_private_source.patch'
--- debian/patches/git_ipod_no_private_source.patch	2012-03-16 11:11:59 +0000
+++ debian/patches/git_ipod_no_private_source.patch	1970-01-01 00:00:00 +0000
@@ -1,161 +0,0 @@
-From 63a5411ebd6058c8c6ffc618a8c3ce940c210ecc Mon Sep 17 00:00:00 2001
-From: Cole Robinson <[e-mail]>
-Date: Mon, 12 Mar 2012 22:43:01 +0000
-Subject: ipod: playlist handlers shouldn't need private source access
-
-Accomplist this by adding an ipod source method to lookup a track
-in the private entry_map.
-
-Signed-off-by: Cole Robinson <[e-mail]>
----
-diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
-index aea499e..7a23d0c 100644
---- a/plugins/ipod/rb-ipod-source.c
-+++ b/plugins/ipod/rb-ipod-source.c
-@@ -594,15 +594,15 @@ playlist_track_removed (RhythmDBQueryModel *m,
- 	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
- 	Itdb_Playlist *ipod_pl = rb_ipod_static_playlist_source_get_itdb_playlist (playlist);
- 	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (ipod);
-+	RbIpodDb *ipod_db = rb_ipod_static_playlist_source_get_ipod_db (playlist);
- 	Itdb_Track *track;
- 
- 	g_return_if_fail (ipod != NULL);
- 	g_return_if_fail (ipod_pl != NULL);
- 
--	track = g_hash_table_lookup (priv->entry_map, entry);
-+	track = rb_ipod_source_lookup_track (ipod, entry);
- 	g_return_if_fail (track != NULL);
--	rb_ipod_db_remove_from_playlist (priv->ipod_db, ipod_pl, track);
-+	rb_ipod_db_remove_from_playlist (ipod_db, ipod_pl, track);
- }
- 
- static void
-@@ -612,7 +612,7 @@ playlist_track_added (GtkTreeModel *model, GtkTreePath *path,
- 	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
- 	Itdb_Playlist *ipod_pl = rb_ipod_static_playlist_source_get_itdb_playlist (playlist);
- 	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (ipod);
-+	RbIpodDb *ipod_db = rb_ipod_static_playlist_source_get_ipod_db (playlist);
- 	Itdb_Track *track;
- 	RhythmDBEntry *entry;
- 
-@@ -620,10 +620,10 @@ playlist_track_added (GtkTreeModel *model, GtkTreePath *path,
- 	g_return_if_fail (ipod_pl != NULL);
- 
- 	gtk_tree_model_get (model, iter, 0, &entry, -1);
--        track = g_hash_table_lookup (priv->entry_map, entry);
-+	track = rb_ipod_source_lookup_track (ipod, entry);
- 	g_return_if_fail (track != NULL);
- 
--	rb_ipod_db_add_to_playlist (priv->ipod_db, ipod_pl, track);
-+	rb_ipod_db_add_to_playlist (ipod_db, ipod_pl, track);
- }
- 
- static void
-@@ -633,7 +633,6 @@ playlist_before_save (RbIpodDb *ipod_db, gpointer data)
- 	GtkTreeModel *model = GTK_TREE_MODEL (rb_playlist_source_get_query_model (RB_PLAYLIST_SOURCE (playlist)));
- 	Itdb_Playlist *ipod_pl = rb_ipod_static_playlist_source_get_itdb_playlist (playlist);
- 	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (ipod);
- 	GtkTreeIter iter;
- 
- 	if (!rb_ipod_static_playlist_source_get_was_reordered (playlist)) {
-@@ -650,7 +649,7 @@ playlist_before_save (RbIpodDb *ipod_db, gpointer data)
- 			Itdb_Track *track;
- 
- 			gtk_tree_model_get (model, &iter, 0, &entry, -1);
--			track = g_hash_table_lookup (priv->entry_map, entry);
-+			track = rb_ipod_source_lookup_track (ipod, entry);
- 
- 			g_return_if_fail (track != NULL);
- 		} while (gtk_tree_model_iter_next (model, &iter));
-@@ -675,7 +674,7 @@ playlist_before_save (RbIpodDb *ipod_db, gpointer data)
- 			Itdb_Track *track;
- 
- 			gtk_tree_model_get (model, &iter, 0, &entry, -1);
--			track = g_hash_table_lookup (priv->entry_map, entry);
-+			track = rb_ipod_source_lookup_track (ipod, entry);
- 
- 			rb_debug ("adding \"%s\" to \"%s\"", track->title, ipod_pl->name);
- 
-@@ -692,13 +691,12 @@ playlist_rows_reordered (GtkTreeModel *model,
- 			 gint *order, gpointer data)
- {
- 	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
--	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (ipod);
-+	RbIpodDb *ipod_db = rb_ipod_static_playlist_source_get_ipod_db (playlist);
- 
- 	/* Mark as reordered; will check before save */
- 	rb_ipod_static_playlist_source_set_was_reordered (playlist, TRUE);
- 
--	rb_ipod_db_save_async (priv->ipod_db);
-+	rb_ipod_db_save_async (ipod_db);
- }
- 
- static void
-@@ -2064,6 +2062,16 @@ rb_ipod_source_remove_playlist (RBiPodSource *ipod_source,
- 	rb_ipod_db_remove_playlist (priv->ipod_db, rb_ipod_static_playlist_source_get_itdb_playlist (playlist_source));
- }
- 
-+
-+Itdb_Track *
-+rb_ipod_source_lookup_track (RBiPodSource *source,
-+			     RhythmDBEntry *entry)
-+{
-+	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
-+
-+	return g_hash_table_lookup (priv->entry_map, entry);
-+}
-+
- static gboolean
- ipod_name_changed_cb (GtkWidget     *widget,
-  		      GdkEventFocus *event,
-diff --git a/plugins/ipod/rb-ipod-source.h b/plugins/ipod/rb-ipod-source.h
-index f95d735..9af5fa3 100644
---- a/plugins/ipod/rb-ipod-source.h
-+++ b/plugins/ipod/rb-ipod-source.h
-@@ -71,6 +71,9 @@ void			rb_ipod_source_show_properties	(RBiPodSource *source);
- void			rb_ipod_source_delete_entries	(RBiPodSource *source,
- 							 GList *entries);
- 
-+Itdb_Track *		rb_ipod_source_lookup_track	(RBiPodSource *source,
-+							 RhythmDBEntry *entry);
-+
- G_END_DECLS
- 
- #endif /* __RB_IPOD_SOURCE_H */
-diff --git a/plugins/ipod/rb-ipod-static-playlist-source.c b/plugins/ipod/rb-ipod-static-playlist-source.c
-index a2f0248..0a95dc8 100644
---- a/plugins/ipod/rb-ipod-static-playlist-source.c
-+++ b/plugins/ipod/rb-ipod-static-playlist-source.c
-@@ -262,6 +262,14 @@ rb_ipod_static_playlist_source_get_ipod_source (RBIpodStaticPlaylistSource *play
- 	return priv->ipod_source;
- }
- 
-+RbIpodDb*
-+rb_ipod_static_playlist_source_get_ipod_db (RBIpodStaticPlaylistSource *playlist)
-+{
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (playlist);
-+
-+	return priv->ipod_db;
-+}
-+
- gboolean
- rb_ipod_static_playlist_source_get_was_reordered (RBIpodStaticPlaylistSource *playlist)
- {
-diff --git a/plugins/ipod/rb-ipod-static-playlist-source.h b/plugins/ipod/rb-ipod-static-playlist-source.h
-index 38afff0..49c833f 100644
---- a/plugins/ipod/rb-ipod-static-playlist-source.h
-+++ b/plugins/ipod/rb-ipod-static-playlist-source.h
-@@ -56,6 +56,7 @@ RBIpodStaticPlaylistSource *	rb_ipod_static_playlist_source_new (RBShell *shell,
- 
- Itdb_Playlist* rb_ipod_static_playlist_source_get_itdb_playlist (RBIpodStaticPlaylistSource *playlist);
- RBiPodSource* rb_ipod_static_playlist_source_get_ipod_source (RBIpodStaticPlaylistSource *playlist);
-+RbIpodDb* rb_ipod_static_playlist_source_get_ipod_db (RBIpodStaticPlaylistSource *playlist);
- gboolean rb_ipod_static_playlist_source_get_was_reordered (RBIpodStaticPlaylistSource *playlist);
- void rb_ipod_static_playlist_source_set_was_reordered (RBIpodStaticPlaylistSource *playlist, gboolean was_reordered);
- 
---
-cgit v0.9.0.2
 
=== removed file 'debian/patches/git_ipod_playlist_handler.patch'
--- debian/patches/git_ipod_playlist_handler.patch	2012-03-16 11:11:59 +0000
+++ debian/patches/git_ipod_playlist_handler.patch	1970-01-01 00:00:00 +0000
@@ -1,632 +0,0 @@
-From d99a239c500516c792d50712834a2be76c10feb2 Mon Sep 17 00:00:00 2001
-From: Jonathan Matthew <[e-mail]>
-Date: Wed, 14 Mar 2012 13:16:50 +0000
-Subject: ipod: Move all playlist handlers to private playlist code
-
-Various other cleanups, removal of the notify::base-query-model
-signal handler that would never have worked, and stuff moved
-from impl_delete_thyself to the dispose method where it belongs.
-
-based on a patch by Cole Robinson <[e-mail]>
----
-diff --git a/plugins/ipod/rb-ipod-plugin.c b/plugins/ipod/rb-ipod-plugin.c
-index 089c1b4..e0907bc 100644
---- a/plugins/ipod/rb-ipod-plugin.c
-+++ b/plugins/ipod/rb-ipod-plugin.c
-@@ -277,14 +277,13 @@ rb_ipod_plugin_cmd_playlist_rename (GtkAction *action, RBSource *source)
- static void
- rb_ipod_plugin_cmd_playlist_delete (GtkAction *action, RBSource *source)
- {
--	RBIpodStaticPlaylistSource *psource;
- 	RBiPodSource *ipod_source;
- 
- 	g_return_if_fail (RB_IS_IPOD_STATIC_PLAYLIST_SOURCE (source));
--	psource = RB_IPOD_STATIC_PLAYLIST_SOURCE (source);
- 
--	ipod_source = rb_ipod_static_playlist_source_get_ipod_source (psource);
-+	g_object_get (source, "ipod-source", &ipod_source, NULL);
- 	rb_ipod_source_remove_playlist (ipod_source, source);
-+	g_object_unref (ipod_source);
- }
- 
- static void
-diff --git a/plugins/ipod/rb-ipod-source.c b/plugins/ipod/rb-ipod-source.c
-index 7a23d0c..194807c 100644
---- a/plugins/ipod/rb-ipod-source.c
-+++ b/plugins/ipod/rb-ipod-source.c
-@@ -587,170 +587,6 @@ ipod_path_to_uri (const char *mount_point, const char *ipod_path)
- }
- 
- static void
--playlist_track_removed (RhythmDBQueryModel *m,
--			RhythmDBEntry *entry,
--			gpointer data)
--{
--	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
--	Itdb_Playlist *ipod_pl = rb_ipod_static_playlist_source_get_itdb_playlist (playlist);
--	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	RbIpodDb *ipod_db = rb_ipod_static_playlist_source_get_ipod_db (playlist);
--	Itdb_Track *track;
--
--	g_return_if_fail (ipod != NULL);
--	g_return_if_fail (ipod_pl != NULL);
--
--	track = rb_ipod_source_lookup_track (ipod, entry);
--	g_return_if_fail (track != NULL);
--	rb_ipod_db_remove_from_playlist (ipod_db, ipod_pl, track);
--}
--
--static void
--playlist_track_added (GtkTreeModel *model, GtkTreePath *path,
--		      GtkTreeIter *iter, gpointer data)
--{
--	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
--	Itdb_Playlist *ipod_pl = rb_ipod_static_playlist_source_get_itdb_playlist (playlist);
--	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	RbIpodDb *ipod_db = rb_ipod_static_playlist_source_get_ipod_db (playlist);
--	Itdb_Track *track;
--	RhythmDBEntry *entry;
--
--	g_return_if_fail (ipod != NULL);
--	g_return_if_fail (ipod_pl != NULL);
--
--	gtk_tree_model_get (model, iter, 0, &entry, -1);
--	track = rb_ipod_source_lookup_track (ipod, entry);
--	g_return_if_fail (track != NULL);
--
--	rb_ipod_db_add_to_playlist (ipod_db, ipod_pl, track);
--}
--
--static void
--playlist_before_save (RbIpodDb *ipod_db, gpointer data)
--{
--	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
--	GtkTreeModel *model = GTK_TREE_MODEL (rb_playlist_source_get_query_model (RB_PLAYLIST_SOURCE (playlist)));
--	Itdb_Playlist *ipod_pl = rb_ipod_static_playlist_source_get_itdb_playlist (playlist);
--	RBiPodSource *ipod = rb_ipod_static_playlist_source_get_ipod_source (playlist);
--	GtkTreeIter iter;
--
--	if (!rb_ipod_static_playlist_source_get_was_reordered (playlist)) {
--		return;
--	}
--
--	rb_ipod_static_playlist_source_set_was_reordered (playlist, FALSE);
--
--	/* Sanity check that all tracks are in entry_map */
--
--	if (gtk_tree_model_get_iter_first (model, &iter)) {
--		do {
--			RhythmDBEntry *entry;
--			Itdb_Track *track;
--
--			gtk_tree_model_get (model, &iter, 0, &entry, -1);
--			track = rb_ipod_source_lookup_track (ipod, entry);
--
--			g_return_if_fail (track != NULL);
--		} while (gtk_tree_model_iter_next (model, &iter));
--	}
--
--	/* Remove all tracks then re-add in correct order */
--
--	while (ipod_pl->members != NULL) {
--		Itdb_Track *track;
--
--		track = (Itdb_Track *)ipod_pl->members->data;
--
--		rb_debug ("removing \"%s\" from \"%s\"", track->title, ipod_pl->name);
--
--		/* Call directly to itdb to avoid scheduling another save */
--		itdb_playlist_remove_track (ipod_pl, track);
--	}
--
--	if (gtk_tree_model_get_iter_first (model, &iter)) {
--		do {
--			RhythmDBEntry *entry;
--			Itdb_Track *track;
--
--			gtk_tree_model_get (model, &iter, 0, &entry, -1);
--			track = rb_ipod_source_lookup_track (ipod, entry);
--
--			rb_debug ("adding \"%s\" to \"%s\"", track->title, ipod_pl->name);
--
--			/* Call directly to itdb to avoid scheduling another save */
--			itdb_playlist_add_track (ipod_pl, track, -1);
--		} while (gtk_tree_model_iter_next (model, &iter));
--	}
--}
--
--static void
--playlist_rows_reordered (GtkTreeModel *model,
--			 GtkTreePath *path,
--			 GtkTreeIter *iter,
--			 gint *order, gpointer data)
--{
--	RBIpodStaticPlaylistSource *playlist = RB_IPOD_STATIC_PLAYLIST_SOURCE (data);
--	RbIpodDb *ipod_db = rb_ipod_static_playlist_source_get_ipod_db (playlist);
--
--	/* Mark as reordered; will check before save */
--	rb_ipod_static_playlist_source_set_was_reordered (playlist, TRUE);
--
--	rb_ipod_db_save_async (ipod_db);
--}
--
--static void
--playlist_source_model_disconnect_signals (GObject *model, RBIpodStaticPlaylistSource *playlist_source)
--{
--	g_return_if_fail (RB_IS_IPOD_STATIC_PLAYLIST_SOURCE (playlist_source));
--
--	g_signal_handlers_disconnect_by_func (model,
--					      G_CALLBACK (playlist_track_added),
--					      playlist_source);
--	g_signal_handlers_disconnect_by_func (model,
--					      G_CALLBACK (playlist_track_removed),
--					      playlist_source);
--	g_signal_handlers_disconnect_by_func (model,
--					      G_CALLBACK (playlist_rows_reordered),
--					      playlist_source);
--}
--
--static void
--playlist_source_model_connect_signals (RBIpodStaticPlaylistSource *playlist_source)
--{
--	RhythmDBQueryModel *model;
--
--	g_return_if_fail (RB_IS_IPOD_STATIC_PLAYLIST_SOURCE (playlist_source));
--
--	g_object_get (G_OBJECT (playlist_source),
--		      "base-query-model", &model, NULL);
--	g_signal_connect (model, "row-inserted",
--			  G_CALLBACK (playlist_track_added),
--			  playlist_source);
--	g_signal_connect (model, "entry-removed",
--			  G_CALLBACK (playlist_track_removed),
--			  playlist_source);
--	g_signal_connect (model, "rows-reordered",
--			  G_CALLBACK (playlist_rows_reordered),
--			  playlist_source);
--	g_object_unref (model);
--}
--
--static void
--playlist_source_model_changed (GObject *obj, GParamSpec *pspec, gpointer old_model)
--{
--	RBIpodStaticPlaylistSource *playlist_source;
--
--	rb_debug ("base model changed for iPod playlist");
--
--	playlist_source = RB_IPOD_STATIC_PLAYLIST_SOURCE (obj);
--
--	playlist_source_model_disconnect_signals (G_OBJECT (old_model), playlist_source);
--
--	playlist_source_model_connect_signals (playlist_source);
--}
--
--static void
- set_podcast_icon (RBIpodStaticPlaylistSource *source)
- {
- 	GdkPixbuf *pixbuf;
-@@ -776,7 +612,6 @@ add_rb_playlist (RBiPodSource *source, Itdb_Playlist *playlist)
- 	GList *it;
- 	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (source);
- 	RhythmDBEntryType *entry_type;
--	RhythmDBQueryModel *model;
- 
- 	g_object_get (source,
- 			  "shell", &shell,
-@@ -812,17 +647,6 @@ add_rb_playlist (RBiPodSource *source, Itdb_Playlist *playlist)
- 	playlist->userdata_destroy = g_object_unref;
- 	playlist->userdata_duplicate = g_object_ref;
- 
--	g_object_get (G_OBJECT (playlist_source),
--		      "base-query-model", &model, NULL);
--	g_signal_connect (playlist_source, "notify::base-query-model",
--			  G_CALLBACK (playlist_source_model_changed),
--			  playlist_source);
--	g_signal_connect (priv->ipod_db, "before-save",
--			  G_CALLBACK (playlist_before_save),
--			  playlist_source);
--	g_object_unref (model);
--	playlist_source_model_connect_signals (playlist_source);
--
- 	if (itdb_playlist_is_podcasts(playlist)) {
- 		priv->podcast_pl = playlist_source;
- 		set_podcast_icon (playlist_source);
-@@ -2013,17 +1837,8 @@ impl_delete_thyself (RBDisplayPage *page)
- 		Itdb_Playlist *playlist = (Itdb_Playlist *)p->data;
- 		if (!itdb_playlist_is_mpl (playlist) && !playlist->is_spl) {
- 			RBSource *rb_playlist;
--			RhythmDBQueryModel *model;
- 
- 			rb_playlist = RB_SOURCE (playlist->userdata);
--			g_object_get (G_OBJECT (rb_playlist),
--				      "base-query-model", &model, NULL);
--
--			/* remove these to ensure they aren't called during source deletion */
--			playlist_source_model_disconnect_signals (G_OBJECT (model),
--								  RB_IPOD_STATIC_PLAYLIST_SOURCE (rb_playlist));
--
--			g_object_unref (model);
- 			rb_display_page_delete_thyself (RB_DISPLAY_PAGE (rb_playlist));
- 		}
- 	}
-@@ -2057,9 +1872,12 @@ rb_ipod_source_remove_playlist (RBiPodSource *ipod_source,
- {
- 	RBiPodSourcePrivate *priv = IPOD_SOURCE_GET_PRIVATE (ipod_source);
- 	RBIpodStaticPlaylistSource *playlist_source = RB_IPOD_STATIC_PLAYLIST_SOURCE (source);
-+	Itdb_Playlist *playlist;
- 
- 	rb_display_page_delete_thyself (RB_DISPLAY_PAGE (source));
--	rb_ipod_db_remove_playlist (priv->ipod_db, rb_ipod_static_playlist_source_get_itdb_playlist (playlist_source));
-+
-+	g_object_get (playlist_source, "itdb-playlist", &playlist, NULL);
-+	rb_ipod_db_remove_playlist (priv->ipod_db, playlist);
- }
- 
- 
-diff --git a/plugins/ipod/rb-ipod-static-playlist-source.c b/plugins/ipod/rb-ipod-static-playlist-source.c
-index 0a95dc8..261c4c4 100644
---- a/plugins/ipod/rb-ipod-static-playlist-source.c
-+++ b/plugins/ipod/rb-ipod-static-playlist-source.c
-@@ -45,11 +45,6 @@ static void rb_ipod_static_playlist_source_get_property (GObject *object,
- 			                  GParamSpec *pspec);
- 
- static gboolean impl_show_popup (RBDisplayPage *page);
--static void impl_delete_thyself (RBDisplayPage *page);
--
--static void source_name_changed_cb (RBIpodStaticPlaylistSource *source,
--				    GParamSpec *spec,
--				    gpointer data);
- 
- typedef struct
- {
-@@ -67,10 +62,168 @@ enum {
- 	PROP_0,
- 	PROP_IPOD_SOURCE,
- 	PROP_IPOD_DB,
--	PROP_ITDB_PLAYLIST,
--	PROP_WAS_REORDERED
-+	PROP_ITDB_PLAYLIST
- };
- 
-+static void
-+playlist_track_removed (RhythmDBQueryModel *m,
-+			RhythmDBEntry *entry,
-+			gpointer data)
-+{
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (data);
-+	Itdb_Track *track;
-+
-+	track = rb_ipod_source_lookup_track (priv->ipod_source, entry);
-+	g_return_if_fail (track != NULL);
-+	rb_ipod_db_remove_from_playlist (priv->ipod_db, priv->itdb_playlist, track);
-+}
-+
-+static void
-+playlist_track_added (GtkTreeModel *model,
-+		      GtkTreePath *path,
-+		      GtkTreeIter *iter,
-+		      gpointer data)
-+{
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (data);
-+	Itdb_Track *track;
-+	RhythmDBEntry *entry;
-+
-+	gtk_tree_model_get (model, iter, 0, &entry, -1);
-+	track = rb_ipod_source_lookup_track (priv->ipod_source, entry);
-+	g_return_if_fail (track != NULL);
-+
-+	rb_ipod_db_add_to_playlist (priv->ipod_db, priv->itdb_playlist, track);
-+}
-+
-+static void
-+playlist_before_save (RbIpodDb *ipod_db, gpointer data)
-+{
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (data);
-+	RhythmDBQueryModel *model;
-+	GtkTreeIter iter;
-+
-+	if (priv->was_reordered == FALSE)
-+		return;
-+	priv->was_reordered = FALSE;
-+
-+	/* Sanity check that all tracks are in entry_map */
-+
-+	g_object_get (G_OBJECT (data), "base-query-model", &model, NULL);
-+	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) {
-+		do {
-+			RhythmDBEntry *entry;
-+			Itdb_Track *track;
-+
-+			gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &entry, -1);
-+			track = rb_ipod_source_lookup_track (priv->ipod_source, entry);
-+
-+			g_return_if_fail (track != NULL);
-+		} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
-+	}
-+
-+	/* Remove all tracks then re-add in correct order */
-+
-+	while (priv->itdb_playlist->members != NULL) {
-+		Itdb_Track *track;
-+
-+		track = (Itdb_Track *)priv->itdb_playlist->members->data;
-+
-+		rb_debug ("removing \"%s\" from \"%s\"", track->title, priv->itdb_playlist->name);
-+
-+		/* Call directly to itdb to avoid scheduling another save */
-+		itdb_playlist_remove_track (priv->itdb_playlist, track);
-+	}
-+
-+	if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (model), &iter)) {
-+		do {
-+			RhythmDBEntry *entry;
-+			Itdb_Track *track;
-+
-+			gtk_tree_model_get (GTK_TREE_MODEL (model), &iter, 0, &entry, -1);
-+			track = rb_ipod_source_lookup_track (priv->ipod_source, entry);
-+
-+			rb_debug ("adding \"%s\" to \"%s\"", track->title, priv->itdb_playlist->name);
-+
-+			/* Call directly to itdb to avoid scheduling another save */
-+			itdb_playlist_add_track (priv->itdb_playlist, track, -1);
-+		} while (gtk_tree_model_iter_next (GTK_TREE_MODEL (model), &iter));
-+	}
-+
-+	g_object_unref (model);
-+}
-+
-+static void
-+playlist_rows_reordered (GtkTreeModel *model,
-+			 GtkTreePath *path,
-+			 GtkTreeIter *iter,
-+			 gint *order,
-+			 gpointer data)
-+{
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (data);
-+	priv->was_reordered = TRUE;
-+
-+	rb_ipod_db_save_async (priv->ipod_db);
-+}
-+
-+static void
-+playlist_source_model_disconnect_signals (RBIpodStaticPlaylistSource *source)
-+{
-+	RhythmDBQueryModel *model;
-+
-+	g_return_if_fail (RB_IS_IPOD_STATIC_PLAYLIST_SOURCE (source));
-+
-+	g_object_get (source, "base-query-model", &model, NULL);
-+
-+	g_signal_handlers_disconnect_by_func (model,
-+					      G_CALLBACK (playlist_track_added),
-+					      source);
-+	g_signal_handlers_disconnect_by_func (model,
-+					      G_CALLBACK (playlist_track_removed),
-+					      source);
-+	g_signal_handlers_disconnect_by_func (model,
-+					      G_CALLBACK (playlist_rows_reordered),
-+					      source);
-+
-+	g_object_unref (model);
-+}
-+
-+static void
-+playlist_source_model_connect_signals (RBIpodStaticPlaylistSource *playlist_source)
-+{
-+	RhythmDBQueryModel *model;
-+
-+	g_return_if_fail (RB_IS_IPOD_STATIC_PLAYLIST_SOURCE (playlist_source));
-+
-+	g_object_get (playlist_source, "base-query-model", &model, NULL);
-+	g_signal_connect (model, "row-inserted",
-+			  G_CALLBACK (playlist_track_added),
-+			  playlist_source);
-+	g_signal_connect (model, "entry-removed",
-+			  G_CALLBACK (playlist_track_removed),
-+			  playlist_source);
-+	g_signal_connect (model, "rows-reordered",
-+			  G_CALLBACK (playlist_rows_reordered),
-+			  playlist_source);
-+	g_object_unref (model);
-+}
-+
-+static void
-+source_name_changed_cb (RBIpodStaticPlaylistSource *source,
-+			GParamSpec *spec,
-+			gpointer data)
-+{
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (source);
-+	char *name;
-+
-+	g_object_get (source, "name", &name, NULL);
-+
-+	if ((priv->itdb_playlist != NULL) && (strcmp (name, priv->itdb_playlist->name) != 0)) {
-+		rb_debug ("changing playlist name to %s", name);
-+		rb_ipod_db_rename_playlist (priv->ipod_db, priv->itdb_playlist, name);
-+	}
-+	g_free (name);
-+}
-+
- 
- static void
- rb_ipod_static_playlist_source_class_init (RBIpodStaticPlaylistSourceClass *klass)
-@@ -85,7 +238,6 @@ rb_ipod_static_playlist_source_class_init (RBIpodStaticPlaylistSourceClass *klas
- 	object_class->set_property = rb_ipod_static_playlist_source_set_property;
- 
- 	page_class->show_popup = impl_show_popup;
--	page_class->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;
-@@ -115,13 +267,6 @@ rb_ipod_static_playlist_source_class_init (RBIpodStaticPlaylistSourceClass *klas
- 							      "itdb-playlist",
- 							      G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
- 
--	g_object_class_install_property (object_class,
--					 PROP_WAS_REORDERED,
--					 g_param_spec_pointer ("was-reordered",
--							       "was-reordered",
--							       "was-reordered",
--							       G_PARAM_READWRITE));
--
- 	g_type_class_add_private (klass, sizeof (RBIpodStaticPlaylistSourcePrivate));
- }
- 
-@@ -139,20 +284,27 @@ rb_ipod_static_playlist_source_init (RBIpodStaticPlaylistSource *source)
- static void
- rb_ipod_static_playlist_source_constructed (GObject *object)
- {
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (object);
-+	RhythmDBQueryModel *model;
-+
- 	RB_CHAIN_GOBJECT_METHOD (rb_ipod_static_playlist_source_parent_class, constructed, object);
-+
- 	g_signal_connect (object, "notify::name", (GCallback)source_name_changed_cb, NULL);
--}
- 
--static void
--rb_ipod_static_playlist_source_dispose (GObject *object)
--{
--	G_OBJECT_CLASS (rb_ipod_static_playlist_source_parent_class)->dispose (object);
-+	g_object_get (object, "base-query-model", &model, NULL);
-+	g_signal_connect (priv->ipod_db, "before-save",
-+			  G_CALLBACK (playlist_before_save),
-+			  object);
-+	g_object_unref (model);
-+	playlist_source_model_connect_signals (RB_IPOD_STATIC_PLAYLIST_SOURCE (object));
-+
- }
- 
- static void
--impl_delete_thyself (RBDisplayPage *page)
-+rb_ipod_static_playlist_source_dispose (GObject *object)
- {
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (page);
-+	RBIpodStaticPlaylistSource *source = RB_IPOD_STATIC_PLAYLIST_SOURCE (object);
-+	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (object);
- 
- 	if (priv->ipod_source) {
- 		g_object_unref (priv->ipod_source);
-@@ -162,8 +314,10 @@ impl_delete_thyself (RBDisplayPage *page)
- 		g_object_unref (priv->ipod_db);
- 		priv->ipod_db = NULL;
- 	}
--	
--	RB_DISPLAY_PAGE_CLASS (rb_ipod_static_playlist_source_parent_class)->delete_thyself (page);
-+
-+	playlist_source_model_disconnect_signals (source);
-+
-+	G_OBJECT_CLASS (rb_ipod_static_playlist_source_parent_class)->dispose (object);
- }
- 
- RBIpodStaticPlaylistSource *
-@@ -209,9 +363,6 @@ rb_ipod_static_playlist_source_set_property (GObject *object,
- 	case PROP_ITDB_PLAYLIST:
- 		priv->itdb_playlist = g_value_get_pointer (value);
- 		break;
--	case PROP_WAS_REORDERED:
--		priv->was_reordered = g_value_get_boolean (value);
--		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
-@@ -236,56 +387,12 @@ rb_ipod_static_playlist_source_get_property (GObject *object,
- 	case PROP_ITDB_PLAYLIST:
- 		g_value_set_pointer (value, priv->itdb_playlist);
- 		break;
--	case PROP_WAS_REORDERED:
--		g_value_set_boolean (value, priv->was_reordered);
--		break;
- 	default:
- 		G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
- 		break;
- 	}
- }
- 
--
--Itdb_Playlist*
--rb_ipod_static_playlist_source_get_itdb_playlist (RBIpodStaticPlaylistSource *playlist)
--{
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (playlist);
--
--	return priv->itdb_playlist;
--}
--
--RBiPodSource*
--rb_ipod_static_playlist_source_get_ipod_source (RBIpodStaticPlaylistSource *playlist)
--{
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (playlist);
--
--	return priv->ipod_source;
--}
--
--RbIpodDb*
--rb_ipod_static_playlist_source_get_ipod_db (RBIpodStaticPlaylistSource *playlist)
--{
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (playlist);
--
--	return priv->ipod_db;
--}
--
--gboolean
--rb_ipod_static_playlist_source_get_was_reordered (RBIpodStaticPlaylistSource *playlist)
--{
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (playlist);
--
--	return priv->was_reordered;
--}
--
--void
--rb_ipod_static_playlist_source_set_was_reordered (RBIpodStaticPlaylistSource *playlist, gboolean was_reordered)
--{
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (playlist);
--
--	priv->was_reordered = was_reordered;
--}
--
- static gboolean
- impl_show_popup (RBDisplayPage *page)
- {
-@@ -293,23 +400,6 @@ impl_show_popup (RBDisplayPage *page)
- 	return TRUE;
- }
- 
--static void
--source_name_changed_cb (RBIpodStaticPlaylistSource *source,
--			GParamSpec *spec,
--			gpointer data)
--{
--	RBIpodStaticPlaylistSourcePrivate *priv = IPOD_STATIC_PLAYLIST_SOURCE_GET_PRIVATE (source);
--	char *name;
--
--	g_object_get (source, "name", &name, NULL);
--
--	if ((priv->itdb_playlist != NULL) && (strcmp (name, priv->itdb_playlist->name) != 0)) {
--		rb_debug ("changing playlist name to %s", name);
--		rb_ipod_db_rename_playlist (priv->ipod_db, priv->itdb_playlist, name);
--	}
--	g_free (name);
--}
--
- void
- _rb_ipod_static_playlist_source_register_type (GTypeModule *module)
- {
-diff --git a/plugins/ipod/rb-ipod-static-playlist-source.h b/plugins/ipod/rb-ipod-static-playlist-source.h
-index 49c833f..383b447 100644
---- a/plugins/ipod/rb-ipod-static-playlist-source.h
-+++ b/plugins/ipod/rb-ipod-static-playlist-source.h
-@@ -54,12 +54,6 @@ RBIpodStaticPlaylistSource *	rb_ipod_static_playlist_source_new (RBShell *shell,
- 								    Itdb_Playlist *playlist,
- 								    RhythmDBEntryType *entry_type);
- 
--Itdb_Playlist* rb_ipod_static_playlist_source_get_itdb_playlist (RBIpodStaticPlaylistSource *playlist);
--RBiPodSource* rb_ipod_static_playlist_source_get_ipod_source (RBIpodStaticPlaylistSource *playlist);
--RbIpodDb* rb_ipod_static_playlist_source_get_ipod_db (RBIpodStaticPlaylistSource *playlist);
--gboolean rb_ipod_static_playlist_source_get_was_reordered (RBIpodStaticPlaylistSource *playlist);
--void rb_ipod_static_playlist_source_set_was_reordered (RBIpodStaticPlaylistSource *playlist, gboolean was_reordered);
--
- G_END_DECLS
- 
- #endif /* __RB_IPOD_STATIC_PLAYLIST_SOURCE_H */
---
-cgit v0.9.0.2
 
=== removed file 'debian/patches/git_local_art_search_typo.patch'
--- debian/patches/git_local_art_search_typo.patch	2012-03-16 11:11:59 +0000
+++ debian/patches/git_local_art_search_typo.patch	1970-01-01 00:00:00 +0000
@@ -1,23 +0,0 @@
-From b1887b43d6543021dd8e6266e6acdbcfb030feda Mon Sep 17 00:00:00 2001
-From: Jonathan Matthew <[e-mail]>
-Date: Mon, 12 Mar 2012 22:42:42 +0000
-Subject: artsearch: fix typo in local search (bug #671950)
-
-spotted by Patrice Duroux <[e-mail]>
----
-diff --git a/plugins/artsearch/local.py b/plugins/artsearch/local.py
-index a914b1d..819fbaa 100644
---- a/plugins/artsearch/local.py
-+++ b/plugins/artsearch/local.py
-@@ -73,7 +73,7 @@ class LocalSearch:
- 					nkey.add_field("artist", artist)
- 					uri = parent.resolve_relative_path(f_name).get_uri()
- 					print "found album+artist match " + uri
--					self.store.store_uri(nkey. RB.ExtDBSourceType.USER, uri)
-+					self.store.store_uri(nkey, RB.ExtDBSourceType.USER, uri)
- 
- 		# if that didn't work, look for the longest shared prefix
- 		# only accept matches longer than 2 to avoid weird false positives
---
-cgit v0.9.0.2
-
 
=== removed file 'debian/patches/git_magnatune_dialog_segfault.patch'
--- debian/patches/git_magnatune_dialog_segfault.patch	2012-03-16 11:11:59 +0000
+++ debian/patches/git_magnatune_dialog_segfault.patch	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-From 7b344c68e25ec6ac61b4eef15659316d7859ed91 Mon Sep 17 00:00:00 2001
-From: Ole Laursen <[e-mail]>
-Date: Wed, 14 Mar 2012 21:35:48 +0000
-Subject: magnatune: fix crash opening preferences dialog (bug #672084)
-
----
-diff --git a/plugins/magnatune/magnatune.py b/plugins/magnatune/magnatune.py
-index ce2aeb3..e88f0e2 100644
---- a/plugins/magnatune/magnatune.py
-+++ b/plugins/magnatune/magnatune.py
-@@ -214,8 +214,8 @@ class MagnatuneConfig(GObject.GObject, PeasGtk.Configurable):
- 			builder.get_object("stream_account_radio").set_active(account_type == "stream")
- 			builder.get_object("download_account_radio").set_active(account_type == "download")
- 
--			builder.get_object("username_entry").set_text(username)
--			builder.get_object("password_entry").set_text(password)
-+			builder.get_object("username_entry").set_text(username or "")
-+			builder.get_object("password_entry").set_text(password or "")
- 
- 			update_sensitivity(account_type)
- 
---
-cgit v0.9.0.2
-
 
=== removed file 'debian/patches/git_mpris_playlists.patch'
--- debian/patches/git_mpris_playlists.patch	2012-04-05 19:23:42 +0000
+++ debian/patches/git_mpris_playlists.patch	1970-01-01 00:00:00 +0000
@@ -1,118 +0,0 @@
-Index: rhythmbox-2.96/sources/rb-display-page-model.c
-===================================================================
---- rhythmbox-2.96.orig/sources/rb-display-page-model.c	2012-03-10 11:22:26.000000000 +0100
-+++ rhythmbox-2.96/sources/rb-display-page-model.c	2012-04-05 21:22:35.725425083 +0200
-@@ -70,6 +70,7 @@
- enum
- {
- 	DROP_RECEIVED,
-+	PAGE_INSERTED,
- 	LAST_SIGNAL
- };
- 
-@@ -670,6 +671,7 @@
- 				           RB_DISPLAY_PAGE_MODEL_COLUMN_PLAYING, FALSE,
- 					   RB_DISPLAY_PAGE_MODEL_COLUMN_PAGE, page,
- 					   -1);
-+	g_signal_emit (G_OBJECT (page_model), rb_display_page_model_signals[PAGE_INSERTED], 0, page, &iter);
- 
- 	g_signal_connect_object (page, "notify::name", G_CALLBACK (page_notify_cb), page_model, 0);
- 	g_signal_connect_object (page, "notify::visibility", G_CALLBACK (page_notify_cb), page_model, 0);
-@@ -872,6 +874,27 @@
- 			      3,
- 			      RB_TYPE_DISPLAY_PAGE, G_TYPE_INT, G_TYPE_POINTER);
- 
-+	/**
-+	 * RBDisplayPageModel::page-inserted:
-+	 * @model: the #RBDisplayPageModel
-+	 * @page: the #RBDisplayPage that was inserted
-+	 * @iter: a #GtkTreeIter indicating the page position
-+	 *
-+	 * Emitted when a new page is inserted into the model.
-+	 * Use this instead of GtkTreeModel::row-inserted as this
-+	 * doesn't get complicated by visibility filtering.
-+	 */
-+	rb_display_page_model_signals[PAGE_INSERTED] =
-+		g_signal_new ("page-inserted",
-+			      G_OBJECT_CLASS_TYPE (object_class),
-+			      G_SIGNAL_RUN_LAST,
-+			      G_STRUCT_OFFSET (RBDisplayPageModelClass, page_inserted),
-+			      NULL, NULL,
-+			      NULL,
-+			      G_TYPE_NONE,
-+			      2,
-+			      RB_TYPE_DISPLAY_PAGE, GTK_TYPE_TREE_ITER);
-+
- 	if (!drag_target_list) {
- 		drag_target_list = gtk_target_list_new (dnd_targets, G_N_ELEMENTS (dnd_targets));
- 	}
-Index: rhythmbox-2.96/sources/rb-display-page-model.h
-===================================================================
---- rhythmbox-2.96.orig/sources/rb-display-page-model.h	2012-02-27 11:08:45.000000000 +0100
-+++ rhythmbox-2.96/sources/rb-display-page-model.h	2012-04-05 21:22:35.725425083 +0200
-@@ -67,6 +67,9 @@
- 			       RBDisplayPage *target,
- 			       GtkTreeViewDropPosition pos,
- 			       GtkSelectionData *data);
-+	void (*page_inserted) (RBDisplayPageModel *model,
-+			       RBDisplayPage *page,
-+			       GtkTreeIter *iter);
- };
- 
- GType		rb_display_page_model_get_type	(void);
-Index: rhythmbox-2.96/plugins/mpris/rb-mpris-plugin.c
-===================================================================
---- rhythmbox-2.96.orig/plugins/mpris/rb-mpris-plugin.c	2012-03-10 11:22:26.000000000 +0100
-+++ rhythmbox-2.96/plugins/mpris/rb-mpris-plugin.c	2012-04-05 21:22:35.729425083 +0200
-@@ -1346,14 +1346,9 @@
- 	add_playlist_property_change (plugin, "PlaylistCount", g_variant_new_uint32 (plugin->playlist_count));
- }
- 
--static gboolean
--display_page_inserted_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, RBMprisPlugin *plugin)
-+static void
-+display_page_inserted_cb (RBDisplayPageModel *model, RBDisplayPage *page, GtkTreeIter *iter, RBMprisPlugin *plugin)
- {
--	RBDisplayPage *page;
--
--	gtk_tree_model_get (model, iter,
--			    RB_DISPLAY_PAGE_MODEL_COLUMN_PAGE, &page,
--			    -1);
- 	if (RB_IS_PLAYLIST_SOURCE (page)) {
- 		gboolean is_local;
- 
-@@ -1371,11 +1366,19 @@
- 			g_signal_connect_object (page, "deleted", G_CALLBACK (source_deleted_cb), plugin, 0);
- 		}
- 	}
-+}
-+
-+static gboolean
-+display_page_foreach_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter, RBMprisPlugin *plugin)
-+{
-+	RBDisplayPage *page;
-+
-+	gtk_tree_model_get (model, iter, RB_DISPLAY_PAGE_MODEL_COLUMN_PAGE, &page, -1);
-+	display_page_inserted_cb (RB_DISPLAY_PAGE_MODEL (model), page, iter, plugin);
- 
- 	return FALSE;
- }
- 
--
- static void
- name_acquired_cb (GDBusConnection *connection, const char *name, RBMprisPlugin *plugin)
- {
-@@ -1499,11 +1502,11 @@
- 				 G_CALLBACK (elapsed_nano_changed_cb),
- 				 plugin, 0);
- 	g_signal_connect_object (plugin->page_model,
--				 "row-inserted",
-+				 "page-inserted",
- 				 G_CALLBACK (display_page_inserted_cb),
- 				 plugin, 0);
- 	gtk_tree_model_foreach (GTK_TREE_MODEL (plugin->page_model),
--				(GtkTreeModelForeachFunc) display_page_inserted_cb,
-+				(GtkTreeModelForeachFunc) display_page_foreach_cb,
- 				plugin);
- 
- 	plugin->art_store = rb_ext_db_new ("album-art");
 
=== removed file 'debian/patches/git_playlists_sync_segfault.patch'
--- debian/patches/git_playlists_sync_segfault.patch	2012-03-16 11:11:59 +0000
+++ debian/patches/git_playlists_sync_segfault.patch	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-From d6127eba18bf088f3a43a3a693cad8691b061d39 Mon Sep 17 00:00:00 2001
-From: Cole Robinson <[e-mail]>
-Date: Mon, 12 Mar 2012 23:10:31 +0000
-Subject: ipod: Fix segfault when syncing playlists (bz 661217)
-
-Signed-off-by: Cole Robinson <[e-mail]>
----
-diff --git a/plugins/ipod/rb-ipod-static-playlist-source.c b/plugins/ipod/rb-ipod-static-playlist-source.c
-index 261c4c4..d389baa 100644
---- a/plugins/ipod/rb-ipod-static-playlist-source.c
-+++ b/plugins/ipod/rb-ipod-static-playlist-source.c
-@@ -311,6 +311,10 @@ rb_ipod_static_playlist_source_dispose (GObject *object)
- 		priv->ipod_source = NULL;
- 	}
- 	if (priv->ipod_db) {
-+		g_signal_handlers_disconnect_by_func (priv->ipod_db,
-+						      G_CALLBACK (playlist_before_save),
-+						      source);
-+
- 		g_object_unref (priv->ipod_db);
- 		priv->ipod_db = NULL;
- 	}
---
-cgit v0.9.0.2
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2012-05-14 04:30:50 +0000
+++ debian/patches/series	2012-06-04 10:19:20 +0000
@@ -3,9 +3,3 @@
 04_pause_button.patch
 05_hide_on_quit.patch
 07_quicklists.patch
-git_local_art_search_typo.patch
-git_magnatune_dialog_segfault.patch
-git_ipod_no_private_source.patch
-git_ipod_playlist_handler.patch
-git_playlists_sync_segfault.patch
-git_mpris_playlists.patch
 
=== modified file 'debian/rhythmbox-plugins.install'
--- debian/rhythmbox-plugins.install	2012-03-14 09:14:08 +0000
+++ debian/rhythmbox-plugins.install	2012-06-04 10:19:20 +0000
@@ -1,5 +1,3 @@
-usr/lib/rhythmbox/plugins/artdisplay
-usr/share/rhythmbox/plugins/artdisplay
 usr/lib/rhythmbox/plugins/artsearch
 usr/lib/rhythmbox/plugins/audioscrobbler
 usr/share/rhythmbox/plugins/audioscrobbler
 
=== modified file 'debian/rhythmbox.gsettings-override'
--- debian/rhythmbox.gsettings-override	2011-12-16 12:45:30 +0000
+++ debian/rhythmbox.gsettings-override	2012-06-04 10:19:20 +0000
@@ -2,4 +2,4 @@
 monitor-library=true
 
 [org.gnome.rhythmbox.plugins]
-active-plugins=['artdisplay','audiocd','audioscrobbler','cd-recorder','daap','dbus-media-server','generic-player','ipod','iradio','mmkeys','mpris','mtpdevice','notification','power-manager']
+active-plugins=['audiocd','audioscrobbler','cd-recorder','daap','dbus-media-server','generic-player','ipod','iradio','mmkeys','mpris','mtpdevice','notification','power-manager']