Revision: 1749
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=1749&view=rev
Author: teuf
Date: 2007-10-30 01:21:16 -0700 (Tue, 30 Oct 2007)
Log Message:
-----------
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
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/libgpod-1.0.pc.in
libgpod/trunk/src/Makefile.am
libgpod/trunk/src/db-parse-context.c
libgpod/trunk/src/itdb_artwork.c
libgpod/trunk/src/itdb_itunesdb.c
libgpod/trunk/src/itdb_photoalbum.c
libgpod/trunk/src/itdb_private.h
libgpod/trunk/src/ithumb-writer.c
Removed Paths:
-------------
libgpod/trunk/src/glib-compat.h
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/ChangeLog 2007-10-30 08:21:16 UTC (rev 1749)
@@ -1,3 +1,19 @@
+2007-10-30 Christophe Fergeau <[EMAIL PROTECTED]>
+
+ 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 <[EMAIL PROTECTED]>
Patch from Filippo Giunchedi <[EMAIL PROTECTED]>
Modified: libgpod/trunk/libgpod-1.0.pc.in
===================================================================
--- libgpod/trunk/libgpod-1.0.pc.in 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/libgpod-1.0.pc.in 2007-10-30 08:21:16 UTC (rev 1749)
@@ -6,6 +6,6 @@
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
Modified: libgpod/trunk/src/Makefile.am
===================================================================
--- libgpod/trunk/src/Makefile.am 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/Makefile.am 2007-10-30 08:21:16 UTC (rev 1749)
@@ -28,7 +28,6 @@
db-image-parser.h \
db-itunes-parser.h \
db-parse-context.h \
- glib-compat.h \
itdb_device.h \
itdb_endianness.h \
itdb_private.h \
Modified: libgpod/trunk/src/db-parse-context.c
===================================================================
--- libgpod/trunk/src/db-parse-context.c 2007-10-29 23:01:54 UTC (rev
1748)
+++ libgpod/trunk/src/db-parse-context.c 2007-10-30 08:21:16 UTC (rev
1749)
@@ -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"
Deleted: libgpod/trunk/src/glib-compat.h
===================================================================
--- libgpod/trunk/src/glib-compat.h 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/glib-compat.h 2007-10-30 08:21:16 UTC (rev 1749)
@@ -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 */
Modified: libgpod/trunk/src/itdb_artwork.c
===================================================================
--- libgpod/trunk/src/itdb_artwork.c 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/itdb_artwork.c 2007-10-30 08:21:16 UTC (rev 1749)
@@ -40,6 +40,7 @@
#include <gdk-pixbuf/gdk-pixbuf.h>
#endif
#include <glib/gi18n-lib.h>
+#include <glib/gstdio.h>
#include <stdlib.h>
/**
Modified: libgpod/trunk/src/itdb_itunesdb.c
===================================================================
--- libgpod/trunk/src/itdb_itunesdb.c 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/itdb_itunesdb.c 2007-10-30 08:21:16 UTC (rev 1749)
@@ -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>
Modified: libgpod/trunk/src/itdb_photoalbum.c
===================================================================
--- libgpod/trunk/src/itdb_photoalbum.c 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/itdb_photoalbum.c 2007-10-30 08:21:16 UTC (rev 1749)
@@ -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
Modified: libgpod/trunk/src/itdb_private.h
===================================================================
--- libgpod/trunk/src/itdb_private.h 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/itdb_private.h 2007-10-30 08:21:16 UTC (rev 1749)
@@ -32,7 +32,6 @@
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
-#include "glib-compat.h"
#include "itdb_device.h"
#include "itdb.h"
Modified: libgpod/trunk/src/ithumb-writer.c
===================================================================
--- libgpod/trunk/src/ithumb-writer.c 2007-10-29 23:01:54 UTC (rev 1748)
+++ libgpod/trunk/src/ithumb-writer.c 2007-10-30 08:21:16 UTC (rev 1749)
@@ -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 */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
