[gtpd-cvs] gtkpod/src file_itunesdb.c,1.66,1.67

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

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

Modified Files:
	file_itunesdb.c 
Log Message:
	 * file_itunesdb.c: bugfix: tracks marked for deletion were
           not deleted from the iPod.



Index: file_itunesdb.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_itunesdb.c,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- file_itunesdb.c	9 Nov 2005 23:58:59 -0000	1.66
+++ file_itunesdb.c	12 Nov 2005 09:22:14 -0000	1.67
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-10 08:57:52 jcs>
+/* Time-stamp: <2005-11-12 18:10:50 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -1077,7 +1077,6 @@
   gboolean result = TRUE;
   static gboolean abort_flag;
   ExtraiTunesDBData *eitdb;
-  const gchar *mp = NULL;
 #ifdef G_THREADS_ENABLED
   GThread *thread = NULL;
   GTimeVal gtime;
@@ -1085,6 +1084,8 @@
   if (!cond) cond = g_cond_new ();
 #endif
 
+
+
   g_return_val_if_fail (itdb, FALSE);
   eitdb = itdb->userdata;
   g_return_val_if_fail (eitdb, FALSE);
@@ -1096,8 +1097,7 @@
 
   if (itdb->usertype & GP_ITDB_TYPE_IPOD)
   {
-      mp = prefs_get_ipod_mount ();
-      g_return_val_if_fail (mp, FALSE);
+      g_return_val_if_fail (itdb->mountpoint, FALSE);
   }
 
   abort_flag = FALSE;
@@ -1117,7 +1117,9 @@
 
       if (itdb->usertype & GP_ITDB_TYPE_IPOD)
       {
-	  filename = get_file_name_on_ipod (track);
+	  track->itdb = itdb;
+	  filename = itdb_filename_on_ipod (track);
+	  track->itdb = NULL;
       }
       if (itdb->usertype & GP_ITDB_TYPE_LOCAL)
       {