* src/itdb.h: changed 'gchar *chapterdata' to 'gpointer

	  chapterdata' with note that chapterdata is not yet supported.

	* src/itdb_track.c (itdb_track_duplicate): arrange the strings in
	  the same order as in Itdb_Track for easier error-checking.


git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1413 f01d2545-417e-4e96-918e-98f8d0dbbcb6

2 files changed, 7 insertions, 9 deletions

diff --git a/src/itdb.h b/src/itdb.h
index 05cc0e2..ed9a89e 100644
--- a/src/itdb.h
+++ b/src/itdb.h
@@ -1,5 +1,4 @@
-/* Time-stamp: <2007-02-25 13:26:22 jcs>
-|
+/*
 |  Copyright (C) 2002-2006 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
 | 
@@ -670,7 +669,7 @@ struct _Itdb_Track
   gchar   *description;      /* see note for MHOD_ID in itdb_itunesdb.c */
   gchar   *podcasturl;       /* see note for MHOD_ID in itdb_itunesdb.c */
   gchar   *podcastrss;       /* see note for MHOD_ID in itdb_itunesdb.c */
-  gchar   *chapterdata;      /* see note for MHOD_ID in itdb_itunesdb.c */
+  gpointer chapterdata;      /* not yet supported. Help welcome.        */
   gchar   *subtitle;         /* see note for MHOD_ID in itdb_itunesdb.c */
 /* the following 6 are new in libgpod 0.4.2... */
   gchar   *tvshow;           /* see note for MHOD_ID in itdb_itunesdb.c */
diff --git a/src/itdb_track.c b/src/itdb_track.c
index ca52528..d7e7933 100644
--- a/src/itdb_track.c
+++ b/src/itdb_track.c
@@ -1,5 +1,4 @@
-/* Time-stamp: <2006-11-23 23:32:16 jcs>
-|
+/*
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
 | 
@@ -337,14 +336,14 @@ Itdb_Track *itdb_track_duplicate (Itdb_Track *tr)
 
     /* copy strings */
     tr_dup->title = g_strdup (tr->title);
-    tr_dup->artist = g_strdup (tr->artist);
     tr_dup->album = g_strdup (tr->album);
+    tr_dup->artist = g_strdup (tr->artist);
     tr_dup->genre = g_strdup (tr->genre);
-    tr_dup->composer = g_strdup (tr->composer);
-    tr_dup->comment = g_strdup (tr->comment);
     tr_dup->filetype = g_strdup (tr->filetype);
-    tr_dup->grouping = g_strdup (tr->grouping);
+    tr_dup->comment = g_strdup (tr->comment);
     tr_dup->category = g_strdup (tr->category);
+    tr_dup->composer = g_strdup (tr->composer);
+    tr_dup->grouping = g_strdup (tr->grouping);
     tr_dup->description = g_strdup (tr->description);
     tr_dup->podcasturl = g_strdup (tr->podcasturl);
     tr_dup->podcastrss = g_strdup (tr->podcastrss);