gvfs r2201 - in trunk: . client daemon

[hadess svn gnome org]

Author: hadess
Date: Thu Feb  5 14:02:16 2009
New Revision: 2201
URL: http://svn.gnome.org/viewvc/gvfs?rev=2201&view=rev

Log:
2009-02-05  Bastien Nocera  <hadess hadess net>

	Bug 563788 â GNOME Goal: Clean up GLib and GTK+ includes

	* client/gvfsuriutils.h:
	* daemon/gvfsbackendburn.c:
	* daemon/gvfsbackendcomputer.c:
	* daemon/gvfsbackenddnssd.c:
	* daemon/gvfsbackendnetwork.c:
	* daemon/gvfsdaemonutils.c:
	* daemon/mount.c: Fix build for single GTK+ include, patch
	from Luis Menina <liberforce freeside fr> (Closes: #563788)



Modified:
   trunk/ChangeLog
   trunk/client/gvfsuriutils.h
   trunk/daemon/gvfsbackendburn.c
   trunk/daemon/gvfsbackendcomputer.c
   trunk/daemon/gvfsbackenddnssd.c
   trunk/daemon/gvfsbackendnetwork.c
   trunk/daemon/gvfsdaemonutils.c
   trunk/daemon/mount.c

Modified: trunk/client/gvfsuriutils.h
==============================================================================
--- trunk/client/gvfsuriutils.h	(original)
+++ trunk/client/gvfsuriutils.h	Thu Feb  5 14:02:16 2009
@@ -24,7 +24,6 @@
 #define __G_VFS_URI_UTILS_H__
 
 #include <glib.h>
-#include <glib/gurifuncs.h>
 
 G_BEGIN_DECLS
 

Modified: trunk/daemon/gvfsbackendburn.c
==============================================================================
--- trunk/daemon/gvfsbackendburn.c	(original)
+++ trunk/daemon/gvfsbackendburn.c	Thu Feb  5 14:02:16 2009
@@ -32,11 +32,11 @@
 #include <string.h>
 #include <stdlib.h>
 
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
-#include <glib/gurifuncs.h>
 
 #include "gvfsbackendburn.h"
 #include "gvfsmonitor.h"

Modified: trunk/daemon/gvfsbackendcomputer.c
==============================================================================
--- trunk/daemon/gvfsbackendcomputer.c	(original)
+++ trunk/daemon/gvfsbackendcomputer.c	Thu Feb  5 14:02:16 2009
@@ -32,11 +32,11 @@
 #include <fcntl.h>
 #include <string.h>
 
+#include <glib.h>
 #include <glib/gstdio.h>
 #include <glib/gi18n.h>
 #include <gio/gio.h>
 #include <gio/gunixmounts.h>
-#include <glib/gurifuncs.h>
 
 #include "gvfsbackendcomputer.h"
 #include "gvfsmonitor.h"

Modified: trunk/daemon/gvfsbackenddnssd.c
==============================================================================
--- trunk/daemon/gvfsbackenddnssd.c	(original)
+++ trunk/daemon/gvfsbackenddnssd.c	Thu Feb  5 14:02:16 2009
@@ -26,7 +26,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gurifuncs.h>
 #include <gio/gio.h>
 
 #include <avahi-client/client.h>

Modified: trunk/daemon/gvfsbackendnetwork.c
==============================================================================
--- trunk/daemon/gvfsbackendnetwork.c	(original)
+++ trunk/daemon/gvfsbackendnetwork.c	Thu Feb  5 14:02:16 2009
@@ -27,7 +27,6 @@
 #include <string.h>
 #include <glib.h>
 #include <glib/gi18n.h>
-#include <glib/gurifuncs.h>
 #include <gio/gio.h>
 #include <gconf/gconf-client.h>
 

Modified: trunk/daemon/gvfsdaemonutils.c
==============================================================================
--- trunk/daemon/gvfsdaemonutils.c	(original)
+++ trunk/daemon/gvfsdaemonutils.c	Thu Feb  5 14:02:16 2009
@@ -31,7 +31,7 @@
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#include <glib/gthread.h>
+#include <glib.h>
 #include <glib/gi18n.h>
 
 #include <gio/gio.h>

Modified: trunk/daemon/mount.c
==============================================================================
--- trunk/daemon/mount.c	(original)
+++ trunk/daemon/mount.c	Thu Feb  5 14:02:16 2009
@@ -33,7 +33,7 @@
 #include "gmountoperationdbus.h"
 #include "gvfsdaemonprotocol.h"
 #include "gdbusutils.h"
-#include <glib/gurifuncs.h>
+#include <glib.h>
 #include <gio/gio.h>
 
 typedef struct {