commit 9bda17fc5bda9db8337e651af4d78e51663302f8 Author: Christophe Fergeau <t...@gnome.org> Date: Sat Jan 1 14:05:28 2011 +0100
fix nano5g support It was broken when adding hashAB support because even if the nano5g says it uses DBVersion 3, it expects Locations.itdb.cbk to be checksummed using a hash72 (as if it was a DBVersion 4 device). src/itdb_sqlite.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) --- diff --git a/src/itdb_sqlite.c b/src/itdb_sqlite.c index 4e0197a..2ce764e 100644 --- a/src/itdb_sqlite.c +++ b/src/itdb_sqlite.c @@ -2077,6 +2077,10 @@ static gboolean mk_Locations_cbk(Itdb_iTunesDB *itdb, const char *dirname) case ITDB_CHECKSUM_HASHAB: cbk_header_size = 57; break; + case ITDB_CHECKSUM_HASH58: + /* the nano 5g advertises DBVersion 3 but expects an hash72 on + * its cbk file. + */ case ITDB_CHECKSUM_HASH72: cbk_header_size = 46; break; @@ -2106,6 +2110,10 @@ static gboolean mk_Locations_cbk(Itdb_iTunesDB *itdb, const char *dirname) case ITDB_CHECKSUM_HASHAB: success = itdb_hashAB_compute_hash_for_sha1 (itdb->device, final_sha1, cbk_hash, NULL); break; + case ITDB_CHECKSUM_HASH58: + /* the nano 5g advertises DBVersion 3 but expects an hash72 on + * its cbk file. + */ case ITDB_CHECKSUM_HASH72: success = itdb_hash72_compute_hash_for_sha1 (itdb->device, final_sha1, cbk_hash, NULL); break; ------------------------------------------------------------------------------ Learn how Oracle Real Application Clusters (RAC) One Node allows customers to consolidate database storage, standardize their database environment, and, should the need arise, upgrade to a full multi-node Oracle RAC database without downtime or disruption http://p.sf.net/sfu/oracle-sfdevnl _______________________________________________ gtkpod-cvs2 mailing list gtkpod-cvs2@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2