* applied Chrisophe's patch to make libgdk optional

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

5 files changed, 34 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 496c38d..8392143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2005-09-29  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* applied Chrisophe's patch to make libgdk optional
+
+2005-09-27  Jorg Schuler <jcsjcs at users.sourceforge.net>
+
+	* src/itdb_track.c: include thumbnails into itdb_track_duplicate()
+	  (Christophe Fergeau)
+
+	* src/db-image-parser.c: support for iPod nano (Christophe
+	  Fergeau)
+
+	* configure.c: make MacOS compatible (Tristan O'Tierney)
+
 2005-09-27  Jorg Schuler <jcsjcs at users.sourceforge.net>
 
 	* .cvsignore: added reasonable defaults in ./ ./src/ ./tests ./po
diff --git a/configure.ac b/configure.ac
index 4cbed98..2db2349 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,9 @@ AC_SUBST(LIBGPOD_LIBS)
 
 PKG_CHECK_MODULES(GDKPIXBUF, gdk-pixbuf-2.0, have_gdkpixbuf=yes, have_gdkpibux=no)
 AM_CONDITIONAL(HAVE_GDKPIXBUF, test x"$have_gdkpixbuf" = xyes)
+if test x"have_gdkpixbuf" = xyes; then
+   AC_DEFINE_UNQUOTED(HAVE_GDKPIXBUF,1, [Whether gdk-pixbuf is installed, ArtworkDB writing support will be disabled if it can't be found])
+fi
 AC_SUBST(GDKPIXBUF_CFLAGS)
 AC_SUBST(GDKPIXBUF_LIBS)
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 917d9fa..ee75854 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,7 @@ lib_LTLIBRARIES = libgpod.la
 if HAVE_GDKPIXBUF
 ARTWORKDB_WRITER_FILES=	db-artwork-writer.c ithumb-writer.c
 else
-ARTWORKDB_WRITER_FILES=
+ARTWORKDB_WRITER_FILES= db-artwork-writer-dummy.c
 endif
 
 libgpod_la_SOURCES = \
diff --git a/src/itdb_playlist.c b/src/itdb_playlist.c
index 7e3bebb..96736de 100644
--- a/src/itdb_playlist.c
+++ b/src/itdb_playlist.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-09-24 13:25:33 jcs>
+/* Time-stamp: <2005-09-29 21:04:45 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -939,7 +939,7 @@ Itdb_Playlist *itdb_playlist_duplicate (Itdb_Playlist *pl)
 
     g_return_val_if_fail (pl, NULL);
 
-    pl_dup = g_new0 (Itdb_Playlist, 1);
+    pl_dup = g_new (Itdb_Playlist, 1);
     memcpy (pl_dup, pl, sizeof (Itdb_Playlist));
     /* clear list heads */
     pl_dup->members = NULL;
diff --git a/src/itdb_track.c b/src/itdb_track.c
index 34495b3..162abbe 100644
--- a/src/itdb_track.c
+++ b/src/itdb_track.c
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-09-29 00:01:38 jcs>
+/* Time-stamp: <2005-09-29 21:02:05 jcs>
 |
 |  Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
 |  Part of the gtkpod project.
@@ -27,6 +27,8 @@
 |  $Id$
 */
 
+#include <config.h>
+
 #include "itdb_private.h"
 #include <string.h>
 #include <glib/gstdio.h>
@@ -229,7 +231,7 @@ static GList *dup_thumbnails (GList *thumbnails)
 	image = (Itdb_Image *)it->data;
 	g_return_val_if_fail (image, NULL);
 
-	new_image = g_new0 (Itdb_Image, 1);
+	new_image = g_new (Itdb_Image, 1);
 	memcpy (new_image, image, sizeof (Itdb_Image));
 	new_image->filename = g_strdup (image->filename);
 	
@@ -246,7 +248,7 @@ Itdb_Track *itdb_track_duplicate (Itdb_Track *tr)
 
     g_return_val_if_fail (tr, NULL);
 
-    tr_dup = g_new0 (Itdb_Track, 1);
+    tr_dup = g_new (Itdb_Track, 1);
     memcpy (tr_dup, tr, sizeof (Itdb_Track));
 
     /* clear itdb pointer */
@@ -368,6 +370,8 @@ itdb_track_remove_thumbnail (Itdb_Track *song)
 }
 
 
+#ifdef HAVE_GDKPIXBUF
+/* This operation doesn't make sense when we can't save thumbnail files */
 int 
 itdb_track_set_thumbnail (Itdb_Track *song, const char *filename)
 {
@@ -384,3 +388,10 @@ itdb_track_set_thumbnail (Itdb_Track *song, const char *filename)
 
     return 0;
 }
+#else
+int 
+itdb_track_set_thumbnail (Itdb_Track *song, const char *filename)
+{
+    return -1;
+}
+#endif