diff options
| author | Alexander Larsson <alexl@redhat.com> | 2007-10-04 14:08:11 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-10-04 14:08:11 +0000 |
| commit | efd8ab55dd85159397c043b03efe54d47c28c307 (patch) | |
| tree | 870cad51a8485bf4ab0b3c3d756138aa3ab70193 /daemon/gvfsjob.h | |
| parent | 14f210480005deb8a9cb4e23d07f8ba979ee29bb (diff) | |
| download | gvfs-efd8ab55dd85159397c043b03efe54d47c28c307.tar.gz | |
Allow NULL end pointer
2007-10-04 Alexander Larsson <alexl@redhat.com>
* common/gvfsuriutils.c:
(g_uri_unescape_string):
Allow NULL end pointer
* daemon/gvfsjob.[ch]:
Add cancellable to GVfsJob for backends that want one
* daemon/gvfsjobenumerate.[ch]:
* daemon/gvfsjobqueryinfo.[ch]:
Also store attribute in string form.
Needed if you want to pass it on into gio.
* daemon/Makefile.am:
* daemon/gvfsbackendtrash.[ch]:
* daemon/trash.mount.in: Added.
Added trash backend
svn path=/trunk/; revision=968
Diffstat (limited to 'daemon/gvfsjob.h')
| -rw-r--r-- | daemon/gvfsjob.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/daemon/gvfsjob.h b/daemon/gvfsjob.h index be41ccb7..f8d4e2c5 100644 --- a/daemon/gvfsjob.h +++ b/daemon/gvfsjob.h @@ -2,6 +2,7 @@ #define __G_VFS_JOB_H__ #include <glib-object.h> +#include <gio/gcancellable.h> G_BEGIN_DECLS @@ -32,7 +33,8 @@ struct _GVfsJob guint sent_reply : 1; guint finished : 1; GError *error; - + GCancellable *cancellable; + GVfsJobPrivate *priv; }; |