From 8b62d2ab267f3389fad75bf14bf464f04189db1b Mon Sep 17 00:00:00 2001 From: Christophe Fergeau Date: Mon, 21 Nov 2005 20:09:53 +0000 Subject: 2005-11-21 Christophe Fergeau * 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 git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1158 f01d2545-417e-4e96-918e-98f8d0dbbcb6 --- ChangeLog | 10 ++++++++++ src/db-artwork-writer.c | 4 ++++ src/db-parse-context.c | 2 +- src/ipod-device.c | 2 +- src/itdb_private.h | 2 +- src/itdb_track.c | 1 - src/ithumb-writer.c | 11 ++++++----- 7 files changed, 23 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 306d240..7ba46e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2005-11-21 Christophe Fergeau + + * 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 + 2005-11-21 Christophe Fergeau * autogen.sh: diff --git a/src/db-artwork-writer.c b/src/db-artwork-writer.c index d96b6fa..a65df2b 100644 --- a/src/db-artwork-writer.c +++ b/src/db-artwork-writer.c @@ -314,6 +314,10 @@ write_mhod_type_3 (enum iPodThumbnailType type, iPodBuffer *buffer) 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); diff --git a/src/db-parse-context.c b/src/db-parse-context.c index ffdd7c4..6cb657d 100644 --- a/src/db-parse-context.c +++ b/src/db-parse-context.c @@ -32,7 +32,7 @@ #include #include - +#include "glib-compat.h" #include "db-parse-context.h" #include "db-itunes-parser.h" diff --git a/src/ipod-device.c b/src/ipod-device.c index 951ddaf..c49e3ab 100644 --- a/src/ipod-device.c +++ b/src/ipod-device.c @@ -68,6 +68,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif +#include "glib-compat.h" #include #include @@ -78,7 +79,6 @@ #include #include #include -#include #include "hal-common.h" #include "ipod-device.h" diff --git a/src/itdb_private.h b/src/itdb_private.h index db29c53..82ba9ad 100644 --- a/src/itdb_private.h +++ b/src/itdb_private.h @@ -33,7 +33,7 @@ #ifdef HAVE_CONFIG_H # include #endif - +#include "glib-compat.h" #include "itdb.h" /* always use itdb_playlist_is_mpl() to check for MPL! */ diff --git a/src/itdb_track.c b/src/itdb_track.c index cfce01f..66d7b7e 100644 --- a/src/itdb_track.c +++ b/src/itdb_track.c @@ -31,7 +31,6 @@ #include "itdb_private.h" #include -#include static gboolean is_video_ipod (IpodDevice *ipod) { diff --git a/src/ithumb-writer.c b/src/ithumb-writer.c index 98a04fc..95521b0 100644 --- a/src/ithumb-writer.c +++ b/src/ithumb-writer.c @@ -141,8 +141,8 @@ ithumb_writer_write_thumbnail (iThumbWriter *writer, 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 @@ ithumb_writer_write_thumbnail (iThumbWriter *writer, 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; -- cgit