diff options
author | Christophe Fergeau <teuf@gnome.org> | 2007-10-30 08:21:16 +0000 |
---|---|---|
committer | Christophe Fergeau <teuf@gnome.org> | 2007-10-30 08:21:16 +0000 |
commit | db1a26c4b6c2f920ad6e5a188a3304097211f250 (patch) | |
tree | f985905a4e1a7545ea89b4b0f4022ec1381a66c5 | |
parent | 5833cbb6bb51d98acc7e0b4c937182445fa539ea (diff) | |
download | libgpod-db1a26c4b6c2f920ad6e5a188a3304097211f250.tar.gz libgpod-db1a26c4b6c2f920ad6e5a188a3304097211f250.tar.xz libgpod-db1a26c4b6c2f920ad6e5a188a3304097211f250.zip |
Additional clean-ups after the glib requirement bumping pointed out by
tmz on IRC
* libgpod-1.0.pc.in: bump glib requirement there as well
* src/Makefile.am:
* src/db-parse-context.c:
* src/glib-compat.h:
* src/itdb_artwork.c:
* src/itdb_itunesdb.c:
* src/itdb_photoalbum.c:
* src/itdb_private.h:
* src/ithumb-writer.c: get rid of glib-compat.h since we raised the
minimum version to 2.8
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1749 f01d2545-417e-4e96-918e-98f8d0dbbcb6
-rw-r--r-- | ChangeLog | 16 | ||||
-rw-r--r-- | libgpod-1.0.pc.in | 2 | ||||
-rw-r--r-- | src/Makefile.am | 1 | ||||
-rw-r--r-- | src/db-parse-context.c | 1 | ||||
-rw-r--r-- | src/glib-compat.h | 66 | ||||
-rw-r--r-- | src/itdb_artwork.c | 1 | ||||
-rw-r--r-- | src/itdb_itunesdb.c | 1 | ||||
-rw-r--r-- | src/itdb_photoalbum.c | 1 | ||||
-rw-r--r-- | src/itdb_private.h | 1 | ||||
-rw-r--r-- | src/ithumb-writer.c | 1 |
10 files changed, 21 insertions, 70 deletions
@@ -1,3 +1,19 @@ +2007-10-30 Christophe Fergeau <christophe@anevia.com> + + Additional clean-ups after the glib requirement bumping pointed out by + tmz on IRC + + * libgpod-1.0.pc.in: bump glib requirement there as well + * src/Makefile.am: + * src/db-parse-context.c: + * src/glib-compat.h: + * src/itdb_artwork.c: + * src/itdb_itunesdb.c: + * src/itdb_photoalbum.c: + * src/itdb_private.h: + * src/ithumb-writer.c: get rid of glib-compat.h since we raised the + minimum version to 2.8 + 2007-10-30 Christophe Fergeau <teuf@gnome.org> Patch from Filippo Giunchedi <filippo@esaurito.net> diff --git a/libgpod-1.0.pc.in b/libgpod-1.0.pc.in index 815e46d..747a7b9 100644 --- a/libgpod-1.0.pc.in +++ b/libgpod-1.0.pc.in @@ -6,6 +6,6 @@ includedir=@includedir@ Name: libgpod Description: A library to manipulate songs and playlists stored on an ipod Version: @VERSION@ -Requires: glib-2.0 >= 2.4.0 gobject-2.0 +Requires: glib-2.0 >= 2.8.0 gobject-2.0 Libs: -L${libdir} -lgpod Cflags: -I${includedir}/gpod-1.0 diff --git a/src/Makefile.am b/src/Makefile.am index a044dec..0d7d58e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -28,7 +28,6 @@ noinst_HEADERS = \ db-image-parser.h \ db-itunes-parser.h \ db-parse-context.h \ - glib-compat.h \ itdb_device.h \ itdb_endianness.h \ itdb_private.h \ diff --git a/src/db-parse-context.c b/src/db-parse-context.c index ceb8313..e4e058a 100644 --- a/src/db-parse-context.c +++ b/src/db-parse-context.c @@ -32,7 +32,6 @@ #include <unistd.h> #include <glib.h> -#include "glib-compat.h" #include "db-parse-context.h" #include "db-itunes-parser.h" #include "itdb_endianness.h" diff --git a/src/glib-compat.h b/src/glib-compat.h deleted file mode 100644 index 47ba310..0000000 --- a/src/glib-compat.h +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2005 Christophe Fergeau - * - * - * The code contained in this file is free software; you can redistribute - * it and/or modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either version - * 2.1 of the License, or (at your option) any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this code; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - * 02111-1307 USA - * - * iTunes and iPod are trademarks of Apple - * - * This product is not supported/written/published by Apple! - * - * $Id$ - */ - -#ifndef GLIB_COMPAT_H -#define GLIB_COMPAT_H - -#include <glib.h> - -#if ((GLIB_MAJOR_VERSION == 2) && (GLIB_MINOR_VERSION <= 4)) -/*** glib <= 2.4 ***/ - -/* G_GNUC_INTERNAL */ -#ifndef G_GNUC_INTERNAL -#define G_GNUC_INTERNAL -#endif - -/* g_stat */ -#include <stdio.h> -#include<unistd.h> -#include<sys/types.h> -#include<sys/stat.h> -#define g_stat stat -#define g_mkdir mkdir -#define g_rename rename -#define g_printf printf - -/* G_IS_DIR_SEPARATOR */ -#ifdef G_OS_WIN32 -#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR || (c) == '/') -#else -#define G_IS_DIR_SEPARATOR(c) ((c) == G_DIR_SEPARATOR) -#endif - -#else -/*** glib > 2.4 ***/ - -/* g_stat */ -#include <glib/gstdio.h> -#endif - - - -#endif /* GLIB_COMPAT_H */ diff --git a/src/itdb_artwork.c b/src/itdb_artwork.c index 69dc38c..1c2bcbf 100644 --- a/src/itdb_artwork.c +++ b/src/itdb_artwork.c @@ -40,6 +40,7 @@ #include <gdk-pixbuf/gdk-pixbuf.h> #endif #include <glib/gi18n-lib.h> +#include <glib/gstdio.h> #include <stdlib.h> /** diff --git a/src/itdb_itunesdb.c b/src/itdb_itunesdb.c index a31de38..5edddbd 100644 --- a/src/itdb_itunesdb.c +++ b/src/itdb_itunesdb.c @@ -116,6 +116,7 @@ #include <fcntl.h> #include <glib-object.h> #include <glib/gi18n-lib.h> +#include <glib/gstdio.h> #include <stdio.h> #include <string.h> #include <sys/statvfs.h> diff --git a/src/itdb_photoalbum.c b/src/itdb_photoalbum.c index af15407..3533a56 100644 --- a/src/itdb_photoalbum.c +++ b/src/itdb_photoalbum.c @@ -35,6 +35,7 @@ #include <stdio.h> #include <string.h> #include <glib/gi18n-lib.h> +#include <glib/gstdio.h> #ifdef HAVE_GDKPIXBUF #include <gdk-pixbuf/gdk-pixbuf.h> #endif diff --git a/src/itdb_private.h b/src/itdb_private.h index e87dc67..1ce36da 100644 --- a/src/itdb_private.h +++ b/src/itdb_private.h @@ -32,7 +32,6 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include "glib-compat.h" #include "itdb_device.h" #include "itdb.h" diff --git a/src/ithumb-writer.c b/src/ithumb-writer.c index 24f1566..4f2e410 100644 --- a/src/ithumb-writer.c +++ b/src/ithumb-writer.c @@ -45,6 +45,7 @@ #include <sys/stat.h> #include <fcntl.h> +#include <glib/gstdio.h> /* Maximum size for .ithmb files. Reduced from 500 MB to 256 MB after reports of slow iPod interface behavior */ |