summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2007-11-06 13:44:47 +0000
committerAlexander Larsson <alexl@src.gnome.org>2007-11-06 13:44:47 +0000
commit880fee930818b3a689e585823d0710f6eac8329d (patch)
tree6a517b1243ae7cadef13c1f62faf906281bf09df
parentfad2f450b310baf06cc435343e0a6ce0b9e838a3 (diff)
downloadgvfs-880fee930818b3a689e585823d0710f6eac8329d.tar.gz
Remove use of old giotypes.h header
2007-11-06 Alexander Larsson <alexl@redhat.com> * common/gmountoperationdbus.c: * common/gmounttracker.c: * daemon/gvfsbackend.h: * daemon/gvfschannel.h: Remove use of old giotypes.h header svn path=/trunk/; revision=1010
-rw-r--r--ChangeLog8
-rw-r--r--common/gmountoperationdbus.c3
-rw-r--r--common/gmounttracker.c1
-rw-r--r--daemon/gvfsbackend.h1
-rw-r--r--daemon/gvfschannel.h1
5 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index e21d849b..8f0f9f17 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-11-06 Alexander Larsson <alexl@redhat.com>
+
+ * common/gmountoperationdbus.c:
+ * common/gmounttracker.c:
+ * daemon/gvfsbackend.h:
+ * daemon/gvfschannel.h:
+ Remove use of old giotypes.h header
+
2007-11-03 Paolo Borelli <pborelli@katamail.com>
* client/gdaemonvfs.c (get_mountspec_from_uri):
diff --git a/common/gmountoperationdbus.c b/common/gmountoperationdbus.c
index 5a29d058..52156638 100644
--- a/common/gmountoperationdbus.c
+++ b/common/gmountoperationdbus.c
@@ -26,7 +26,8 @@
#include <dbus/dbus.h>
-#include <gio/giotypes.h>
+#define I_(string) g_intern_static_string (string)
+
#include <gio/gioerror.h>
#include "gmountoperationdbus.h"
#include "gvfsdaemonprotocol.h"
diff --git a/common/gmounttracker.c b/common/gmounttracker.c
index 97efd6ee..c0f1537b 100644
--- a/common/gmounttracker.c
+++ b/common/gmounttracker.c
@@ -41,6 +41,7 @@ enum {
/* TODO: Real P_() */
#define P_(_x) (_x)
+#define I_(string) g_intern_static_string (string)
static guint signals[LAST_SIGNAL] = { 0 };
diff --git a/daemon/gvfsbackend.h b/daemon/gvfsbackend.h
index 6e19af8d..2cad7cbc 100644
--- a/daemon/gvfsbackend.h
+++ b/daemon/gvfsbackend.h
@@ -24,7 +24,6 @@
#define __G_VFS_BACKEND_H__
#include <dbus/dbus.h>
-#include <gio/giotypes.h>
#include <gio/gfileinfo.h>
#include <gio/gfile.h>
#include <gvfsdaemon.h>
diff --git a/daemon/gvfschannel.h b/daemon/gvfschannel.h
index 252a33a1..d65adb29 100644
--- a/daemon/gvfschannel.h
+++ b/daemon/gvfschannel.h
@@ -24,7 +24,6 @@
#define __G_VFS_CHANNEL_H__
#include <glib-object.h>
-#include <gio/giotypes.h>
#include <gvfsjob.h>
#include <gvfsbackend.h>
#include <gvfsdaemonprotocol.h>