2 files changed, 757 insertions, 7 deletions

diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index cf90fac28b70..0497e53964df 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	galeon
 PORTVERSION=	1.2.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,11 +16,9 @@ MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers \
 		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
-		msgfmt-new:${PORTSDIR}/devel/gettext-devel \
-		nautilus:${PORTSDIR}/x11-fm/nautilus
+		msgfmt-new:${PORTSDIR}/devel/gettext-devel
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA} \
-		nautilus:${PORTSDIR}/x11-fm/nautilus
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
 
 #BROKEN=		"b0rken with Mozilla-0.9.9"
 
@@ -37,7 +35,8 @@ USE_NEWGCC=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla" \
-		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}"
+		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
+		--enable-nautilus-view
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		MSGFMT=${LOCALBASE}/bin/msgfmt-new \
@@ -65,12 +64,14 @@ pre-patch:
 		 s|-lpthread|${PTHREAD_LIBS}|g'
 	@find ${WRKSRC} -name "*.[ch]" | xargs ${PERL} -pi -e \
 		's|iconv\.h|giconv.h|g'
+	@${MKDIR} ${WRKSRC}/src/libnautilus
 
 post-configure:
 	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g ; \
 			 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
 			 s|%%X11BASE%%|${X11BASE}|g ; \
-			 s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon
+			 s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon \
+						     ${WRKSRC}/src/nautstub.c
 
 pre-install:
 	@-${X11BASE}/bin/gconftool --shutdown
diff --git a/www/galeon/files/patch-hairy b/www/galeon/files/patch-hairy
new file mode 100644
index 000000000000..7b40aa920f36
--- /dev/null
+++ b/www/galeon/files/patch-hairy
@@ -0,0 +1,749 @@
+Magick to allow libnautilus.so be linked at runtime. nautstub.c is mine,
+all other files (libnautilus.h, nautilus-view.h and nautilus-view-component.h)
+are stock versions from nautilus-1.0.6.
+
+$FreeBSD$
+
+--- /dev/null	Wed Mar 13 22:43:29 2002
++++ src/nautstub.c	Wed Mar 13 22:22:07 2002
+@@ -0,0 +1,108 @@
++#include <dlfcn.h>
++#include <stdlib.h>
++
++#define SIZE 1024
++
++static void *handle = NULL;
++
++void nautilus_view_get_bonobo_control(void);
++void nautilus_view_new(void);
++void nautilus_view_open_location_force_new_window(void);
++void nautilus_view_report_load_complete(void);
++void nautilus_view_report_load_failed(void);
++void nautilus_view_report_load_progress(void);
++void nautilus_view_report_load_underway(void);
++void nautilus_view_report_location_change(void);
++void nautilus_view_report_status(void);
++void nautilus_view_set_title(void);
++void nautilus_view_set_up_ui(void);
++
++
++static void *
++f(const char *name)
++{
++    if (handle == NULL) {
++	handle = dlopen("%%X11BASE%%/lib/libnautilus.so", RTLD_LAZY);
++	if (handle == NULL)
++	    abort();
++    }
++
++    return (dlsym(handle, name));
++}
++
++void
++nautilus_view_get_bonobo_control(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_new(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_open_location_force_new_window(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_report_load_complete(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_report_load_failed(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_report_load_progress(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_report_load_underway(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_report_location_change(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_report_status(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_set_title(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
++
++void
++nautilus_view_set_up_ui(void)
++{
++    __builtin_return(__builtin_apply(f(__FUNCTION__), __builtin_apply_args(), \
++		     SIZE));
++}
+--- /dev/null	Wed Mar 13 22:43:29 2002
++++ src/libnautilus/libnautilus.h	Wed Mar 13 19:44:22 2002
+@@ -0,0 +1,35 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 2 -*- */
++
++/*
++ *  libnautilus: A library for nautilus view components.
++ *
++ *  Copyright (C) 1999, 2000 Red Hat, Inc.
++ *  Copyright (C) 2000 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: Elliot Lee <sopwith@redhat.com>
++ *
++ */
++
++/* libnautilus.h: Main library header file */
++
++#ifndef LIBNAUTILUS_H
++#define LIBNAUTILUS_H
++
++#include <libnautilus/nautilus-view-component.h>
++#include <libnautilus/nautilus-view.h>
++
++#endif /* LIBNAUTILUS_H */
+--- /dev/null	Wed Mar 13 22:43:29 2002
++++ src/libnautilus/nautilus-view-component.h	Wed Mar 13 19:26:59 2002
+@@ -0,0 +1,436 @@
++/*
++ * This file was generated by orbit-idl - DO NOT EDIT!
++ */
++
++#include <glib.h>
++#define ORBIT_IDL_SERIAL 9
++#include <orb/orbit.h>
++
++#ifndef nautilus_view_component_H
++#define nautilus_view_component_H 1
++#ifdef __cplusplus
++extern "C" {
++#endif /* __cplusplus */
++
++
++/** typedefs **/
++#include <bonobo/Bonobo.h>
++#if !defined(_Nautilus_URI_defined)
++#define _Nautilus_URI_defined 1
++typedef CORBA_char * Nautilus_URI;
++#if !defined(TC_IMPL_TC_Nautilus_URI_0)
++#define TC_IMPL_TC_Nautilus_URI_0 'n'
++#define TC_IMPL_TC_Nautilus_URI_1 'a'
++#define TC_IMPL_TC_Nautilus_URI_2 'u'
++#define TC_IMPL_TC_Nautilus_URI_3 't'
++#define TC_IMPL_TC_Nautilus_URI_4 'i'
++#define TC_IMPL_TC_Nautilus_URI_5 'l'
++#define TC_IMPL_TC_Nautilus_URI_6 'u'
++#define TC_IMPL_TC_Nautilus_URI_7 's'
++#define TC_IMPL_TC_Nautilus_URI_8 '_'
++#define TC_IMPL_TC_Nautilus_URI_9 'v'
++#define TC_IMPL_TC_Nautilus_URI_10 'i'
++#define TC_IMPL_TC_Nautilus_URI_11 'e'
++#define TC_IMPL_TC_Nautilus_URI_12 'w'
++#define TC_IMPL_TC_Nautilus_URI_13 '_'
++#define TC_IMPL_TC_Nautilus_URI_14 'c'
++#define TC_IMPL_TC_Nautilus_URI_15 'o'
++#define TC_IMPL_TC_Nautilus_URI_16 'm'
++#define TC_IMPL_TC_Nautilus_URI_17 'p'
++#define TC_IMPL_TC_Nautilus_URI_18 'o'
++#define TC_IMPL_TC_Nautilus_URI_19 'n'
++#define TC_IMPL_TC_Nautilus_URI_20 'e'
++#define TC_IMPL_TC_Nautilus_URI_21 'n'
++#define TC_IMPL_TC_Nautilus_URI_22 't'
++extern const struct CORBA_TypeCode_struct TC_Nautilus_URI_struct;
++#define TC_Nautilus_URI ((CORBA_TypeCode)&TC_Nautilus_URI_struct)
++#endif
++#define Nautilus_URI__free CORBA_string__free
++#endif
++#if !defined(ORBIT_DECL_CORBA_sequence_Nautilus_URI) && !defined(_CORBA_sequence_Nautilus_URI_defined)
++#define ORBIT_DECL_CORBA_sequence_Nautilus_URI 1
++#define _CORBA_sequence_Nautilus_URI_defined 1
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_0 'n'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_1 'a'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_2 'u'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_3 't'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_4 'i'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_5 'l'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_6 'u'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_7 's'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_8 '_'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_9 'v'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_10 'i'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_11 'e'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_12 'w'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_13 '_'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_14 'c'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_15 'o'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_16 'm'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_17 'p'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_18 'o'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_19 'n'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_20 'e'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_21 'n'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_URI_22 't'
++typedef struct { CORBA_unsigned_long _maximum, _length; Nautilus_URI* _buffer; CORBA_boolean _release; } CORBA_sequence_Nautilus_URI;
++Nautilus_URI *CORBA_sequence_Nautilus_URI_allocbuf(CORBA_unsigned_long len);
++#endif
++#if !defined(TC_IMPL_TC_CORBA_sequence_Nautilus_URI_0)
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_0 'n'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_1 'a'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_2 'u'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_3 't'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_4 'i'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_5 'l'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_6 'u'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_7 's'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_8 '_'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_9 'v'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_10 'i'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_11 'e'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_12 'w'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_13 '_'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_14 'c'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_15 'o'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_16 'm'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_17 'p'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_18 'o'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_19 'n'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_20 'e'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_21 'n'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_URI_22 't'
++extern const struct CORBA_TypeCode_struct TC_CORBA_sequence_Nautilus_URI_struct;
++#define TC_CORBA_sequence_Nautilus_URI ((CORBA_TypeCode)&TC_CORBA_sequence_Nautilus_URI_struct)
++#endif
++extern CORBA_sequence_Nautilus_URI* CORBA_sequence_Nautilus_URI__alloc(void);
++extern gpointer CORBA_sequence_Nautilus_URI__free(gpointer mem, gpointer dat, CORBA_boolean free_strings); /* ORBit internal use */
++#if !defined(_Nautilus_URIList_defined)
++#define _Nautilus_URIList_defined 1
++typedef CORBA_sequence_Nautilus_URI Nautilus_URIList;
++#if !defined(TC_IMPL_TC_Nautilus_URIList_0)
++#define TC_IMPL_TC_Nautilus_URIList_0 'n'
++#define TC_IMPL_TC_Nautilus_URIList_1 'a'
++#define TC_IMPL_TC_Nautilus_URIList_2 'u'
++#define TC_IMPL_TC_Nautilus_URIList_3 't'
++#define TC_IMPL_TC_Nautilus_URIList_4 'i'
++#define TC_IMPL_TC_Nautilus_URIList_5 'l'
++#define TC_IMPL_TC_Nautilus_URIList_6 'u'
++#define TC_IMPL_TC_Nautilus_URIList_7 's'
++#define TC_IMPL_TC_Nautilus_URIList_8 '_'
++#define TC_IMPL_TC_Nautilus_URIList_9 'v'
++#define TC_IMPL_TC_Nautilus_URIList_10 'i'
++#define TC_IMPL_TC_Nautilus_URIList_11 'e'
++#define TC_IMPL_TC_Nautilus_URIList_12 'w'
++#define TC_IMPL_TC_Nautilus_URIList_13 '_'
++#define TC_IMPL_TC_Nautilus_URIList_14 'c'
++#define TC_IMPL_TC_Nautilus_URIList_15 'o'
++#define TC_IMPL_TC_Nautilus_URIList_16 'm'
++#define TC_IMPL_TC_Nautilus_URIList_17 'p'
++#define TC_IMPL_TC_Nautilus_URIList_18 'o'
++#define TC_IMPL_TC_Nautilus_URIList_19 'n'
++#define TC_IMPL_TC_Nautilus_URIList_20 'e'
++#define TC_IMPL_TC_Nautilus_URIList_21 'n'
++#define TC_IMPL_TC_Nautilus_URIList_22 't'
++extern const struct CORBA_TypeCode_struct TC_Nautilus_URIList_struct;
++#define TC_Nautilus_URIList ((CORBA_TypeCode)&TC_Nautilus_URIList_struct)
++#endif
++extern Nautilus_URIList* Nautilus_URIList__alloc(void);
++extern gpointer Nautilus_URIList__free(gpointer mem, gpointer dat, CORBA_boolean free_strings); /* ORBit internal use */
++#endif
++#if !defined(_Nautilus_HistoryItem_defined)
++#define _Nautilus_HistoryItem_defined 1
++typedef struct {
++CORBA_char * title;
++Nautilus_URI location;
++CORBA_char * icon;
++} Nautilus_HistoryItem;
++
++#if !defined(TC_IMPL_TC_Nautilus_HistoryItem_0)
++#define TC_IMPL_TC_Nautilus_HistoryItem_0 'n'
++#define TC_IMPL_TC_Nautilus_HistoryItem_1 'a'
++#define TC_IMPL_TC_Nautilus_HistoryItem_2 'u'
++#define TC_IMPL_TC_Nautilus_HistoryItem_3 't'
++#define TC_IMPL_TC_Nautilus_HistoryItem_4 'i'
++#define TC_IMPL_TC_Nautilus_HistoryItem_5 'l'
++#define TC_IMPL_TC_Nautilus_HistoryItem_6 'u'
++#define TC_IMPL_TC_Nautilus_HistoryItem_7 's'
++#define TC_IMPL_TC_Nautilus_HistoryItem_8 '_'
++#define TC_IMPL_TC_Nautilus_HistoryItem_9 'v'
++#define TC_IMPL_TC_Nautilus_HistoryItem_10 'i'
++#define TC_IMPL_TC_Nautilus_HistoryItem_11 'e'
++#define TC_IMPL_TC_Nautilus_HistoryItem_12 'w'
++#define TC_IMPL_TC_Nautilus_HistoryItem_13 '_'
++#define TC_IMPL_TC_Nautilus_HistoryItem_14 'c'
++#define TC_IMPL_TC_Nautilus_HistoryItem_15 'o'
++#define TC_IMPL_TC_Nautilus_HistoryItem_16 'm'
++#define TC_IMPL_TC_Nautilus_HistoryItem_17 'p'
++#define TC_IMPL_TC_Nautilus_HistoryItem_18 'o'
++#define TC_IMPL_TC_Nautilus_HistoryItem_19 'n'
++#define TC_IMPL_TC_Nautilus_HistoryItem_20 'e'
++#define TC_IMPL_TC_Nautilus_HistoryItem_21 'n'
++#define TC_IMPL_TC_Nautilus_HistoryItem_22 't'
++extern const struct CORBA_TypeCode_struct TC_Nautilus_HistoryItem_struct;
++#define TC_Nautilus_HistoryItem ((CORBA_TypeCode)&TC_Nautilus_HistoryItem_struct)
++#endif
++extern Nautilus_HistoryItem* Nautilus_HistoryItem__alloc(void);
++extern gpointer Nautilus_HistoryItem__free(gpointer mem, gpointer dat, CORBA_boolean free_strings); /* ORBit internal use */
++#endif
++#if !defined(ORBIT_DECL_CORBA_sequence_Nautilus_HistoryItem) && !defined(_CORBA_sequence_Nautilus_HistoryItem_defined)
++#define ORBIT_DECL_CORBA_sequence_Nautilus_HistoryItem 1
++#define _CORBA_sequence_Nautilus_HistoryItem_defined 1
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_0 'n'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_1 'a'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_2 'u'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_3 't'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_4 'i'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_5 'l'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_6 'u'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_7 's'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_8 '_'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_9 'v'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_10 'i'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_11 'e'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_12 'w'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_13 '_'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_14 'c'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_15 'o'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_16 'm'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_17 'p'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_18 'o'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_19 'n'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_20 'e'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_21 'n'
++#define ORBIT_IMPL_CORBA_sequence_Nautilus_HistoryItem_22 't'
++typedef struct { CORBA_unsigned_long _maximum, _length; Nautilus_HistoryItem* _buffer; CORBA_boolean _release; } CORBA_sequence_Nautilus_HistoryItem;
++Nautilus_HistoryItem *CORBA_sequence_Nautilus_HistoryItem_allocbuf(CORBA_unsigned_long len);
++#endif
++#if !defined(TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_0)
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_0 'n'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_1 'a'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_2 'u'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_3 't'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_4 'i'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_5 'l'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_6 'u'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_7 's'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_8 '_'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_9 'v'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_10 'i'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_11 'e'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_12 'w'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_13 '_'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_14 'c'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_15 'o'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_16 'm'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_17 'p'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_18 'o'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_19 'n'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_20 'e'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_21 'n'
++#define TC_IMPL_TC_CORBA_sequence_Nautilus_HistoryItem_22 't'
++extern const struct CORBA_TypeCode_struct TC_CORBA_sequence_Nautilus_HistoryItem_struct;
++#define TC_CORBA_sequence_Nautilus_HistoryItem ((CORBA_TypeCode)&TC_CORBA_sequence_Nautilus_HistoryItem_struct)
++#endif
++extern CORBA_sequence_Nautilus_HistoryItem* CORBA_sequence_Nautilus_HistoryItem__alloc(void);
++extern gpointer CORBA_sequence_Nautilus_HistoryItem__free(gpointer mem, gpointer dat, CORBA_boolean free_strings); /* ORBit internal use */
++#if !defined(_Nautilus_History_defined)
++#define _Nautilus_History_defined 1
++typedef CORBA_sequence_Nautilus_HistoryItem Nautilus_History;
++#if !defined(TC_IMPL_TC_Nautilus_History_0)
++#define TC_IMPL_TC_Nautilus_History_0 'n'
++#define TC_IMPL_TC_Nautilus_History_1 'a'
++#define TC_IMPL_TC_Nautilus_History_2 'u'
++#define TC_IMPL_TC_Nautilus_History_3 't'
++#define TC_IMPL_TC_Nautilus_History_4 'i'
++#define TC_IMPL_TC_Nautilus_History_5 'l'
++#define TC_IMPL_TC_Nautilus_History_6 'u'
++#define TC_IMPL_TC_Nautilus_History_7 's'
++#define TC_IMPL_TC_Nautilus_History_8 '_'
++#define TC_IMPL_TC_Nautilus_History_9 'v'
++#define TC_IMPL_TC_Nautilus_History_10 'i'
++#define TC_IMPL_TC_Nautilus_History_11 'e'
++#define TC_IMPL_TC_Nautilus_History_12 'w'
++#define TC_IMPL_TC_Nautilus_History_13 '_'
++#define TC_IMPL_TC_Nautilus_History_14 'c'
++#define TC_IMPL_TC_Nautilus_History_15 'o'
++#define TC_IMPL_TC_Nautilus_History_16 'm'
++#define TC_IMPL_TC_Nautilus_History_17 'p'
++#define TC_IMPL_TC_Nautilus_History_18 'o'
++#define TC_IMPL_TC_Nautilus_History_19 'n'
++#define TC_IMPL_TC_Nautilus_History_20 'e'
++#define TC_IMPL_TC_Nautilus_History_21 'n'
++#define TC_IMPL_TC_Nautilus_History_22 't'
++extern const struct CORBA_TypeCode_struct TC_Nautilus_History_struct;
++#define TC_Nautilus_History ((CORBA_TypeCode)&TC_Nautilus_History_struct)
++#endif
++extern Nautilus_History* Nautilus_History__alloc(void);
++extern gpointer Nautilus_History__free(gpointer mem, gpointer dat, CORBA_boolean free_strings); /* ORBit internal use */
++#endif
++#if !defined(ORBIT_DECL_Nautilus_View) && !defined(_Nautilus_View_defined)
++#define ORBIT_DECL_Nautilus_View 1
++#define _Nautilus_View_defined 1
++#define Nautilus_View__free CORBA_Object__free
++typedef CORBA_Object Nautilus_View;
++extern CORBA_unsigned_long Nautilus_View__classid;
++#if !defined(TC_IMPL_TC_Nautilus_View_0)
++#define TC_IMPL_TC_Nautilus_View_0 'n'
++#define TC_IMPL_TC_Nautilus_View_1 'a'
++#define TC_IMPL_TC_Nautilus_View_2 'u'
++#define TC_IMPL_TC_Nautilus_View_3 't'
++#define TC_IMPL_TC_Nautilus_View_4 'i'
++#define TC_IMPL_TC_Nautilus_View_5 'l'
++#define TC_IMPL_TC_Nautilus_View_6 'u'
++#define TC_IMPL_TC_Nautilus_View_7 's'
++#define TC_IMPL_TC_Nautilus_View_8 '_'
++#define TC_IMPL_TC_Nautilus_View_9 'v'
++#define TC_IMPL_TC_Nautilus_View_10 'i'
++#define TC_IMPL_TC_Nautilus_View_11 'e'
++#define TC_IMPL_TC_Nautilus_View_12 'w'
++#define TC_IMPL_TC_Nautilus_View_13 '_'
++#define TC_IMPL_TC_Nautilus_View_14 'c'
++#define TC_IMPL_TC_Nautilus_View_15 'o'
++#define TC_IMPL_TC_Nautilus_View_16 'm'
++#define TC_IMPL_TC_Nautilus_View_17 'p'
++#define TC_IMPL_TC_Nautilus_View_18 'o'
++#define TC_IMPL_TC_Nautilus_View_19 'n'
++#define TC_IMPL_TC_Nautilus_View_20 'e'
++#define TC_IMPL_TC_Nautilus_View_21 'n'
++#define TC_IMPL_TC_Nautilus_View_22 't'
++extern const struct CORBA_TypeCode_struct TC_Nautilus_View_struct;
++#define TC_Nautilus_View ((CORBA_TypeCode)&TC_Nautilus_View_struct)
++#endif
++#endif
++#if !defined(ORBIT_DECL_Nautilus_ViewFrame) && !defined(_Nautilus_ViewFrame_defined)
++#define ORBIT_DECL_Nautilus_ViewFrame 1
++#define _Nautilus_ViewFrame_defined 1
++#define Nautilus_ViewFrame__free CORBA_Object__free
++typedef CORBA_Object Nautilus_ViewFrame;
++extern CORBA_unsigned_long Nautilus_ViewFrame__classid;
++#if !defined(TC_IMPL_TC_Nautilus_ViewFrame_0)
++#define TC_IMPL_TC_Nautilus_ViewFrame_0 'n'
++#define TC_IMPL_TC_Nautilus_ViewFrame_1 'a'
++#define TC_IMPL_TC_Nautilus_ViewFrame_2 'u'
++#define TC_IMPL_TC_Nautilus_ViewFrame_3 't'
++#define TC_IMPL_TC_Nautilus_ViewFrame_4 'i'
++#define TC_IMPL_TC_Nautilus_ViewFrame_5 'l'
++#define TC_IMPL_TC_Nautilus_ViewFrame_6 'u'
++#define TC_IMPL_TC_Nautilus_ViewFrame_7 's'
++#define TC_IMPL_TC_Nautilus_ViewFrame_8 '_'
++#define TC_IMPL_TC_Nautilus_ViewFrame_9 'v'
++#define TC_IMPL_TC_Nautilus_ViewFrame_10 'i'
++#define TC_IMPL_TC_Nautilus_ViewFrame_11 'e'
++#define TC_IMPL_TC_Nautilus_ViewFrame_12 'w'
++#define TC_IMPL_TC_Nautilus_ViewFrame_13 '_'
++#define TC_IMPL_TC_Nautilus_ViewFrame_14 'c'
++#define TC_IMPL_TC_Nautilus_ViewFrame_15 'o'
++#define TC_IMPL_TC_Nautilus_ViewFrame_16 'm'
++#define TC_IMPL_TC_Nautilus_ViewFrame_17 'p'
++#define TC_IMPL_TC_Nautilus_ViewFrame_18 'o'
++#define TC_IMPL_TC_Nautilus_ViewFrame_19 'n'
++#define TC_IMPL_TC_Nautilus_ViewFrame_20 'e'
++#define TC_IMPL_TC_Nautilus_ViewFrame_21 'n'
++#define TC_IMPL_TC_Nautilus_ViewFrame_22 't'
++extern const struct CORBA_TypeCode_struct TC_Nautilus_ViewFrame_struct;
++#define TC_Nautilus_ViewFrame ((CORBA_TypeCode)&TC_Nautilus_ViewFrame_struct)
++#endif
++#endif
++
++/** POA structures **/
++typedef struct {
++  void *_private;
++void (*load_location)(PortableServer_Servant _servant, const Nautilus_URI location, CORBA_Environment *ev);
++void (*stop_loading)(PortableServer_Servant _servant, CORBA_Environment *ev);
++void (*selection_changed)(PortableServer_Servant _servant, const Nautilus_URIList* selection, CORBA_Environment *ev);
++void (*title_changed)(PortableServer_Servant _servant, const CORBA_char * title, CORBA_Environment *ev);
++void (*history_changed)(PortableServer_Servant _servant, const Nautilus_History* history, CORBA_Environment *ev);
++} POA_Nautilus_View__epv;
++typedef struct {
++  PortableServer_ServantBase__epv *_base_epv;
++  POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
++  POA_Nautilus_View__epv *Nautilus_View_epv;
++} POA_Nautilus_View__vepv;
++typedef struct {
++  void *_private;
++  POA_Nautilus_View__vepv *vepv;
++} POA_Nautilus_View;
++extern void POA_Nautilus_View__init(PortableServer_Servant servant, CORBA_Environment *ev);
++extern void POA_Nautilus_View__fini(PortableServer_Servant servant, CORBA_Environment *ev);
++typedef struct {
++  void *_private;
++void (*open_location_in_this_window)(PortableServer_Servant _servant, const Nautilus_URI location, CORBA_Environment *ev);
++void (*open_location_prefer_existing_window)(PortableServer_Servant _servant, const Nautilus_URI location, CORBA_Environment *ev);
++void (*open_location_force_new_window)(PortableServer_Servant _servant, const Nautilus_URI location, const Nautilus_URIList* selection, CORBA_Environment *ev);
++void (*report_location_change)(PortableServer_Servant _servant, const Nautilus_URI location, const Nautilus_URIList* selection, const CORBA_char * title, CORBA_Environment *ev);
++void (*report_redirect)(PortableServer_Servant _servant, const Nautilus_URI from_location, const Nautilus_URI to_location, const Nautilus_URIList* selection, const CORBA_char * title, CORBA_Environment *ev);
++void (*report_selection_change)(PortableServer_Servant _servant, const Nautilus_URIList* selection, CORBA_Environment *ev);
++void (*report_status)(PortableServer_Servant _servant, const CORBA_char * status, CORBA_Environment *ev);
++void (*report_load_underway)(PortableServer_Servant _servant, CORBA_Environment *ev);
++void (*report_load_progress)(PortableServer_Servant _servant, const CORBA_float fraction_done, CORBA_Environment *ev);
++void (*report_load_complete)(PortableServer_Servant _servant, CORBA_Environment *ev);
++void (*report_load_failed)(PortableServer_Servant _servant, CORBA_Environment *ev);
++void (*set_title)(PortableServer_Servant _servant, const CORBA_char * new_title, CORBA_Environment *ev);
++void (*go_back)(PortableServer_Servant _servant, CORBA_Environment *ev);
++} POA_Nautilus_ViewFrame__epv;
++typedef struct {
++  PortableServer_ServantBase__epv *_base_epv;
++  POA_Bonobo_Unknown__epv *Bonobo_Unknown_epv;
++  POA_Nautilus_ViewFrame__epv *Nautilus_ViewFrame_epv;
++} POA_Nautilus_ViewFrame__vepv;
++typedef struct {
++  void *_private;
++  POA_Nautilus_ViewFrame__vepv *vepv;
++} POA_Nautilus_ViewFrame;
++extern void POA_Nautilus_ViewFrame__init(PortableServer_Servant servant, CORBA_Environment *ev);
++extern void POA_Nautilus_ViewFrame__fini(PortableServer_Servant servant, CORBA_Environment *ev);
++
++/** prototypes **/
++#define Nautilus_View_ref Bonobo_Unknown_ref
++#define Nautilus_View_unref Bonobo_Unknown_unref
++#define Nautilus_View_queryInterface Bonobo_Unknown_queryInterface
++void Nautilus_View_load_location(Nautilus_View _obj, const Nautilus_URI location, CORBA_Environment *ev);
++void Nautilus_View_stop_loading(Nautilus_View _obj, CORBA_Environment *ev);
++void Nautilus_View_selection_changed(Nautilus_View _obj, const Nautilus_URIList* selection, CORBA_Environment *ev);
++void Nautilus_View_title_changed(Nautilus_View _obj, const CORBA_char * title, CORBA_Environment *ev);
++void Nautilus_View_history_changed(Nautilus_View _obj, const Nautilus_History* history, CORBA_Environment *ev);
++#define Nautilus_ViewFrame_ref Bonobo_Unknown_ref
++#define Nautilus_ViewFrame_unref Bonobo_Unknown_unref
++#define Nautilus_ViewFrame_queryInterface Bonobo_Unknown_queryInterface
++void Nautilus_ViewFrame_open_location_in_this_window(Nautilus_ViewFrame _obj, const Nautilus_URI location, CORBA_Environment *ev);
++void Nautilus_ViewFrame_open_location_prefer_existing_window(Nautilus_ViewFrame _obj, const Nautilus_URI location, CORBA_Environment *ev);
++void Nautilus_ViewFrame_open_location_force_new_window(Nautilus_ViewFrame _obj, const Nautilus_URI location, const Nautilus_URIList* selection, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_location_change(Nautilus_ViewFrame _obj, const Nautilus_URI location, const Nautilus_URIList* selection, const CORBA_char * title, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_redirect(Nautilus_ViewFrame _obj, const Nautilus_URI from_location, const Nautilus_URI to_location, const Nautilus_URIList* selection, const CORBA_char * title, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_selection_change(Nautilus_ViewFrame _obj, const Nautilus_URIList* selection, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_status(Nautilus_ViewFrame _obj, const CORBA_char * status, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_load_underway(Nautilus_ViewFrame _obj, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_load_progress(Nautilus_ViewFrame _obj, const CORBA_float fraction_done, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_load_complete(Nautilus_ViewFrame _obj, CORBA_Environment *ev);
++void Nautilus_ViewFrame_report_load_failed(Nautilus_ViewFrame _obj, CORBA_Environment *ev);
++void Nautilus_ViewFrame_set_title(Nautilus_ViewFrame _obj, const CORBA_char * new_title, CORBA_Environment *ev);
++void Nautilus_ViewFrame_go_back(Nautilus_ViewFrame _obj, CORBA_Environment *ev);
++
++void _ORBIT_skel_Nautilus_View_load_location(POA_Nautilus_View *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_load_location)(PortableServer_Servant _servant, const Nautilus_URI location, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_View_stop_loading(POA_Nautilus_View *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_stop_loading)(PortableServer_Servant _servant, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_View_selection_changed(POA_Nautilus_View *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_selection_changed)(PortableServer_Servant _servant, const Nautilus_URIList* selection, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_View_title_changed(POA_Nautilus_View *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_title_changed)(PortableServer_Servant _servant, const CORBA_char * title, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_View_history_changed(POA_Nautilus_View *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_history_changed)(PortableServer_Servant _servant, const Nautilus_History* history, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_open_location_in_this_window(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_open_location_in_this_window)(PortableServer_Servant _servant, const Nautilus_URI location, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_open_location_prefer_existing_window(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_open_location_prefer_existing_window)(PortableServer_Servant _servant, const Nautilus_URI location, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_open_location_force_new_window(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_open_location_force_new_window)(PortableServer_Servant _servant, const Nautilus_URI location, const Nautilus_URIList* selection, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_location_change(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_location_change)(PortableServer_Servant _servant, const Nautilus_URI location, const Nautilus_URIList* selection, const CORBA_char * title, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_redirect(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_redirect)(PortableServer_Servant _servant, const Nautilus_URI from_location, const Nautilus_URI to_location, const Nautilus_URIList* selection, const CORBA_char * title, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_selection_change(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_selection_change)(PortableServer_Servant _servant, const Nautilus_URIList* selection, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_status(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_status)(PortableServer_Servant _servant, const CORBA_char * status, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_load_underway(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_load_underway)(PortableServer_Servant _servant, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_load_progress(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_load_progress)(PortableServer_Servant _servant, const CORBA_float fraction_done, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_load_complete(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_load_complete)(PortableServer_Servant _servant, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_report_load_failed(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_report_load_failed)(PortableServer_Servant _servant, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_set_title(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_set_title)(PortableServer_Servant _servant, const CORBA_char * new_title, CORBA_Environment *ev));
++void _ORBIT_skel_Nautilus_ViewFrame_go_back(POA_Nautilus_ViewFrame *_ORBIT_servant, GIOPRecvBuffer *_ORBIT_recv_buffer, CORBA_Environment *ev, void (*_impl_go_back)(PortableServer_Servant _servant, CORBA_Environment *ev));
++#ifdef __cplusplus
++}
++#endif /* __cplusplus */
++
++#endif
++#undef ORBIT_IDL_SERIAL
+--- /dev/null	Wed Mar 13 22:43:29 2002
++++ src/libnautilus/nautilus-view.h	Wed Mar 13 19:26:37 2002
+@@ -0,0 +1,120 @@
++/* -*- Mode: C; tab-width: 8; indent-tabs-mode: 8; c-basic-offset: 8 -*- */
++
++/*
++ *  libnautilus: A library for nautilus view implementations.
++ *
++ *  Copyright (C) 1999, 2000 Red Hat, Inc.
++ *  Copyright (C) 2000 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.
++ *
++ *  Authors: Elliot Lee <sopwith@redhat.com>
++ *           Maciej Stachowiak <mjs@eazel.com>
++ *           Darin Adler <darin@bentspoon.com>
++ *
++ */
++
++#ifndef NAUTILUS_VIEW_H
++#define NAUTILUS_VIEW_H
++
++#include <libnautilus/nautilus-view-component.h>
++#include <bonobo/bonobo-control.h>
++
++BEGIN_GNOME_DECLS
++
++#define NAUTILUS_TYPE_VIEW	      (nautilus_view_get_type ())
++#define NAUTILUS_VIEW(obj)	      (GTK_CHECK_CAST ((obj), NAUTILUS_TYPE_VIEW, NautilusView))
++#define NAUTILUS_VIEW_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), NAUTILUS_TYPE_VIEW, NautilusViewClass))
++#define NAUTILUS_IS_VIEW(obj)	      (GTK_CHECK_TYPE ((obj), NAUTILUS_TYPE_VIEW))
++#define NAUTILUS_IS_VIEW_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), NAUTILUS_TYPE_VIEW))
++
++typedef struct NautilusViewDetails NautilusViewDetails;
++
++typedef struct {
++	BonoboObject parent_spot;
++	NautilusViewDetails *details;
++} NautilusView;
++
++typedef struct {
++	BonoboObjectClass parent_spot;
++	
++	void (* load_location)     (NautilusView          *view,
++		                    const char            *location_uri);
++	void (* stop_loading)      (NautilusView          *view);
++	void (* selection_changed) (NautilusView          *view,
++				    GList                 *selection); /* list of URI char *s */
++	void (* title_changed)     (NautilusView          *view,
++				    const char            *title);
++	void (* history_changed)   (NautilusView          *view,
++				    const Nautilus_History *history);
++} NautilusViewClass;
++
++GtkType            nautilus_view_get_type                             (void);
++NautilusView *     nautilus_view_new                                  (GtkWidget              *widget);
++NautilusView *     nautilus_view_new_from_bonobo_control              (BonoboControl          *bonobo_control);
++BonoboControl *    nautilus_view_get_bonobo_control                   (NautilusView           *view);
++
++/* Calls to the Nautilus shell via the view frame. See the IDL for detailed comments. */
++void               nautilus_view_open_location_in_this_window         (NautilusView           *view,
++								       const char             *location_uri);
++void               nautilus_view_open_location_prefer_existing_window (NautilusView           *view,
++								       const char             *location_uri);
++void               nautilus_view_open_location_force_new_window       (NautilusView           *view,
++								       const char             *location_uri,
++								       GList                  *selection); /* list of URI char *s */
++void               nautilus_view_report_location_change               (NautilusView           *view,
++								       const char             *location_uri,
++								       GList                  *selection, /* list of URI char *s */
++								       const char             *title);
++void               nautilus_view_report_redirect                      (NautilusView           *view,
++								       const char             *from_location_uri,
++								       const char             *to_location_uri,
++								       GList                  *selection, /* list of URI char *s */
++								       const char             *title);
++void               nautilus_view_report_selection_change              (NautilusView           *view,
++								       GList                  *selection); /* list of URI char *s */
++void               nautilus_view_report_status                        (NautilusView           *view,
++								       const char             *status);
++void               nautilus_view_report_load_underway                 (NautilusView           *view);
++void               nautilus_view_report_load_progress                 (NautilusView           *view,
++								       double                  fraction_done);
++void               nautilus_view_report_load_complete                 (NautilusView           *view);
++void               nautilus_view_report_load_failed                   (NautilusView           *view);
++void               nautilus_view_set_title                            (NautilusView           *view,
++								       const char             *title);
++void               nautilus_view_go_back                              (NautilusView           *view);
++
++/* Some utility functions useful for doing the CORBA work directly.
++ * Not needed by most components, but shared with the view frame code,
++ * which is why they are public.
++ */
++Nautilus_URIList * nautilus_uri_list_from_g_list                      (GList                  *list);
++GList *            nautilus_g_list_from_uri_list                      (const Nautilus_URIList *uri_list);
++
++/* Simpler API for setting up and getting the UI component. */
++BonoboUIComponent *nautilus_view_set_up_ui                            (NautilusView           *view,
++								       const char             *datadir,
++								       const char             *ui_xml_file_name,
++								       const char             *application_name);
++
++/* `protected' functions for use by subclasses only. */
++NautilusView *     nautilus_view_construct                            (NautilusView           *view,
++								       GtkWidget              *widget);
++NautilusView *     nautilus_view_construct_from_bonobo_control        (NautilusView           *view,
++								       BonoboControl          *bonobo_control);
++
++END_GNOME_DECLS
++
++#endif /* NAUTILUS_VIEW_H */
+--- src/Makefile.in	2002/03/13 20:55:18	1.1
++++ src/Makefile.in	2002/03/13 20:56:15
+@@ -165,7 +165,7 @@
+ CXXLD = $(CXX)
+ LINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
+ 
+-NAUTILUS_VIEW_SRC =  	galeon-nautilus-view.c 	galeon-nautilus-view.h 	eel-gtk-macros.h
++NAUTILUS_VIEW_SRC =  	galeon-nautilus-view.c 	galeon-nautilus-view.h 	eel-gtk-macros.h nautstub.c
+ 
+ 
+ @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = $(NAUTILUS_VIEW_SRC)
+@@ -244,7 +244,8 @@
+ @ENABLE_NAUTILUS_VIEW_TRUE@window.$(OBJEXT) window_callbacks.$(OBJEXT) \
+ @ENABLE_NAUTILUS_VIEW_TRUE@window_notifiers.$(OBJEXT) xbel.$(OBJEXT) \
+ @ENABLE_NAUTILUS_VIEW_TRUE@xlink.$(OBJEXT) \
+-@ENABLE_NAUTILUS_VIEW_TRUE@galeon-nautilus-view.$(OBJEXT)
++@ENABLE_NAUTILUS_VIEW_TRUE@galeon-nautilus-view.$(OBJEXT) \
++@ENABLE_NAUTILUS_VIEW_TRUE@nautstub.$(OBJEXT)
+ @ENABLE_NAUTILUS_VIEW_FALSE@galeon_bin_OBJECTS =  \
+ @ENABLE_NAUTILUS_VIEW_FALSE@GaleonAutomation-common.$(OBJEXT) \
+ @ENABLE_NAUTILUS_VIEW_FALSE@Galeon-impl.$(OBJEXT) \
+--- configure.orig	Wed Mar 13 19:23:43 2002
++++ configure	Wed Mar 13 19:29:40 2002
+@@ -7030,7 +7030,7 @@
+ #define ENABLE_NAUTILUS_VIEW 1
+ EOF
+ 
+-  _gnome_modules="$_gnome_modules bonobox nautilus"
++  _gnome_modules="$_gnome_modules bonobox"
+ fi
+ echo "$ac_t""$enable_nautilus_view" 1>&6
+