summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--client/gvfsuriutils.h1
-rw-r--r--daemon/gvfsbackendburn.c2
-rw-r--r--daemon/gvfsbackendcomputer.c2
-rw-r--r--daemon/gvfsbackenddnssd.c1
-rw-r--r--daemon/gvfsbackendnetwork.c1
-rw-r--r--daemon/gvfsdaemonutils.c2
-rw-r--r--daemon/mount.c2
8 files changed, 17 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index b44990c4..01032f32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+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)
+
2009-02-04 Ryan Lortie <desrt@desrt.ca>
Bug 570481 – Please add translator comments
diff --git a/client/gvfsuriutils.h b/client/gvfsuriutils.h
index 20de00d3..15550464 100644
--- a/client/gvfsuriutils.h
+++ b/client/gvfsuriutils.h
@@ -24,7 +24,6 @@
#define __G_VFS_URI_UTILS_H__
#include <glib.h>
-#include <glib/gurifuncs.h>
G_BEGIN_DECLS
diff --git a/daemon/gvfsbackendburn.c b/daemon/gvfsbackendburn.c
index e9ed3da5..fb27dda3 100644
--- a/daemon/gvfsbackendburn.c
+++ b/daemon/gvfsbackendburn.c
@@ -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"
diff --git a/daemon/gvfsbackendcomputer.c b/daemon/gvfsbackendcomputer.c
index 25d6c716..58e6c8a1 100644
--- a/daemon/gvfsbackendcomputer.c
+++ b/daemon/gvfsbackendcomputer.c
@@ -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"
diff --git a/daemon/gvfsbackenddnssd.c b/daemon/gvfsbackenddnssd.c
index f412e40e..6950ef3f 100644
--- a/daemon/gvfsbackenddnssd.c
+++ b/daemon/gvfsbackenddnssd.c
@@ -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>
diff --git a/daemon/gvfsbackendnetwork.c b/daemon/gvfsbackendnetwork.c
index 3ccde8f4..5fe0e4a8 100644
--- a/daemon/gvfsbackendnetwork.c
+++ b/daemon/gvfsbackendnetwork.c
@@ -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>
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c
index 43243ec7..b221fdb8 100644
--- a/daemon/gvfsdaemonutils.c
+++ b/daemon/gvfsdaemonutils.c
@@ -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>
diff --git a/daemon/mount.c b/daemon/mount.c
index 6a446ab8..d4d65818 100644
--- a/daemon/mount.c
+++ b/daemon/mount.c
@@ -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 {