In notify_location_change, send progress back (because the Bonobo control,

* src/ntl-view-bonobo-control.c: In notify_location_change, send
progress back (because the Bonobo control, which might be the
content view, can't do it).

* src/ntl-view-bonobo-subdoc.c: As above, plus don't use
PersistFile interface, plus use bonobo-stream-vfs instead of
bonobo-stream-fs.

* src/ntl-uri-map.c: If no content type is found, default to text/plain.

* libnautilus/bonobo-stream-vfs.[ch], libnautilus/Makefile.am:
Initial implementation of bonobo streams in terms of Gnome VFS.

1 files changed, 70 insertions, 0 deletions

diff --git a/libnautilus-private/bonobo-stream-vfs.h b/libnautilus-private/bonobo-stream-vfs.h
new file mode 100644
index 000000000..7e00aa239
--- /dev/null
+++ b/libnautilus-private/bonobo-stream-vfs.h
@@ -0,0 +1,70 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ *  libnautilus: A library for nautilus view implementations.
+ *
+ *  Copyright (C) 2000 Red Hat, Inc.
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Library General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Library General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Library General Public
+ *  License along with this library; if not, write to the Free
+ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * Author: Elliot Lee <sopwith@redhat.com>, based on bonobo-stream-fs.h by Miguel de Icaza.
+ * bonobo-stream-vfs.h: Gnome VFS-based Stream interface
+ */
+#ifndef _BONOBO_STREAM_VFS_H_
+#define _BONOBO_STREAM_VFS_H_
+
+#include <bonobo/bonobo-stream.h>
+#include <libgnomevfs/gnome-vfs.h>
+
+BEGIN_GNOME_DECLS
+
+struct _BonoboStreamVFS;
+typedef struct _BonoboStreamVFS BonoboStreamVFS;
+
+#ifndef _BONOBO_STORAGE_VFS_H_
+struct _BonoboStorageVFS;
+typedef struct _BonoboStorageVFS BonoboStorageVFS;
+#endif
+
+#define BONOBO_STREAM_VFS_TYPE        (bonobo_stream_vfs_get_type ())
+#define BONOBO_STREAM_VFS(o)          (GTK_CHECK_CAST ((o), BONOBO_STREAM_VFS_TYPE, BonoboStreamVFS))
+#define BONOBO_STREAM_VFS_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), BONOBO_STREAM_VFS_TYPE, BonoboStreamVFSClass))
+#define BONOBO_IS_STREAM_VFS(o)       (GTK_CHECK_TYPE ((o), BONOBO_STREAM_VFS_TYPE))
+#define BONOBO_IS_STREAM_VFS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), BONOBO_STREAM_VFS_TYPE))
+
+typedef struct _BonoboStreamVFSPrivate BonoboStreamVFSPrivate;
+
+struct _BonoboStreamVFS {
+  BonoboStream stream;
+
+  GnomeVFSURI *uri;
+  GnomeVFSHandle *fd;
+  gboolean got_eof;
+
+  BonoboStreamVFSPrivate *priv;
+};
+
+typedef struct {
+	BonoboStreamClass parent_class;
+} BonoboStreamVFSClass;
+
+GtkType         bonobo_stream_vfs_get_type     (void);
+BonoboStream    *bonobo_stream_vfs_open         (const char *uri, Bonobo_Storage_OpenMode mode);
+BonoboStream    *bonobo_stream_vfs_create       (const char *uri);
+BonoboStream    *bonobo_stream_vfs_construct    (BonoboStreamVFS *stream,
+						 Bonobo_Stream corba_stream);
+	
+END_GNOME_DECLS
+
+#endif /* _BONOBO_STREAM_VFS_H_ */