[gtpd-cvs] gtkpod/src display_itdb.c,1.68,1.69

[<jc...@us...>]

Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv26045/src

Modified Files:
	display_itdb.c 
Log Message:
	* src/display_itdb.c (gp_playlist_remove_track): podcasts
          could not be removed from the iPod.



Index: display_itdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_itdb.c,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- display_itdb.c	11 May 2007 15:41:53 -0000	1.68
+++ display_itdb.c	16 May 2007 13:54:23 -0000	1.69
@@ -628,10 +628,8 @@
     case DELETE_ACTION_IPOD:
     case DELETE_ACTION_LOCAL:
     case DELETE_ACTION_DATABASE:
-	/* remove from MPL in these cases (unless we are removing
-	   podcasts) */
-	if (!(plitem && itdb_playlist_is_podcasts (plitem)))
-	    plitem = NULL;
+	/* remove from MPL in these cases */
+	plitem = NULL;
 	break;
     case DELETE_ACTION_PLAYLIST:
 	/* cannot remove from MPL */
@@ -652,6 +650,8 @@
     /* remove track from playlist */
     itdb_playlist_remove_track (plitem, track);
 
+#if 0
+    /* podcasts are no longer treated differently from other playlists */
     /* if we removed a podcasts, remove it from memory as well, unless
        it's present in the MPL (this happens if this podcast was on
        the iPod as podcast as well as standard track) */
@@ -673,6 +673,7 @@
 	    gp_track_set_flags_default (track);
 	}
     }
+#endif
 
     if (itdb_playlist_is_mpl (plitem))
     { /* if it's the MPL, we remove the track permanently */