libgsf r1025 - in trunk: . gsf

[mortenw svn gnome org]

Author: mortenw
Date: Sun Dec 14 21:39:59 2008
New Revision: 1025
URL: http://svn.gnome.org/viewvc/libgsf?rev=1025&view=rev

Log:
2008-12-14  Morten Welinder  <terra gnome org>

	* */*.c: Clean up glib includes.  Patch from Pedro Fragoso.  Fixes
	#564004.



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/gsf/gsf-infile-stdio.c
   trunk/gsf/gsf-output-csv.c
   trunk/gsf/gsf-output-iconv.c
   trunk/gsf/gsf-output-stdio.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sun Dec 14 21:39:59 2008
@@ -6,6 +6,9 @@
 Morten:
 	* Solaris compilation issue.  [#558253]
 
+Pedro Fragoso:
+	* Clean up glib includes.  [#564004]
+
 Richard W.M. Jones
 	* MinGW configure fix for libbz2 detection.
 

Modified: trunk/gsf/gsf-infile-stdio.c
==============================================================================
--- trunk/gsf/gsf-infile-stdio.c	(original)
+++ trunk/gsf/gsf-infile-stdio.c	Sun Dec 14 21:39:59 2008
@@ -36,7 +36,7 @@
 #endif
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <glib/gdir.h>
+#include <glib.h>
 #include <string.h>
 
 static GObjectClass *parent_class;

Modified: trunk/gsf/gsf-output-csv.c
==============================================================================
--- trunk/gsf/gsf-output-csv.c	(original)
+++ trunk/gsf/gsf-output-csv.c	Sun Dec 14 21:39:59 2008
@@ -24,7 +24,7 @@
 #include <gsf/gsf-output-impl.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
-#include <glib/gconvert.h>
+#include <glib.h>
 #include <string.h>
 
 static GObjectClass *parent_class;

Modified: trunk/gsf/gsf-output-iconv.c
==============================================================================
--- trunk/gsf/gsf-output-iconv.c	(original)
+++ trunk/gsf/gsf-output-iconv.c	Sun Dec 14 21:39:59 2008
@@ -24,7 +24,7 @@
 #include <gsf/gsf-output-impl.h>
 #include <gsf/gsf-impl-utils.h>
 #include <gsf/gsf-utils.h>
-#include <glib/gconvert.h>
+#include <glib.h>
 #include <string.h>
 
 #define BUF_SIZE 0x400

Modified: trunk/gsf/gsf-output-stdio.c
==============================================================================
--- trunk/gsf/gsf-output-stdio.c	(original)
+++ trunk/gsf/gsf-output-stdio.c	Sun Dec 14 21:39:59 2008
@@ -41,7 +41,7 @@
 #ifdef G_OS_WIN32
 #include <wchar.h>
 #include <direct.h>
-#include <glib/gwin32.h>
+#include <glib.h>
 #ifdef HAVE_IO_H
 #include <io.h>
 #endif