diff -ur rb-cvs2/plugins/ipod/CVS/Entries rb-cvs/plugins/ipod/CVS/Entries
--- rb-cvs2/plugins/ipod/CVS/Entries	2006-05-14 21:50:09.845128627 +0200
+++ rb-cvs/plugins/ipod/CVS/Entries	2006-05-14 20:50:07.013176397 +0200
@@ -1,5 +1,5 @@
 /.cvsignore/1.1/Tue May  9 08:52:16 2006//
-/Makefile.am/1.2/Fri May 12 16:04:47 2006//
-/ipod.rb-plugin.desktop.in/1.1/Mon Apr 17 14:35:25 2006//
-/rb-ipod-plugin.c/1.2/Thu Apr 20 20:43:24 2006//
+/Makefile.am/1.2/Sun May 14 18:50:06 2006//
+/ipod.rb-plugin.desktop.in/1.1/Sun May 14 18:50:06 2006//
+/rb-ipod-plugin.c/1.2/Sun May 14 18:50:07 2006//
 D
Seulement dans rb-cvs/plugins/ipod/: .deps
Seulement dans rb-cvs/plugins/ipod/: librbipodmanager.la
Seulement dans rb-cvs/plugins/ipod/: .libs
Seulement dans rb-cvs/plugins/ipod/: Makefile
Seulement dans rb-cvs/plugins/ipod/: .#Makefile.am.1.1
Seulement dans rb-cvs/plugins/ipod/: .#Makefile.am.1.2
Seulement dans rb-cvs/plugins/ipod/: Makefile.am.rej
Seulement dans rb-cvs/plugins/ipod/: Makefile.in
diff -ur rb-cvs2/plugins/ipod/rb-ipod.c rb-cvs/plugins/ipod/rb-ipod.c
--- rb-cvs2/plugins/ipod/rb-ipod.c	2006-05-14 21:52:41.969853486 +0200
+++ rb-cvs/plugins/ipod/rb-ipod.c	2006-05-14 21:26:31.896321331 +0200
@@ -436,6 +436,8 @@
 	g_return_val_if_fail (playlist != NULL, NULL);
 	g_return_val_if_fail (playlist->userdata != NULL, NULL);
 
+	pdata = rb_ipod_playlist_get_data (playlist);
+
 	switch (propid) {
 		case RB_IPOD_PLAYLIST_PROP_NAME:
 			return pdata->name;
Seulement dans rb-cvs/plugins/ipod/: rb-ipod.c~
Seulement dans rb-cvs/plugins/ipod/: rb-ipod.lo
diff -ur rb-cvs2/plugins/ipod/rb-ipod-manager.c rb-cvs/plugins/ipod/rb-ipod-manager.c
--- rb-cvs2/plugins/ipod/rb-ipod-manager.c	2006-05-14 21:52:41.994847034 +0200
+++ rb-cvs/plugins/ipod/rb-ipod-manager.c	2006-05-14 21:36:41.392748414 +0200
@@ -628,8 +628,10 @@
 		return FALSE;
 	}
 
-	if (g_list_find_custom (manager->priv->removed_playlists,
-				cmp_data, cmp_func) != NULL) {
+	node = g_list_find_custom (manager->priv->removed_playlists,
+				   cmp_data, cmp_func);
+
+	if (node != NULL) {
 		/* adding a removed playlist: keep the previous playlist and
 		 * if necessary free the one passed as argument now */
 		orig_playlist = (Itdb_Playlist *) node->data;
Seulement dans rb-cvs/plugins/ipod/: rb-ipod-manager.c~
Seulement dans rb-cvs/plugins/ipod/: rb-ipod-manager.lo
Seulement dans rb-cvs/plugins/ipod/: rb-ipod-manager.o
Seulement dans rb-cvs/plugins/ipod/: rb-ipod.o
Seulement dans rb-cvs/plugins/ipod/: .#rb-ipod-plugin.c.1.1
Seulement dans rb-cvs/plugins/ipod/: rb-ipod-plugin.lo
Seulement dans rb-cvs/plugins/ipod/: rb-ipod-plugin.o
