Sprout from master 2003-04-01 12:40:07 UTC aflinta <aflinta@pld-linux.org> '- updated to version 2.2.3.1'
Delete:
nautilus-DESTDIR.patch
nautilus-ac25.patch
nautilus-ac_fix.patch
nautilus-aclocal.patch
nautilus-amfix.patch
nautilus-applnk.patch
nautilus-bonobo-workaround.patch
nautilus-bonobo.patch
nautilus-cpp.patch
nautilus-dblib_fix.patch
nautilus-gettext.patch
nautilus-m4-gnome.patch
nautilus-mozilla-profile-startup.patch
nautilus-new_mozilla.patch
nautilus-omf-encoding.patch
nautilus-omf.patch
nautilus-time.patch
nautilus-use_AM_GNU_GETTEXT.patch
nautilus-xml-i18n-rules.patch
+++ /dev/null
---- nautilus-1.0.5.orig/Makefile.am Thu Oct 11 19:56:56 2001
-+++ nautilus-1.0.5/Makefile.am Tue Oct 30 19:46:41 2001
-@@ -107,7 +107,7 @@
- ##################################################################
-
- dist-hook: nautilus.spec
-- cp nautilus.spec $(distdir)
-+ cp nautilus.spec $(DESTDIR)$(distdir)
-
- ##################################################################
- #
+++ /dev/null
---- nautilus-1.0.6/configure.in.ac25 Wed Nov 7 20:52:37 2001
-+++ nautilus-1.0.6/configure.in Tue Jan 22 15:57:23 2002
-@@ -98,10 +98,10 @@
- FAM_MISSING_WARNING="Nautilus depends on FAM to provide notification when files are altered (either through filesystem polling, or a kernel notification mechanism). If Nautilus is built without FAM support, directories viewed with Nautilus will not remain in synch with the actual filesystem when they are altered by external processes. Particularly if you are a distributor please compile Nautilus with FAM support. FAM is available from http://oss.sgi.com/projects/fam/. A patch to add Linux Kernel 2.4 directory notify support to FAM (highly desirable) is available from http://people.redhat.com/alexl/files/"
- FAM_LIBS=
- AC_CHECK_LIB(fam, FAMOpen,
-- AC_CHECK_HEADERS(fam.h,
-+ [ AC_CHECK_HEADERS(fam.h,
- [AC_DEFINE(HAVE_LIBFAM)
- FAM_LIBS="-lfam"],
-- AC_MSG_WARN(*** FAM support will not be built (header files not found) $FAM_MISSING_WARNING ***)),
-+ AC_MSG_WARN(*** FAM support will not be built (header files not found) $FAM_MISSING_WARNING ***)) ],
- AC_MSG_WARN(*** FAM support will not be built (FAM library not found) $FAM_MISSING_WARNING ***))
- AC_SUBST(FAM_LIBS)
-
-@@ -585,9 +585,9 @@
- dnl ====================================
- if test -z "$LIBPNG"; then
- AC_CHECK_LIB(png, png_read_info,
-- AC_CHECK_HEADER(png.h,
-- png_ok=yes,
-- png_ok=no),
-+ [ AC_CHECK_HEADER(png.h,
-+ png_ok=yes,
-+ png_ok=no) ],
- AC_MSG_ERROR(*** (PNG library not found) ***), -lz -lm)
- if test "$png_ok" = yes; then
- AC_MSG_CHECKING([for png_structp in png.h])
-@@ -616,9 +616,9 @@
- dnl ====================================
- if test -z "$LIBJPEG"; then
- AC_CHECK_LIB(jpeg, jpeg_start_decompress,
-- AC_CHECK_HEADER(jpeglib.h,
-+ [ AC_CHECK_HEADER(jpeglib.h,
- jpeg_ok=yes,
-- jpeg_ok=no),
-+ jpeg_ok=no) ],
- AC_MSG_WARN(*** (jpeg library not found) ***), -lm)
- if test "$jpeg_ok" = yes; then
- JPEG='jpeg'; LIBJPEG='-ljpeg'
+++ /dev/null
---- configure.in.orig Tue Aug 6 22:14:46 2002
-+++ configure.in Tue Aug 6 22:34:29 2002
-@@ -326,10 +326,10 @@
- dnl = cdda module support
- dnl ====================================
-
--AM_CONDITIONAL(HAVE_CDDA, false);
-+AM_CONDITIONAL(HAVE_CDDA, false)
- AC_CHECK_HEADERS(cdda_interface.h cdda_paranoia.h, [
-- CDDA_LIBS="$CDDA_LIBS -lcdda_paranoia, -lcdda_interface";
-- AM_CONDITIONAL(HAVE_CDDA, true);
-+ CDDA_LIBS="$CDDA_LIBS -lcdda_paranoia, -lcdda_interface"
-+ AM_CONDITIONAL(HAVE_CDDA, true)
- ])
-
- dnl ====================================
-@@ -822,6 +822,7 @@
- applets/launcher/Makefile
- applets/preferences-applet/Makefile
- omf-install/Makefile
-+intl/Makefile
- ])
-
- dnl <= Configuration summary =>
+++ /dev/null
---- nautils-1.0.6.orig/acinclude.m4 Thu Jan 1 01:00:00 1970
-+++ nautilus-1.0.6/acinclude.m4 Tue Nov 13 11:22:16 2001
-@@ -0,0 +1,359 @@
-+AC_DEFUN([AM_PATH_GNOME],
-+[dnl
-+dnl Get the cflags and libraries from the gnome-config script
-+dnl
-+AC_ARG_WITH(gnome-prefix,[ --with-gnome-prefix=PFX Prefix where GNOME is installed (optional)],
-+ gnome_config_prefix="$withval", gnome_config_prefix="")
-+AC_ARG_WITH(gnome-exec-prefix,[ --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional)],
-+ gnome_config_exec_prefix="$withval", gnome_config_exec_prefix="")
-+
-+ if test x$gnome_config_exec_prefix != x ; then
-+ gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix"
-+ if test x${GNOME_CONFIG+set} != xset ; then
-+ GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config
-+ fi
-+ fi
-+ if test x$gnome_config_prefix != x ; then
-+ gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
-+ if test x${GNOME_CONFIG+set} != xset ; then
-+ GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-+ min_gnome_version=ifelse([$1], , 1.1.0, $1)
-+
-+ AC_MSG_CHECKING(for GNOME - version >= $min_gnome_version)
-+ no_gnome=""
-+ if test "$GNOME_CONFIG" = "no" ; then
-+ no_gnome=yes
-+ else
-+ GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`"
-+ GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`"
-+ GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`"
-+ GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`"
-+
-+ gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-+ gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-+ gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-+ needed_major_version=`echo $min_gnome_version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-+ needed_minor_version=`echo $min_gnome_version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-+ needed_micro_version=`echo $min_gnome_version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-+
-+ if test $gnome_config_major_version -lt $needed_major_version; then
-+ ifelse([$3], , :, [$3])
-+ no_gnome=yes
-+ elif test $gnome_config_major_version = $needed_major_version; then
-+ if test -n "$needed_minor_version" -a $gnome_config_minor_version -lt $needed_minor_version; then
-+ ifelse([$3], , :, [$3])
-+ no_gnome=yes
-+ elif test -n "$needed_minor_version" -a $gnome_config_minor_version = $needed_minor_version; then
-+ if test -n "$needed_micro_version" -a $gnome_config_micro_version -lt $needed_micro_version; then
-+ ifelse([$3], , :, [$3])
-+ no_gnome=yes
-+ fi
-+ fi
-+ fi
-+ fi
-+ AC_SUBST(GNOME_CFLAGS)
-+ AC_SUBST(GNOME_LIBS)
-+ AC_SUBST(GNOMEUI_CFLAGS)
-+ AC_SUBST(GNOMEUI_LIBS)
-+
-+ if test "x$no_gnome" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GNOME_CONFIG" = "no" ; then
-+ echo "*** The gnome-config script installed by GNOME could not be found"
-+ echo "*** If GNOME was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GNOME_CONFIG environment variable to the"
-+ echo "*** full path to gnome-config."
-+ else
-+ :
-+ fi
-+ GNOME_CFLAGS=""
-+ GNOME_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+
-+ tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir`
-+ if test -n "$4"; then
-+ AC_MSG_CHECKING([for additional GNOME modules])
-+ fi
-+ for module in $4 ""; do
-+ gnome_m4_notfound=no
-+ if test "$module" = zvt; then
-+ ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`"
-+ AC_SUBST(ZVT_LIBS)
-+ elif test "$module" = gtk; then
-+ GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`"
-+ GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`"
-+ AC_SUBST(GTK_CFLAGS)
-+ AC_SUBST(GTK_LIBS)
-+ elif test "$module" = "glib"; then
-+ GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`"
-+ GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`"
-+ AC_SUBST(GLIB_CFLAGS)
-+ AC_SUBST(GLIB_LIBS)
-+ elif test "$module" = "oaf"; then
-+ OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`"
-+ OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`"
-+ AC_SUBST(OAF_CFLAGS)
-+ AC_SUBST(OAF_LIBS)
-+ elif test "$module" = "gnorba"; then
-+ GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`"
-+ GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`"
-+ AC_SUBST(GNORBA_CFLAGS)
-+ AC_SUBST(GNORBA_LIBS)
-+ elif test -n "$module"; then
-+ if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then
-+ tmp_bsnom=`echo $module | tr a-z A-Z`
-+ eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\"
-+ eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\"
-+ else
-+ AC_MSG_RESULT([*** $module library is not installed])
-+ ifelse([$3], , :, [$3])
-+ gnome_m4_notfound=yes
-+ fi
-+ fi
-+ if test "$gnome_m4_notfound" = no; then
-+ echo $ac_n " $module" 1>&6
-+ fi
-+ done
-+ if test -n "$4"; then
-+ AC_MSG_RESULT([])
-+ fi
-+])
-+
-+dnl ===========================================================================
-+
-+dnl NAUTILUS_VERSION_CANON(version)
-+dnl 1
-+
-+AC_DEFUN([NAUTILUS_VERSION_CANON], [`
-+
-+ dnl Assumes that there are no more than 999 revisions at a level,
-+ dnl no more than three levels of revision.
-+ dnl
-+ dnl Any more than that, and test starts messing up the numeric
-+ dnl comparisons because its integers overflow, and there's no
-+ dnl way to do string comparisons in the shell. Grr.
-+ dnl
-+ dnl Must come up with some way to fix this.
-+
-+ echo "$1" |
-+ tr . '\012' |
-+ sed -e 's/^/000/' -e 's/^.*\(...\)/\1/' |
-+ tr -d '\012' |
-+ sed 's/$/000000000/
-+ s/^\(.........\).*/\1/'
-+`])
-+
-+dnl NAUTILUS_VERSION_INSIST(package, get-version-cmd, operator, want-version-var)
-+dnl 1 2 3 4
-+
-+AC_DEFUN([NAUTILUS_VERSION_INSIST], [
-+ ez_want_version=[$]$4
-+
-+ case "$3" in
-+ ">") ez_operator=-gt ;;
-+ ">=") ez_operator=-ge ;;
-+ "<") ez_operator=-lt ;;
-+ "<=") ez_operator=-le ;;
-+ "=") ez_operator=-eq ;;
-+ "!=") ez_operator=-ne ;;
-+ *) AC_ERROR(Unknown operator $3 in configure script) ;;
-+ esac
-+
-+ AC_MSG_CHECKING(for $1 $3 [$ez_want_version])
-+
-+ if ez_installed_version="`$2`"
-+ then
-+ AC_MSG_RESULT([$ez_installed_version])
-+ else
-+ AC_ERROR($2 failed)
-+ fi
-+
-+ if test "NAUTILUS_VERSION_CANON([$ez_installed_version])" "$ez_operator" \
-+ "NAUTILUS_VERSION_CANON([$ez_want_version])"
-+ then
-+ :
-+ AC_SUBST($4)
-+ else
-+ AC_ERROR($1 version [$ez_want_version] is required.)
-+ fi
-+])
-+
-+dnl NAUTILUS_PATH_FREETYPE2([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]])
-+dnl Test for FreeType2, and define FREETYPE2_CFLAGS and FREETYPE2_LIBS
-+dnl
-+dnl Shamelessly cut-n-pasted from AM_PATH_LIBART
-+dnl
-+AC_DEFUN([NAUTILUS_PATH_FREETYPE2],
-+[dnl
-+dnl Get the cflags and libraries from the freetype-config script
-+dnl
-+AC_ARG_WITH(freetype2-prefix,[ --with-freetype2-prefix=PFX Prefix where FREETYPE2 is installed (optional)],
-+ freetype2_prefix="$withval", freetype2_prefix="")
-+AC_ARG_WITH(freetype2-exec-prefix,[ --with-freetype2-exec-prefix=PFX Exec prefix where FREETYPE2 is installed (optional)],
-+ freetype2_exec_prefix="$withval", freetype2_exec_prefix="")
-+AC_ARG_ENABLE(freetype2test, [ --disable-freetype2test Do not try to compile and run a test FREETYPE2 program],
-+ , enable_freetype2test=yes)
-+
-+ if test x$freetype2_exec_prefix != x ; then
-+ freetype2_args="$freetype2_args --exec-prefix=$freetype2_exec_prefix"
-+ if test x${FREETYPE2_CONFIG+set} != xset ; then
-+ FREETYPE2_CONFIG=$freetype2_exec_prefix/bin/freetype-config
-+ fi
-+ fi
-+ if test x$freetype2_prefix != x ; then
-+ freetype2_args="$freetype2_args --prefix=$freetype2_prefix"
-+ if test x${FREETYPE2_CONFIG+set} != xset ; then
-+ FREETYPE2_CONFIG=$freetype2_prefix/bin/freetype-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(FREETYPE2_CONFIG, freetype-config, no)
-+ min_freetype2_version=ifelse([$1], ,0.2.5,$1)
-+ AC_MSG_CHECKING(for FREETYPE2 - version >= $min_freetype2_version)
-+ no_freetype2=""
-+ if test "$FREETYPE2_CONFIG" = "no" ; then
-+ no_freetype2=yes
-+ else
-+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG $freetype2conf_args --cflags`
-+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG $freetype2conf_args --libs`
-+
-+ freetype2_major_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
-+ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\1/'`
-+ freetype2_minor_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
-+ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\2/'`
-+ freetype2_micro_version=`$FREETYPE2_CONFIG $freetype2_args --version | \
-+ sed 's/\([[0-9]]*\)[[:.]]\([[0-9]]*\)[[:.]]\([[0-9]]*\)/\3/'`
-+
-+ if test "x$enable_freetype2test" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+ LIBS="$LIBS $FREETYPE2_LIBS"
-+dnl
-+dnl Now check if the installed FREETYPE2 is sufficiently new. (Also sanity
-+dnl checks the results of freetype-config to some extent
-+dnl
-+ rm -f conf.freetype2test
-+ AC_TRY_RUN([
-+#include <stdio.h>
-+#include <stdlib.h>
-+#include <string.h>
-+#include <freetype/freetype.h>
-+
-+char*
-+my_strdup (char *str)
-+{
-+ char *new_str;
-+
-+ if (str)
-+ {
-+ new_str = malloc ((strlen (str) + 1) * sizeof(char));
-+ strcpy (new_str, str);
-+ }
-+ else
-+ new_str = NULL;
-+
-+ return new_str;
-+}
-+
-+int main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ system ("touch conf.freetype2test");
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = my_strdup("$min_freetype2_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_freetype2_version");
-+ exit(1);
-+ }
-+
-+ if (($freetype2_major_version > major) ||
-+ (($freetype2_major_version == major) && ($freetype2_minor_version > minor)) ||
-+ (($freetype2_major_version == major) && ($freetype2_minor_version == minor) && ($freetype2_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n");
-+ printf("*** \n");
-+ printf("*** 'freetype-config --version' returned %d.%d.%d, but the minimum version\n", $freetype2_major_version, $freetype2_minor_version, $freetype2_micro_version);
-+ printf("*** of FREETYPE2 required is %d.%d.%d. If freetype-config is correct, then it is\n", major, minor, micro);
-+ printf("*** best to upgrade to the required version.\n");
-+ printf("*** If freetype-config was wrong, set the environment variable FREETYPE2_CONFIG\n");
-+ printf("*** to point to the correct copy of freetype-config, and remove the file\n");
-+ printf("*** config.cache before re-running configure\n");
-+ printf("*** \n");
-+
-+ return 1;
-+ }
-+}
-+
-+],, no_freetype2=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_freetype2" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$FREETYPE2_CONFIG" = "no" ; then
-+ echo "*** The freetype-config script installed by FREETYPE2 could not be found"
-+ echo "*** If FREETYPE2 was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the FREETYPE2_CONFIG environment variable to the"
-+ echo "*** full path to freetype-config."
-+ else
-+ if test -f conf.freetype2test ; then
-+ :
-+ else
-+ echo "*** Could not run FREETYPE2 test program, checking why..."
-+ CFLAGS="$CFLAGS $FREETYPE2_CFLAGS"
-+ LIBS="$LIBS $FREETYPE2_LIBS"
-+ AC_TRY_LINK([
-+#include <stdio.h>
-+#include <freetype/freetype.h>
-+], [ return 0; ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding FREETYPE2 or finding the wrong"
-+ echo "*** version of FREETYPE2. If it is not finding FREETYPE2, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means FREETYPE2 was incorrectly installed"
-+ echo "*** or that you have moved FREETYPE2 since it was installed. In the latter case, you"
-+ echo "*** may want to edit the freetype-config script: $FREETYPE2_CONFIG" ])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ FREETYPE2_CFLAGS=""
-+ FREETYPE2_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(FREETYPE2_CFLAGS)
-+ AC_SUBST(FREETYPE2_LIBS)
-+ rm -f conf.freetype2test
-+])
+++ /dev/null
---- nautilus-1.0.6/data/Makefile.am.orig Sun Oct 7 18:36:03 2001
-+++ nautilus-1.0.6/data/Makefile.am Tue Nov 13 10:58:06 2001
-@@ -28,8 +28,6 @@
- serverconfig.desktop \
- $(NULL)
-
--DESKTOP_FILES=$(DESKTOP_IN_FILES:.in=)
--
- nautilusdatadir = $(datadir)/nautilus
-
- nautilusdata_DATA = \
---- nautilus-1.0.6/components/tree/Makefile.am.orig Tue Nov 13 10:56:09 2001
-+++ nautilus-1.0.6/components/tree/Makefile.am Tue Nov 13 10:56:48 2001
-@@ -7,7 +7,7 @@
- $(NAUTILUS_PRIVATE_CFLAGS) \
- $(NULL)
-
--TREE_VIEW_COMMON_SOURCES = \
-+TREE_VIEW_COMMON_SRCS = \
- nautilus-tree-change-queue.c \
- nautilus-tree-change-queue.h \
- nautilus-tree-expansion-state.c \
-@@ -30,7 +30,7 @@
- libnautilus-tree-view.la
-
- libnautilus_tree_view_la_SOURCES = \
-- $(TREE_VIEW_COMMON_SOURCES) \
-+ $(TREE_VIEW_COMMON_SRCS) \
- libmain.c \
- $(NULL)
-
---- nautilus-1.0.6/help/sgmldocs.make.orig Tue Nov 13 11:05:14 2001
-+++ nautilus-1.0.6/help/sgmldocs.make Tue Nov 13 11:03:02 2001
-@@ -58,7 +58,7 @@
- -cp $(docname)/index.html .
-
- $(docname).sgml: $(sgml_ents)
-- -ourdir=`pwd`; \
-+ ourdir=`pwd` || true; \
- cd $(srcdir); \
- cp $(sgml_ents) $$ourdir
-
---- nautilus-1.0.6/Makefile.am~ Sun Aug 11 21:24:44 2002
-+++ nautilus-1.0.6/Makefile.am Sun Aug 11 21:25:51 2002
-@@ -24,6 +24,7 @@
- test \
- user-guide \
- help \
-+ intl \
- po \
- omf-install \
- $(NULL)
+++ /dev/null
---- nautilus-1.0.6/Makefile.am.orig Sat Feb 9 00:27:32 2002
-+++ nautilus-1.0.6/Makefile.am Sat Feb 9 09:21:22 2002
-@@ -62,11 +62,11 @@
- gnome-starthere-96.png \
- gnome-starthere.png
-
--Applicationsdir = $(datadir)/gnome/apps/Applications
-+Applicationsdir = $(datadir)/applnk/Utilities
- Applications_DATA = $(DESKTOP_FILES)
-
--Toplevelmenudir = $(datadir)/gnome/apps
--Toplevelmenu_DATA = nautilus-help.desktop
-+NautilusHelpdir = $(datadir)/applnk/Help
-+NautilusHelp_DATA = nautilus-help.desktop
-
- ## [The following is shamelessly copied from gnome-vfs.]
-
+++ /dev/null
---- nautilus-1.0.6/configure.in.orig Tue Nov 13 11:54:06 2001
-+++ nautilus-1.0.6/configure.in Tue Nov 13 11:54:26 2001
-@@ -715,7 +715,7 @@
-
- dnl Flags for libraries that Nautilus depends on
- NAUTILUS_DEPENDENCY_CFLAGS="`$GNOME_CONFIG --cflags bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel`"
--NAUTILUS_DEPENDENCY_LIBS="`$GNOME_CONFIG --libs bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel`"
-+NAUTILUS_DEPENDENCY_LIBS="`$GNOME_CONFIG --libs bonobo bonobox bonobox_print gnomecanvaspixbuf xml vfs eel` -lbonobox"
- AC_SUBST(NAUTILUS_DEPENDENCY_CFLAGS)
- AC_SUBST(NAUTILUS_DEPENDENCY_LIBS)
-
---- nautilus-1.0.6/components/sample/Makefile.am.orig Tue Nov 13 12:24:32 2001
-+++ nautilus-1.0.6/components/sample/Makefile.am Tue Nov 13 12:24:57 2001
-@@ -25,7 +25,7 @@
- nautilus_sample_content_view_LDADD = \
- $(top_builddir)/libnautilus/libnautilus.la \
- $(BONOBO_LIBS) \
-- $(BONOBOX_LIBS) \
-+ $(BONOBOX_LIBS) -lbonobox \
- $(VFS_LIBS) \
- $(OAF_LIBS)
-
+++ /dev/null
-diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-embed-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-embed-strategy.c
---- nautilus-0.5/components/adapter/nautilus-adapter-embed-strategy.c Mon Oct 23 16:36:53 2000
-+++ nautilus-0.5.new/components/adapter/nautilus-adapter-embed-strategy.c Sun Nov 19 20:11:50 2000
-@@ -120,7 +120,7 @@
-
- CORBA_exception_init (&ev);
-
-- control = Bonobo_Unknown_query_interface (component,
-+ control = Bonobo_Unknown_queryInterface (component,
- "IDL:Bonobo/Control:1.0", &ev);
-
-
-@@ -130,7 +130,7 @@
- return nautilus_adapter_control_embed_strategy_new (control, CORBA_OBJECT_NIL);
- }
-
-- embeddable = Bonobo_Unknown_query_interface (component,
-+ embeddable = Bonobo_Unknown_queryInterface (component,
- "IDL:Bonobo/Embeddable:1.0", &ev);
-
- if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (embeddable, &ev)) {
-diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-load-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-load-strategy.c
---- nautilus-0.5/components/adapter/nautilus-adapter-load-strategy.c Tue Oct 3 06:12:50 2000
-+++ nautilus-0.5.new/components/adapter/nautilus-adapter-load-strategy.c Sun Nov 19 20:11:50 2000
-@@ -136,7 +136,7 @@
-
- CORBA_exception_init (&ev);
-
-- progressive_data_sink = Bonobo_Unknown_query_interface (component,
-+ progressive_data_sink = Bonobo_Unknown_queryInterface (component,
- "IDL:Bonobo/ProgressiveDataSink:1.0", &ev);
-
-
-@@ -147,7 +147,7 @@
- }
-
-
-- persist_stream = Bonobo_Unknown_query_interface (component,
-+ persist_stream = Bonobo_Unknown_queryInterface (component,
- "IDL:Bonobo/PersistStream:1.0", &ev);
-
- if (ev._major == CORBA_NO_EXCEPTION && !CORBA_Object_is_nil (persist_stream, &ev)) {
-@@ -157,7 +157,7 @@
- }
-
-
-- persist_file = Bonobo_Unknown_query_interface (component,
-+ persist_file = Bonobo_Unknown_queryInterface (component,
- "IDL:Bonobo/PersistFile:1.0", &ev);
-
-
-diff -Nur nautilus-0.5/components/adapter/nautilus-adapter-progressive-load-strategy.c nautilus-0.5.new/components/adapter/nautilus-adapter-progressive-load-strategy.c
---- nautilus-0.5/components/adapter/nautilus-adapter-progressive-load-strategy.c Fri Oct 20 10:45:48 2000
-+++ nautilus-0.5.new/components/adapter/nautilus-adapter-progressive-load-strategy.c Sun Nov 19 20:11:50 2000
-@@ -208,7 +208,7 @@
- gnome_vfs_file_info_clear (&file_info);
-
- if (result == GNOME_VFS_OK && file_info.valid_fields | GNOME_VFS_FILE_INFO_FIELDS_SIZE) {
-- Bonobo_ProgressiveDataSink_set_size (strategy->details->progressive_data_sink,
-+ Bonobo_ProgressiveDataSink_setSize (strategy->details->progressive_data_sink,
- (long) file_info.size, &ev);
- CHECK_IF_STOPPED;
- }
-@@ -219,7 +219,7 @@
- if (result == GNOME_VFS_OK) {
- iobuf->_length = bytes_read;
-
-- Bonobo_ProgressiveDataSink_add_data (strategy->details->progressive_data_sink, iobuf, &ev);
-+ Bonobo_ProgressiveDataSink_addData (strategy->details->progressive_data_sink, iobuf, &ev);
-
- CHECK_IF_STOPPED;
-
-diff -Nur nautilus-0.5/components/history/nautilus-history-view.c nautilus-0.5.new/components/history/nautilus-history-view.c
---- nautilus-0.5/components/history/nautilus-history-view.c Fri Oct 6 01:47:34 2000
-+++ nautilus-0.5.new/components/history/nautilus-history-view.c Sun Nov 19 20:12:44 2000
-@@ -69,7 +69,7 @@
- g_return_val_if_fail (NAUTILUS_IS_VIEW (view), CORBA_OBJECT_NIL);
-
- CORBA_exception_init (ev);
-- return Bonobo_Unknown_query_interface
-+ return Bonobo_Unknown_queryInterface
- (bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
- "IDL:Nautilus/HistoryFrame:1.0", ev);
- }
-diff -Nur nautilus-0.5/libnautilus/nautilus-distributed-undo.h nautilus-0.5.new/libnautilus/nautilus-distributed-undo.h
---- nautilus-0.5/libnautilus/nautilus-distributed-undo.h Tue Nov 7 15:30:22 2000
-+++ nautilus-0.5.new/libnautilus/nautilus-distributed-undo.h Sun Nov 19 20:11:50 2000
-@@ -260,7 +260,7 @@
- /** prototypes **/
- #define Nautilus_Undo_Transaction_ref Bonobo_Unknown_ref
- #define Nautilus_Undo_Transaction_unref Bonobo_Unknown_unref
--#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_Undo_Transaction_query_interface Bonobo_Unknown_queryInterface
- Nautilus_Undo_MenuItem
- *Nautilus_Undo_Transaction__get_undo_menu_item(Nautilus_Undo_Transaction
- _obj,
-@@ -277,7 +277,7 @@
- CORBA_Environment * ev);
- #define Nautilus_Undo_Manager_ref Bonobo_Unknown_ref
- #define Nautilus_Undo_Manager_unref Bonobo_Unknown_unref
--#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_Undo_Manager_query_interface Bonobo_Unknown_queryInterface
- void Nautilus_Undo_Manager_append(Nautilus_Undo_Manager _obj,
- const Nautilus_Undo_Transaction
- transaction, CORBA_Environment * ev);
-@@ -288,7 +288,7 @@
- CORBA_Environment * ev);
- #define Nautilus_Undo_Context_ref Bonobo_Unknown_ref
- #define Nautilus_Undo_Context_unref Bonobo_Unknown_unref
--#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_Undo_Context_query_interface Bonobo_Unknown_queryInterface
- Nautilus_Undo_Manager
- Nautilus_Undo_Context__get_undo_manager(Nautilus_Undo_Context _obj,
- CORBA_Environment * ev);
-diff -Nur nautilus-0.5/libnautilus/nautilus-undo.c nautilus-0.5.new/libnautilus/nautilus-undo.c
---- nautilus-0.5/libnautilus/nautilus-undo.c Fri Oct 6 01:47:43 2000
-+++ nautilus-0.5.new/libnautilus/nautilus-undo.c Sun Nov 19 20:11:50 2000
-@@ -255,7 +255,7 @@
- /* Find the undo manager. */
- control_frame = bonobo_control_get_control_frame (control);
- if (!CORBA_Object_is_nil (control_frame, &ev)) {
-- undo_context = Bonobo_Control_query_interface
-+ undo_context = Bonobo_Control_queryInterface
- (control_frame, "IDL:Nautilus/Undo/Context:1.0", &ev);
- if (!CORBA_Object_is_nil (undo_context, &ev)) {
- manager = Nautilus_Undo_Context__get_undo_manager (undo_context, &ev);
-diff -Nur nautilus-0.5/libnautilus/nautilus-view-component.h nautilus-0.5.new/libnautilus/nautilus-view-component.h
---- nautilus-0.5/libnautilus/nautilus-view-component.h Tue Nov 7 15:30:21 2000
-+++ nautilus-0.5.new/libnautilus/nautilus-view-component.h Sun Nov 19 20:11:51 2000
-@@ -781,7 +781,7 @@
- /** prototypes **/
- #define Nautilus_View_ref Bonobo_Unknown_ref
- #define Nautilus_View_unref Bonobo_Unknown_unref
--#define Nautilus_View_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_View_query_interface Bonobo_Unknown_queryInterface
- void Nautilus_View_load_location(Nautilus_View _obj,
- const Nautilus_URI location,
- CORBA_Environment * ev);
-@@ -795,7 +795,7 @@
- CORBA_Environment * ev);
- #define Nautilus_ViewFrame_ref Bonobo_Unknown_ref
- #define Nautilus_ViewFrame_unref Bonobo_Unknown_unref
--#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_ViewFrame_query_interface Bonobo_Unknown_queryInterface
- void Nautilus_ViewFrame_open_location(Nautilus_ViewFrame _obj,
- const Nautilus_URI location,
- CORBA_Environment * ev);
-@@ -829,7 +829,7 @@
- CORBA_Environment * ev);
- #define Nautilus_Zoomable_ref Bonobo_Unknown_ref
- #define Nautilus_Zoomable_unref Bonobo_Unknown_unref
--#define Nautilus_Zoomable_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_Zoomable_query_interface Bonobo_Unknown_queryInterface
- CORBA_float Nautilus_Zoomable__get_zoom_level(Nautilus_Zoomable _obj,
- CORBA_Environment * ev);
- void Nautilus_Zoomable__set_zoom_level(Nautilus_Zoomable _obj,
-@@ -852,7 +852,7 @@
- CORBA_Environment * ev);
- #define Nautilus_ZoomableFrame_ref Bonobo_Unknown_ref
- #define Nautilus_ZoomableFrame_unref Bonobo_Unknown_unref
--#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_ZoomableFrame_query_interface Bonobo_Unknown_queryInterface
- void
- Nautilus_ZoomableFrame_report_zoom_level_changed(Nautilus_ZoomableFrame
- _obj,
-@@ -862,7 +862,7 @@
- ev);
- #define Nautilus_HistoryFrame_ref Bonobo_Unknown_ref
- #define Nautilus_HistoryFrame_unref Bonobo_Unknown_unref
--#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_query_interface
-+#define Nautilus_HistoryFrame_query_interface Bonobo_Unknown_queryInterface
- Nautilus_HistoryList
- *Nautilus_HistoryFrame_get_history_list(Nautilus_HistoryFrame _obj,
- CORBA_Environment * ev);
-diff -Nur nautilus-0.5/libnautilus/nautilus-view.c nautilus-0.5.new/libnautilus/nautilus-view.c
---- nautilus-0.5/libnautilus/nautilus-view.c Fri Oct 6 01:47:43 2000
-+++ nautilus-0.5.new/libnautilus/nautilus-view.c Sun Nov 19 20:11:51 2000
-@@ -312,7 +312,7 @@
-
- CORBA_exception_init (ev);
-
-- view_frame = Bonobo_Unknown_query_interface
-+ view_frame = Bonobo_Unknown_queryInterface
- (bonobo_control_get_control_frame (nautilus_view_get_bonobo_control (view)),
- "IDL:Nautilus/ViewFrame:1.0", ev);
-
-diff -Nur nautilus-0.5/libnautilus/nautilus-zoomable.c nautilus-0.5.new/libnautilus/nautilus-zoomable.c
---- nautilus-0.5/libnautilus/nautilus-zoomable.c Thu Sep 14 19:10:16 2000
-+++ nautilus-0.5.new/libnautilus/nautilus-zoomable.c Sun Nov 19 20:11:51 2000
-@@ -538,7 +538,7 @@
- CORBA_exception_init (&ev);
-
- if (CORBA_Object_is_nil (view->details->zoomable_frame, &ev)) {
-- view->details->zoomable_frame = Bonobo_Unknown_query_interface
-+ view->details->zoomable_frame = Bonobo_Unknown_queryInterface
- (bonobo_control_get_control_frame
- (BONOBO_CONTROL (nautilus_zoomable_get_bonobo_control (view))),
- "IDL:Nautilus/ZoomableFrame:1.0", &ev);
-diff -Nur nautilus-0.5/src/nautilus-window.c nautilus-0.5.new/src/nautilus-window.c
---- nautilus-0.5/src/nautilus-window.c Mon Nov 6 14:41:55 2000
-+++ nautilus-0.5.new/src/nautilus-window.c Sun Nov 19 20:11:51 2000
-@@ -125,7 +125,7 @@
-
- NAUTILUS_DEFINE_CLASS_BOILERPLATE (NautilusWindow,
- nautilus_window,
-- BONOBO_TYPE_WIN)
-+ BONOBO_TYPE_WINDOW)
-
- static void
- nautilus_window_initialize_class (NautilusWindowClass *klass)
-@@ -341,7 +341,7 @@
- /* CORBA and Bonobo setup, which must be done before the location bar setup */
- window->details->ui_container = bonobo_ui_container_new ();
- bonobo_ui_container_set_win (window->details->ui_container,
-- BONOBO_WIN (window));
-+ BONOBO_WINDOW (window));
-
- /* Load the user interface from the XML file. */
- window->details->shell_ui = bonobo_ui_component_new ("Nautilus Shell");
-@@ -420,7 +420,7 @@
- e_paned_set_position (E_PANED (window->content_hbox), sidebar_width);
- }
- gtk_widget_show (window->content_hbox);
-- bonobo_win_set_contents (BONOBO_WIN (window), window->content_hbox);
-+ bonobo_window_set_contents (BONOBO_WINDOW (window), window->content_hbox);
-
- /* set up the index panel */
-
-@@ -496,8 +496,8 @@
- if (GTK_VALUE_STRING (*arg) == NULL) {
- return;
- }
-- old_name = bonobo_win_get_name (BONOBO_WIN (object));
-- bonobo_win_set_name (BONOBO_WIN (object), GTK_VALUE_STRING (*arg));
-+ old_name = bonobo_window_get_name (BONOBO_WINDOW (object));
-+ bonobo_window_set_name (BONOBO_WINDOW (object), GTK_VALUE_STRING (*arg));
- /* This hack of using the time when the name first
- * goes non-NULL to be window-constructed time is
- * completely lame. But it works, so for now we leave
-@@ -521,7 +521,7 @@
- {
- switch(arg_id) {
- case ARG_APP_ID:
-- GTK_VALUE_STRING (*arg) = bonobo_win_get_name (BONOBO_WIN (object));
-+ GTK_VALUE_STRING (*arg) = bonobo_window_get_name (BONOBO_WINDOW (object));
- break;
- case ARG_APP:
- GTK_VALUE_OBJECT (*arg) = GTK_OBJECT (NAUTILUS_WINDOW (object)->application);
-diff -Nur nautilus-0.5/src/nautilus-window.h nautilus-0.5.new/src/nautilus-window.h
---- nautilus-0.5/src/nautilus-window.h Sat Oct 7 02:34:52 2000
-+++ nautilus-0.5.new/src/nautilus-window.h Sun Nov 19 20:11:51 2000
-@@ -49,7 +49,7 @@
- #endif
-
- typedef struct {
-- BonoboWinClass parent_spot;
-+ BonoboWindowClass parent_spot;
- } NautilusWindowClass;
-
- typedef struct NautilusWindowStateInfo NautilusWindowStateInfo;
-@@ -64,7 +64,7 @@
- typedef struct NautilusWindowDetails NautilusWindowDetails;
-
- struct NautilusWindow {
-- BonoboWin parent_object;
-+ BonoboWindow parent_object;
-
- NautilusWindowDetails *details;
-
+++ /dev/null
---- nautilus-1.0.6/components/mozilla/nautilus-mozilla-embed-extensions.cpp~ Mon Oct 15 19:31:46 2001
-+++ nautilus-1.0.6/components/mozilla/nautilus-mozilla-embed-extensions.cpp Mon Dec 3 17:44:21 2001
-@@ -47,12 +47,17 @@
-
- #include <vector>
-
-+#if __GNUC__ < 3
- /* We can't include <string> because of a bug in g++, which gets confused
- * by the "string" directory in the mozilla include directory. So we do the
- * following as a workaround.
- */
- #include <std/bastring.h>
- typedef basic_string<char> string;
-+#else
-+#include <string>
-+using namespace std;
-+#endif
-
- struct Encoding
- {
+++ /dev/null
---- components/help/converters/gnome-db2html3/docbook/lib/Makefile.am~ Fri Jun 8 18:10:47 2001
-+++ components/help/converters/gnome-db2html3/docbook/lib/Makefile.am Tue Aug 6 22:10:52 2002
-@@ -1,5 +1,5 @@
--libdir=$(datadir)/sgml/docbook/xsl-stylesheets-1.29/lib
-+dblibdir=$(datadir)/sgml/docbook/xsl-stylesheets-1.29/lib
-
--lib_DATA=lib.xsl
-+dblib_DATA=lib.xsl
-
--EXTRA_DIST=$(lib_DATA)
-+EXTRA_DIST=$(dblib_DATA)
+++ /dev/null
-diff -urN nautilus-1.0.1.1.org/configure.in nautilus-1.0.1.1/configure.in
---- nautilus-1.0.1.1.org/configure.in Sat Apr 7 16:33:23 2001
-+++ nautilus-1.0.1.1/configure.in Sat Apr 7 16:33:32 2001
-@@ -891,7 +891,7 @@
-
- dnl Checks for i18n
- ALL_LINGUAS="az ca da de el en_GB es fi fr ga gl hu it ja ko nl nn no pl pt_BR ru sk sl sv ta tr uk zh_TW.Big5"
--AM_GNOME_GETTEXT
-+AM_GNU_GETTEXT
- # AM_GNOME_GETTEXT above substs $DATADIRNAME
- # this is the directory where the *.{mo,gmo} files are installed
- gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
+++ /dev/null
-diff -urN nautilus-1.0.1.1.org/acinclude.m4 nautilus-1.0.1.1/acinclude.m4
---- nautilus-1.0.1.1.org/acinclude.m4 Thu Jan 1 01:00:00 1970
-+++ nautilus-1.0.1.1/acinclude.m4 Sat Apr 7 16:37:04 2001
-@@ -0,0 +1,135 @@
-+AC_DEFUN(AM_PATH_GNOME,
-+[dnl
-+dnl Get the cflags and libraries from the gnome-config script
-+dnl
-+AC_ARG_WITH(gnome-prefix,[ --with-gnome-prefix=PFX Prefix where GNOME is installed (optional)],
-+ gnome_config_prefix="$withval", gnome_config_prefix="")
-+AC_ARG_WITH(gnome-exec-prefix,[ --with-gnome-exec-prefix=PFX Exec prefix where GNOME is installed (optional)],
-+ gnome_config_exec_prefix="$withval", gnome_config_exec_prefix="")
-+
-+ if test x$gnome_config_exec_prefix != x ; then
-+ gnome_config_args="$gnome_config_args --exec-prefix=$gnome_config_exec_prefix"
-+ if test x${GNOME_CONFIG+set} != xset ; then
-+ GNOME_CONFIG=$gnome_config_exec_prefix/bin/gnome-config
-+ fi
-+ fi
-+ if test x$gnome_config_prefix != x ; then
-+ gnome_config_args="$gnome_config_args --prefix=$gnome_config_prefix"
-+ if test x${GNOME_CONFIG+set} != xset ; then
-+ GNOME_CONFIG=$gnome_config_prefix/bin/gnome-config
-+ fi
-+ fi
-+
-+ AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
-+ min_gnome_version=ifelse([$1], , 1.1.0, $1)
-+
-+ AC_MSG_CHECKING(for GNOME - version >= $min_gnome_version)
-+ no_gnome=""
-+ if test "$GNOME_CONFIG" = "no" ; then
-+ no_gnome=yes
-+ else
-+ GNOME_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnome`"
-+ GNOME_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnome`"
-+ GNOMEUI_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnomeui`"
-+ GNOMEUI_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnomeui`"
-+
-+ gnome_config_major_version=`$GNOME_CONFIG $gnome_config_args --version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-+ gnome_config_minor_version=`$GNOME_CONFIG $gnome_config_args --version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-+ gnome_config_micro_version=`$GNOME_CONFIG $gnome_config_args --version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-+ needed_major_version=`echo $min_gnome_version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'`
-+ needed_minor_version=`echo $min_gnome_version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'`
-+ needed_micro_version=`echo $min_gnome_version | \
-+ sed 's/[[^0-9]]*\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'`
-+
-+ if test $gnome_config_major_version -lt $needed_major_version; then
-+ ifelse([$3], , :, [$3])
-+ no_gnome=yes
-+ elif test $gnome_config_major_version = $needed_major_version; then
-+ if test -n "$needed_minor_version" -a $gnome_config_minor_version -lt $needed_minor_version; then
-+ ifelse([$3], , :, [$3])
-+ no_gnome=yes
-+ elif test -n "$needed_minor_version" -a $gnome_config_minor_version = $needed_minor_version; then
-+ if test -n "$needed_micro_version" -a $gnome_config_micro_version -lt $needed_micro_version; then
-+ ifelse([$3], , :, [$3])
-+ no_gnome=yes
-+ fi
-+ fi
-+ fi
-+ fi
-+ AC_SUBST(GNOME_CFLAGS)
-+ AC_SUBST(GNOME_LIBS)
-+ AC_SUBST(GNOMEUI_CFLAGS)
-+ AC_SUBST(GNOMEUI_LIBS)
-+
-+ if test "x$no_gnome" = x ; then
-+ AC_MSG_RESULT(yes)
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$GNOME_CONFIG" = "no" ; then
-+ echo "*** The gnome-config script installed by GNOME could not be found"
-+ echo "*** If GNOME was installed in PREFIX, make sure PREFIX/bin is in"
-+ echo "*** your path, or set the GNOME_CONFIG environment variable to the"
-+ echo "*** full path to gnome-config."
-+ else
-+ :
-+ fi
-+ GNOME_CFLAGS=""
-+ GNOME_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+
-+ tmp_gnome_libdir=`$GNOME_CONFIG $gnome_config_args --libdir`
-+ if test -n "$4"; then
-+ AC_MSG_CHECKING([for additional GNOME modules])
-+ fi
-+ for module in $4 ""; do
-+ gnome_m4_notfound=no
-+ if test "$module" = zvt; then
-+ ZVT_LIBS="`$GNOME_CONFIG $gnome_config_args --libs zvt`"
-+ AC_SUBST(ZVT_LIBS)
-+ elif test "$module" = gtk; then
-+ GTK_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gtk`"
-+ GTK_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gtk`"
-+ AC_SUBST(GTK_CFLAGS)
-+ AC_SUBST(GTK_LIBS)
-+ elif test "$module" = "glib"; then
-+ GLIB_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags glib`"
-+ GLIB_LIBS="`$GNOME_CONFIG $gnome_config_args --libs glib`"
-+ AC_SUBST(GLIB_CFLAGS)
-+ AC_SUBST(GLIB_LIBS)
-+ elif test "$module" = "oaf"; then
-+ OAF_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags oaf`"
-+ OAF_LIBS="`$GNOME_CONFIG $gnome_config_args --libs oaf`"
-+ AC_SUBST(OAF_CFLAGS)
-+ AC_SUBST(OAF_LIBS)
-+ elif test "$module" = "gnorba"; then
-+ GNORBA_CFLAGS="`$GNOME_CONFIG $gnome_config_args --cflags gnorba`"
-+ GNORBA_LIBS="`$GNOME_CONFIG $gnome_config_args --libs gnorba`"
-+ AC_SUBST(GNORBA_CFLAGS)
-+ AC_SUBST(GNORBA_LIBS)
-+ elif test -n "$module"; then
-+ if $GNOME_CONFIG $gnome_config_args --cflags $module >/dev/null 2>&1; then
-+ tmp_bsnom=`echo $module | tr a-z A-Z`
-+ eval $tmp_bsnom'_CFLAGS'=\"`$GNOME_CONFIG $gnome_config_args --cflags $module`\"
-+ eval $tmp_bsnom'_LIBS'=\"`$GNOME_CONFIG $gnome_config_args --libs $module`\"
-+ else
-+ AC_MSG_RESULT([*** $module library is not installed])
-+ ifelse([$3], , :, [$3])
-+ gnome_m4_notfound=yes
-+ fi
-+ fi
-+ if test "$gnome_m4_notfound" = no; then
-+ echo $ac_n " $module" 1>&6
-+ fi
-+ done
-+ if test -n "$4"; then
-+ AC_MSG_RESULT([])
-+ fi
-+])
-+
+++ /dev/null
---- nautilus-1.0.6/components/mozilla/main.c~ Tue Oct 9 17:03:21 2001
-+++ nautilus-1.0.6/components/mozilla/main.c Fri Dec 28 22:38:58 2001
-@@ -190,6 +190,41 @@
- g_free (mozilla_path);
- }
-
-+/* The "Mozilla Profile" directory is the place where mozilla stores
-+ * things like cookies and cache. Here we tell the mozilla embedding
-+ * widget to use ~/.nautilus/MozillaProfile for this purpose.
-+ *
-+ * We need mozilla 0.8 to support this feature.
-+ */
-+
-+static void
-+set_up_mozilla_profile(void)
-+{
-+ const char *profile_directory_name = "MozillaProfile";
-+ char *profile_base_path;
-+ char *profile_path;
-+ char *cache_path;
-+
-+ profile_base_path = g_strdup_printf ("%s/.nautilus", g_get_home_dir ());
-+ profile_path = g_strdup_printf ("%s/.nautilus/%s", g_get_home_dir (), profile_directory_name);
-+ cache_path = g_strdup_printf ("%s/.nautilus/%s/Cache", g_get_home_dir (), profile_directory_name);
-+
-+ /* Create directories if they don't already exist */
-+ mkdir (profile_path, 0777);
-+ mkdir (cache_path, 0777);
-+
-+#ifdef MOZILLA_HAVE_PROFILES_SUPPORT
-+ /* this will be in Mozilla 0.8 */
-+ /* Its a bug in mozilla embedding that we need to cast the const away */
-+ gtk_moz_embed_set_profile_path (profile_base_path, (char *) profile_directory_name);
-+#endif
-+
-+ g_free (cache_path);
-+ g_free (profile_path);
-+ g_free (profile_base_path);
-+}
-+
-+
- int
- main (int argc, char *argv[])
- {
-@@ -201,6 +236,12 @@
-
- DEBUG_MSG (("nautilus-mozilla-content-view: starting...\n"));
-
-+ /* Set up the default mozilla profile directory. This has to
-+ happen before push_startup below otherwise the profile
-+ directory will never be set so things like the cache and
-+ global history won't work. */
-+ set_up_mozilla_profile();
-+
- /* set MOZILLA_FIVE_HOME if it's not already set */
- set_up_MOZILLA_FIVE_HOME();
-
---- nautilus-1.0.6/components/mozilla/nautilus-mozilla-content-view.c~ Tue Oct 9 17:09:04 2001
-+++ nautilus-1.0.6/components/mozilla/nautilus-mozilla-content-view.c Fri Dec 28 22:39:43 2001
-@@ -234,7 +234,6 @@
- guint num_strings,
- const char *string);
-
--static void pre_widget_initialize (void);
- static void post_widget_initialize (void);
-
- /* BonoboControl callbacks */
-@@ -255,8 +254,6 @@
- object_class = GTK_OBJECT_CLASS (klass);
-
- object_class->destroy = nautilus_mozilla_content_view_destroy;
--
-- pre_widget_initialize ();
- }
-
-
-@@ -1900,46 +1897,6 @@
- }
-
-
--/*
-- * one-time initialization that need to happen before the first GtkMozEmbed widget
-- * is created
-- */
--
--/* The "Mozilla Profile" directory is the place where mozilla stores
-- * things like cookies and cache. Here we tell the mozilla embedding
-- * widget to use ~/.nautilus/MozillaProfile for this purpose.
-- *
-- * We need mozilla 0.8 to support this feature.
-- */
--
--static void
--pre_widget_initialize (void)
--{
-- const char *profile_directory_name = "MozillaProfile";
-- char *profile_base_path;
-- char *profile_path;
-- char *cache_path;
--
-- profile_base_path = g_strdup_printf ("%s/.nautilus", g_get_home_dir ());
-- profile_path = g_strdup_printf ("%s/.nautilus/%s", g_get_home_dir (), profile_directory_name);
-- cache_path = g_strdup_printf ("%s/.nautilus/%s/Cache", g_get_home_dir (), profile_directory_name);
--
-- /* Create directories if they don't already exist */
-- mkdir (profile_path, 0777);
-- mkdir (cache_path, 0777);
--
--#ifdef MOZILLA_HAVE_PROFILES_SUPPORT
-- /* this will be in Mozilla 0.8 */
-- /* Its a bug in mozilla embedding that we need to cast the const away */
-- gtk_moz_embed_set_profile_path (profile_base_path, (char *) profile_directory_name);
--#endif
--
-- g_free (cache_path);
-- g_free (profile_path);
-- g_free (profile_base_path);
--}
--
--
- /*
- * one-time initialization that need to happen after the first GtkMozEmbed widget
- * is created
+++ /dev/null
-diff -urN nautilus-1.0.6.orig/components/mozilla/mozilla-components.cpp nautilus-1.0.6/components/mozilla/mozilla-components.cpp
---- nautilus-1.0.6.orig/components/mozilla/mozilla-components.cpp Fri Feb 16 12:48:46 2001
-+++ nautilus-1.0.6/components/mozilla/mozilla-components.cpp Sun Aug 11 16:27:46 2002
-@@ -34,6 +34,7 @@
- #include "nsIServiceManager.h"
- #include "nsComponentManagerUtils.h"
- #include "nsILocalFile.h"
-+#include "nsString2.h"
-
- #define LOCAL_FILE_ID NS_LOCAL_FILE_CONTRACTID
-
-@@ -62,7 +63,7 @@
- return FALSE;
- }
-
-- rv = spec->InitWithPath (library_file_name);
-+ rv = spec->InitWithPath (NS_ConvertASCIItoUCS2(library_file_name));
-
- if (NS_FAILED (rv)) {
- #ifdef DEBUG_ramiro
-diff -urN nautilus-1.0.6.orig/components/mozilla/mozilla-events.cpp nautilus-1.0.6/components/mozilla/mozilla-events.cpp
---- nautilus-1.0.6.orig/components/mozilla/mozilla-events.cpp Mon Oct 15 18:25:17 2001
-+++ nautilus-1.0.6/components/mozilla/mozilla-events.cpp Sun Aug 11 17:12:59 2002
-@@ -355,7 +355,7 @@
-
- /* Why can't I use GetElementsByTagName? I couldn't get it to work for me */
- static nsIDOMNode *
--get_anchor_named (nsIDOMNode *top_node, const nsAReadableString& aName)
-+get_anchor_named (nsIDOMNode *top_node, const nsAString& aName)
- {
- nsresult rv;
- nsAutoString src_string;
+++ /dev/null
---- nautilus-1.0.6/help/nautilus-user-manual/ko/nautilus-user-manual-ko.omf.omf_encoding Thu Jan 31 15:33:31 2002
-+++ nautilus-1.0.6/help/nautilus-user-manual/ko/nautilus-user-manual-ko.omf Thu Jan 31 15:33:39 2002
-@@ -1,4 +1,4 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" standalone="no" encoding="EUC-KR"?>
- <omf>
- <resource>
- <title>
---- nautilus-1.0.6/help/nautilus-quick-reference/ko/nautilus-quick-reference-ko.omf.omf_encoding Thu Jan 31 15:27:55 2002
-+++ nautilus-1.0.6/help/nautilus-quick-reference/ko/nautilus-quick-reference-ko.omf Thu Jan 31 15:32:18 2002
-@@ -1,4 +1,4 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" standalone="no" encoding="EUC-KR"?>
- <omf>
- <resource>
- <title>
+++ /dev/null
-diff -ur nautilus-1.0.6.orig/help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf nautilus-1.0.6/help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf
---- nautilus-1.0.6.orig/help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf Thu Feb 22 11:26:18 2001
-+++ nautilus-1.0.6/help/nautilus-quick-reference/C/nautilus-quick-reference-C.omf Fri Oct 4 17:18:31 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Nautilus Quick Reference
- </title>
-- <subject>
-- <category>GNOME|Core Desktop</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Core Desktop"/>
-+ <description/>
-+ <type/>
- <format mime="text/html"/>
- <identifier url="index.html"/>
- <language code="C"/>
-+ <relation seriesid="8a83b6e8-d7ac-11d6-839e-9153b58e6573"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-quick-reference/es/nautilus-quick-reference-es.omf nautilus-1.0.6/help/nautilus-quick-reference/es/nautilus-quick-reference-es.omf
---- nautilus-1.0.6.orig/help/nautilus-quick-reference/es/nautilus-quick-reference-es.omf Thu Mar 1 10:27:33 2001
-+++ nautilus-1.0.6/help/nautilus-quick-reference/es/nautilus-quick-reference-es.omf Fri Oct 4 17:19:02 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Referencia Rápida de Nautilus
- </title>
-- <subject>
-- <category>GNOME|Núcleo del Escritorio</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Núcleo del Escritorio"/>
-+ <description/>
-+ <type/>
- <format mime="text/html"/>
- <identifier url="index.html"/>
- <language code="es"/>
-+ <relation seriesid="8a83b6e8-d7ac-11d6-839e-9153b58e6573"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-quick-reference/ko/nautilus-quick-reference-ko.omf nautilus-1.0.6/help/nautilus-quick-reference/ko/nautilus-quick-reference-ko.omf
---- nautilus-1.0.6.orig/help/nautilus-quick-reference/ko/nautilus-quick-reference-ko.omf Fri Oct 4 17:12:08 2002
-+++ nautilus-1.0.6/help/nautilus-quick-reference/ko/nautilus-quick-reference-ko.omf Fri Oct 4 17:19:32 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no" encoding="EUC-KR"?>
-+<?xml version="1.0" encoding="EUC-KR"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- ³ëÆ¿·¯½º ºü¸¥ µµ¿ò¸»
- </title>
-- <subject>
-- <category>±×³ð|¹ÙÅÁȸé ÇÙ½É</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="±×³ð|¹ÙÅÁȸé ÇÙ½É"/>
-+ <description/>
-+ <type/>
- <format mime="text/html"/>
- <identifier url="index.html"/>
- <language code="ko"/>
-+ <relation seriesid="8a83b6e8-d7ac-11d6-839e-9153b58e6573"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-quick-reference/no/nautilus-quick-reference-no.omf nautilus-1.0.6/help/nautilus-quick-reference/no/nautilus-quick-reference-no.omf
---- nautilus-1.0.6.orig/help/nautilus-quick-reference/no/nautilus-quick-reference-no.omf Thu Mar 1 00:40:39 2001
-+++ nautilus-1.0.6/help/nautilus-quick-reference/no/nautilus-quick-reference-no.omf Fri Oct 4 17:18:31 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Nautilus hurtigreferanse
- </title>
-- <subject>
-- <category>GNOME|Skrivebord</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Skrivebord"/>
-+ <description/>
-+ <type/>
- <format mime="text/html"/>
- <identifier url="index.html"/>
- <language code="no"/>
-+ <relation seriesid="8a83b6e8-d7ac-11d6-839e-9153b58e6573"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-quick-reference/sv/nautilus-quick-reference-sv.omf nautilus-1.0.6/help/nautilus-quick-reference/sv/nautilus-quick-reference-sv.omf
---- nautilus-1.0.6.orig/help/nautilus-quick-reference/sv/nautilus-quick-reference-sv.omf Fri Mar 2 01:34:03 2001
-+++ nautilus-1.0.6/help/nautilus-quick-reference/sv/nautilus-quick-reference-sv.omf Fri Oct 4 17:18:31 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Nautilus snabbreferens
- </title>
-- <subject>
-- <category>GNOME|Grundskrivbordet</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Grundskrivbordet"/>
-+ <description/>
-+ <type/>
- <format mime="text/html"/>
- <identifier url="index.html"/>
- <language code="sv"/>
-+ <relation seriesid="8a83b6e8-d7ac-11d6-839e-9153b58e6573"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-release-notes/C/nautilus-release-notes-C.omf nautilus-1.0.6/help/nautilus-release-notes/C/nautilus-release-notes-C.omf
---- nautilus-1.0.6.orig/help/nautilus-release-notes/C/nautilus-release-notes-C.omf Thu Mar 1 10:27:39 2001
-+++ nautilus-1.0.6/help/nautilus-release-notes/C/nautilus-release-notes-C.omf Fri Oct 4 17:18:19 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Nautilus 1.0 Release Notes
- </title>
-- <subject>
-- <category>GNOME|Core Desktop</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Core Desktop"/>
-+ <description/>
-+ <type/>
- <format mime="text/sgml"/>
- <identifier url="nautilus-release-notes.sgml"/>
- <language code="C"/>
-+ <relation seriesid="83634acc-d7ac-11d6-9f1c-c3b77193ef69"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-user-manual/C/nautilus-user-manual-C.omf nautilus-1.0.6/help/nautilus-user-manual/C/nautilus-user-manual-C.omf
---- nautilus-1.0.6.orig/help/nautilus-user-manual/C/nautilus-user-manual-C.omf Thu Feb 22 11:26:19 2001
-+++ nautilus-1.0.6/help/nautilus-user-manual/C/nautilus-user-manual-C.omf Fri Oct 4 17:18:09 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Nautilus User Manual
- </title>
-- <subject>
-- <category>GNOME|Core Desktop</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Core Desktop"/>
-+ <description/>
-+ <type/>
- <format mime="text/sgml"/>
- <identifier url="nautilus-user-manual.sgml"/>
- <language code="C"/>
-+ <relation seriesid="7d706d0c-d7ac-11d6-9846-de2bb1b90474"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-user-manual/es/nautilus-user-manual-es.omf nautilus-1.0.6/help/nautilus-user-manual/es/nautilus-user-manual-es.omf
---- nautilus-1.0.6.orig/help/nautilus-user-manual/es/nautilus-user-manual-es.omf Sat Feb 24 11:18:05 2001
-+++ nautilus-1.0.6/help/nautilus-user-manual/es/nautilus-user-manual-es.omf Fri Oct 4 17:20:26 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="ISO-8859-1"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- Manual del Usuario de Nautilus
- </title>
-- <subject>
-- <category>GNOME|Núcleo del Escritorio</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|Núcleo del Escritorio"/>
-+ <description/>
-+ <type/>
- <format mime="text/sgml"/>
- <identifier url="nautilus-user-manual.sgml"/>
- <language code="es"/>
-+ <relation seriesid="7d706d0c-d7ac-11d6-9846-de2bb1b90474"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -ur nautilus-1.0.6.orig/help/nautilus-user-manual/ko/nautilus-user-manual-ko.omf nautilus-1.0.6/help/nautilus-user-manual/ko/nautilus-user-manual-ko.omf
---- nautilus-1.0.6.orig/help/nautilus-user-manual/ko/nautilus-user-manual-ko.omf Fri Oct 4 17:12:08 2002
-+++ nautilus-1.0.6/help/nautilus-user-manual/ko/nautilus-user-manual-ko.omf Fri Oct 4 17:20:35 2002
-@@ -1,14 +1,22 @@
--<?xml version="1.0" standalone="no" encoding="EUC-KR"?>
-+<?xml version="1.0" encoding="EUC-KR"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
- ³ëÆ¿·¯½º »ç¿ëÀÚ ¼³¸í¼
- </title>
-- <subject>
-- <category>GNOME|¹ÙÅÁȸé ÇÙ½É</category>
-- </subject>
-+ <date>
-+ 2002-10-04
-+ </date>
-+ <version identifier="1.0.6" date="2002-10-04"/>
-+ <subject category="GNOME|¹ÙÅÁȸé ÇÙ½É"/>
-+ <description/>
-+ <type/>
- <format mime="text/sgml"/>
- <identifier url="nautilus-user-manual.sgml"/>
- <language code="ko"/>
-+ <relation seriesid="7d706d0c-d7ac-11d6-9846-de2bb1b90474"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
+++ /dev/null
-diff -urN nautilus-1.0.org/nautilus-installer/libtrilobite/trilobite-core-messaging.c nautilus-1.0/nautilus-installer/libtrilobite/trilobite-core-messaging.c
---- nautilus-1.0.org/nautilus-installer/libtrilobite/trilobite-core-messaging.c Sun Apr 1 23:39:58 2001
-+++ nautilus-1.0/nautilus-installer/libtrilobite/trilobite-core-messaging.c Sun Apr 1 23:40:08 2001
-@@ -22,6 +22,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <time.h>
- #include <sys/time.h>
- #include <stdarg.h>
- #include <string.h>
+++ /dev/null
---- nautilus-1.0.6/configure.in.orig Thu Nov 8 02:52:37 2001
-+++ nautilus-1.0.6/configure.in Tue Nov 13 10:49:26 2001
-@@ -635,8 +635,8 @@
-
- dnl Checks for i18n
- ALL_LINGUAS="az ca cs da de el en_GB es fi fr ga gl hu it ja ko lt lv nl nn no pl pt pt_BR ro ru sk sl sv ta tr uk zh_TW"
--AM_GNOME_GETTEXT
--# AM_GNOME_GETTEXT above substs $DATADIRNAME
-+AM_GNU_GETTEXT
-+# AM_GNU_GETTEXT above substs $DATADIRNAME
- # this is the directory where the *.{mo,gmo} files are installed
- gnomelocaledir='${prefix}/${DATADIRNAME}/locale'
- AC_SUBST(gnomelocaledir)
+++ /dev/null
-diff -Nur nautilus-1.0.6.orig/Makefile.am nautilus-1.0.6/Makefile.am
---- nautilus-1.0.6.orig/Makefile.am Tue Nov 13 11:26:25 2001
-+++ nautilus-1.0.6/Makefile.am Tue Nov 13 11:29:06 2001
-@@ -1,6 +1,7 @@
- include $(top_srcdir)/Makefile.shared
-
--@XML_I18N_MERGE_DESKTOP_RULE@
-+@XML_I18N_MERGE_DESKTOP_RULE1@
-+@XML_I18N_MERGE_DESKTOP_RULE2@
-
- DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in
- DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop)
-diff -Nur nautilus-1.0.6.orig/components/adapter/Makefile.am nautilus-1.0.6/components/adapter/Makefile.am
---- nautilus-1.0.6.orig/components/adapter/Makefile.am Sat Sep 1 00:19:05 2001
-+++ nautilus-1.0.6/components/adapter/Makefile.am Tue Nov 13 11:32:04 2001
-@@ -14,7 +14,8 @@
-
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- bin_PROGRAMS = \
- nautilus-adapter \
-diff -Nur nautilus-1.0.6.orig/components/hardware/Makefile.am nautilus-1.0.6/components/hardware/Makefile.am
---- nautilus-1.0.6.orig/components/hardware/Makefile.am Fri May 4 05:12:42 2001
-+++ nautilus-1.0.6/components/hardware/Makefile.am Tue Nov 13 11:32:17 2001
-@@ -17,7 +17,8 @@
-
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- bin_PROGRAMS = \
- nautilus-hardware-view
-diff -Nur nautilus-1.0.6.orig/components/help/Makefile.am nautilus-1.0.6/components/help/Makefile.am
---- nautilus-1.0.6.orig/components/help/Makefile.am Thu Nov 8 02:52:08 2001
-+++ nautilus-1.0.6/components/help/Makefile.am Tue Nov 13 11:32:41 2001
-@@ -62,7 +62,8 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
-
- EXTRA_DIST=pages.map $(oaf_in_files) $(oaf_DATA) $(modulesconf_DATA) $(hyperbola_DATA) $(ui_DATA)
-diff -Nur nautilus-1.0.6.orig/components/history/Makefile.am nautilus-1.0.6/components/history/Makefile.am
---- nautilus-1.0.6.orig/components/history/Makefile.am Fri May 4 05:14:26 2001
-+++ nautilus-1.0.6/components/history/Makefile.am Tue Nov 13 11:32:55 2001
-@@ -24,7 +24,8 @@
-
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
-
-diff -Nur nautilus-1.0.6.orig/components/image-viewer/Makefile.am nautilus-1.0.6/components/image-viewer/Makefile.am
---- nautilus-1.0.6.orig/components/image-viewer/Makefile.am Sat Sep 1 00:19:05 2001
-+++ nautilus-1.0.6/components/image-viewer/Makefile.am Tue Nov 13 11:33:20 2001
-@@ -26,6 +26,7 @@
-
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST=$(oaf_DATA) $(oaf_in_files)
-diff -Nur nautilus-1.0.6.orig/components/loser/content/Makefile.am nautilus-1.0.6/components/loser/content/Makefile.am
---- nautilus-1.0.6.orig/components/loser/content/Makefile.am Sat Sep 1 00:19:06 2001
-+++ nautilus-1.0.6/components/loser/content/Makefile.am Tue Nov 13 11:33:43 2001
-@@ -31,6 +31,7 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA)
-diff -Nur nautilus-1.0.6.orig/components/loser/sidebar/Makefile.am nautilus-1.0.6/components/loser/sidebar/Makefile.am
---- nautilus-1.0.6.orig/components/loser/sidebar/Makefile.am Sat Sep 1 00:19:06 2001
-+++ nautilus-1.0.6/components/loser/sidebar/Makefile.am Tue Nov 13 11:33:57 2001
-@@ -31,6 +31,7 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA)
-diff -Nur nautilus-1.0.6.orig/components/mozilla/Makefile.am nautilus-1.0.6/components/mozilla/Makefile.am
---- nautilus-1.0.6.orig/components/mozilla/Makefile.am Tue Oct 9 23:09:16 2001
-+++ nautilus-1.0.6/components/mozilla/Makefile.am Tue Nov 13 11:36:32 2001
-@@ -55,7 +55,8 @@
-
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- uidir = $(datadir)/gnome/ui
- ui_DATA = \
-diff -Nur nautilus-1.0.6.orig/components/music/Makefile.am nautilus-1.0.6/components/music/Makefile.am
---- nautilus-1.0.6.orig/components/music/Makefile.am Wed Aug 15 20:55:16 2001
-+++ nautilus-1.0.6/components/music/Makefile.am Tue Nov 13 11:34:11 2001
-@@ -70,7 +70,8 @@
-
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(platform_source) \
- configure.c \
-diff -Nur nautilus-1.0.6.orig/components/news/Makefile.am nautilus-1.0.6/components/news/Makefile.am
---- nautilus-1.0.6.orig/components/news/Makefile.am Sun Aug 26 21:01:10 2001
-+++ nautilus-1.0.6/components/news/Makefile.am Tue Nov 13 11:34:29 2001
-@@ -32,7 +32,8 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST= \
- $(nautilus_DATA) \
-diff -Nur nautilus-1.0.6.orig/components/notes/Makefile.am nautilus-1.0.6/components/notes/Makefile.am
---- nautilus-1.0.6.orig/components/notes/Makefile.am Fri May 4 05:14:30 2001
-+++ nautilus-1.0.6/components/notes/Makefile.am Tue Nov 13 11:34:39 2001
-@@ -23,7 +23,8 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST= \
- $(oaf_DATA)\
-diff -Nur nautilus-1.0.6.orig/components/sample/Makefile.am nautilus-1.0.6/components/sample/Makefile.am
---- nautilus-1.0.6.orig/components/sample/Makefile.am Sat Sep 1 00:19:07 2001
-+++ nautilus-1.0.6/components/sample/Makefile.am Tue Nov 13 11:34:53 2001
-@@ -38,6 +38,7 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA)
-diff -Nur nautilus-1.0.6.orig/components/text/Makefile.am nautilus-1.0.6/components/text/Makefile.am
---- nautilus-1.0.6.orig/components/text/Makefile.am Fri May 4 05:14:31 2001
-+++ nautilus-1.0.6/components/text/Makefile.am Tue Nov 13 11:35:07 2001
-@@ -33,7 +33,8 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA)
-
-diff -Nur nautilus-1.0.6.orig/components/throbber/Makefile.am nautilus-1.0.6/components/throbber/Makefile.am
---- nautilus-1.0.6.orig/components/throbber/Makefile.am Wed Jun 27 01:51:51 2001
-+++ nautilus-1.0.6/components/throbber/Makefile.am Tue Nov 13 11:35:20 2001
-@@ -28,7 +28,8 @@
- $(NULL)
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST = \
- $(oaf_in_files) \
-diff -Nur nautilus-1.0.6.orig/components/tree/Makefile.am nautilus-1.0.6/components/tree/Makefile.am
---- nautilus-1.0.6.orig/components/tree/Makefile.am Tue Nov 13 11:26:25 2001
-+++ nautilus-1.0.6/components/tree/Makefile.am Tue Nov 13 11:36:20 2001
-@@ -38,7 +38,8 @@
- oaf_in_files = Nautilus_View_tree.oaf.in
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- EXTRA_DIST = $(oaf_in_files) $(oaf_DATA)
-
-diff -Nur nautilus-1.0.6.orig/data/Makefile.am nautilus-1.0.6/data/Makefile.am
---- nautilus-1.0.6.orig/data/Makefile.am Tue Nov 13 11:26:25 2001
-+++ nautilus-1.0.6/data/Makefile.am Tue Nov 13 11:29:28 2001
-@@ -1,7 +1,9 @@
- NULL=
-
--@XML_I18N_MERGE_DESKTOP_RULE@
--@XML_I18N_MERGE_DIRECTORY_RULE@
-+@XML_I18N_MERGE_DESKTOP_RULE1@
-+@XML_I18N_MERGE_DESKTOP_RULE2@
-+@XML_I18N_MERGE_DIRECTORY_RULE1@
-+@XML_I18N_MERGE_DIRECTORY_RULE2@
-
- DESKTOP_IN_FILES= favorites.desktop.in \
- programs.desktop.in \
-diff -Nur nautilus-1.0.6.orig/src/Makefile.am nautilus-1.0.6/src/Makefile.am
---- nautilus-1.0.6.orig/src/Makefile.am Tue Oct 9 23:10:20 2001
-+++ nautilus-1.0.6/src/Makefile.am Tue Nov 13 11:29:45 2001
-@@ -125,7 +125,8 @@
- oaf_in_files = Nautilus_shell.oaf.in
- oaf_DATA = $(oaf_in_files:.oaf.in=.oaf)
-
--@XML_I18N_MERGE_OAF_RULE@
-+@XML_I18N_MERGE_OAF_RULE1@
-+@XML_I18N_MERGE_OAF_RULE2@
-
- uidir = $(datadir)/gnome/ui
- ui_DATA = \
projects / packages / nautilus.git / commitdiff