Re: [GNOME VFS] Patches: fix same_fs check and fix canonization of url

Yes, please go ahead and check these in to both head and gnome-2-0.=20

In the future feel free to get any competent GNOME hacker to review your
changes to HEAD and just check them in (noting who reviewed them), if
you prefer. See GnomeVFS' HACKING for more details.

-Seth

On Mon, 2002-07-08 at 09:51, Frederic Crozat wrote:
> Here are two patches for gnome-vfs (gnome-2-0 branch and HEAD):
>=20
> -first patch fixes gnome_vfs_check_same_fs_uris_cancellable which wasn'=
t
> storing same_fs value in the same_fs_return parameter (quite ugly)
>=20
> -second patch is a partial fix for bug #81670 (start-here: and vfolder
> monitors broken) which ensures that "start-here:" or "applications:" ar=
e
> canonized to "start-here:///" (resp. "applications:///"). This partly
> fixes the monitoring problem in nautilus (because gnome-vfs was
> notifying "start-here:///Foobar.desktop has been changed" and nautilus
> was listening to "start-here:Foobar.desktop notification")..=20
>=20
> Ok to commit (both branches) ?
> --=20
> Fr=E9d=E9ric Crozat
> MandrakeSoft
> ----
>=20

> ? gnome-vfs-2.0.1-desktopuri.patch.bz2
> ? gnome-vfs-samefs.patch
> Index: ChangeLog
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvs/gnome/gnome-vfs/ChangeLog,v
> retrieving revision 1.1334.2.11
> diff -u -r1.1334.2.11 ChangeLog
> --- ChangeLog	28 Jun 2002 08:52:32 -0000	1.1334.2.11
> +++ ChangeLog	8 Jul 2002 16:36:34 -0000
> @@ -1,3 +1,10 @@
> +2002-07-08  Frederic Crozat  <[email protected]>
> +
> +	* libgnomevfs/gnome-vfs-cancellable-ops.c:
> +	(gnome_vfs_check_same_fs_uris_cancellable):
> +	Be sure to pass same_fs_return address to check_same_fs method,
> +	otherwise return value won't be retrieved.
> +
>  2002-06-27  Michael Meeks  <[email protected]>
> =20
>  	* modules/vfolder-desktop-method.c
> Index: libgnomevfs/gnome-vfs-cancellable-ops.c
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> RCS file: /cvs/gnome/gnome-vfs/libgnomevfs/gnome-vfs-cancellable-ops.c,=
v
> retrieving revision 1.25
> diff -u -r1.25 gnome-vfs-cancellable-ops.c
> --- libgnomevfs/gnome-vfs-cancellable-ops.c	5 Nov 2001 08:06:58 -0000	1=
.25
> +++ libgnomevfs/gnome-vfs-cancellable-ops.c	8 Jul 2002 16:36:34 -0000
> @@ -396,7 +396,7 @@
>  		return GNOME_VFS_OK;
>  	}
> =20
> -	return a->method->check_same_fs (a->method, a, b, same_fs_return, con=
text);
> +	return a->method->check_same_fs (a->method, a, b, &same_fs_return, co=
ntext);
>  }
> =20
>  GnomeVFSResult
> ----
>=20

> --- gnome-vfs-2.0.1/libgnomevfs/gnome-vfs-uri.c.canonicaluri	2002-05-04=
 17:30:32.000000000 +0200
> +++ gnome-vfs-2.0.1/libgnomevfs/gnome-vfs-uri.c	2002-07-03 15:22:20.000=
000000 +0200
> @@ -310,7 +310,7 @@
>  	char *escaped_text;
> =20
>  	if (text =3D=3D NULL || len =3D=3D 0) {
> -		uri->text =3D NULL;
> +		uri->text =3D g_strdup("/");;
>  		return;
>  	}
> =20



_______________________________________________
gnome-vfs maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/gnome-vfs