glib r6879 - trunk/gio

[mitch svn gnome org]

Author: mitch
Date: Mon May  5 15:12:13 2008
New Revision: 6879
URL: http://svn.gnome.org/viewvc/glib?rev=6879&view=rev

Log:
2008-05-05  Michael Natterer  <mitch imendio com>

	* Makefile.am. build with G_DISABLE_SINGLE_INCLUDES to prevent
	code from being checked in that breaks the build of applications
	which use G_DISABLE_SINGLE_INCLUDES.

	* makegioalias.pl: make the alias file include "glib.h" instead of
	"glibconfig.h".

	* gio.symbols: whitespace change to force regeneration of the
	alias file after above script change.

	* gfileinfo.h: remove inlcusion of <glib/gfileutils.h>.

	* gfilenamecompleter.c: remove inclusion of "gurifuncs.h".

	* gioerror.h: #include <glib.h> instead of <glib/gerror.h>.

	* glocalfileinfo.c: remove inclusion of <glib/gchecksum>.



Modified:
   trunk/gio/ChangeLog
   trunk/gio/Makefile.am
   trunk/gio/gfileinfo.h
   trunk/gio/gfilenamecompleter.c
   trunk/gio/gio.symbols
   trunk/gio/gioerror.h
   trunk/gio/glocalfileinfo.c
   trunk/gio/makegioalias.pl

Modified: trunk/gio/Makefile.am
==============================================================================
--- trunk/gio/Makefile.am	(original)
+++ trunk/gio/Makefile.am	Mon May  5 15:12:13 2008
@@ -49,6 +49,7 @@
 	-I$(top_srcdir)/gmodule				\
 	$(GLIB_DEBUG_FLAGS)				\
 	-DG_DISABLE_DEPRECATED				\
+	-DG_DISABLE_SINGLE_INCLUDES			\
 	-DGIO_COMPILATION				\
 	-DGIO_MODULE_DIR=\"$(GIO_MODULE_DIR)\"	
 

Modified: trunk/gio/gfileinfo.h
==============================================================================
--- trunk/gio/gfileinfo.h	(original)
+++ trunk/gio/gfileinfo.h	Mon May  5 15:12:13 2008
@@ -28,7 +28,6 @@
 #define __G_FILE_INFO_H__
 
 #include <glib-object.h>
-#include <glib/gfileutils.h>
 #include <gio/gfileattribute.h>
 #include <gio/gicon.h>
 

Modified: trunk/gio/gfilenamecompleter.c
==============================================================================
--- trunk/gio/gfilenamecompleter.c	(original)
+++ trunk/gio/gfilenamecompleter.c	Mon May  5 15:12:13 2008
@@ -22,7 +22,6 @@
 
 #include <config.h>
 #include "gfilenamecompleter.h"
-#include "gurifuncs.h"
 #include "gfile.h"
 #include <string.h>
 #include "glibintl.h"

Modified: trunk/gio/gio.symbols
==============================================================================
--- trunk/gio/gio.symbols	(original)
+++ trunk/gio/gio.symbols	Mon May  5 15:12:13 2008
@@ -7,6 +7,7 @@
  * #ifdef IN_HEADER(sym) #endif and
  * #ifdef IN_FILE(sym) #endif sections.
  */
+
 #ifdef ALL_FILES
 #define IN_FILE(x) 1
 #define IN_HEADER(x) 1

Modified: trunk/gio/gioerror.h
==============================================================================
--- trunk/gio/gioerror.h	(original)
+++ trunk/gio/gioerror.h	Mon May  5 15:12:13 2008
@@ -27,7 +27,7 @@
 #ifndef __G_IO_ERROR_H__
 #define __G_IO_ERROR_H__
 
-#include <glib/gerror.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/gio/glocalfileinfo.c
==============================================================================
--- trunk/gio/glocalfileinfo.c	(original)
+++ trunk/gio/glocalfileinfo.c	Mon May  5 15:12:13 2008
@@ -58,7 +58,6 @@
 #endif /* HAVE_XATTR */
 
 #include <glib/gstdio.h>
-#include <glib/gchecksum.h>
 #include <gfileattribute-priv.h>
 
 #include "glibintl.h"

Modified: trunk/gio/makegioalias.pl
==============================================================================
--- trunk/gio/makegioalias.pl	(original)
+++ trunk/gio/makegioalias.pl	Mon May  5 15:12:13 2008
@@ -12,7 +12,7 @@
 
 #ifndef DISABLE_VISIBILITY
 
-#include "glibconfig.h"
+#include "glib.h"
 
 #ifdef G_HAVE_GNUC_VISIBILITY