[monkey-bubble: 516/753] Sort out the build after some moves, and start fixing storage modules.

[Sven Herzberg <herzi src gnome org>]

commit 6bf47a6ed5dcf424c9a3f0d60896f2bc101f2d5e
Author: Michael Meeks <michael src gnome org>
Date:   Tue Jul 10 10:23:51 2001 +0000

    Sort out the build after some moves, and start fixing storage modules.

 configure.in                 |    1 -
 monikers/bonobo-storage-fs.c |    3 ---
 monikers/bonobo-storage-fs.h |   14 +++++++-------
 monikers/bonobo-stream-fs.h  |    4 ++--
 tests/.cvsignore             |    8 ++++++++
 5 files changed, 17 insertions(+), 13 deletions(-)
---
diff --git a/configure.in b/configure.in
index 7e8256c..9441b50 100644
--- a/configure.in
+++ b/configure.in
@@ -91,7 +91,6 @@ tests/Makefile
 libgnome/Makefile
 libgnome/libgnome-2.0.pc
 monikers/Makefile
-storage-modules/Makefile
 doc/Makefile
 ],[case "$CONFIG_FILES" in
 *tools/gnome-maketypes.awk*)chmod +x tools/gnome-maketypes.awk;;
diff --git a/monikers/bonobo-storage-fs.c b/monikers/bonobo-storage-fs.c
index ae4ba20..95b0cd2 100644
--- a/monikers/bonobo-storage-fs.c
+++ b/monikers/bonobo-storage-fs.c
@@ -15,9 +15,6 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <errno.h>
-#include <libgnome/gnome-defs.h>
-#include <libgnome/gnome-util.h>
-#include <libgnome/gnome-mime.h>
 #include <storage-modules/bonobo-storage-fs.h>
 #include <storage-modules/bonobo-stream-fs.h>
 #include <bonobo/bonobo-storage-plugin.h>
diff --git a/monikers/bonobo-storage-fs.h b/monikers/bonobo-storage-fs.h
index f8aed93..e4dc1cd 100644
--- a/monikers/bonobo-storage-fs.h
+++ b/monikers/bonobo-storage-fs.h
@@ -13,19 +13,19 @@ BEGIN_GNOME_DECLS
 #define BONOBO_IS_STORAGE_FS_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), BONOBO_STORAGE_FS_TYPE))
 
 typedef struct {
-	BonoboStorage storage;
+	BonoboObject parent;
 	char *path;
 } BonoboStorageFS;
 
 typedef struct {
-	BonoboStorageClass parent_class;
+	BonoboObjectClass parent_class;
 } BonoboStorageFSClass;
 
-GtkType        bonobo_storage_fs_get_type  (void);
-BonoboStorage *bonobo_storage_fs_open      (const char        *path,
-					    gint               flags, 
-					    gint               mode,
-					    CORBA_Environment *ev);
+GType            bonobo_storage_fs_get_type (void);
+BonoboStorageFS *bonobo_storage_fs_open     (const char        *path,
+					     gint               flags, 
+					     gint               mode,
+					     CORBA_Environment *ev);
 
 END_GNOME_DECLS
 
diff --git a/monikers/bonobo-stream-fs.h b/monikers/bonobo-stream-fs.h
index 49cd71e..29931e1 100644
--- a/monikers/bonobo-stream-fs.h
+++ b/monikers/bonobo-stream-fs.h
@@ -25,7 +25,7 @@ typedef struct _BonoboStreamFS BonoboStreamFS;
 typedef struct _BonoboStreamFSPrivate BonoboStreamFSPrivate;
 
 struct _BonoboStreamFS {
-	BonoboStream stream;
+	BonoboObject stream;
 	int fd;
 	char *path;
 
@@ -33,7 +33,7 @@ struct _BonoboStreamFS {
 };
 
 typedef struct {
-	BonoboStreamClass parent_class;
+	BonoboObjectClass parent_class;
 } BonoboStreamFSClass;
 
 GtkType          bonobo_stream_fs_get_type     (void);
diff --git a/tests/.cvsignore b/tests/.cvsignore
new file mode 100644
index 0000000..7ec9cbb
--- /dev/null
+++ b/tests/.cvsignore
@@ -0,0 +1,8 @@
+Makefile.in
+Makefile
+.deps
+.libs
+*.la
+*.lo
+*.oaf
+test-storage