diff -crN ./gnome-vfs/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/configure.in
*** ./gnome-vfs/configure.in	Mon Mar 10 20:24:11 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/configure.in	Fri Jul  4 09:16:09 2003
***************
*** 321,329 ****
  
  dnl modules/cdemenu-desktop
  
! AC_MSG_CHECKING(for Solaris platform)
  case "$host" in
          *solaris*) build_cdemenu_module=yes ;;
          *) build_cdemenu_module=no ;;
  esac
  AC_MSG_RESULT([$build_cdemenu_module])
--- 321,330 ----
  
  dnl modules/cdemenu-desktop
  
! AC_MSG_CHECKING(for CDE for Solaris/AIX)
  case "$host" in
          *solaris*) build_cdemenu_module=yes ;;
+ 	*aix*) build_cdemenu_module=yes ;;
          *) build_cdemenu_module=no ;;
  esac
  AC_MSG_RESULT([$build_cdemenu_module])
diff -crN ./gnome-vfs/libgnomevfs/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/Makefile.am
*** ./gnome-vfs/libgnomevfs/Makefile.am	Fri Feb 21 09:37:41 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/Makefile.am	Fri Jul  4 09:10:23 2003
***************
*** 35,40 ****
--- 35,41 ----
  
  libgnomevfs_2_la_LIBADD =			\
  	$(LIBGNOMEVFS_LIBS)			\
+ 	@LIBOBJS@				\
  	$(NULL)
  
  libgnomevfsincludedir = $(includedir)/gnome-vfs-2.0/libgnomevfs
diff -crN ./gnome-vfs/libgnomevfs/getdelim.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/getdelim.c
*** ./gnome-vfs/libgnomevfs/getdelim.c	Tue Oct 19 19:00:52 1999
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/getdelim.c	Fri Jul  4 09:10:54 2003
***************
*** 1,177 ****
! /* Copyright (C) 1991, 1992, 1995, 1996, 1997 Free Software Foundation, Inc.
!    This file is part of the GNU C Library.
  
!    The GNU C 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.
! 
!    The GNU C 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 the GNU C Library; see the file COPYING.LIB.  If not,
!    write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
!    Boston, MA 02111-1307, USA.  */
  
- #include <stddef.h>
  #include <stdio.h>
! #include <stdlib.h>
! #include <string.h>
! #include <limits.h>
! #include <errno.h>
  
  /* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
!    (and null-terminate it). *LINEPTR is a pointer returned from malloc (or
!    NULL), pointing to *N characters of space.  It is realloc'd as
!    necessary.  Returns the number of characters read (not including the
!    null terminator), or -1 on error or EOF.  */
  
! ssize_t
  getdelim (lineptr, n, terminator, stream)
       char **lineptr;
       size_t *n;
-      int terminator;
       FILE *stream;
  {
!   char *line, *p;
!   size_t size, copy;
  
!   if (!__validfp (stream) || lineptr == NULL || n == NULL)
!     {
!       __set_errno (EINVAL);
!       return -1;
!     }
! 
!   if (ferror (stream))
      return -1;
  
!   /* Make sure we have a line buffer to start with.  */
!   if (*lineptr == NULL || *n < 2) /* !seen and no buf yet need 2 chars.  */
      {
! #ifndef	MAX_CANON
! #define	MAX_CANON	256
! #endif
!       line = realloc (*lineptr, MAX_CANON);
!       if (line == NULL)
  	return -1;
-       *lineptr = line;
-       *n = MAX_CANON;
      }
  
!   line = *lineptr;
!   size = *n;
! 
!   copy = size;
!   p = line;
  
!   if (stream->__buffer == NULL && stream->__userbuf)
      {
!       /* Unbuffered stream.  Not much optimization to do.  */
  
!       while (1)
! 	{
! 	  size_t len;
  
! 	  while (--copy > 0)
! 	    {
! 	      register int c = getc (stream);
! 	      if (c == EOF)
! 		goto lose;
! 	      else if ((*p++ = c) == terminator)
! 		goto win;
! 	    }
! 
! 	  /* Need to enlarge the line buffer.  */
! 	  len = p - line;
! 	  size *= 2;
! 	  line = realloc (line, size);
! 	  if (line == NULL)
! 	    goto lose;
! 	  *lineptr = line;
! 	  *n = size;
! 	  p = line + len;
! 	  copy = size - len;
  	}
-     }
-   else
-     {
-       /* Leave space for the terminating null.  */
-       --copy;
  
!       if (!stream->__seen || stream->__buffer == NULL || stream->__pushed_back)
  	{
! 	  /* Do one with getc to allocate a buffer.  */
! 	  int c = getc (stream);
! 	  if (c == EOF)
! 	    goto lose;
! 	  *p++ = c;
! 	  if (c == terminator)
! 	    goto win;
! 	  --copy;
  	}
  
!       while (1)
! 	{
! 	  size_t i;
! 	  char *found;
  
! 	  i = stream->__get_limit - stream->__bufp;
! 	  if (i == 0)
! 	    {
! 	      /* Refill the buffer.  */
! 	      int c = __fillbf (stream);
! 	      if (c == EOF)
! 		goto lose;
! 	      *p++ = c;
! 	      if (c == terminator)
! 		goto win;
! 	      --copy;
! 	      i = stream->__get_limit - stream->__bufp;
! 	    }
! 
! 	  if (i > copy)
! 	    i = copy;
! 
! 	  found = (char *) __memccpy ((void *) p, stream->__bufp, 
! 				      terminator, i);
! 	  if (found != NULL)
! 	    {
! 	      stream->__bufp += found - p;
! 	      p = found;
! 	      goto win;
! 	    }
! 
! 	  stream->__bufp += i;
! 	  p += i;
! 	  copy -= i;
! 	  if (copy == 0)
! 	    {
! 	      /* Need to enlarge the line buffer.  */
! 	      size_t len = p - line;
! 	      size *= 2;
! 	      line = realloc (line, size);
! 	      if (line == NULL)
! 		goto lose;
! 	      *lineptr = line;
! 	      *n = size;
! 	      p = line + len;
! 	      copy = size - len;
! 	      /* Leave space for the terminating null.  */
! 	      --copy;
! 	    }
! 	}
      }
  
!  lose:
!   if (p == *lineptr)
!     return -1;
!   /* Return a partial line since we got an error in the middle.  */
!  win:
!   *p = '\0';
!   return p - *lineptr;
! }
  
! weak_alias (__getdelim, getdelim)
--- 1,116 ----
! /* getdelim.c -- Replacement for GNU C library function getdelim
  
! Copyright (C) 1993, 1996 Free Software Foundation, Inc.
! 
! This program is free software; you can redistribute it and/or
! modify it under the terms of the GNU General Public License as
! published by the Free Software Foundation; either version 2 of the
! License, or (at your option) any later version.
! 
! This program is distributed in the hope that it will be useful, but
! WITHOUT ANY WARRANTY; without even the implied warranty of
! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
! General Public License for more details.
! 
! You should have received a copy of the GNU General Public License
! along with this program; if not, write to the Free Software
! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
! 
! /* Written by Jan Brittenson, bson@gnu.ai.mit.edu.  
!  * copy inserted in libgnomevfs from gettext to support AIX 
!  * by Laurent.Vivier@bull.net
!  */
! 
! #if HAVE_CONFIG_H
! # include <config.h>
! #endif
  
  #include <stdio.h>
! #include <sys/types.h>
! 
! # if HAVE_STDLIB_H
! #  include <stdlib.h>
! # else
! extern char *malloc ();
! extern char *realloc ();
! # endif
! 
! /* Always add at least this many bytes when extending the buffer.  */
! # define MIN_CHUNK 64
  
  /* Read up to (and including) a TERMINATOR from STREAM into *LINEPTR
!    (and null-terminate it). *LINEPTR is a pointer returned from
!    malloc (or NULL), pointing to *N characters of space.  It is realloc'd
!    as necessary.  Return the number of characters read (not including the
!    null terminator), or -1 on error or EOF. */
  
! int
  getdelim (lineptr, n, terminator, stream)
       char **lineptr;
       size_t *n;
       FILE *stream;
+      char terminator;
  {
!   int nchars_avail;		/* Allocated but unused chars in *LINEPTR.  */
!   char *read_pos;		/* Where we're reading into *LINEPTR. */
!   int ret;
  
!   if (!lineptr || !n || !stream)
      return -1;
  
!   if (!*lineptr)
      {
!       *n = MIN_CHUNK;
!       *lineptr = malloc (*n);
!       if (!*lineptr)
  	return -1;
      }
  
!   nchars_avail = *n;
!   read_pos = *lineptr;
  
!   for (;;)
      {
!       register int c = getc (stream);
  
!       /* We always want at least one char left in the buffer, since we
! 	 always (unless we get an error while reading the first char)
! 	 NUL-terminate the line buffer.  */
  
!       if (nchars_avail < 2)
! 	{
! 	  if (*n > MIN_CHUNK)
! 	    *n *= 2;
! 	  else
! 	    *n += MIN_CHUNK;
! 
! 	  nchars_avail = *n + *lineptr - read_pos;
! 	  *lineptr = realloc (*lineptr, *n);
! 	  if (!*lineptr)
! 	    return -1;
! 	  read_pos = *n - nchars_avail + *lineptr;
  	}
  
!       if (c == EOF || ferror (stream))
  	{
! 	  /* Return partial line, if any.  */
! 	  if (read_pos == *lineptr)
! 	    return -1;
! 	  else
! 	    break;
  	}
  
!       *read_pos++ = c;
!       nchars_avail--;
  
!       if (c == terminator)
! 	/* Return the line.  */
! 	break;
      }
  
!   /* Done - NUL terminate and return the number of chars read.  */
!   *read_pos = '\0';
  
!   ret = read_pos - *lineptr;
!   return ret;
! }
diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c
*** ./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c	Fri Sep 27 18:12:46 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-inet-connection.c	Fri Jul  4 09:11:58 2003
***************
*** 36,43 ****
  #include <sys/types.h>
  #include <unistd.h>
  
- extern int h_errno;
- 
  struct GnomeVFSInetConnection {
  	struct sockaddr_in addr;
  	guint sock;
--- 36,41 ----
diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c
*** ./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c	Fri Dec 20 22:15:03 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-mime-monitor.c	Fri Jul  4 09:13:04 2003
***************
*** 34,40 ****
  
  enum {
  	LOCAL_MIME_DIR,
! 	GNOME_MIME_DIR,
  };
  
  static guint signals[LAST_SIGNAL];
--- 34,40 ----
  
  enum {
  	LOCAL_MIME_DIR,
! 	GNOME_MIME_DIR
  };
  
  static guint signals[LAST_SIGNAL];
diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c
*** ./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c	Fri Dec 20 22:15:04 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-private-utils.c	Fri Jul  4 09:15:05 2003
***************
*** 264,270 ****
   * 
   * Return value: 
   **/
! GnomeVFSProcessResult
  gnome_vfs_process_run_cancellable (const gchar *file_name,
  				   const gchar * const argv[],
  				   GnomeVFSProcessOptions options,
--- 264,270 ----
   * 
   * Return value: 
   **/
! GnomeVFSProcessRunResult
  gnome_vfs_process_run_cancellable (const gchar *file_name,
  				   const gchar * const argv[],
  				   GnomeVFSProcessOptions options,
diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-process.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-process.c
*** ./gnome-vfs/libgnomevfs/gnome-vfs-process.c	Fri Dec 20 22:15:04 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-process.c	Fri Jul  4 09:14:07 2003
***************
*** 257,263 ****
   * 
   * Return value: A numeric value reporting the result of the operation.
   **/
! GnomeVFSProcessRunResult
  _gnome_vfs_process_signal (GnomeVFSProcess *process,
  			  guint signal_number)
  {
--- 257,263 ----
   * 
   * Return value: A numeric value reporting the result of the operation.
   **/
! GnomeVFSProcessResult
  _gnome_vfs_process_signal (GnomeVFSProcess *process,
  			  guint signal_number)
  {
diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-result.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-result.c
*** ./gnome-vfs/libgnomevfs/gnome-vfs-result.c	Thu Dec 12 09:08:45 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-result.c	Fri Jul  4 09:13:34 2003
***************
*** 29,36 ****
  #include <errno.h>
  #include <netdb.h>
  
- extern int h_errno;
- 
  static char *status_strings[] = {
  	/* GNOME_VFS_OK */				N_("No error"),
  	/* GNOME_VFS_ERROR_NOT_FOUND */			N_("File not found"),
--- 29,34 ----
***************
*** 105,111 ****
--- 103,111 ----
  	case EMFILE:	return GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES;
  	case EMLINK:	return GNOME_VFS_ERROR_TOO_MANY_LINKS;
  	case ENFILE:	return GNOME_VFS_ERROR_TOO_MANY_OPEN_FILES;
+ #if ENOTEMPTY != EEXIST
  	case ENOTEMPTY: return GNOME_VFS_ERROR_DIRECTORY_NOT_EMPTY;
+ #endif
  	case ENOENT:	return GNOME_VFS_ERROR_NOT_FOUND;
  	case ENOMEM:	return GNOME_VFS_ERROR_NO_MEMORY;
  	case ENOSPC:	return GNOME_VFS_ERROR_NO_SPACE;
diff -crN ./gnome-vfs/libgnomevfs/gnome-vfs-xfer.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-xfer.h
*** ./gnome-vfs/libgnomevfs/gnome-vfs-xfer.h	Mon Nov  4 11:18:44 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/libgnomevfs/gnome-vfs-xfer.h	Fri Jul  4 09:14:38 2003
***************
*** 45,51 ****
  	GNOME_VFS_XFER_REMOVESOURCE = 1 << 8,
  	GNOME_VFS_XFER_USE_UNIQUE_NAMES = 1 << 9,
  	GNOME_VFS_XFER_LINK_ITEMS = 1 << 10,
! 	GNOME_VFS_XFER_FOLLOW_LINKS_RECURSIVE = 1 << 11,
  } GnomeVFSXferOptions;
  
  /* Progress status, to be reported to the caller of the transfer operation.  */
--- 45,51 ----
  	GNOME_VFS_XFER_REMOVESOURCE = 1 << 8,
  	GNOME_VFS_XFER_USE_UNIQUE_NAMES = 1 << 9,
  	GNOME_VFS_XFER_LINK_ITEMS = 1 << 10,
! 	GNOME_VFS_XFER_FOLLOW_LINKS_RECURSIVE = 1 << 11
  } GnomeVFSXferOptions;
  
  /* Progress status, to be reported to the caller of the transfer operation.  */
***************
*** 89,95 ****
  	GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE = 1,
  	GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL = 2,
  	GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP = 3,
! 	GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP_ALL = 4,
  } GnomeVFSXferOverwriteAction;
  
  typedef enum {
--- 89,95 ----
  	GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE = 1,
  	GNOME_VFS_XFER_OVERWRITE_ACTION_REPLACE_ALL = 2,
  	GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP = 3,
! 	GNOME_VFS_XFER_OVERWRITE_ACTION_SKIP_ALL = 4
  } GnomeVFSXferOverwriteAction;
  
  typedef enum {
***************
*** 98,104 ****
  	GNOME_VFS_XFER_ERROR_MODE_ABORT = 0,
  	/* Invoke the progress callback with a
  	   `GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR' status code. */
! 	GNOME_VFS_XFER_ERROR_MODE_QUERY = 1,
  } GnomeVFSXferErrorMode;
  
  /* This defines the possible actions to be performed after an error has
--- 98,104 ----
  	GNOME_VFS_XFER_ERROR_MODE_ABORT = 0,
  	/* Invoke the progress callback with a
  	   `GNOME_VFS_XFER_PROGRESS_STATUS_VFSERROR' status code. */
! 	GNOME_VFS_XFER_ERROR_MODE_QUERY = 1
  } GnomeVFSXferErrorMode;
  
  /* This defines the possible actions to be performed after an error has
diff -crN ./gnome-vfs/modules/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/Makefile.am
*** ./gnome-vfs/modules/Makefile.am	Wed Dec 18 15:04:58 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/Makefile.am	Fri Jul  4 09:16:36 2003
***************
*** 1,4 ****
- NULL =
  SUBDIRS = extfs vfolder
  
  INCLUDES =					\
--- 1,3 ----
***************
*** 92,98 ****
  
  libextfs_la_SOURCES = extfs-method.c
  libextfs_la_LDFLAGS = $(module_flags)
! libextfs_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la
  
  ###  `file' method
  
--- 91,97 ----
  
  libextfs_la_SOURCES = extfs-method.c
  libextfs_la_LDFLAGS = $(module_flags)
! libextfs_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la $(MODULES_LIBS)
  
  ###  `file' method
  
***************
*** 104,122 ****
  
  libnntp_la_SOURCES = nntp-method.c nntp-method.h
  libnntp_la_LDFLAGS = $(module_flags)
! libnntp_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la
  
  ###  `cdemenu-desktop' method
  
  libcdemenu_desktop_la_SOURCES = cdemenu-desktop-method.c
  libcdemenu_desktop_la_LDFLAGS = $(module_flags)
! libcdemenu_desktop_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la
  
  ###  `ssh' method
  
  libssh_la_SOURCES = ssh-method.c
  libssh_la_LDFLAGS = $(module_flags)
! libssh_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la
  
  ###  `test' method
  
--- 103,121 ----
  
  libnntp_la_SOURCES = nntp-method.c nntp-method.h
  libnntp_la_LDFLAGS = $(module_flags)
! libnntp_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la $(MODULES_LIBS)
  
  ###  `cdemenu-desktop' method
  
  libcdemenu_desktop_la_SOURCES = cdemenu-desktop-method.c
  libcdemenu_desktop_la_LDFLAGS = $(module_flags)
! libcdemenu_desktop_la_LIBADD =  $(MODULES_FILE_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  ###  `ssh' method
  
  libssh_la_SOURCES = ssh-method.c
  libssh_la_LDFLAGS = $(module_flags)
! libssh_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  ###  `test' method
  
***************
*** 128,146 ****
  
  libgzip_la_SOURCES = gzip-method.c
  libgzip_la_LDFLAGS = $(module_flags)
! libgzip_la_LIBADD = -lz ../libgnomevfs/libgnomevfs-2.la
  
  ### `bzip2' method
  
  libbzip2_la_SOURCES = bzip2-method.c
  libbzip2_la_LDFLAGS = $(module_flags)
! libbzip2_la_LIBADD = $(BZ2_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  ### `ftp' method
  
  libftp_la_SOURCES = ftp-method.c
  libftp_la_LDFLAGS = $(module_flags)
! libftp_la_LIBADD = ../libgnomevfs/libgnomevfs-2.la
  
  ### `nfs' method
  
--- 127,145 ----
  
  libgzip_la_SOURCES = gzip-method.c
  libgzip_la_LDFLAGS = $(module_flags)
! libgzip_la_LIBADD = $(MODULES_LIBS) -lz ../libgnomevfs/libgnomevfs-2.la
  
  ### `bzip2' method
  
  libbzip2_la_SOURCES = bzip2-method.c
  libbzip2_la_LDFLAGS = $(module_flags)
! libbzip2_la_LIBADD = $(MODULES_LIBS) $(BZ2_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  ### `ftp' method
  
  libftp_la_SOURCES = ftp-method.c
  libftp_la_LDFLAGS = $(module_flags)
! libftp_la_LIBADD = $(MODULES_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  ### `nfs' method
  
***************
*** 166,172 ****
  	http-cache.h				\
  	$(NULL)
  libhttp_la_LDFLAGS = $(module_flags)
! libhttp_la_LIBADD  = $(MODULES_GCONF_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  libvfs_pipe_la_SOURCES = pipe-method.c
  libvfs_pipe_la_LDFLAGS = $(module_flags)
--- 165,171 ----
  	http-cache.h				\
  	$(NULL)
  libhttp_la_LDFLAGS = $(module_flags)
! libhttp_la_LIBADD  = $(MODULES_XML_LIBS) $(MODULES_GCONF_LIBS) ../libgnomevfs/libgnomevfs-2.la
  
  libvfs_pipe_la_SOURCES = pipe-method.c
  libvfs_pipe_la_LDFLAGS = $(module_flags)
diff -crN ./gnome-vfs/modules/bzip2-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/bzip2-method.c
*** ./gnome-vfs/modules/bzip2-method.c	Mon May 13 01:05:21 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/bzip2-method.c	Fri Jul  4 09:20:22 2003
***************
*** 549,555 ****
  			file_info->name[namelen-4] = '\0';
  
  		/* we can't tell the size without uncompressing it */
! 		//file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE;
  
  		/* guess the mime type of the file inside */
  		/* FIXME bugzilla.eazel.com 2791: guess mime based on contents */
--- 549,555 ----
  			file_info->name[namelen-4] = '\0';
  
  		/* we can't tell the size without uncompressing it */
! 		/*file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE;*/
  
  		/* guess the mime type of the file inside */
  		/* FIXME bugzilla.eazel.com 2791: guess mime based on contents */
diff -crN ./gnome-vfs/modules/cdemenu-module.conf /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/cdemenu-module.conf
*** ./gnome-vfs/modules/cdemenu-module.conf	Fri Sep 27 19:33:25 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/cdemenu-module.conf	Fri Jul 18 13:50:40 2003
***************
*** 1 ****
! cdemenu: libcdemenu-desktop.so
--- 1 ----
! cdemenu: cdemenu-desktop
diff -crN ./gnome-vfs/modules/default-modules.conf /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/default-modules.conf
*** ./gnome-vfs/modules/default-modules.conf	Thu Dec  5 10:24:44 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/default-modules.conf	Fri Jul  4 09:20:53 2003
***************
*** 34,49 ****
  a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs
  
  # vfolder desktop method
! applications:           libvfolder-desktop.so
! applications-all-users: libvfolder-desktop.so
! all-applications:       libvfolder-desktop.so
! preferences:            libvfolder-desktop.so
! preferences-all-users:  libvfolder-desktop.so
! all-preferences:        libvfolder-desktop.so
! favorites:              libvfolder-desktop.so
! network:                libvfolder-desktop.so
! start-here:             libvfolder-desktop.so
! system-settings:        libvfolder-desktop.so
! server-settings:        libvfolder-desktop.so
  
  tar: tar
--- 34,49 ----
  a ar arj cpio deb hp48 lha mailfs patchfs rar rpm rpms trpm zip zoo: extfs
  
  # vfolder desktop method
! applications:           vfolder-desktop
! applications-all-users: vfolder-desktop
! all-applications:       vfolder-desktop
! preferences:            vfolder-desktop
! preferences-all-users:  vfolder-desktop
! all-preferences:        vfolder-desktop
! favorites:              vfolder-desktop
! network:                vfolder-desktop
! start-here:             vfolder-desktop
! system-settings:        vfolder-desktop
! server-settings:        vfolder-desktop
  
  tar: tar
diff -crN ./gnome-vfs/modules/extfs-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/extfs-method.c
*** ./gnome-vfs/modules/extfs-method.c	Wed Dec 18 15:04:58 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/extfs-method.c	Fri Jul  4 09:21:22 2003
***************
*** 192,199 ****
  get_dirname (const gchar *pth)
  {
  	gchar *p;
! 	//gchar *s;
! 	//guint len;
  	gchar *path = strip_separators(pth);
  
  	p = strrchr (path, G_DIR_SEPARATOR);
--- 192,199 ----
  get_dirname (const gchar *pth)
  {
  	gchar *p;
! 	/*gchar *s;*/
! 	/*guint len;*/
  	gchar *path = strip_separators(pth);
  
  	p = strrchr (path, G_DIR_SEPARATOR);
***************
*** 588,595 ****
  	gchar *quoted_file_name;
  	gchar *cmd;
  	gchar *sub_uri;
! 	//const gchar *p;
! 	//const GList *item;
  	GList *entries=NULL;
  	GList *l;
  	FILE *pipe;
--- 588,595 ----
  	gchar *quoted_file_name;
  	gchar *cmd;
  	gchar *sub_uri;
! 	/*const gchar *p;*/
! 	/*const GList *itema;*/
  	GList *entries=NULL;
  	GList *l;
  	FILE *pipe;
***************
*** 708,714 ****
  
  	gnome_vfs_file_info_copy (file_info, (GnomeVFSFileInfo *)item->data);
  
! 	//gnome_vfs_file_info_unref((GnomeVFSFileInfo *)item->data);
  
  	*((GList **)method_handle) = item->next;
  
--- 708,714 ----
  
  	gnome_vfs_file_info_copy (file_info, (GnomeVFSFileInfo *)item->data);
  
! 	/*gnome_vfs_file_info_unref((GnomeVFSFileInfo *)item->data);*/
  
  	*((GList **)method_handle) = item->next;
  
diff -crN ./gnome-vfs/modules/fstype.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/fstype.c
*** ./gnome-vfs/modules/fstype.c	Fri Sep 27 18:12:56 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/fstype.c	Fri Jul  4 09:21:54 2003
***************
*** 47,52 ****
--- 47,54 ----
  #include <string.h>
  #include <glib.h>
  
+ #include <libgen.h>
+ 
  #if __STDC__
  # define P_(s) s
  #else
diff -crN ./gnome-vfs/modules/ftp-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/ftp-method.c
*** ./gnome-vfs/modules/ftp-method.c	Tue Nov 12 09:52:08 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/ftp-method.c	Fri Jul  4 09:17:07 2003
***************
*** 1356,1363 ****
  {
  	FtpConnection *conn;
  	GnomeVFSResult result;
! 	GnomeVFSFileSize num_bytes = 1024, bytes_read;
! 	gchar buffer[num_bytes+1];
  	GString *dirlist = g_string_new ("");
  
  	result = ftp_connection_acquire (uri, &conn, context);
--- 1356,1363 ----
  {
  	FtpConnection *conn;
  	GnomeVFSResult result;
! 	GnomeVFSFileSize bytes_read;
!         gchar buffer[1025];
  	GString *dirlist = g_string_new ("");
  
  	result = ftp_connection_acquire (uri, &conn, context);
***************
*** 1397,1403 ****
  
  	while (result == GNOME_VFS_OK) {
  		result = gnome_vfs_socket_buffer_read (conn->data_socketbuf, buffer, 
! 					       num_bytes, &bytes_read);
  		if (result == GNOME_VFS_OK && bytes_read > 0) {
  			buffer[bytes_read] = '\0';
  			dirlist = g_string_append (dirlist, buffer);
--- 1397,1403 ----
  
  	while (result == GNOME_VFS_OK) {
  		result = gnome_vfs_socket_buffer_read (conn->data_socketbuf, buffer, 
! 						1024, &bytes_read);
  		if (result == GNOME_VFS_OK && bytes_read > 0) {
  			buffer[bytes_read] = '\0';
  			dirlist = g_string_append (dirlist, buffer);
diff -crN ./gnome-vfs/modules/gzip-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/gzip-method.c
*** ./gnome-vfs/modules/gzip-method.c	Tue Jan  7 16:10:41 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/gzip-method.c	Fri Jul  4 09:22:24 2003
***************
*** 733,739 ****
  			file_info->name[namelen-3] = '\0';
  
  		/* we can't tell the size without uncompressing it */
! 		//file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE;
  
  		/* guess the mime type of the file inside */
  		/* FIXME bugzilla.eazel.com 2791: guess mime based on contents */
--- 733,739 ----
  			file_info->name[namelen-3] = '\0';
  
  		/* we can't tell the size without uncompressing it */
! 		/*file_info->valid_fields &= ~GNOME_VFS_FILE_INFO_FIELDS_SIZE;*/
  
  		/* guess the mime type of the file inside */
  		/* FIXME bugzilla.eazel.com 2791: guess mime based on contents */
diff -crN ./gnome-vfs/modules/test-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/test-method.c
*** ./gnome-vfs/modules/test-method.c	Tue Oct 23 04:07:02 2001
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/test-method.c	Fri Jul  4 09:22:52 2003
***************
*** 586,592 ****
  
  	if (load_settings (conf_file) == FALSE) {
  
! 	  // FIXME: we probably shouldn't use printf to output the message
  	  printf (_("Didn't find a valid settings file at %s\n"), 
  		  conf_file);
  	  printf (_("Use the %s environment variable to specify a different location.\n"),
--- 586,592 ----
  
  	if (load_settings (conf_file) == FALSE) {
  
! 	  /* FIXME: we probably shouldn't use printf to output the message */
  	  printf (_("Didn't find a valid settings file at %s\n"), 
  		  conf_file);
  	  printf (_("Use the %s environment variable to specify a different location.\n"),
diff -crN ./gnome-vfs/modules/vfolder/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/Makefile.am
*** ./gnome-vfs/modules/vfolder/Makefile.am	Tue Dec 17 09:41:25 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/Makefile.am	Fri Jul  4 09:17:36 2003
***************
*** 50,56 ****
  	vfolder-common.h 	\
  	vfolder-method.c
  libvfolder_desktop_la_LDFLAGS = $(module_flags)
! libvfolder_desktop_la_LIBADD = $(top_builddir)/libgnomevfs/libgnomevfs-2.la $(TEST_LIBS)
  
  ###  Default .vfolder-info files
  
--- 50,56 ----
  	vfolder-common.h 	\
  	vfolder-method.c
  libvfolder_desktop_la_LDFLAGS = $(module_flags)
! libvfolder_desktop_la_LIBADD = $(top_builddir)/libgnomevfs/libgnomevfs-2.la $(TEST_LIBS) $(MODULES_XML_LIBS)
  
  ###  Default .vfolder-info files
  
diff -crN ./gnome-vfs/modules/vfolder/test-vfolder-modules.conf /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/test-vfolder-modules.conf
*** ./gnome-vfs/modules/vfolder/test-vfolder-modules.conf	Fri Sep 27 18:12:59 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/test-vfolder-modules.conf	Fri Jul  4 09:18:16 2003
***************
*** 1,3 ****
  
! test-vfolder: libvfolder-desktop.so
! test-vfolder-parent: libvfolder-desktop.so
--- 1,3 ----
  
! test-vfolder: libvfolder-desktop
! test-vfolder-parent: libvfolder-desktop
diff -crN ./gnome-vfs/modules/vfolder/test-vfolder.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/test-vfolder.c
*** ./gnome-vfs/modules/vfolder/test-vfolder.c	Fri Sep 27 18:12:59 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/test-vfolder.c	Fri Jul  4 09:18:45 2003
***************
*** 466,491 ****
  	 * Move existing directory with children inside a new directory.
  	 */
  
! 	// create dir
! 	// delete new dir
! 	// delete existing dir
! 
! 	// create file
! 	// create file with keywords, check appearance in vfolders
! 	// edit new file
! 	// edit existing file
! 	// move new file
! 	// move existing file
! 	// set filename new file
! 	// set filename existing file
! 	// delete new file
! 	// delete existing file
  	
! 	// monitor file creation
! 	// monitor file edit
! 	// monitor file delete
! 	// monitor dir creation
! 	// monitor dir delete	
  	
  	return 0;
  }
--- 466,492 ----
  	 * Move existing directory with children inside a new directory.
  	 */
  
! 	/* create dir
!   	 * delete new dir
! 	 * delete existing dir
! 
! 	 * create file
! 	 * create file with keywords, check appearance in vfolders
! 	 * edit new file
! 	 * edit existing file
! 	 * move new file
! 	 * move existing file
! 	 * set filename new file
! 	 * set filename existing file
! 	 * delete new file
! 	 * delete existing file
  	
! 	 * monitor file creation
! 	 * monitor file edit
! 	 * monitor file delete
! 	 * monitor dir creation
! 	 * monitor dir delete	
! 	 */
  	
  	return 0;
  }
diff -crN ./gnome-vfs/modules/vfolder/vfolder-common.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-common.c
*** ./gnome-vfs/modules/vfolder/vfolder-common.c	Mon Nov  4 11:18:47 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-common.c	Fri Jul  4 09:19:19 2003
***************
*** 249,254 ****
--- 249,255 ----
  	}
  
  	/* FIXME: Support this */
+ #if 0   /* See BUGZILLA 96256 */
  	if (deprecates) {
  		char **parsed = g_strsplit (keywords, ";", -1);
  		Entry *dep;
***************
*** 266,271 ****
--- 267,273 ----
  		}
  		g_strfreev (parsed);
  	}
+ #endif
  
  	g_free (keywords);
  	g_free (deprecates);
diff -crN ./gnome-vfs/modules/vfolder/vfolder-method.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-method.c
*** ./gnome-vfs/modules/vfolder/vfolder-method.c	Wed Feb 12 10:53:13 2003
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/modules/vfolder/vfolder-method.c	Fri Jul  4 09:19:55 2003
***************
*** 1177,1185 ****
  			key_idx [-1] == '\r')) {
  		/* Look for the end of the value */
  		val_end = strchr (key_idx, '\n');
! 		if (val_end < 0)
  			val_end = strchr (key_idx, '\r');
! 		if (val_end < 0)
  			val_end = &fullbuf->str [fullbuf->len - 1];
  
  		/* Erase the old name */
--- 1177,1185 ----
  			key_idx [-1] == '\r')) {
  		/* Look for the end of the value */
  		val_end = strchr (key_idx, '\n');
! 		if ((int)val_end < 0)
  			val_end = strchr (key_idx, '\r');
! 		if ((int)val_end < 0)
  			val_end = &fullbuf->str [fullbuf->len - 1];
  
  		/* Erase the old name */
diff -crN ./gnome-vfs/monikers/GNOME_VFS_Moniker_std.server.in.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/monikers/GNOME_VFS_Moniker_std.server.in.in
*** ./gnome-vfs/monikers/GNOME_VFS_Moniker_std.server.in.in	Wed Aug  1 21:23:36 2001
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/monikers/GNOME_VFS_Moniker_std.server.in.in	Fri Jul  4 09:15:40 2003
***************
*** 1,7 ****
  <oaf_info>
  
  <oaf_server iid="OAFIID:GNOME_VFS_Moniker_std_Factory"
! 	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_gnome_vfs_std.so">
  	<oaf_attribute name="repo_ids" type="stringv">
  		<item value="IDL:Bonobo/GenericFactory:1.0"/>
  	</oaf_attribute>
--- 1,7 ----
  <oaf_info>
  
  <oaf_server iid="OAFIID:GNOME_VFS_Moniker_std_Factory"
! 	type="shlib" location="@MONIKER_LIBDIR@/libmoniker_gnome_vfs_std">
  	<oaf_attribute name="repo_ids" type="stringv">
  		<item value="IDL:Bonobo/GenericFactory:1.0"/>
  	</oaf_attribute>
diff -crN ./gnome-vfs/test/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/test/Makefile.am
*** ./gnome-vfs/test/Makefile.am	Tue Dec 17 18:16:35 2002
--- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./gnome-vfs/test/Makefile.am	Fri Jul  4 09:09:52 2003
***************
*** 25,34 ****
  	test-mime-info				\
  	test-monitor				\
  	test-performance			\
- 	test-resolv				\
  	test-seek				\
  	test-shell				\
- 	test-subdir				\
  	test-symlinks				\
  	test-ssl				\
  	test-sync				\
--- 25,32 ----
***************
*** 43,48 ****
--- 41,47 ----
  	$(NULL)
  
  test_files=		\
+ 	auto-test	\
  	test.input	\
  	test.cmds	\
  	test.output
***************
*** 66,77 ****
  test_performance_SOURCES = test-performance.c
  test_performance_LDADD = $(libraries)
  
- test_resolv_SOURCES = test-resolv.c
- test_resolv_LDADD = $(libraries)
- 
- test_subdir_SOURCES = test-subdir.c
- test_subdir_LDADD = $(libraries)
- 
  test_async_directory_SOURCES = test-async-directory.c
  test_async_directory_LDADD = $(libraries)
  
--- 65,70 ----
***************
*** 144,152 ****
  test_monitor_SOURCES = test-monitor.c
  test_monitor_LDADD = $(libraries)
  
- # test_metadata_SOURCES = test-metadata.c
- # test_metadata_LDADD = $(libraries)
- 
  test_callback_SOURCES = test-callback.c
  test_callback_LDADD = $(libraries)
  
--- 137,142 ----
***************
*** 158,162 ****
  
  EXTRA_DIST =					\
  	$(test_files)				\
- 	auto-test				\
  	vfs-run.in
--- 148,151 ----