cut-n-paste-code now compiles, and we are a hair's breadth away from

	* Lots of files:
	cut-n-paste-code now compiles, and we are a hair's breadth
	away from linking -- so far from running, though

3 files changed, 1 insertions, 422 deletions

diff --git a/libnautilus/nautilus-bonobo-workarounds.c b/libnautilus/nautilus-bonobo-workarounds.c
deleted file mode 100644
index 747897a51..000000000
--- a/libnautilus/nautilus-bonobo-workarounds.c
+++ /dev/null
@@ -1,368 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
-
-/*
- *  libnautilus: A library for nautilus view implementations.
- *
- *  Copyright (C) 2000, 2001 Eazel, 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: Darin Adler <darin@bentspoon.com>
- *
- */
-
-#include <config.h>
-#include "nautilus-bonobo-workarounds.h"
-
-#include <bonobo/bonobo-stream.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtksignal.h>
-
-#define RELY_ON_BONOBO_INTERNALS
-
-#ifdef RELY_ON_BONOBO_INTERNALS
-
-/* This is incredibly unsafe and relies on details of the Bonobo
- * internals. I should be shot and killed for even thinking of doing
- * this.
- */
-typedef struct {
-	int   ref_count;
-	GList *objs;
-} StartOfBonoboAggregateObject;
-
-typedef struct {
-	StartOfBonoboAggregateObject *ao;
-	int destroy_id;
-} StartOfBonoboObjectPrivate;
-
-#endif
-
-/* By waiting a minute before self-destructing, we minimize the race
- * conditions that can occur if we self-destruct right when we notice
- * an X window going away.
- */
-#define MINIMIZE_RACE_CONDITIONS_DELAY 60000
-
-/* FIXME bugzilla.gnome.org 42456: Is a hard-coded 20 seconds wait to
- * detect that a remote object's process is hung acceptable? Can a
- * component that is working still take 20 seconds to respond?
- */
-/* in milliseconds */
-#define REMOTE_CHECK_TIME_INTERVAL 20000
-#define REMOTE_CHECK_DATA_KEY "nautilus-bonobo-workarounds/RemoteCheckData"
-
-typedef struct {
-	BonoboObject *object;
-	Bonobo_Unknown remote_object;
-	guint timeout_id;
-	guint destroy_handler_id;
-	NautilusBonoboObjectCallback function;
-	gpointer callback_data;
-} RemoteCheckData;
-
-typedef struct {
-	BonoboObject *object;
-	guint timeout_id;
-	guint destroy_handler_id;
-} DestroyLaterData;
-
-/* The following is the most evil function in the world. But on the
- * other hand, it works and prevents us from having tons of lingering
- * processes when Nautilus crashes. It's unsafe to call it if there
- * are any direct references to the bonobo object, but it's OK to have
- * any number of references to it through CORBA.
- */
-
-#ifndef RELY_ON_BONOBO_INTERNALS
-
-/* This version of the function doesn't rely on Bonobo internals as
- * much as the other one does, but it gets screwed up by incoming
- * unref calls while the object is being destroyed. This was actually
- * happening, which is why I had to write the other version.
- */
-
-static void
-set_gone_flag (GtkObject *object,
-	       gpointer callback_data)
-{
-	gboolean *gone_flag;
-
-	gone_flag = callback_data;
-	*gone_flag = TRUE;
-}
-
-void
-nautilus_bonobo_object_force_destroy (BonoboObject *object)
-{
-	gboolean gone;
-
-	if (object == NULL) {
-		return;
-	}
-
-	g_return_if_fail (BONOBO_IS_OBJECT (object));
-	g_return_if_fail (!GTK_OBJECT_DESTROYED (object));
-
-	gone = FALSE;
-	gtk_signal_connect (GTK_OBJECT (object), "destroy",
-			    set_gone_flag, &gone);
-	do {
-		bonobo_object_unref (object);
-	} while (!gone);
-}
-
-#else /* RELY_ON_BONOBO_INTERNALS */
-
-void
-nautilus_bonobo_object_force_destroy (BonoboObject *object)
-{
-	StartOfBonoboAggregateObject *aggregate;
-	GList *node;
-	GtkObject *subobject;
-	guint *id;
-
-	if (object == NULL) {
-		return;
-	}
-
-	g_return_if_fail (BONOBO_IS_OBJECT (object));
-
-	aggregate = ((StartOfBonoboObjectPrivate *) object->priv)->ao;
-
-	/* Do all the destroying with a normal reference count. This
-	 * lets us live through unrefs that happen during the destroy
-	 * process.
-	 */
-	bonobo_object_ref (object);
-	for (node = aggregate->objs; node != NULL; node = node->next) {
-		subobject = GTK_OBJECT (node->data);
-		id = &((StartOfBonoboObjectPrivate *) BONOBO_OBJECT (subobject)->priv)->destroy_id;
-		if (*id != 0) {
-			gtk_signal_disconnect (subobject, *id);
-			*id = 0;
-		}
-		gtk_object_destroy (subobject);
-	}
-
-	/* Now force a destroy by forcing the reference count to 1. */
-	aggregate->ref_count = 1;
-	bonobo_object_unref (object);
-}
-
-#endif /* RELY_ON_BONOBO_INTERNALS */
-
-static gboolean
-destroy_later_callback (gpointer callback_data)
-{
-	DestroyLaterData *data;
-
-	data = callback_data;
-	g_assert (BONOBO_IS_OBJECT (data->object));
-
-	gtk_signal_disconnect (GTK_OBJECT (data->object),
-			       data->destroy_handler_id);
-	nautilus_bonobo_object_force_destroy (data->object);
-	g_free (data);
-	return FALSE;
-}
-
-static void
-destroyed_before_timeout_callback (GtkObject *object,
-				   gpointer callback_data)
-{
-	DestroyLaterData *data;
-
-	data = callback_data;
-	g_assert (data->object == BONOBO_OBJECT (object));
-
-	gtk_timeout_remove (data->timeout_id);
-	g_free (data);
-}
-
-void
-nautilus_bonobo_object_force_destroy_later (BonoboObject *object)
-{
-	DestroyLaterData *data;
-
-	if (object == NULL) {
-		return;
-	}
-
-	g_return_if_fail (BONOBO_IS_OBJECT (object));
-	g_return_if_fail (!GTK_OBJECT_DESTROYED (object));
-
-	data = g_new (DestroyLaterData, 1);
-	data->object = object;
-	data->timeout_id = gtk_timeout_add
-		(MINIMIZE_RACE_CONDITIONS_DELAY,
-		 destroy_later_callback, data);
-	data->destroy_handler_id = g_signal_connect
-		(G_OBJECT (object), "destroy",
-		 G_CALLBACK (destroyed_before_timeout_callback), data);
-}
-
-/* Same as bonobo_unknown_ping, but this one works. */
-static gboolean
-object_is_gone (Bonobo_Unknown object)
-{
-	CORBA_Environment ev;
-	gboolean gone;
-
-	CORBA_exception_init (&ev);
-	gone = CORBA_Object_non_existent (object, &ev);
-	if (ev._major != CORBA_NO_EXCEPTION) {
-		gone = TRUE;
-	}
-	CORBA_exception_free (&ev);
-	
-	return gone;
-}
-
-static void
-remote_check_data_free (RemoteCheckData *data)
-{
-	CORBA_Environment ev;
-
-	if (data == NULL) {
-		return;
-	}
-
-	gtk_object_remove_data (GTK_OBJECT (data->object), REMOTE_CHECK_DATA_KEY);
-
-	CORBA_exception_init (&ev);
-	CORBA_Object_release (data->remote_object, &ev);
-	CORBA_exception_free (&ev);
-
-	if (data->timeout_id != 0) {
-		g_source_remove (data->timeout_id);
-	}
-
-	if (data->destroy_handler_id != 0) {
-		gtk_signal_disconnect (GTK_OBJECT (data->object),
-				       data->destroy_handler_id);
-	}
-
-	g_free (data);
-}
-
-static gboolean
-remote_check_timed_callback (gpointer callback_data)
-{
-	RemoteCheckData *data;
-	BonoboObject *object;
-	NautilusBonoboObjectCallback function;
-	gpointer function_data;
-
-	data = callback_data;
-	g_assert (BONOBO_IS_OBJECT (data->object));
-	g_assert (!GTK_OBJECT_DESTROYED (data->object));
-	g_assert (data->remote_object != CORBA_OBJECT_NIL);
-	g_assert (data->timeout_id != 0);
-	g_assert (data->destroy_handler_id != 0);
-	g_assert (data->function != NULL);
-
-	if (!object_is_gone (data->remote_object)) {
-		return TRUE;
-	}
-
-	object = data->object;
-	function = data->function;
-	function_data = data->callback_data;
-
-	data->timeout_id = 0;
-	remote_check_data_free (data);
-
-	(* function) (object, function_data);
-
-	return FALSE;
-}
-
-static void
-remote_check_destroy_callback (GtkObject *object,
-			       gpointer callback_data)
-{
-	RemoteCheckData *data;
-
-	g_assert (BONOBO_IS_OBJECT (object));
-
-	data = callback_data;
-	g_assert (data->object == BONOBO_OBJECT (object));
-	g_assert (data->remote_object != CORBA_OBJECT_NIL);
-	g_assert (data->timeout_id != 0);
-	g_assert (data->destroy_handler_id != 0);
-	g_assert (data->function != NULL);
-
-	remote_check_data_free (data);
-}
-
-void
-nautilus_bonobo_object_call_when_remote_object_disappears (BonoboObject *object,
-							   Bonobo_Unknown remote_object,
-							   NautilusBonoboObjectCallback function,
-							   gpointer callback_data)
-{
-	RemoteCheckData *data;
-	CORBA_Environment ev;
-
-	g_return_if_fail (BONOBO_IS_OBJECT (object));
-
-	data = gtk_object_get_data (GTK_OBJECT (object), REMOTE_CHECK_DATA_KEY);
-
-	if (GTK_OBJECT_DESTROYED (object)
-	    || remote_object == CORBA_OBJECT_NIL
-	    || function == NULL) {
-		remote_check_data_free (data);
-		return;
-	}
-
-	if (data == NULL) {
-		data = g_new0 (RemoteCheckData, 1);
-		data->object = object;
-	}
-	CORBA_exception_init (&ev);
-	data->remote_object = CORBA_Object_duplicate (remote_object, &ev);
-	CORBA_exception_free (&ev);
-	data->function = function;
-	data->callback_data = callback_data;
-
-	if (data->timeout_id == 0) {
-		data->timeout_id = g_timeout_add
-			(REMOTE_CHECK_TIME_INTERVAL,
-			 remote_check_timed_callback, data);
-	}
-	if (data->destroy_handler_id == 0) {
-		data->destroy_handler_id = g_signal_connect
-			(G_OBJECT (object), "destroy",
-			 G_CALLBACK (remote_check_destroy_callback), data);
-	}
-
-	gtk_object_set_data (GTK_OBJECT (object), REMOTE_CHECK_DATA_KEY, data);
-}
-
-static void
-force_destroy_cover (BonoboObject *object,
-		     gpointer callback_data)
-{
-	nautilus_bonobo_object_force_destroy (object);
-}
-
-void
-nautilus_bonobo_object_force_destroy_when_owner_disappears (BonoboObject *object,
-							    Bonobo_Unknown owner)
-{
-	nautilus_bonobo_object_call_when_remote_object_disappears
-		(object, owner, force_destroy_cover, NULL);
-}
diff --git a/libnautilus/nautilus-bonobo-workarounds.h b/libnautilus/nautilus-bonobo-workarounds.h
deleted file mode 100644
index bbdc55fbf..000000000
--- a/libnautilus/nautilus-bonobo-workarounds.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
-
-/*
- *  libnautilus: A library for nautilus view implementations.
- *
- *  Copyright (C) 2000, 2001 Eazel, 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: Darin Adler <darin@bentspoon.com>
- *
- */
-
-#ifndef NAUTILUS_BONOBO_WORKAROUNDS_H
-#define NAUTILUS_BONOBO_WORKAROUNDS_H
-
-#include <bonobo/bonobo-object.h>
-
-typedef void (* NautilusBonoboObjectCallback) (BonoboObject *object,
-					       gpointer      callback_data);
-
-/* Gets a single global one. */
-POA_Bonobo_Unknown__epv *nautilus_bonobo_object_get_epv                             (void);
-POA_Bonobo_Stream__epv * nautilus_bonobo_stream_get_epv                             (void);
-
-/* Bonobo will address this problem some day. */
-void                     nautilus_bonobo_object_force_destroy                       (BonoboObject                 *object);
-void                     nautilus_bonobo_object_force_destroy_later                 (BonoboObject                 *object);
-void                     nautilus_bonobo_object_call_when_remote_object_disappears  (BonoboObject                 *object,
-										     Bonobo_Unknown                remote_object,
-										     NautilusBonoboObjectCallback  function,
-										     gpointer                      callback_data);
-void                     nautilus_bonobo_object_force_destroy_when_owner_disappears (BonoboObject                 *object,
-										     Bonobo_Unknown                owner);
-
-#endif /* NAUTILUS_BONOBO_WORKAROUNDS_H */
diff --git a/libnautilus/nautilus-view.c b/libnautilus/nautilus-view.c
index 2a7ad8c23..34c269913 100644
--- a/libnautilus/nautilus-view.c
+++ b/libnautilus/nautilus-view.c
@@ -59,11 +59,6 @@ struct NautilusViewDetails {
 	NautilusIdleQueue *outgoing_queue;
 };
 
-typedef struct {
-	POA_Nautilus_View servant;
-	NautilusView *bonobo_object;
-} impl_POA_Nautilus_View;
-
 typedef void (* ViewFunction) (NautilusView *view,
 			       gpointer callback_data);
 
@@ -102,7 +97,7 @@ queue_incoming_call (PortableServer_Servant servant,
 {
 	NautilusView *view;
 
-	view = ((impl_POA_Nautilus_View *) servant)->bonobo_object;
+	view = NAUTILUS_VIEW (bonobo_object_from_servant (bonobo_object));
 
 	nautilus_idle_queue_add (view->details->incoming_queue,
 				 (GFunc) call,