Update of /cvsroot/gtkpod/libgpod/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26936/src Modified Files: db-artwork-writer.c db-parse-context.c ipod-device.c itdb_private.h itdb_track.c ithumb-writer.c Log Message: 2005-11-21 Christophe Fergeau <te...@gn...> * src/db-artwork-writer.c: (write_mhod_type_3): * src/db-parse-context.c: * src/ipod-device.c: * src/itdb_private.h: * src/itdb_track.c: * src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some changes which should help compiling with glib 2.4 Index: db-artwork-writer.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/db-artwork-writer.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- db-artwork-writer.c 2 Nov 2005 19:11:29 -0000 1.7 +++ db-artwork-writer.c 21 Nov 2005 20:09:53 -0000 1.8 @@ -314,6 +314,10 @@ break; default: g_assert_not_reached (); + /* Set filename to NULL to shut gcc up when compiling with + * glib 2.4 + */ + filename = NULL; } len = strlen (filename); Index: db-parse-context.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/db-parse-context.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- db-parse-context.c 22 Sep 2005 18:16:50 -0000 1.2 +++ db-parse-context.c 21 Nov 2005 20:09:53 -0000 1.3 @@ -32,7 +32,7 @@ #include <unistd.h> #include <glib.h> - +#include "glib-compat.h" #include "db-parse-context.h" #include "db-itunes-parser.h" Index: ipod-device.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/ipod-device.c,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- ipod-device.c 21 Nov 2005 19:50:27 -0000 1.7 +++ ipod-device.c 21 Nov 2005 20:09:53 -0000 1.8 @@ -68,6 +68,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "glib-compat.h" #include <stdlib.h> #include <stdio.h> @@ -78,7 +79,6 @@ #include <string.h> #include <ctype.h> #include <errno.h> -#include <glib/gstdio.h> #include "hal-common.h" #include "ipod-device.h" Index: itdb_private.h =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb_private.h,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- itdb_private.h 15 Oct 2005 15:08:36 -0000 1.7 +++ itdb_private.h 21 Nov 2005 20:09:53 -0000 1.8 @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif - +#include "glib-compat.h" #include "itdb.h" /* always use itdb_playlist_is_mpl() to check for MPL! */ Index: itdb_track.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/itdb_track.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- itdb_track.c 12 Nov 2005 13:58:50 -0000 1.11 +++ itdb_track.c 21 Nov 2005 20:09:53 -0000 1.12 @@ -31,7 +31,6 @@ #include "itdb_private.h" #include <string.h> -#include <glib/gstdio.h> static gboolean is_video_ipod (IpodDevice *ipod) { Index: ithumb-writer.c =================================================================== RCS file: /cvsroot/gtkpod/libgpod/src/ithumb-writer.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- ithumb-writer.c 2 Oct 2005 13:22:10 -0000 1.3 +++ ithumb-writer.c 21 Nov 2005 20:09:53 -0000 1.4 @@ -141,8 +141,8 @@ return NULL; } - thumb = gdk_pixbuf_new_from_file_at_scale (filename, writer->size, -1, - TRUE, NULL); + thumb = gdk_pixbuf_new_from_file_at_size (filename, writer->size, + writer->size, NULL); if (thumb == NULL) { g_free (image); return NULL; @@ -150,9 +150,10 @@ g_object_get (G_OBJECT (thumb), "height", &image->height, NULL); if (image->height > writer->size) { g_object_unref (thumb); - thumb = gdk_pixbuf_new_from_file_at_scale (filename, - -1, writer->size, - TRUE, NULL); + thumb = gdk_pixbuf_new_from_file_at_size (filename, + writer->size, + writer->size, + NULL); if (thumb == NULL) { g_free (image); return NULL; |