Remove. Remove. Remove. Remove. Remove.

	* check-signals.pl: Remove.
	* components/adapter/bonobo-stream-vfs.c: Remove.
	* components/adapter/bonobo-stream-vfs.h: Remove.
	* components/adapter/nautilus-adapter-progressive-load-strategy.c: Remove.
	* components/adapter/nautilus-adapter-progressive-load-strategy.h: Remove.

	* components/adapter/Makefile.am:
	* components/hardware/Makefile.am:
	* components/history/Makefile.am:
	* components/image-viewer/Makefile.am:
	* components/music/Makefile.am:
	* components/news/Makefile.am:
	* components/notes/Makefile.am:
	* components/text/Makefile.am:
	* components/throbber/Makefile.am:
	* components/tree/Makefile.am:
	* libnautilus-private/Makefile.am:
	* test/Makefile.am:
	General cleanups, mostly formatting.

	* configure.in: Remove libiconv stuff, since we don't use it
	any more. Do esound stuff in the main call to pkg-config, not
	a separate set of variables.

	* components/image-viewer/nautilus-image-view.c: Remove unused
	libart includes.

	* cut-n-paste-code/widgets/gimphwrapbox/gtkwrapbox.h: Remove
	the use of "decrement" as a synonym for "remove".

	* test/test.c: Remove unused libart include.

15 files changed, 57 insertions, 1117 deletions

diff --git a/components/adapter/Makefile.am b/components/adapter/Makefile.am
index c912c07bc..d6243a9eb 100644
--- a/components/adapter/Makefile.am
+++ b/components/adapter/Makefile.am
@@ -8,17 +8,11 @@ INCLUDES =					\
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files =						\
-	Nautilus_ComponentAdapterFactory_std.server.in	\
-	$(NULL)
-
+server_in_files = Nautilus_ComponentAdapterFactory_std.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
-bin_PROGRAMS =					\
-	nautilus-adapter			\
-	$(NULL)
+bin_PROGRAMS = nautilus-adapter $(NULL)
 
 nautilus_adapter_SOURCES =				\
 	main.c						\
@@ -44,10 +38,10 @@ nautilus_adapter_SOURCES =				\
 	nautilus-adapter.h				\
 	$(NULL)
 
-nautilus_adapter_LDADD =							\
-	$(top_builddir)/libnautilus/libnautilus.la				\
-	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la		\
-	$(COMPONENT_LIBS)						\
+nautilus_adapter_LDADD =				\
+	$(top_builddir)/libnautilus/libnautilus.la	\
+	$(top_builddir)/libnautilus-adapter/libnautilus-adapter.la	\
+	$(COMPONENT_LIBS)				\
 	$(NULL)
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)
diff --git a/components/adapter/bonobo-stream-vfs.c b/components/adapter/bonobo-stream-vfs.c
deleted file mode 100644
index 8866d851e..000000000
--- a/components/adapter/bonobo-stream-vfs.c
+++ /dev/null
@@ -1,539 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 1999 Helix Code, Inc.
- * Copyright (C) 2000 Red Hat, Inc.
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Elliot Lee <sopwith@redhat.com>, based on bonobo-stream-fs.c by Miguel de Icaza.
- */
-
-/*
- * bonobo-stream-vfs.c: Gnome VFS-based Stream implementation
- */
-
-/* FIXME bugzilla.gnome.org 44400: There's another copy of this file,
- * with a few subtle differences, in the Bonobo sources, although it's
- * currently not being compiled.  
- */
-
-#include <config.h>
-#include "bonobo-stream-vfs.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <sys/stat.h>
-
-#define READ_CHUNK_SIZE 65536
-
-struct BonoboStreamVFSDetails {
-	GnomeVFSHandle *handle;
-};
-
-static BonoboStreamClass *bonobo_stream_vfs_parent_class;
-static POA_Bonobo_Stream__vepv vepv;
-
-
-static void
-bonobo_stream_vfs_storageinfo_from_file_info (Bonobo_StorageInfo *si,
-					      GnomeVFSFileInfo   *fi)
-{
-	g_return_if_fail (si != NULL);
-	g_return_if_fail (fi != NULL);
-
-	si->name = CORBA_string_dup (fi->name);
-
-	if (fi->flags & GNOME_VFS_FILE_INFO_FIELDS_SIZE)
-		si->size = fi->size;
-	else
-		si->size = 0;
-
-	if (fi->flags & GNOME_VFS_FILE_INFO_FIELDS_TYPE &&
-	    fi->type == GNOME_VFS_FILE_TYPE_DIRECTORY)
-		si->type = Bonobo_STORAGE_TYPE_DIRECTORY;
-	else
-		si->type = Bonobo_STORAGE_TYPE_REGULAR;
-
-	if (fi->flags & GNOME_VFS_FILE_INFO_FIELDS_MIME_TYPE &&
-	    fi->mime_type)
-		si->content_type = CORBA_string_dup (fi->mime_type);
-	else
-		si->content_type = CORBA_string_dup ("");
-}
-
-static Bonobo_StorageInfo *
-vfs_get_info (BonoboStream *stream,
-	      Bonobo_StorageInfoFields mask,
-	      CORBA_Environment *ev)
-{
-	BonoboStreamVFS    *sfs = BONOBO_STREAM_VFS (stream);
-	Bonobo_StorageInfo *si;
-	GnomeVFSFileInfo    fi;
-	GnomeVFSResult      result;
-
-	if (mask & ~(Bonobo_FIELD_CONTENT_TYPE | Bonobo_FIELD_SIZE |
-		     Bonobo_FIELD_TYPE)) {
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION, 
-				     ex_Bonobo_Storage_NotSupported, NULL);
-		return CORBA_OBJECT_NIL;
-	}
-
-	result = gnome_vfs_get_file_info_from_handle (
-			sfs->details->handle, &fi,
-			(mask & Bonobo_FIELD_CONTENT_TYPE) ?
-			GNOME_VFS_FILE_INFO_GET_MIME_TYPE :
-			GNOME_VFS_FILE_INFO_DEFAULT);
-
-	if (result != GNOME_VFS_OK) {
-		if (result == GNOME_VFS_ERROR_ACCESS_DENIED)
-			CORBA_exception_set 
-				(ev, CORBA_USER_EXCEPTION,
-				 ex_Bonobo_Stream_NoPermission, NULL);
-		else
-			CORBA_exception_set 
-				(ev, CORBA_USER_EXCEPTION,
-				 ex_Bonobo_Stream_IOError, NULL);
-		return NULL;
-	}
-
-	si = Bonobo_StorageInfo__alloc ();
-
-	bonobo_stream_vfs_storageinfo_from_file_info (si, &fi);
-
-	return si;
-}
-
-static void
-vfs_set_info (BonoboStream *stream,
-	      const Bonobo_StorageInfo *info,
-	      Bonobo_StorageInfoFields mask,
-	      CORBA_Environment *ev)
-{
-	/* FIXME bugzilla.gnome.org 44403: Is it OK to have this
-	 * unimplemented? 
-	 */
-	g_warning ("BonoboStreamVFS:set_info not implemented");
-        CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-                             ex_Bonobo_Stream_IOError, NULL);
-}
-	   
-static void
-vfs_write (BonoboStream *stream,
-	   const Bonobo_Stream_iobuf *buffer,
-	   CORBA_Environment *ev)
-{
-	BonoboStreamVFS *stream_vfs;
-	GnomeVFSResult res;
-	GnomeVFSFileSize written;
-
-	stream_vfs = BONOBO_STREAM_VFS (stream);
-
-	res = gnome_vfs_write (stream_vfs->details->handle, buffer->_buffer, buffer->_length, &written);
-	if (res != GNOME_VFS_OK) {
-		/* FIXME bugzilla.gnome.org 44396: We might need to
-		 * distinguish NoPermission from IOError.  
-		 */
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Stream_IOError, NULL);
-	}
-}
-
-static void
-vfs_read (BonoboStream *stream,
-	  CORBA_long count,
-	  Bonobo_Stream_iobuf **buffer,
-	  CORBA_Environment *ev)
-{
-	BonoboStreamVFS *stream_vfs;
-	CORBA_octet *data;
-	GnomeVFSResult res;
-	GnomeVFSFileSize nread = 0;
-	
-	stream_vfs = BONOBO_STREAM_VFS (stream);
-
-	*buffer = Bonobo_Stream_iobuf__alloc ();
-	CORBA_sequence_set_release (*buffer, TRUE);
-	data = CORBA_sequence_CORBA_octet_allocbuf (count);
-
-	res = gnome_vfs_read (stream_vfs->details->handle, data, count, &nread);
-
-	if (res == GNOME_VFS_OK) {
-		(*buffer)->_buffer = data;
-		(*buffer)->_length = nread;
-	} else if (res == GNOME_VFS_ERROR_EOF) {
-		/* Bonobo returns a zero length buffer for end of file */
-		(*buffer)->_buffer = data;
-		(*buffer)->_length = 0;
-	} else{
-		CORBA_free (data);
-		CORBA_free (*buffer);
-		*buffer = NULL;
-		/* FIXME bugzilla.gnome.org 44396: We might need to
-		 * distinguish NoPermission from IOError.  
-		 */
-		CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-				     ex_Bonobo_Stream_IOError, NULL);
-	}
-}
-
-static CORBA_long
-vfs_seek (BonoboStream *stream,
-	  CORBA_long offset, 
-	  Bonobo_Stream_SeekType whence,
-	  CORBA_Environment *ev)
-{
-	BonoboStreamVFS *stream_vfs;
-	GnomeVFSSeekPosition vfs_whence;
-	GnomeVFSFileSize pos;
-	GnomeVFSResult res;
-
-	stream_vfs = BONOBO_STREAM_VFS (stream);
-
-	switch (whence) {
-	case Bonobo_Stream_SEEK_CUR:
-		vfs_whence = GNOME_VFS_SEEK_CURRENT;
-		break;
-	case Bonobo_Stream_SEEK_END:
-		vfs_whence = GNOME_VFS_SEEK_END;
-		break;
-	default:
-		vfs_whence = GNOME_VFS_SEEK_START;
-		break;
-	}
-
-	res = gnome_vfs_seek (stream_vfs->details->handle, vfs_whence, offset);
-	if (res != GNOME_VFS_OK) {
-		pos = -1;
-	} else {
-		res = gnome_vfs_tell (stream_vfs->details->handle, &pos);
-		if (res != GNOME_VFS_OK) {
-			pos = -1;
-		}
-	}
-	
-	/* FIXME: Will munge >31-bit file positions, which can
-	 * happen in gnome-vfs.
-	 */
-	return pos;
-}
-
-static void
-vfs_truncate (BonoboStream *stream,
-	      const CORBA_long new_size, 
-	      CORBA_Environment *ev)
-{
-	BonoboStreamVFS *stream_vfs;
-
-	stream_vfs = BONOBO_STREAM_VFS (stream);
-	gnome_vfs_truncate_handle (stream_vfs->details->handle, new_size);
-}
-
-static void
-vfs_copy_to  (BonoboStream *stream,
-	      const CORBA_char *dest,
-	      const CORBA_long bytes,
-	      CORBA_long *read_bytes,
-	      CORBA_long *written_bytes,
-	      CORBA_Environment *ev)
-{
-	BonoboStreamVFS *stream_vfs;
-	CORBA_octet *data;
-	CORBA_unsigned_long more;
-	GnomeVFSHandle *fd_out;
-	GnomeVFSResult res;
-	GnomeVFSFileSize rsize, wsize;
-
-	stream_vfs = BONOBO_STREAM_VFS (stream);
-
-	data = CORBA_sequence_CORBA_octet_allocbuf (READ_CHUNK_SIZE);
-
-	*read_bytes = 0;
-	*written_bytes = 0;
-
-	res = gnome_vfs_create (&fd_out, dest, GNOME_VFS_OPEN_WRITE, FALSE, 0666);
-	if (res != GNOME_VFS_OK) {
-		/* FIXME bugzilla.gnome.org 44398: Need to set exception here. */
-		return;
-	}
-
-	if (bytes == -1) {
-		more = sizeof (data);
-	} else {
-		more = bytes;
-	}
-
-	do {
-		res = gnome_vfs_read (stream_vfs->details->handle, data, MIN (READ_CHUNK_SIZE, more), &rsize);
-		if (res != GNOME_VFS_OK) {
-			/* FIXME bugzilla.gnome.org 44398: Need to set exception here. */
-			break;
-		}
-		*read_bytes += rsize;
-
-		res = gnome_vfs_write (fd_out, data, rsize, &wsize);
-		if (res != GNOME_VFS_OK) {
-			/* FIXME bugzilla.gnome.org 44398: Need to set exception here. */
-			break;
-		}
-		*written_bytes += wsize;
-		
-		if (bytes != -1) {
-			more -= rsize;
-		}
-	} while (more > 0 && rsize > 0);
-	
-	gnome_vfs_close (fd_out);
-}
-
-static void
-vfs_commit (BonoboStream *stream,
-	    CORBA_Environment *ev)
-{
-        CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-                             ex_Bonobo_Stream_NotSupported, NULL);
-}
-
-static void
-vfs_revert (BonoboStream *stream,
-	    CORBA_Environment *ev)
-{
-	CORBA_exception_set (ev, CORBA_USER_EXCEPTION,
-			     ex_Bonobo_Stream_NotSupported, NULL);
-}
-
-static void
-vfs_destroy (GtkObject *object)
-{
-	BonoboStreamVFS *stream_vfs;
-
-	stream_vfs = BONOBO_STREAM_VFS (object);
-
-	if (stream_vfs->details->handle != NULL) {
-		gnome_vfs_close (stream_vfs->details->handle);
-		/* FIXME bugzilla.gnome.org 44399: Errors that happen
-		 * only at flush time are lost here. Many gnome-vfs
-		 * modules return errors at close time about the
-		 * remaining flushed writes.  
-		 */
-		stream_vfs->details->handle = NULL;
-	}
-
-	GTK_OBJECT_CLASS (bonobo_stream_vfs_parent_class)->destroy (object);
-}
-
-static void
-bonobo_stream_vfs_class_init (BonoboStreamVFSClass *klass)
-{
-	BonoboStreamClass *stream_class;
-	GtkObjectClass *object_class;
-
-	vepv.Bonobo_Unknown_epv = nautilus_bonobo_object_get_epv ();
-	vepv.Bonobo_Stream_epv = nautilus_bonobo_stream_get_epv ();
-
-	stream_class = BONOBO_STREAM_CLASS (klass);
-	object_class = GTK_OBJECT_CLASS (klass);
-
-	bonobo_stream_vfs_parent_class = gtk_type_class (bonobo_stream_get_type ());
-
-	stream_class->get_info = vfs_get_info;
-	stream_class->set_info = vfs_set_info;
-	stream_class->write    = vfs_write;
-	stream_class->read     = vfs_read;
-	stream_class->seek     = vfs_seek;
-	stream_class->truncate = vfs_truncate;
-	stream_class->copy_to  = vfs_copy_to;
-	stream_class->commit   = vfs_commit;
-	stream_class->revert   = vfs_revert;
-
-	object_class->destroy = vfs_destroy;
-}
-
-static void
-bonobo_stream_vfs_init (BonoboStreamVFS *stream)
-{
-	stream->details = g_new0 (BonoboStreamVFSDetails, 1);
-}
-
-/**
- * bonobo_stream_vfs_get_type:
- *
- * Returns the GtkType for the BonoboStreamVFS class.
- */
-GtkType
-bonobo_stream_vfs_get_type (void)
-{
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"IDL:GNOME/StreamVFS:1.0",
-			sizeof (BonoboStreamVFS),
-			sizeof (BonoboStreamVFSClass),
-			(GtkClassInitFunc) bonobo_stream_vfs_class_init,
-			(GtkObjectInitFunc) bonobo_stream_vfs_init,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (bonobo_stream_get_type (), &info);
-	}
-	
-	return type;
-}
-
-/**
- * bonobo_stream_vfs_construct:
- * @stream: The BonoboStreamVFS object to initialize.
- * @corba_stream: The CORBA server which implements the BonoboStreamVFS service.
- *
- * This function initializes an object of type BonoboStreamVFS using the
- * provided CORBA server @corba_stream.
- *
- * Returns the constructed BonoboStreamVFS @stream.
- */
-BonoboStream *
-bonobo_stream_vfs_construct (BonoboStreamVFS *stream,
-			   Bonobo_Stream corba_stream)
-{
-	g_return_val_if_fail (stream != NULL, NULL);
-	g_return_val_if_fail (BONOBO_IS_STREAM (stream), NULL);
-	g_return_val_if_fail (corba_stream != CORBA_OBJECT_NIL, NULL);
-	
-	bonobo_object_construct (BONOBO_OBJECT (stream), corba_stream);
-	
-	return BONOBO_STREAM (stream);
-}
-
-static Bonobo_Stream
-Bonobo_Stream_vfs__create (BonoboObject *object)
-{
-	POA_Bonobo_Stream *servant;
-	CORBA_Environment ev;
-
-	servant = (POA_Bonobo_Stream *) g_new0 (BonoboObjectServant, 1);
-	servant->vepv = &vepv;
-	
-	CORBA_exception_init (&ev);
-
-	POA_Bonobo_Stream__init ((PortableServer_Servant) servant, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION){
-                g_free (servant);
-		CORBA_exception_free (&ev);
-                return CORBA_OBJECT_NIL;
-        }
-
-	CORBA_exception_free (&ev);
-	return (Bonobo_Stream) bonobo_object_activate_servant (object, servant);
-}
-
-static BonoboStream *
-bonobo_stream_vfs_new_internal (GnomeVFSHandle *handle)
-{
-	BonoboStreamVFS *stream_vfs;
-	Bonobo_Stream corba_stream;
-	CORBA_Environment ev;
-
-	stream_vfs = BONOBO_STREAM_VFS (g_object_new (bonobo_stream_vfs_get_type (), NULL));
-	
-	stream_vfs->details->handle = handle;
-	
-	corba_stream = Bonobo_Stream_vfs__create (BONOBO_OBJECT (stream_vfs));
-	
-	CORBA_exception_init (&ev);
-	
-	if (CORBA_Object_is_nil (corba_stream, &ev)){
-		g_object_unref (stream_vfs);
-		CORBA_exception_free (&ev);
-		return NULL;
-	}
-	
-	CORBA_exception_free (&ev);
-	
-	return bonobo_stream_vfs_construct (stream_vfs, corba_stream);
-}
-
-/**
- * bonobo_stream_vfs_open:
- * @uri: The path to the file to be opened.
- * @mode: The mode with which the file should be opened.
- *
- * Creates a new BonoboStream object for the filename specified by
- * @path.  
- */
-BonoboStream *
-bonobo_stream_vfs_open (const char *uri, Bonobo_Storage_OpenMode mode)
-{
-	GnomeVFSHandle *handle;
-	GnomeVFSResult result;
-
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	handle = NULL;
-	if (mode == Bonobo_Storage_READ) {
-		result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
-	} else if (mode == Bonobo_Storage_WRITE) {
-		result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_WRITE);
-	} else {
-		/* FIXME bugzilla.gnome.org 44401: Do we need to
-		 * support CREATE, FAILIFEXIST, COMPRESSED,
-		 * TRANSACTED, or combinations?  
-		 */
-	   	result = GNOME_VFS_ERROR_NOT_SUPPORTED;
-	}
-	
-	if (result != GNOME_VFS_OK || handle == NULL) {
-		return NULL;
-	}
-
-	return bonobo_stream_vfs_new_internal (handle);
-}
-
-/**
- * bonobo_stream_vfs_new:
- * @uri: The path to the file to be opened.
- *
- * Creates a new BonoboStreamVFS object which is bound to the file
- * specified by @path.
- *
- * When data is read out of or written into the returned BonoboStream
- * object, the read() and write() operations are mapped to the
- * corresponding operations on the specified file.
- *
- * Returns: the constructed BonoboStream object which is bound to the specified file.
- */
-BonoboStream *
-bonobo_stream_vfs_new (const char *uri)
-{
-	GnomeVFSHandle *handle;
-	GnomeVFSResult result;
-
-	g_return_val_if_fail (uri != NULL, NULL);
-
-	handle = NULL;
-	result = gnome_vfs_create (&handle, uri,
-				   GNOME_VFS_OPEN_READ | GNOME_VFS_OPEN_WRITE,
-				   FALSE, 0666);
-
-	if (result != GNOME_VFS_OK || handle == NULL) {
-		return NULL;
-	}
-
-	return bonobo_stream_vfs_new_internal (handle);
-}
diff --git a/components/adapter/bonobo-stream-vfs.h b/components/adapter/bonobo-stream-vfs.h
deleted file mode 100644
index 1655f5661..000000000
--- a/components/adapter/bonobo-stream-vfs.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- 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>
-
-G_BEGIN_DECLS
-
-struct BonoboStreamVFS;
-typedef struct BonoboStreamVFS BonoboStreamVFS;
-
-
-#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 BonoboStreamVFSDetails BonoboStreamVFSDetails;
-
-struct BonoboStreamVFS {
-	BonoboStream stream;
-
-	BonoboStreamVFSDetails *details;
-};
-
-typedef struct {
-	BonoboStreamClass parent_class;
-} BonoboStreamVFSClass;
-
-GtkType         bonobo_stream_vfs_get_type     (void);
-BonoboStream *  bonobo_stream_vfs_new          (const char              *uri);
-BonoboStream *  bonobo_stream_vfs_construct    (BonoboStreamVFS         *stream,
-						Bonobo_Stream            corba_stream);
-BonoboStream *  bonobo_stream_vfs_open         (const char              *uri, 
-						Bonobo_Storage_OpenMode  mode);
-
-G_END_DECLS
-
-#endif /* _BONOBO_STREAM_VFS_H_ */
diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.c b/components/adapter/nautilus-adapter-progressive-load-strategy.c
deleted file mode 100644
index 72db6a56e..000000000
--- a/components/adapter/nautilus-adapter-progressive-load-strategy.c
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/*
- * Nautilus
- *
- * Copyright (C) 2000 Eazel, Inc.
- *
- * Nautilus is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * Nautilus 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; see the file COPYING.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Maciej Stachowiak <mjs@eazel.com>
- */
-
-
-/* nautilus-adapter-progressive-load-strategy.c - 
- */
-
-
-#include <config.h>
-
-#include "nautilus-adapter-progressive-load-strategy.h"
-
-#include <gtk/gtkobject.h>
-#include <eel/eel-gtk-macros.h>
-#include <libgnomevfs/gnome-vfs.h>
-#include <bonobo/Bonobo.h>
-
-#include <stdio.h>
-
-
-typedef void (*StopLoadingCallback) (NautilusAdapterProgressiveLoadStrategy *strategy,
-				     void *user_data);
-
-
-struct NautilusAdapterProgressiveLoadStrategyDetails {
-	Bonobo_ProgressiveDataSink  progressive_data_sink;
-	gboolean                    stop;
-	gboolean                    loading;
-	gboolean                    no_report_stop;
-	StopLoadingCallback         callback;
-	void                       *user_data;
-};
-
-
-static void nautilus_adapter_progressive_load_strategy_class_init (NautilusAdapterProgressiveLoadStrategyClass *klass);
-static void nautilus_adapter_progressive_load_strategy_init       (NautilusAdapterProgressiveLoadStrategy      *strategy);
-static void nautilus_adapter_progressive_load_strategy_destroy          (GtkObject                              *object);
-
-static void nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStrategy *strategy,
-								 const char                  *uri);
-
-static void nautilus_adapter_progressive_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *strategy);
-
-
-EEL_CLASS_BOILERPLATE (NautilusAdapterProgressiveLoadStrategy, nautilus_adapter_progressive_load_strategy, NAUTILUS_TYPE_ADAPTER_LOAD_STRATEGY)
-
-
-static void
-nautilus_adapter_progressive_load_strategy_class_init (NautilusAdapterProgressiveLoadStrategyClass *klass)
-{
-	GtkObjectClass                   *object_class;
-	NautilusAdapterLoadStrategyClass *adapter_load_strategy_class;
-
-	object_class = GTK_OBJECT_CLASS (klass);
-
-	object_class->destroy = nautilus_adapter_progressive_load_strategy_destroy;
-
-	adapter_load_strategy_class = NAUTILUS_ADAPTER_LOAD_STRATEGY_CLASS (klass);
-
-	adapter_load_strategy_class->load_location = nautilus_adapter_progressive_load_strategy_load_location;
-	adapter_load_strategy_class->stop_loading = nautilus_adapter_progressive_load_strategy_stop_loading;
-}
-
-static void
-nautilus_adapter_progressive_load_strategy_init (NautilusAdapterProgressiveLoadStrategy *strategy)
-{
-	strategy->details = g_new0 (NautilusAdapterProgressiveLoadStrategyDetails, 1);
-}
-
-static void
-nautilus_adapter_progressive_load_strategy_destroy (GtkObject *object)
-{
-	NautilusAdapterProgressiveLoadStrategy *strategy;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (object);
-
-	if (strategy->details->progressive_data_sink != CORBA_OBJECT_NIL) {
-		bonobo_object_release_unref (strategy->details->progressive_data_sink, &ev);
-	}
-
-	CORBA_exception_free (&ev);
-
-	g_free (strategy->details);
-
-	EEL_CALL_PARENT (GTK_OBJECT_CLASS, destroy, (object));
-}
-
-NautilusAdapterLoadStrategy *
-nautilus_adapter_progressive_load_strategy_new (Bonobo_ProgressiveDataSink  progressive_data_sink)
-{
-	NautilusAdapterProgressiveLoadStrategy *strategy;
-	CORBA_Environment ev;
-
-	CORBA_exception_init (&ev);
-
-	strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (g_object_new (NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NULL));
-	g_object_ref (strategy);
-	gtk_object_sink (GTK_OBJECT (strategy));
-
-	strategy->details->progressive_data_sink = progressive_data_sink;
-
-	CORBA_exception_free (&ev);
-
-	return NAUTILUS_ADAPTER_LOAD_STRATEGY (strategy);
-}
-
-
-
-static void
-call_when_stopped (NautilusAdapterProgressiveLoadStrategy *strategy,
-		   StopLoadingCallback                     callback, 
-		   void                                   *user_data)
-{
-	strategy->details->callback = callback;
-	strategy->details->user_data = user_data;
-}
-
-
-static void
-load_and_free_uri (NautilusAdapterProgressiveLoadStrategy *strategy,
-		   gpointer                                data)
-{
-	char *uri;
-
-	uri = (char *) data;
-	nautilus_adapter_progressive_load_strategy_load_location 
-		(NAUTILUS_ADAPTER_LOAD_STRATEGY (strategy), uri);
-	g_free (uri);
-
-}
-
-static void
-declare_done_loading (NautilusAdapterProgressiveLoadStrategy *strategy)
-{
-	StopLoadingCallback cb;
-	void *data;
-
-	strategy->details->loading = FALSE;
-
-	if (strategy->details->callback != NULL) {
-		cb = strategy->details->callback;
-		strategy->details->callback = NULL;
-		data = strategy->details->user_data;
-		strategy->details->user_data = NULL;
-		
-		(*cb) (strategy, data);
-	}
-}
-
-
-static void
-stop_loading (NautilusAdapterProgressiveLoadStrategy *strategy,
-	      GnomeVFSHandle *handle,
-	      Bonobo_ProgressiveDataSink_iobuf *iobuf,
-	      gboolean           failed,
-	      CORBA_Environment *ev) 
-{
-	Bonobo_ProgressiveDataSink_end (strategy->details->progressive_data_sink, ev); 
-	if (! strategy->details->no_report_stop) {
-		if (failed) {
-			nautilus_adapter_load_strategy_report_load_failed (NAUTILUS_ADAPTER_LOAD_STRATEGY (strategy));
-		} else {
-			nautilus_adapter_load_strategy_report_load_complete (NAUTILUS_ADAPTER_LOAD_STRATEGY (strategy));
-		}
-	}
-	g_object_unref (strategy);
-	gnome_vfs_close (handle);
-	CORBA_free (iobuf);
-	CORBA_exception_free (ev);
-	declare_done_loading (strategy);
-}
-
-
-
-#define STOP_LOADING                                                 \
-        do {                                                         \
-	         stop_loading (strategy, handle, iobuf, TRUE, &ev);  \
-		 return;                                             \
-        } while (0)
-
-#define CHECK_IF_STOPPED                                              \
-        do {                                                          \
-	        if (strategy->details->stop) {                        \
-	         stop_loading (strategy, handle, iobuf, FALSE, &ev);  \
-		 return;                                              \
-                }                                                     \
-        } while (0)
-
-
-#define LOAD_CHUNK 32768
-
-static void
-nautilus_adapter_progressive_load_strategy_load_location (NautilusAdapterLoadStrategy *abstract_strategy,
-							  const char                  *uri)
-{
-	NautilusAdapterProgressiveLoadStrategy *strategy;
-	GnomeVFSFileInfo *file_info;
-	GnomeVFSHandle   *handle;
-	GnomeVFSResult    result;
-	GnomeVFSFileSize  bytes_read;
-	Bonobo_ProgressiveDataSink_iobuf *iobuf;
-	CORBA_octet *data;
-	CORBA_Environment ev;
-	GnomeVFSFileSize size;
-
-	strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (abstract_strategy);
-
-	if (strategy->details->loading == TRUE) {
-		strategy->details->no_report_stop = TRUE;
-		nautilus_adapter_progressive_load_strategy_stop_loading  (abstract_strategy);
-
-		call_when_stopped (strategy, load_and_free_uri, g_strdup (uri));
-
-		return;
-	}
-
-	strategy->details->no_report_stop = FALSE;
-
-	g_object_ref (strategy);
-
-	strategy->details->loading = TRUE;
-	strategy->details->stop = FALSE;
-
-
-	CORBA_exception_init (&ev);
-
-	/* FIXME bugzilla.gnome.org 43455: this code is stupid and
-           loads the component in a way that blocks the nautilus
-           adapter component, which is pointless/stupid; it should be
-           async. */
-
-	if (gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ) != GNOME_VFS_OK) {
-		nautilus_adapter_load_strategy_report_load_failed (abstract_strategy);
-		g_object_unref (strategy);
-		CORBA_exception_free (&ev);
-		declare_done_loading (strategy);
-		return;
-	}
-
-	iobuf = Bonobo_ProgressiveDataSink_iobuf__alloc ();
-	CORBA_sequence_set_release (iobuf, TRUE);
-	data = CORBA_sequence_CORBA_octet_allocbuf (LOAD_CHUNK);
-	iobuf->_buffer = data;
-
-	nautilus_adapter_load_strategy_report_load_underway (abstract_strategy);
-
-	if (strategy->details->stop) {
-		nautilus_adapter_load_strategy_report_load_complete (abstract_strategy);
-		g_object_unref (strategy);
-		CORBA_exception_free (&ev);
-		declare_done_loading (strategy);
-		return;
-	}
-
-	Bonobo_ProgressiveDataSink_start (strategy->details->progressive_data_sink, &ev);
-
-	CHECK_IF_STOPPED;
-
-	file_info = gnome_vfs_file_info_new ();
-	result = gnome_vfs_get_file_info_from_handle (handle, file_info, GNOME_VFS_FILE_INFO_DEFAULT);
-	size = 0;
-	if (result == GNOME_VFS_OK && (file_info->valid_fields | GNOME_VFS_FILE_INFO_FIELDS_SIZE)) {
-		size = file_info->size;
-	}
-	gnome_vfs_file_info_unref (file_info);
-
-	if (size > 0) {
-		Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink, 
-						    (long) size, &ev);
-		CHECK_IF_STOPPED;
-	}
-		
-	do {
-		result = gnome_vfs_read (handle, data, LOAD_CHUNK, &bytes_read);
-
-		if (result == GNOME_VFS_OK) {
-			iobuf->_length = bytes_read;
-
-			Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev);
-			
-			CHECK_IF_STOPPED;
-			
-			if (ev._major != CORBA_NO_EXCEPTION) {
-				STOP_LOADING;
-			}
-		} else if (result == GNOME_VFS_ERROR_EOF) {
-			if (ev._major == CORBA_NO_EXCEPTION) {
-				Bonobo_ProgressiveDataSink_end (strategy->details->progressive_data_sink, &ev);
-				nautilus_adapter_load_strategy_report_load_complete (abstract_strategy);
-				g_object_unref (strategy);
-				gnome_vfs_close (handle);
-				CORBA_free (iobuf);
-				CORBA_exception_free (&ev);
-				declare_done_loading (strategy);
-				return;
-			} else {
-				STOP_LOADING;
-			}
-		} else {
-			STOP_LOADING;
-		}
-	} while (TRUE);
-}
-
-static void
-nautilus_adapter_progressive_load_strategy_stop_loading  (NautilusAdapterLoadStrategy *abstract_strategy)
-{
-	NautilusAdapterProgressiveLoadStrategy *strategy;
-
-	strategy = NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY (abstract_strategy);
-
-	strategy->details->stop = TRUE;
-}
-
-
diff --git a/components/adapter/nautilus-adapter-progressive-load-strategy.h b/components/adapter/nautilus-adapter-progressive-load-strategy.h
deleted file mode 100644
index 7c8aea0f8..000000000
--- a/components/adapter/nautilus-adapter-progressive-load-strategy.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-
-/* 
- * Copyright (C) 2000 Eazel, Inc
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program 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
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: Maciej Stachowiak <mjs@eazel.com>
- */
-
-/* nautilus-adapter-progressive-load-strategy.h
- */
-
-#ifndef NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY_H
-#define NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY_H
-
-#include "nautilus-adapter-load-strategy.h"
-
-#define NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY	      (nautilus_adapter_progressive_load_strategy_get_type ())
-#define NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY(obj)	      (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NautilusAdapterProgressiveLoadStrategy))
-#define NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY, NautilusAdapterProgressiveLoadStrategyClass))
-#define NAUTILUS_IS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY(obj)	      (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY))
-#define NAUTILUS_IS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_ADAPTER_PROGRESSIVE_LOAD_STRATEGY))
-
-typedef struct NautilusAdapterProgressiveLoadStrategyDetails NautilusAdapterProgressiveLoadStrategyDetails;
-
-typedef struct {
-	NautilusAdapterLoadStrategy parent;
-	NautilusAdapterProgressiveLoadStrategyDetails *details;
-} NautilusAdapterProgressiveLoadStrategy;
-
-typedef struct {
-	NautilusAdapterLoadStrategyClass parent;
-} NautilusAdapterProgressiveLoadStrategyClass;
-
-/* GtkObject support */
-GtkType                      nautilus_adapter_progressive_load_strategy_get_type (void);
-
-NautilusAdapterLoadStrategy *nautilus_adapter_progressive_load_strategy_new      (Bonobo_ProgressiveDataSink progressive_data_sink);
-
-
-#endif /* NAUTILUS_ADAPTER_PROGRESSIVE_LOAD_STRATEGY_H */
-
-
-
diff --git a/components/hardware/Makefile.am b/components/hardware/Makefile.am
index 6a99cda17..1729435da 100644
--- a/components/hardware/Makefile.am
+++ b/components/hardware/Makefile.am
@@ -10,28 +10,21 @@ INCLUDES =						\
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
-
-server_in_files =					\
-	Nautilus_View_hardware.server.in		\
-	$(NULL)
-
+server_in_files = Nautilus_View_hardware.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
-bin_PROGRAMS =					\
-	nautilus-hardware-view
+bin_PROGRAMS =nautilus-hardware-view
 
 nautilus_hardware_view_SOURCES =		        \
 	nautilus-hardware-view.c			\
 	nautilus-hardware-view.h			\
 	main.c
 
-nautilus_hardware_view_LDADD =			\
+nautilus_hardware_view_LDADD =				\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-private/libnautilus-private.la	\
-	$(COMPONENT_LIBS) 	\
+	$(COMPONENT_LIBS) 				\
 	$(NULL)
 
 EXTRA_DIST = $(server_DATA) $(server_in_files)
-
diff --git a/components/history/Makefile.am b/components/history/Makefile.am
index 22f4a1992..ece5aca8d 100644
--- a/components/history/Makefile.am
+++ b/components/history/Makefile.am
@@ -17,14 +17,8 @@ LDADD=\
 nautilus_history_view_SOURCES=nautilus-history-view.c
 
 serverdir = $(libdir)/bonobo/servers
-
-server_in_files =					\
-	Nautilus_View_history.server.in		\
-	$(NULL)
-
+server_in_files = Nautilus_View_history.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST=$(server_DATA) $(server_in_files)
-
diff --git a/components/image-viewer/Makefile.am b/components/image-viewer/Makefile.am
index 5c4844486..2a65c6c9d 100644
--- a/components/image-viewer/Makefile.am
+++ b/components/image-viewer/Makefile.am
@@ -7,10 +7,10 @@ nautilus_image_view_SOURCES =	\
 	io-png.c		\
 	io-png.h
 
-INCLUDES =	\
+INCLUDES =			\
 	-I$(top_srcdir)		\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(COMPONENT_CFLAGS) \
+	$(COMPONENT_CFLAGS)	\
 	$(NULL)
 
 nautilus_image_view_LDADD = 			\
@@ -19,13 +19,8 @@ nautilus_image_view_LDADD = 			\
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
-
-server_in_files =					\
-	Nautilus_View_image.server.in		\
-	$(NULL)
-
+server_in_files = Nautilus_View_image.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST=$(server_DATA) $(server_in_files)
diff --git a/components/image-viewer/nautilus-image-view.c b/components/image-viewer/nautilus-image-view.c
index 068d229bd..d0bbdd76a 100644
--- a/components/image-viewer/nautilus-image-view.c
+++ b/components/image-viewer/nautilus-image-view.c
@@ -34,11 +34,6 @@
 #include <eel/eel-debug.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 #include <gdk-pixbuf/gdk-pixbuf-loader.h>
-#include <libart_lgpl/art_misc.h>
-#include <libart_lgpl/art_affine.h>
-#include <libart_lgpl/art_pixbuf.h>
-#include <libart_lgpl/art_rgb_pixbuf_affine.h>
-#include <libart_lgpl/art_alphagamma.h>
 
 #include "io-png.h"
 
diff --git a/components/music/Makefile.am b/components/music/Makefile.am
index e86ac32fc..8e383426a 100644
--- a/components/music/Makefile.am
+++ b/components/music/Makefile.am
@@ -1,11 +1,9 @@
 NULL =
 
 if X86_OPTIMIZED
-decode_source = decode_i386.c
-dct64_source  = dct64_i386.c
+optimized_source = dct64_i386.c decode_i386.c
 else
-decode_source = decode.c
-dct64_source = dct64.c
+optimized_source = dct64.c decode.c
 endif
 
 platform_source = decode.c dct64.c decode_i386.c dct64_i386.c
@@ -14,66 +12,59 @@ INCLUDES =					\
 	-DG_LOG_DOMAIN=\"Nautilus-Music\"	\
 	-I$(top_srcdir)				\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	$(COMPONENT_CFLAGS)			\
-	$(ESD_CFLAGS)				\
+	$(MUSIC_COMPONENT_CFLAGS)		\
 	$(NULL)
 
-bin_PROGRAMS =					\
-	nautilus-music-view
+bin_PROGRAMS =nautilus-music-view
 
 nautilus_music_view_SOURCES =			\
-	esd-audio.h				\
-	getbits.h				\
-	huffman.h				\
-	mp3head.c				\
-	mp3head.h				\
-	nautilus-music-view.c			\
-	nautilus-music-view.h			\
-	main.c					\
-	tabinit.c				\
+	common.c				\
 	decode_2to1.c				\
 	decode_4to1.c				\
 	decode_ntom.c				\
 	dxhead.c				\
 	dxhead.h				\
-	mpg123.c				\
-	mpg123.h				\
-	common.c				\
-	layer1.c				\
-	layer2.c				\
-	layer3.c				\
-	l2tables.h				\
+	esd-audio.c				\
+	esd-audio.h				\
+	esd-mixer.c				\
+	getbits.h				\
+	huffman.h				\
 	id3.c					\
 	id3.h					\
-	id3_header.h				\
 	id3_frame.c				\
 	id3_frame_content.c			\
 	id3_frame_text.c			\
 	id3_frame_url.c				\
+	id3_header.h				\
 	id3_tag.c				\
-	esd-audio.c				\
-	esd-mixer.c				\
+	l2tables.h				\
+	layer1.c				\
+	layer2.c				\
+	layer3.c				\
+	main.c					\
+	mp3head.c				\
+	mp3head.h				\
+	mpg123.c				\
+	mpg123.h				\
+	nautilus-music-view.c			\
+	nautilus-music-view.h			\
 	pixmaps.h				\
-	$(dct64_source)				\
-	$(decode_source)
+	tabinit.c				\
+	$(optimized_source)
 
 nautilus_music_view_LDADD =			\
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-private/libnautilus-private.la	\
-	$(COMPONENT_CFLAGS)	\
+	$(MUSIC_COMPONENT_LIBS)			\
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
-
-server_in_files =					\
-	Nautilus_View_music.server.in		\
-	$(NULL)
-
+server_in_files = Nautilus_View_music.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST=$(server_DATA) $(server_in_files) $(platform_source) \
-	configure.c \
-	fileinfo.c \
-	getbits.c
+	configure.c				\
+	fileinfo.c				\
+	getbits.c				\
+	$(NULL)
diff --git a/components/news/Makefile.am b/components/news/Makefile.am
index 89003533c..247e9eda2 100644
--- a/components/news/Makefile.am
+++ b/components/news/Makefile.am
@@ -3,17 +3,17 @@ NULL =
 bin_PROGRAMS=nautilus-news
 
 INCLUDES=\
-	-I$(top_srcdir)		\
+	-I$(top_srcdir)	\
 	-DNAUTILUS_DATADIR=\""$(datadir)/nautilus"\" \
 	-DNAUTILUS_PIXMAPDIR=\""$(datadir)/pixmaps/nautilus"\" \
-	-DDATADIR=\""$(datadir)"\" 		\
+	-DDATADIR=\""$(datadir)"\" \
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
 	$(COMPONENT_CFLAGS) \
 	$(NULL)
 
 LDADD=\
 	$(top_builddir)/libnautilus/libnautilus.la \
-	$(top_builddir)/libnautilus-private/libnautilus-private.la	\
+	$(top_builddir)/libnautilus-private/libnautilus-private.la \
 	$(COMPONENT_LIBS) \
 	$(NULL)
 
@@ -27,11 +27,8 @@ nautiluspixmap_DATA = news_bullet.png		\
 		      changed_bullet.png
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files =					\
-	Nautilus_View_news.server.in		\
-	$(NULL)
+server_in_files = Nautilus_View_news.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST= \
diff --git a/components/notes/Makefile.am b/components/notes/Makefile.am
index 3cda8240e..f35142fcf 100644
--- a/components/notes/Makefile.am
+++ b/components/notes/Makefile.am
@@ -19,11 +19,8 @@ LDADD=\
 nautilus_notes_SOURCES=nautilus-notes.c
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files =					\
-	Nautilus_View_notes.server.in		\
-	$(NULL)
+server_in_files = Nautilus_View_notes.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST= \
diff --git a/components/text/Makefile.am b/components/text/Makefile.am
index 5fee1aec8..2507a1e8e 100644
--- a/components/text/Makefile.am
+++ b/components/text/Makefile.am
@@ -28,11 +28,8 @@ uidir = $(datadir)/gnome-2.0/ui
 ui_DATA = nautilus-text-view-ui.xml
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files =				\
-	Nautilus_View_text.server.in		\
-	$(NULL)
+server_in_files = Nautilus_View_text.server.in
 # server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files) $(ui_DATA) $(nautilus_text_view_SOURCES) # $(server_DATA)
diff --git a/components/throbber/Makefile.am b/components/throbber/Makefile.am
index 1ca27ea38..212ec67df 100644
--- a/components/throbber/Makefile.am
+++ b/components/throbber/Makefile.am
@@ -8,8 +8,7 @@ INCLUDES =						\
 	$(COMPONENT_CFLAGS)				\
 	$(NULL)
 
-bin_PROGRAMS =					\
-	nautilus-throbber
+bin_PROGRAMS = nautilus-throbber
 
 nautilus_throbber_SOURCES =		        \
 	nautilus-throbber.c			\
@@ -23,14 +22,8 @@ nautilus_throbber_LDADD =			\
 	$(NULL)
 
 serverdir = $(libdir)/bonobo/servers
-server_in_files =					\
-	Nautilus_Control_throbber.server.in	\
-	$(NULL)
+server_in_files = Nautilus_Control_throbber.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
-EXTRA_DIST = 			\
-	$(server_in_files)		\
-	$(server_DATA)		\
-	$(NULL)
+EXTRA_DIST = $(server_in_files) $(server_DATA)
diff --git a/components/tree/Makefile.am b/components/tree/Makefile.am
index 5e8639e98..899203b43 100644
--- a/components/tree/Makefile.am
+++ b/components/tree/Makefile.am
@@ -25,18 +25,14 @@ TREE_VIEW_COMMON_SOURCES =			\
 	nautilus-tree-view-dnd.h		\
 	$(NULL)
 
-lib_LTLIBRARIES =			\
+lib_LTLIBRARIES =				\
 	libnautilus-tree-view.la
 
-libnautilus_tree_view_la_SOURCES =         \
-	$(TREE_VIEW_COMMON_SOURCES)        \
-	libmain.c                          \
-	$(NULL)
+libnautilus_tree_view_la_SOURCES = $(TREE_VIEW_COMMON_SOURCES) libmain.c 
 
-libnautilus_tree_view_la_LDFLAGS =         \
-	-module -avoid-version
+libnautilus_tree_view_la_LDFLAGS = -module -avoid-version
 
-libnautilus_tree_view_la_LIBADD =          \
+libnautilus_tree_view_la_LIBADD =               \
 	$(top_builddir)/libnautilus/libnautilus.la	\
 	$(top_builddir)/libnautilus-private/libnautilus-private.la \
 	$(COMPONENT_LIBS)
@@ -45,8 +41,6 @@ libnautilus_tree_view_la_LIBADD =          \
 serverdir = $(libdir)/bonobo/servers
 server_in_files = Nautilus_View_tree.server.in
 server_DATA = $(server_in_files:.server.in=.server)
-
 @INTLTOOL_SERVER_RULE@
 
 EXTRA_DIST = $(server_in_files) $(server_DATA)
-