[monkey-bubble: 526/753] Remove duplicate AC_PROG_LEX. Remove unneeded include. Use gnome-vfs MIME

[Sven Herzberg <herzi src gnome org>]

commit 178e2d0bb0702c57848c90675578196729d194c1
Author: Darin Adler <darin src gnome org>
Date:   Thu Jul 12 23:02:30 2001 +0000

    Remove duplicate AC_PROG_LEX. Remove unneeded include. Use gnome-vfs MIME
    
    	* configure.in: Remove duplicate AC_PROG_LEX.
    	* monikers/bonobo-storage-vfs.c: Remove unneeded include.
    	* monikers/bonobo-stream-fs.c: (bonobo_stream_create): Use
    	gnome-vfs MIME calls.
    	* monikers/bonobo-stream-vfs.c: Remove unneeded include.

 ChangeLog                     |    8 ++++++++
 configure.in                  |    1 -
 monikers/bonobo-storage-vfs.c |    1 -
 monikers/bonobo-stream-fs.c   |    9 ++++-----
 monikers/bonobo-stream-vfs.c  |    1 -
 5 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 34f6946..c772f1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2001-07-12  Darin Adler  <darin bentspoon com>
+
+	* configure.in: Remove duplicate AC_PROG_LEX.
+	* monikers/bonobo-storage-vfs.c: Remove unneeded include.
+	* monikers/bonobo-stream-fs.c: (bonobo_stream_create): Use
+	gnome-vfs MIME calls.
+	* monikers/bonobo-stream-vfs.c: Remove unneeded include.
+
 2001-07-11  Martin Baulig  <baulig suse de>
 
 	* configure.in: Don't define ENABLE_ORBIT2, the conditionals
diff --git a/configure.in b/configure.in
index c64c223..4079f40 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,6 @@ AC_ISC_POSIX
 AC_PROG_CC
 AC_STDC_HEADERS
 AM_PROG_LIBTOOL
-AC_PROG_LEX
 AC_PROG_YACC
 AC_PATH_PROGS(PATH_TO_XRDB, "xrdb")
 
diff --git a/monikers/bonobo-storage-vfs.c b/monikers/bonobo-storage-vfs.c
index cc52ce5..19f116b 100644
--- a/monikers/bonobo-storage-vfs.c
+++ b/monikers/bonobo-storage-vfs.c
@@ -8,7 +8,6 @@
 #include <config.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include <bonobo/bonobo-storage.h>
 #include "bonobo-storage-vfs.h"
diff --git a/monikers/bonobo-stream-fs.c b/monikers/bonobo-stream-fs.c
index b25cf01..d69115a 100644
--- a/monikers/bonobo-stream-fs.c
+++ b/monikers/bonobo-stream-fs.c
@@ -12,15 +12,14 @@
  * Copyright 2001, Ximian, Inc
  */
 #include <config.h>
+#include "bonobo-stream-fs.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <errno.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
-#include <libgnome/gnome-mime.h>
-#include "bonobo-stream-fs.h"
+#include <libgnomevfs/gnome-vfs-mime.h>
 
 struct _BonoboStreamFSPrivate {
 	gchar *mime_type;
@@ -333,8 +332,8 @@ bonobo_stream_create (int fd, const char *path)
 		return NULL;
 	
 	stream_fs->fd = fd;
-	stream_fs->priv->mime_type = g_strdup (
-		gnome_mime_type_of_file (path));
+	stream_fs->priv->mime_type = g_strdup
+		(gnome_vfs_get_file_mime_type (path, NULL, FALSE));
 
 	return stream_fs;
 }
diff --git a/monikers/bonobo-stream-vfs.c b/monikers/bonobo-stream-vfs.c
index aebd204..2a92dff 100644
--- a/monikers/bonobo-stream-vfs.c
+++ b/monikers/bonobo-stream-vfs.c
@@ -11,7 +11,6 @@
 #include <stdio.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include <libgnome/gnome-defs.h>
 #include <libgnome/gnome-util.h>
 #include "bonobo-stream-vfs.h"
 #include <errno.h>