[gtpd-cvs] SF.net SVN: gtkpod:[2379] gtkpod/trunk

[<pha...@us...>]

Revision: 2379
          http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2379&view=rev
Author:   phantom_sf
Date:     2009-08-07 20:49:30 +0000 (Fri, 07 Aug 2009)

Log Message:
-----------
2009-08-07 Paul Richardson <phantom_sf at users.sourceforge.net>

        * src/files_itunes.db
          Patch because iphones with os 3.0 only have an iTunesCDB
          file and no iTunesDB file. Thanks to teuf for patch

Modified Paths:
--------------
    gtkpod/trunk/ChangeLog
    gtkpod/trunk/src/file_itunesdb.c

Modified: gtkpod/trunk/ChangeLog
===================================================================
--- gtkpod/trunk/ChangeLog	2009-08-02 16:42:18 UTC (rev 2378)
+++ gtkpod/trunk/ChangeLog	2009-08-07 20:49:30 UTC (rev 2379)
@@ -1,3 +1,9 @@
+2009-08-07 Paul Richardson <phantom_sf at users.sourceforge.net>
+
+	* src/files_itunes.db
+	  Patch because iphones with os 3.0 only have an iTunesCDB
+	  file and no iTunesDB file. Thanks to teuf for patch
+
 2009-08-02 Paul Richardson <phantom_sf at users.sourceforge.net>
 
 	* syncdir.c (sync_playlist):

Modified: gtkpod/trunk/src/file_itunesdb.c
===================================================================
--- gtkpod/trunk/src/file_itunesdb.c	2009-08-02 16:42:18 UTC (rev 2378)
+++ gtkpod/trunk/src/file_itunesdb.c	2009-08-07 20:49:30 UTC (rev 2379)
@@ -524,14 +524,11 @@
     { /* GP_ITDB_TYPE_IPOD _and_ iPod is connected */
 	gchar *name_ext=NULL, *name_db=NULL;
 
-	gchar *itunes_dir = itdb_get_itunes_dir (mp);
-	if (itunes_dir)
-	{
-	    name_ext = itdb_get_path (itunes_dir, "iTunesDB.ext");
-	    name_db  = itdb_get_path (itunes_dir, "iTunesDB");
-	}
+	name_db = itdb_get_itunesdb_path (mp);
 	if (name_db)
 	{
+	    name_ext = g_strdup_printf("%s.ext", name_db);
+
 	    if (WRITE_EXTENDED_INFO)
 	    {
 		if (!read_extended_info (name_ext, name_db))
@@ -571,7 +568,6 @@
 	}
 	g_free (name_ext);
 	g_free (name_db);
-	g_free (itunes_dir);
     }
     g_free (cfgdir);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.