diff options
| author | Christophe Fergeau <teuf@gnome.org> | 2005-11-21 20:09:53 +0000 |
|---|---|---|
| committer | Christophe Fergeau <teuf@gnome.org> | 2005-11-21 20:09:53 +0000 |
| commit | cd51adad8d5e8c96de52842137e5642fc52d2eb7 (patch) | |
| tree | 2c3bf750a8c1ffcdad5e24b007e0e314b2924e05 | |
| parent | 709bd03ccdfa86ae739a37f3b22f22743e22b7b2 (diff) | |
| download | libgpod-tmz-cd51adad8d5e8c96de52842137e5642fc52d2eb7.tar.gz libgpod-tmz-cd51adad8d5e8c96de52842137e5642fc52d2eb7.tar.xz libgpod-tmz-cd51adad8d5e8c96de52842137e5642fc52d2eb7.zip | |
2005-11-21 Christophe Fergeau <teuf@gnome.org>
* 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
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | src/db-artwork-writer.c | 4 | ||||
| -rw-r--r-- | src/db-parse-context.c | 2 | ||||
| -rw-r--r-- | src/ipod-device.c | 2 | ||||
| -rw-r--r-- | src/itdb_private.h | 2 | ||||
| -rw-r--r-- | src/itdb_track.c | 1 | ||||
| -rw-r--r-- | src/ithumb-writer.c | 11 |
7 files changed, 23 insertions, 9 deletions
@@ -1,5 +1,15 @@ 2005-11-21 Christophe Fergeau <teuf@gnome.org> + * 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 <teuf@gnome.org> + * autogen.sh: * gnome-autogen.sh: use autogen.sh script from gnome-common since the custom libgpod one keep having issues (this doesn't add a dependency 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 <unistd.h> #include <glib.h> - +#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 <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" 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 <config.h> #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 <string.h> -#include <glib/gstdio.h> 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; |