Add galeon2 after a repo copy from galeon. Galeon 2 is the GNOME 2

version of the Gecko-based web browser.  Note, this is a development version,
and problems are likely to occur.

16 files changed, 123 insertions, 1223 deletions

diff --git a/www/galeon2/Makefile b/www/galeon2/Makefile
index cee2979..e2f8772 100644
--- a/www/galeon2/Makefile
+++ b/www/galeon2/Makefile
@@ -1,60 +1,36 @@
-# Ports collection Makefile for:	galeon
-# Date created:				1 August 2000
-# Whom:					Maxim Sobolev <sobomax@FreeBSD.org>
+# Ports collection Makefile for:	galeon2
+# Date created:				16 November 2002
+# Whom:					Maxime Romano <verbophobe@jewcrew.org>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	galeon
-PORTVERSION=	1.2.6
-PORTREVISION=	1
+PORTNAME=	galeon2
+PORTVERSION=	1.3.0
 CATEGORIES=	www gnome
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME:S/2$//}-${PORTVERSION}
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/include/mozilla${HEADERS_SUFX}/gtkembedmoz/gtkmozembed.h:${PORTSDIR}/www/mozilla-headers${HEADERS_SUFX} \
-		${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
-LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
-RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/libgtkembedmoz.so:${PORTSDIR}/www/${MOZILLA}
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+LIB_DEPENDS=	gnomeui-2.0:${PORTSDIR}/x11-toolkits/libgnomeui
+RUN_DEPENDS=	${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
 
-MOZ_CONFIGURE_ARGS=
-
-.if !defined(WITH_MOZILLA)
-MOZILLA=	mozilla
-HEADERS_SUFX=
-.else
-.if ${WITH_MOZILLA}=="mozilla-vendor" || ${WITH_MOZILLA}=="mozilla-embedded-vendor"
-MOZILLA=	${WITH_MOZILLA}
-HEADERS_SUFX=	-vendor
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="1.0"
-.else
-.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-embedded-devel"
-MOZILLA=	${WITH_MOZILLA}
+MOZILLA=	mozilla-devel-gtk2
 HEADERS_SUFX=	-devel
-MOZ_CONFIGURE_ARGS=	--with-mozilla-snapshot="trunk"
-.else
-.if ${WITH_MOZILLA}=="mozilla-embedded"
-MOZILLA=	mozilla-embedded
-HEADERS_SUFX=	
-.else
-MOZILLA=	mozilla
-HEADERS_SUFX=
-.endif
-.endif
-.endif
-.endif
 
 USE_X_PREFIX=	yes
 USE_GNOMENG=	yes
-USE_GNOME=	gnomeprefix gnomehack bonobo libglade gnomevfs
+USE_GNOME=	gnomeprefix gnomehack
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ARGS=	--with-mozilla-includes="${X11BASE}/include/mozilla${HEADERS_SUFX}" \
 		--with-mozilla-libs="${X11BASE}/lib/${MOZILLA}" \
-		--enable-nautilus-view \
-		${MOZ_CONFIGURE_ARGS}
+		--with-mozilla-snapshot="trunk" \
+		--enable-nautilus-view=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include -D_REENTRANT ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
@@ -69,16 +45,6 @@ MAN1=		galeon.1
 CONFIGURE_ARGS+=	--disable-werror
 .endif
 
-post-extract:
-	@${ECHO_MSG}
-	@${ECHO_MSG} " By default the port uses www/mozilla for html rendering, but you can change"
-	@${ECHO_MSG} " this by defining WITH_MOZILLA to one of the following values:"
-	@${ECHO_MSG}
-	@${ECHO_MSG} "  mozilla-devel "
-	@${ECHO_MSG} "  mozilla-embedded[-devel|-vendor] "
-	@${ECHO_MSG} "  mozilla-vendor "
-	@${ECHO_MSG}
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
@@ -86,14 +52,6 @@ post-patch:
 		 's|-lpthread|${PTHREAD_LIBS}|g'
 	@${FIND} ${WRKSRC} -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|g'
-	@${MKDIR} ${WRKSRC}/src/libnautilus
-
-post-configure:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-			 s|%%LOCALBASE%%|${LOCALBASE}|g ; \
-			 s|%%X11BASE%%|${X11BASE}|g ; \
-			 s|%%MOZILLA%%|${MOZILLA}|g' ${WRKSRC}/src/galeon \
-						     ${WRKSRC}/src/nautstub.c
 
 pre-install:
 	@-${X11BASE}/bin/gconftool --shutdown
diff --git a/www/galeon2/distinfo b/www/galeon2/distinfo
index 506ed1a..fd17d4f 100644
--- a/www/galeon2/distinfo
+++ b/www/galeon2/distinfo
@@ -1 +1 @@
-MD5 (galeon-1.2.6.tar.gz) = 85738f037bef3504e08173e4d30e4ae3
+MD5 (galeon-1.3.0.tar.gz) = b4383d2153cd41fa1beb1e39a3272808
diff --git a/www/galeon2/files/patch-GNOME_Galeon_NautilusView.oaf b/www/galeon2/files/patch-GNOME_Galeon_NautilusView.oaf
deleted file mode 100644
index d0d7dd9..0000000
--- a/www/galeon2/files/patch-GNOME_Galeon_NautilusView.oaf
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- GNOME_Galeon_NautilusView.oaf	2002/03/13 10:54:39	1.1
-+++ GNOME_Galeon_NautilusView.oaf	2002/03/13 10:55:30
-@@ -8,7 +8,7 @@
- 	<oaf_attribute name="description" type="string" _value="Galeon content view component's factory"/>
- </oaf_server>
- 
--<oaf_server iid="OAFIID:GNOME_Galeon_NautilusView" type="factory" location="OAFIID:GNOME_Galeon_NautilusViewFactory">
-+<oaf_server iid="OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1" type="factory" location="OAFIID:GNOME_Galeon_NautilusViewFactory">
- 	<oaf_attribute name="repo_ids" type="stringv">
- 		<item value="IDL:Bonobo/Unknown:1.0"/>
- 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/www/galeon2/files/patch-GNOME_Galeon_NautilusView.oaf.in b/www/galeon2/files/patch-GNOME_Galeon_NautilusView.oaf.in
deleted file mode 100644
index 286d437..0000000
--- a/www/galeon2/files/patch-GNOME_Galeon_NautilusView.oaf.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- GNOME_Galeon_NautilusView.oaf.in	2002/03/13 10:54:39	1.1
-+++ GNOME_Galeon_NautilusView.oaf.in	2002/03/13 10:55:30
-@@ -8,7 +8,7 @@
- 	<oaf_attribute name="description" type="string" _value="Galeon content view component's factory"/>
- </oaf_server>
- 
--<oaf_server iid="OAFIID:GNOME_Galeon_NautilusView" type="factory" location="OAFIID:GNOME_Galeon_NautilusViewFactory">
-+<oaf_server iid="OAFIID:nautilus_mozilla_content_view:1ee70717-57bf-4079-aae5-922abdd576b1" type="factory" location="OAFIID:GNOME_Galeon_NautilusViewFactory">
- 	<oaf_attribute name="repo_ids" type="stringv">
- 		<item value="IDL:Bonobo/Unknown:1.0"/>
- 		<item value="IDL:Bonobo/Control:1.0"/>
diff --git a/www/galeon2/files/patch-MyportalProtocolHandler.cpp b/www/galeon2/files/patch-MyportalProtocolHandler.cpp
new file mode 100644
index 0000000..6539b8f
--- /dev/null
+++ b/www/galeon2/files/patch-MyportalProtocolHandler.cpp
@@ -0,0 +1,11 @@
+--- mozilla/MyportalProtocolHandler.cpp.orig	Thu Nov  7 01:40:46 2002
++++ mozilla/MyportalProtocolHandler.cpp	Thu Nov  7 01:40:55 2002
+@@ -26,7 +26,7 @@
+ 
+ extern "C" {
+ extern char *realpath (__const char *__restrict __name,
+-                       char *__restrict __resolved) __THROW;
++                       char *__restrict __resolved);
+ };
+ 
+ #include <stdlib.h>
diff --git a/www/galeon2/files/patch-ab b/www/galeon2/files/patch-ab
deleted file mode 100644
index 25b7c37..0000000
--- a/www/galeon2/files/patch-ab
+++ /dev/null
@@ -1,48 +0,0 @@
---- src/galeon.in.orig	Thu Dec 27 19:13:42 2001
-+++ src/galeon.in	Mon Oct 21 23:28:37 2002
-@@ -4,18 +4,14 @@
- 
- if test -n "$MOZILLA_FIVE_HOME"; then
- 	MOZILLA_HOME=$MOZILLA_FIVE_HOME
--elif [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then
-+elif [ -f @MOZILLA_HOME@/libgtkembedmoz.so ]; then
- 	MOZILLA_HOME=@MOZILLA_HOME@
--elif [ -f /usr/local/mozilla/chrome/comm.jar ]; then
--	MOZILLA_HOME=/usr/local/mozilla
--elif [ -f /usr/lib/mozilla/chrome/comm.jar ]; then
--	MOZILLA_HOME=/usr/lib/mozilla
--elif [ -f /opt/mozilla/chrome/comm.jar ]; then
--	MOZILLA_HOME=/opt/mozilla
--elif [ -f /usr/lib/mozilla-0.9.7/chrome/comm.jar ]; then
--	MOZILLA_HOME=/usr/lib/mozilla-0.9.7/
--elif [ -f /opt/gnome/lib/mozilla/chrome/comm.jar ]; then
--        MOZILLA_HOME=/opt/gnome/lib/mozilla/
-+elif [ -f %%LOCALBASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+	MOZILLA_HOME=%%LOCALBASE%%/lib/%%MOZILLA%%
-+elif [ -f %%X11BASE%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+	MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
-+elif [ -f %%PREFIX%%/lib/%%MOZILLA%%/libgtkembedmoz.so ]; then
-+	MOZILLA_HOME=%%PREFIX%%/lib/%%MOZILLA%%
- else
- 	echo "Cannot find mozilla installation directory. Please set MOZILLA_FIVE_HOME to your mozilla directory"
- 	exit
-@@ -27,16 +23,12 @@
- MOZILLA_FIVE_HOME=$MOZILLA_HOME
- export MOZILLA_FIVE_HOME
- 
--# for some reason this lets Galeon start properly on Red Hat 7.1 systems
--if [ -f /etc/redhat-release ]; then
--	if [ "`cat /etc/redhat-release`" = "Red Hat Linux release 7.1 (Seawolf)"  ]; then
--   	 export LD_ASSUME_KERNEL=2.2.5
--	fi
--fi
-+MOZ_PLUGIN_PATH=%%PREFIX%%/lib/browser_plugins
-+export MOZ_PLUGIN_PATH
- 
- if [ -f ./galeon-bin ]; then
- exec ./galeon-bin "$@"
- else
--exec $dist_bin/galeon-bin "$@"
-+exec %%PREFIX%%/bin/galeon-bin "$@"
- fi
- 
diff --git a/www/galeon2/files/patch-configure b/www/galeon2/files/patch-configure
index 86df3c0..7c0b2ed 100644
--- a/www/galeon2/files/patch-configure
+++ b/www/galeon2/files/patch-configure
@@ -1,13 +1,10 @@
-
-$FreeBSD$
-
---- configure.orig	Thu Apr 25 21:02:26 2002
-+++ configure	Thu Apr 25 21:03:14 2002
-@@ -5434,6 +5434,7 @@
+--- configure	Thu Nov  7 02:51:25 2002
++++ configure2	Thu Nov  7 02:51:32 2002
+@@ -7140,6 +7140,7 @@
  
  # This can be used to rebuild libtool when needed
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
 +$ac_aux_dir/ltconfig $LIBTOOL_DEPS
  
  # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool' 
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/www/galeon2/files/patch-galeon-config-tool.in b/www/galeon2/files/patch-galeon-config-tool.in
deleted file mode 100644
index 740e1b3..0000000
--- a/www/galeon2/files/patch-galeon-config-tool.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- galeon-config-tool.in.orig	Thu Mar 14 02:41:26 2002
-+++ galeon-config-tool.in	Sun Apr 21 18:11:28 2002
-@@ -4,7 +4,7 @@
- 
- clean () {
- 
--    if ps hu -C galeon-bin | grep `id -un` >/dev/null 2>&1; then
-+    if ps | awk '{print $5}' | grep -q galeon-bin; then
-     echo "Sorry, this script won't work while galeon is running"
- 
-     else
diff --git a/www/galeon2/files/patch-galeon.schemas.in b/www/galeon2/files/patch-galeon.schemas.in
deleted file mode 100644
index bfb0212..0000000
--- a/www/galeon2/files/patch-galeon.schemas.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- galeon.schemas.in	2001/08/29 09:34:04	1.1
-+++ galeon.schemas.in	2001/08/29 09:34:27
-@@ -510,7 +510,7 @@
-         <applyto>/apps/galeon/UI/Toolbar/spinner_dir</applyto>
-         <owner>galeon</owner>
-         <type>string</type>
--        <default>@prefix@/@DATADIRNAME@/galeon/spinners/galeon</default>
-+        <default>@prefix@/@DATADIRNAME@/gnome/galeon/spinners/galeon</default>
-         <locale name="C">
-         </locale>
-       </schema>
diff --git a/www/galeon2/files/patch-hairy b/www/galeon2/files/patch-hairy
deleted file mode 100644
index ed3c8f9..0000000
--- a/www/galeon2/files/patch-hairy
+++ /dev/null
@@ -1,750 +0,0 @@
-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.orig	Sun Apr 21 18:18:11 2002
-+++ src/Makefile.in	Sun Apr 21 18:21:12 2002
-@@ -184,7 +184,8 @@
- NAUTILUS_VIEW_SRC = \
- 	galeon-nautilus-view.c \
- 	galeon-nautilus-view.h \
--	eel-gtk-macros.h
-+	eel-gtk-macros.h \
-+	nautstub.c
- 
- 
- @ENABLE_NAUTILUS_VIEW_TRUE@NAUTILUS_VIEW_SRC_TO_COMPILE = @ENABLE_NAUTILUS_VIEW_TRUE@$(NAUTILUS_VIEW_SRC)
-@@ -399,7 +400,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
- 
diff --git a/www/galeon2/files/patch-src_main.c b/www/galeon2/files/patch-src_main.c
deleted file mode 100644
index 61f7df2..0000000
--- a/www/galeon2/files/patch-src_main.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/main.c.orig	Fri Apr 26 14:29:08 2002
-+++ src/main.c	Fri Apr 26 14:52:43 2002
-@@ -394,7 +394,12 @@
- 	for (i = 0; i < n; i++)
- 	{
- 		/* try to expand as files */
--		if (realpath (args[i], buffer) != NULL)
-+		if (strncmp(args[i], "ghelp:", strlen("ghelp:")) &&
-+		    strncmp(args[i], "toc:", strlen("toc:")) &&
-+		    strncmp(args[i], "info:", strlen("info:")) &&
-+		    strncmp(args[i], "main:", strlen("man:")) &&
-+		    strncmp(args[i], "gnome-help:", strlen("gnome-help")) &&
-+		    realpath (args[i], buffer) != NULL)
- 		{
- 			(*urls)[i] = g_strconcat ("file://", buffer, NULL);
- 		}
diff --git a/www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp b/www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp
deleted file mode 100644
index 8a63aaa..0000000
--- a/www/galeon2/files/patch-src_mozilla_TOCProtocolHandler.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/mozilla/TOCProtocolHandler.cpp.orig	Sun Jun 16 14:02:36 2002
-+++ src/mozilla/TOCProtocolHandler.cpp	Sun Jun 16 14:11:48 2002
-@@ -400,7 +400,7 @@
- 	nsresult rv;
- 
- 	struct dirent **namelist;
--	int n = scandir (SHARE_DIR"/../gnome/help", &namelist, select,
-+	int n = scandir (SHARE_DIR"/../gnome/help", &namelist, ((int(*)(struct dirent *))select),
- 			 alphasort);
- 	if (n<0) return NS_ERROR_FAILURE;
- 
diff --git a/www/galeon2/files/patch-ui_Makefile.in b/www/galeon2/files/patch-ui_Makefile.in
new file mode 100644
index 0000000..375c1bf
--- /dev/null
+++ b/www/galeon2/files/patch-ui_Makefile.in
@@ -0,0 +1,10 @@
+--- ui/Makefile.in.orig	Sun Nov 17 00:56:49 2002
++++ ui/Makefile.in	Sun Nov 17 00:56:52 2002
+@@ -182,7 +182,6 @@
+ 
+ uixmldir = $(datadir)/gnome-2.0/ui
+ uixml_in_files = galeon-bookmarks-editor-ui.xml.in 	\
+-                 nautilus-galeon-view-ui.xml.in 	\
+ 		 galeon-ui.xml.in
+ 
+ 
diff --git a/www/galeon2/pkg-comment b/www/galeon2/pkg-comment
index df47615..e55ce3f 100644
--- a/www/galeon2/pkg-comment
+++ b/www/galeon2/pkg-comment
@@ -1 +1 @@
-A GNOME Web browser based on gecko (the Mozilla rendering engine)
+A GNOME 2 Web browser based on gecko (the Mozilla rendering engine)
diff --git a/www/galeon2/pkg-descr b/www/galeon2/pkg-descr
index a3006b9..9a42053 100644
--- a/www/galeon2/pkg-descr
+++ b/www/galeon2/pkg-descr
@@ -1,4 +1,4 @@
-Galeon is a GNOME Web browser based on gecko (the mozilla rendering engine).
+Galeon is a GNOME 2 Web browser based on Gecko (the mozilla rendering engine).
 It's fast, it has a light interface, and it is fully standards-compliant.
 
 WWW: http://galeon.sourceforge.net/
diff --git a/www/galeon2/pkg-plist b/www/galeon2/pkg-plist
index 2caf115..e689608 100644
--- a/www/galeon2/pkg-plist
+++ b/www/galeon2/pkg-plist
@@ -3,7 +3,6 @@ bin/galeon-bin
 bin/galeon-config-tool
 etc/gconf/gconf.xml.defaults/apps/galeon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent/%gconf.xml
@@ -13,10 +12,8 @@ etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Bookmarks/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Help/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Print/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/%gconf.xml
@@ -24,12 +21,7 @@ etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/FontsColors/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/State/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/compact_bookmark_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/history_dock/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/js_console/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info/%gconf.xml
-etc/gconf/gconf.xml.defaults/apps/galeon/State/prefs_dialog/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/UI/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs/%gconf.xml
@@ -37,7 +29,6 @@ etc/gconf/gconf.xml.defaults/apps/galeon/UI/Toolbar/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Crash/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent/%gconf.xml
@@ -47,10 +38,8 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Bookmarks/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Help/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/%gconf.xml
@@ -58,12 +47,7 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/FontsColors/%gconf.xm
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/compact_bookmark_editor/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history_dock/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/js_console/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/prefs_dialog/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs/%gconf.xml
@@ -72,60 +56,39 @@ etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Windows/%gconf.xml
 etc/gconf/schemas/galeon.schemas
 etc/sound/events/galeon.soundlist
 lib/galeon/components/libgaleon-xpcom.so
-share/gnome/apps/Internet/galeon.desktop
-share/gnome/galeon/CloseTab.png
+libdata/bonobo/servers/GNOME_Galeon_Automation.server
+libdata/bonobo/servers/GNOME_Galeon_NautilusView.server
+share/gnome/applications/galeon.desktop
 share/gnome/galeon/FAQ.html
-share/gnome/galeon/Fullscreen.png
 share/gnome/galeon/Insecure.png
 share/gnome/galeon/Secure.png
 share/gnome/galeon/about_logo.png
 share/gnome/galeon/autoscroll.xpm
-share/gnome/galeon/babelfish.png
+share/gnome/galeon/bookmarks-editor.glade
 share/gnome/galeon/bookmarks.glade
-share/gnome/galeon/bookmarks.png
-share/gnome/galeon/bug.png
-share/gnome/galeon/crash.xpm
-share/gnome/galeon/debian.png
-share/gnome/galeon/default.png
-share/gnome/galeon/default_open.png
-share/gnome/galeon/delete.xpm
-share/gnome/galeon/dir.png
-share/gnome/galeon/dir_open.png
-share/gnome/galeon/download.png
-share/gnome/galeon/drag-url-icon.png
+share/gnome/galeon/default-bookmarks.xbel
 share/gnome/galeon/fetch_favicon.xpm
-share/gnome/galeon/fetch_favicon_small.xpm
 share/gnome/galeon/fonts.png
 share/gnome/galeon/freshmeat.png
-share/gnome/galeon/galeon-composite.png
-share/gnome/galeon/galeon-watermark.png
+share/gnome/galeon/galeon-bookmark-alias-mark.png
+share/gnome/galeon/galeon-bookmark.png
+share/gnome/galeon/galeon-default-open.png
+share/gnome/galeon/galeon-default.png
+share/gnome/galeon/galeon-folder-open.png
+share/gnome/galeon/galeon-folder.png
+share/gnome/galeon/galeon-history.png
+share/gnome/galeon/galeon-send-link.png
+share/gnome/galeon/galeon-separator.png
+share/gnome/galeon/galeon-viewsource.png
 share/gnome/galeon/galeon.glade
 share/gnome/galeon/galeon.png
 share/gnome/galeon/general.png
-share/gnome/galeon/gnome-error.xpm
-share/gnome/galeon/gnome-question.xpm
-share/gnome/galeon/gnome-warning.xpm
-share/gnome/galeon/gnome_icons.png
 share/gnome/galeon/google.png
 share/gnome/galeon/google_groups.png
 share/gnome/galeon/google_images.png
-share/gnome/galeon/harddrive.png
-share/gnome/galeon/history.png
-share/gnome/galeon/i-bookmark.png
-share/gnome/galeon/i-bookmark.xpm
 share/gnome/galeon/imdb_movies.png
-share/gnome/galeon/js-all.xpm
-share/gnome/galeon/js-error.xpm
-share/gnome/galeon/js-info.xpm
-share/gnome/galeon/js-warning.xpm
-share/gnome/galeon/link.xpm
 share/gnome/galeon/logo.png
-share/gnome/galeon/mime.png
-share/gnome/galeon/mime.xpm
-share/gnome/galeon/mini_find.xpm
-share/gnome/galeon/mouse.png
 share/gnome/galeon/myportal.css
-share/gnome/galeon/nautilus_icons.png
 share/gnome/galeon/network.png
 share/gnome/galeon/new_alias.xpm
 share/gnome/galeon/new_alias_small.xpm
@@ -135,17 +98,11 @@ share/gnome/galeon/new_item.xpm
 share/gnome/galeon/new_item_small.xpm
 share/gnome/galeon/new_separator.xpm
 share/gnome/galeon/new_separator_small.xpm
-share/gnome/galeon/preferences.glade
-share/gnome/galeon/print-preview.glade
+share/gnome/galeon/prefs-dialog.glade
 share/gnome/galeon/print.glade
-share/gnome/galeon/programs.png
 share/gnome/galeon/prompts.glade
 share/gnome/galeon/rpm.png
-share/gnome/galeon/security.png
 share/gnome/galeon/slack.png
-share/gnome/galeon/small-close.xpm
-share/gnome/galeon/small-detach.xpm
-share/gnome/galeon/small-menu.xpm
 share/gnome/galeon/smart-bm-fold.png
 share/gnome/galeon/smart-bm-unfold.png
 share/gnome/galeon/spinners/crashcut/001.png
@@ -204,219 +161,80 @@ share/gnome/galeon/spinners/pipeon/012.png
 share/gnome/galeon/spinners/pipeon/013.png
 share/gnome/galeon/spinners/pipeon/014.png
 share/gnome/galeon/spinners/pipeon/rest.png
-share/gnome/galeon/stock_trash.xpm
 share/gnome/galeon/stocks.png
 share/gnome/galeon/stop.png
 share/gnome/galeon/tabs.png
-share/gnome/galeon/tb_drag_arrow_down.xpm
-share/gnome/galeon/tb_drag_arrow_left.xpm
-share/gnome/galeon/tb_drag_arrow_right.xpm
-share/gnome/galeon/tb_drag_arrow_up.xpm
-share/gnome/galeon/themes/Aquatic/Back-prelight.png
-share/gnome/galeon/themes/Aquatic/Back.png
-share/gnome/galeon/themes/Aquatic/Bookmarks-prelight.png
-share/gnome/galeon/themes/Aquatic/Bookmarks.png
-share/gnome/galeon/themes/Aquatic/Forward-prelight.png
-share/gnome/galeon/themes/Aquatic/Forward.png
-share/gnome/galeon/themes/Aquatic/Home-prelight.png
-share/gnome/galeon/themes/Aquatic/Home.png
-share/gnome/galeon/themes/Aquatic/New-prelight.png
-share/gnome/galeon/themes/Aquatic/New.png
-share/gnome/galeon/themes/Aquatic/Refresh-prelight.png
-share/gnome/galeon/themes/Aquatic/Refresh.png
-share/gnome/galeon/themes/Aquatic/Stop-prelight.png
-share/gnome/galeon/themes/Aquatic/Stop.png
-share/gnome/galeon/themes/Aquatic/Up-prelight.png
-share/gnome/galeon/themes/Aquatic/Up.png
-share/gnome/galeon/themes/GnomeLarge/Back.png
-share/gnome/galeon/themes/GnomeLarge/Forward.png
-share/gnome/galeon/themes/GnomeLarge/Go.png
-share/gnome/galeon/themes/GnomeLarge/Home.png
-share/gnome/galeon/themes/GnomeLarge/New.png
-share/gnome/galeon/themes/GnomeLarge/Refresh.png
-share/gnome/galeon/themes/GnomeLarge/Stop.png
-share/gnome/galeon/themes/GnomeLarge/Up.png
-share/gnome/galeon/themes/Micro/Back-prelight.png
-share/gnome/galeon/themes/Micro/Back.png
-share/gnome/galeon/themes/Micro/Forward-prelight.png
-share/gnome/galeon/themes/Micro/Forward.png
-share/gnome/galeon/themes/Micro/Home-prelight.png
-share/gnome/galeon/themes/Micro/Home.png
-share/gnome/galeon/themes/Micro/New-prelight.png
-share/gnome/galeon/themes/Micro/New.png
-share/gnome/galeon/themes/Micro/Refresh-prelight.png
-share/gnome/galeon/themes/Micro/Refresh.png
-share/gnome/galeon/themes/Micro/Stop-prelight.png
-share/gnome/galeon/themes/Micro/Stop.png
-share/gnome/galeon/themes/Micro/Up-prelight.png
-share/gnome/galeon/themes/Micro/Up.png
-share/gnome/galeon/themes/Remembrance/Back-prelight.png
-share/gnome/galeon/themes/Remembrance/Back.png
-share/gnome/galeon/themes/Remembrance/Forward-prelight.png
-share/gnome/galeon/themes/Remembrance/Forward.png
-share/gnome/galeon/themes/Remembrance/Go-prelight.png
-share/gnome/galeon/themes/Remembrance/Go.png
-share/gnome/galeon/themes/Remembrance/Home-prelight.png
-share/gnome/galeon/themes/Remembrance/Home.png
-share/gnome/galeon/themes/Remembrance/New-prelight.png
-share/gnome/galeon/themes/Remembrance/New.png
-share/gnome/galeon/themes/Remembrance/Print-prelight.png
-share/gnome/galeon/themes/Remembrance/Print.png
-share/gnome/galeon/themes/Remembrance/Refresh-prelight.png
-share/gnome/galeon/themes/Remembrance/Refresh.png
-share/gnome/galeon/themes/Remembrance/Stop-prelight.png
-share/gnome/galeon/themes/Remembrance/Stop.png
-share/gnome/galeon/themes/Remembrance/Up-prelight.png
-share/gnome/galeon/themes/Remembrance/Up.png
-share/gnome/galeon/themes/Remembrance/empty-prelight.png
-share/gnome/galeon/themes/Remembrance/empty.png
 share/gnome/galeon/toc.css
-share/gnome/galeon/toolbars.png
-share/gnome/galeon/windows.png
-share/gnome/help/galeon-manual/C/LEGALNOTICE.html
-share/gnome/help/galeon-manual/C/aboutbook.html
-share/gnome/help/galeon-manual/C/apx-authors.sgml
-share/gnome/help/galeon-manual/C/apx-bugs.sgml
-share/gnome/help/galeon-manual/C/apx-command-line.sgml
-share/gnome/help/galeon-manual/C/apx-compiling.sgml
-share/gnome/help/galeon-manual/C/apx-troubleshooting.sgml
-share/gnome/help/galeon-manual/C/authors.html
-share/gnome/help/galeon-manual/C/bookmarks-aliases.html
-share/gnome/help/galeon-manual/C/bookmarks-autobookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks-context-menus.html
-share/gnome/help/galeon-manual/C/bookmarks-importing.html
-share/gnome/help/galeon-manual/C/bookmarks-my-portal.html
-share/gnome/help/galeon-manual/C/bookmarks-nicks.html
-share/gnome/help/galeon-manual/C/bookmarks-smart-bookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks-toolbars.html
-share/gnome/help/galeon-manual/C/bookmarks-with-images.html
-share/gnome/help/galeon-manual/C/bookmarks.html
-share/gnome/help/galeon-manual/C/bookmarks.sgml
-share/gnome/help/galeon-manual/C/browser-window.html
-share/gnome/help/galeon-manual/C/browser-window.sgml
-share/gnome/help/galeon-manual/C/bugs.html
-share/gnome/help/galeon-manual/C/command-line-options.html
-share/gnome/help/galeon-manual/C/compiling-from-source.html
-share/gnome/help/galeon-manual/C/figures/bookmarks-editor.png
-share/gnome/help/galeon-manual/C/figures/browser-window.png
-share/gnome/help/galeon-manual/C/figures/find-dialog.png
-share/gnome/help/galeon-manual/C/figures/gesture-back.png
-share/gnome/help/galeon-manual/C/figures/gesture-clone-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-clone-window.png
-share/gnome/help/galeon-manual/C/figures/gesture-close-2.png
-share/gnome/help/galeon-manual/C/figures/gesture-close.png
-share/gnome/help/galeon-manual/C/figures/gesture-contents.png
-share/gnome/help/galeon-manual/C/figures/gesture-forward.png
-share/gnome/help/galeon-manual/C/figures/gesture-fullscreen.png
-share/gnome/help/galeon-manual/C/figures/gesture-homepage.png
-share/gnome/help/galeon-manual/C/figures/gesture-new-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-new-window.png
-share/gnome/help/galeon-manual/C/figures/gesture-next-link.png
-share/gnome/help/galeon-manual/C/figures/gesture-next-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-prev-link.png
-share/gnome/help/galeon-manual/C/figures/gesture-prev-tab.png
-share/gnome/help/galeon-manual/C/figures/gesture-reload-bypass.png
-share/gnome/help/galeon-manual/C/figures/gesture-reload.png
-share/gnome/help/galeon-manual/C/figures/gesture-stop.png
-share/gnome/help/galeon-manual/C/figures/gesture-up.png
-share/gnome/help/galeon-manual/C/figures/gesture-view-source.png
-share/gnome/help/galeon-manual/C/figures/othertools-history.png
-share/gnome/help/galeon-manual/C/figures/othertools-pdm.png
-share/gnome/help/galeon-manual/C/figures/tabbed-browsing.png
-share/gnome/help/galeon-manual/C/figures/toolbars-bookmarks.png
-share/gnome/help/galeon-manual/C/figures/toolbars-main.png
-share/gnome/help/galeon-manual/C/find.html
-share/gnome/help/galeon-manual/C/full-screen-mode.html
-share/gnome/help/galeon-manual/C/galeon-manual.sgml
-share/gnome/help/galeon-manual/C/getting-started.html
-share/gnome/help/galeon-manual/C/getting-started.sgml
-share/gnome/help/galeon-manual/C/history.html
-share/gnome/help/galeon-manual/C/index.html
-share/gnome/help/galeon-manual/C/introduction.html
-share/gnome/help/galeon-manual/C/menubar.html
-share/gnome/help/galeon-manual/C/mouse-gestures.html
-share/gnome/help/galeon-manual/C/other-tools.html
-share/gnome/help/galeon-manual/C/other-tools.sgml
-share/gnome/help/galeon-manual/C/plugins.html
-share/gnome/help/galeon-manual/C/plugins.sgml
-share/gnome/help/galeon-manual/C/preface.sgml
-share/gnome/help/galeon-manual/C/preferences.html
-share/gnome/help/galeon-manual/C/preferences.sgml
-share/gnome/help/galeon-manual/C/prefs-advanced.html
-share/gnome/help/galeon-manual/C/prefs-gnome-url-handlers.html
-share/gnome/help/galeon-manual/C/prefs-handlers.html
-share/gnome/help/galeon-manual/C/prefs-rendering.html
-share/gnome/help/galeon-manual/C/prefs-user-interface.html
-share/gnome/help/galeon-manual/C/statusbar.html
-share/gnome/help/galeon-manual/C/stylesheet-images/caution.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/home.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/important.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/next.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/note.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/prev.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/tip.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-blank.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-minus.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/toc-plus.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/up.gif
-share/gnome/help/galeon-manual/C/stylesheet-images/warning.gif
-share/gnome/help/galeon-manual/C/tabbed-browsing.html
-share/gnome/help/galeon-manual/C/toolbar.html
-share/gnome/oaf/GNOME_Galeon_Automation.oaf
-share/gnome/oaf/GNOME_Galeon_NautilusView.oaf
-share/gnome/omf/galeon/galeon-manual-C.omf
+share/gnome/galeon/toolbar-editor.glade
+share/gnome/gnome-2.0/ui/galeon-bookmarks-editor-ui.xml
+share/gnome/gnome-2.0/ui/galeon-ui.xml
+share/gnome/help/galeon/C/apx-authors.xml
+share/gnome/help/galeon/C/apx-bugs.xml
+share/gnome/help/galeon/C/apx-command-line.xml
+share/gnome/help/galeon/C/apx-compiling.xml
+share/gnome/help/galeon/C/apx-troubleshooting.xml
+share/gnome/help/galeon/C/bookmarks.xml
+share/gnome/help/galeon/C/browser-window.xml
+share/gnome/help/galeon/C/figures/bookmarks-editor.png
+share/gnome/help/galeon/C/figures/browser-window.png
+share/gnome/help/galeon/C/figures/find-dialog.png
+share/gnome/help/galeon/C/figures/othertools-history.png
+share/gnome/help/galeon/C/figures/othertools-pdm.png
+share/gnome/help/galeon/C/figures/tabbed-browsing.png
+share/gnome/help/galeon/C/figures/toolbars-bookmarks.png
+share/gnome/help/galeon/C/figures/toolbars-main.png
+share/gnome/help/galeon/C/galeon.xml
+share/gnome/help/galeon/C/getting-started.xml
+share/gnome/help/galeon/C/other-tools.xml
+share/gnome/help/galeon/C/plugins.xml
+share/gnome/help/galeon/C/preface.xml
+share/gnome/help/galeon/C/preferences.xml
+share/gnome/omf/galeon/galeon-C.omf
 share/gnome/pixmaps/galeon.png
 share/gnome/sounds/galeon/clicked.wav
-share/gnome/ui/nautilus-galeon-view-ui.xml
-share/locale/az/LC_MESSAGES/galeon.mo
-share/locale/bg/LC_MESSAGES/galeon.mo
-share/locale/ca/LC_MESSAGES/galeon.mo
-share/locale/cs/LC_MESSAGES/galeon.mo
-share/locale/da/LC_MESSAGES/galeon.mo
-share/locale/de/LC_MESSAGES/galeon.mo
-share/locale/el/LC_MESSAGES/galeon.mo
-share/locale/es/LC_MESSAGES/galeon.mo
-share/locale/et/LC_MESSAGES/galeon.mo
-share/locale/fi/LC_MESSAGES/galeon.mo
-share/locale/fr/LC_MESSAGES/galeon.mo
-share/locale/gl/LC_MESSAGES/galeon.mo
-share/locale/hr/LC_MESSAGES/galeon.mo
-share/locale/hu/LC_MESSAGES/galeon.mo
-share/locale/it/LC_MESSAGES/galeon.mo
-share/locale/ja/LC_MESSAGES/galeon.mo
-share/locale/ko/LC_MESSAGES/galeon.mo
-share/locale/lt/LC_MESSAGES/galeon.mo
-share/locale/lv/LC_MESSAGES/galeon.mo
-share/locale/ms/LC_MESSAGES/galeon.mo
-share/locale/nl/LC_MESSAGES/galeon.mo
-share/locale/nn/LC_MESSAGES/galeon.mo
-share/locale/no/LC_MESSAGES/galeon.mo
-share/locale/pl/LC_MESSAGES/galeon.mo
-share/locale/pt/LC_MESSAGES/galeon.mo
-share/locale/pt_BR/LC_MESSAGES/galeon.mo
-share/locale/ro/LC_MESSAGES/galeon.mo
-share/locale/ru/LC_MESSAGES/galeon.mo
-share/locale/sk/LC_MESSAGES/galeon.mo
-share/locale/sl/LC_MESSAGES/galeon.mo
-share/locale/sv/LC_MESSAGES/galeon.mo
-share/locale/ta/LC_MESSAGES/galeon.mo
-share/locale/tr/LC_MESSAGES/galeon.mo
-share/locale/uk/LC_MESSAGES/galeon.mo
-share/locale/vi/LC_MESSAGES/galeon.mo
-share/locale/wa/LC_MESSAGES/galeon.mo
-share/locale/zh_CN/LC_MESSAGES/galeon.mo
-share/locale/zh_TW/LC_MESSAGES/galeon.mo
+share/locale/az/LC_MESSAGES/galeon-2.0.mo
+share/locale/bg/LC_MESSAGES/galeon-2.0.mo
+share/locale/ca/LC_MESSAGES/galeon-2.0.mo
+share/locale/cs/LC_MESSAGES/galeon-2.0.mo
+share/locale/da/LC_MESSAGES/galeon-2.0.mo
+share/locale/de/LC_MESSAGES/galeon-2.0.mo
+share/locale/el/LC_MESSAGES/galeon-2.0.mo
+share/locale/es/LC_MESSAGES/galeon-2.0.mo
+share/locale/et/LC_MESSAGES/galeon-2.0.mo
+share/locale/eu/LC_MESSAGES/galeon-2.0.mo
+share/locale/fi/LC_MESSAGES/galeon-2.0.mo
+share/locale/fr/LC_MESSAGES/galeon-2.0.mo
+share/locale/gl/LC_MESSAGES/galeon-2.0.mo
+share/locale/hr/LC_MESSAGES/galeon-2.0.mo
+share/locale/hu/LC_MESSAGES/galeon-2.0.mo
+share/locale/it/LC_MESSAGES/galeon-2.0.mo
+share/locale/ja/LC_MESSAGES/galeon-2.0.mo
+share/locale/ko/LC_MESSAGES/galeon-2.0.mo
+share/locale/lt/LC_MESSAGES/galeon-2.0.mo
+share/locale/lv/LC_MESSAGES/galeon-2.0.mo
+share/locale/ms/LC_MESSAGES/galeon-2.0.mo
+share/locale/nl/LC_MESSAGES/galeon-2.0.mo
+share/locale/nn/LC_MESSAGES/galeon-2.0.mo
+share/locale/no/LC_MESSAGES/galeon-2.0.mo
+share/locale/pl/LC_MESSAGES/galeon-2.0.mo
+share/locale/pt/LC_MESSAGES/galeon-2.0.mo
+share/locale/pt_BR/LC_MESSAGES/galeon-2.0.mo
+share/locale/ro/LC_MESSAGES/galeon-2.0.mo
+share/locale/ru/LC_MESSAGES/galeon-2.0.mo
+share/locale/sk/LC_MESSAGES/galeon-2.0.mo
+share/locale/sl/LC_MESSAGES/galeon-2.0.mo
+share/locale/sv/LC_MESSAGES/galeon-2.0.mo
+share/locale/ta/LC_MESSAGES/galeon-2.0.mo
+share/locale/tr/LC_MESSAGES/galeon-2.0.mo
+share/locale/uk/LC_MESSAGES/galeon-2.0.mo
+share/locale/wa/LC_MESSAGES/galeon-2.0.mo
+share/locale/zh_CN/LC_MESSAGES/galeon-2.0.mo
+share/locale/zh_TW/LC_MESSAGES/galeon-2.0.mo
 @dirrm share/gnome/sounds/galeon
 @dirrm share/gnome/omf/galeon
-@dirrm share/gnome/help/galeon-manual/C/stylesheet-images
-@dirrm share/gnome/help/galeon-manual/C/figures
-@dirrm share/gnome/help/galeon-manual/C
-@dirrm share/gnome/help/galeon-manual
-@dirrm share/gnome/galeon/themes/Remembrance
-@dirrm share/gnome/galeon/themes/Micro
-@dirrm share/gnome/galeon/themes/GnomeLarge
-@dirrm share/gnome/galeon/themes/Aquatic
-@dirrm share/gnome/galeon/themes
+@dirrm share/gnome/help/galeon/C/figures
+@dirrm share/gnome/help/galeon/C
+@dirrm share/gnome/help/galeon
 @dirrm share/gnome/galeon/spinners/pipeon
 @dirrm share/gnome/galeon/spinners/galeon
 @dirrm share/gnome/galeon/spinners/crashcut
@@ -429,12 +247,7 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Tabs
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI/Mouse
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/prefs_dialog
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/page_info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/js_console
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history_dock
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/history
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/compact_bookmark_editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State/bookmarks_editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/State
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering/Language
@@ -442,10 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Print
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Help
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers/Downloading
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History/Session
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/History
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/General
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Browsing/Find
@@ -455,7 +266,6 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Persistent
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Network
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Filtering
-@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced/Crash
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon/Advanced
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/galeon
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Windows
@@ -463,12 +273,7 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Tabs
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI/Mouse
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/UI
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/prefs_dialog
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/page_info
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/js_console
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/history_dock
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/history
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/compact_bookmark_editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State/bookmarks_editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/State
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering/Language
@@ -476,10 +281,8 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Rendering
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Print
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Programs
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Help
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers/Downloading
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Handlers
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History/Session
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/History
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/General
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Browsing/Find
@@ -489,6 +292,5 @@ share/locale/zh_TW/LC_MESSAGES/galeon.mo
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Persistent
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Network
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Filtering
-@dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced/Crash
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon/Advanced
 @dirrm etc/gconf/gconf.xml.defaults/apps/galeon