rpms/gnome-vfs2/OLPC-2 gnome-vfs-2.18.1-gnome-vfs-init.patch, NONE, 1.1 gnome-vfs2.spec, 1.159, 1.160

[Reinier Heeres (rwh)]

Author: rwh

Update of /cvs/pkgs/rpms/gnome-vfs2/OLPC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32289

Modified Files:
	gnome-vfs2.spec 
Added Files:
	gnome-vfs-2.18.1-gnome-vfs-init.patch 
Log Message:
Patch gnome_vfs_init(), don't return if ~/.gnome creation fails


gnome-vfs-2.18.1-gnome-vfs-init.patch:

--- NEW FILE gnome-vfs-2.18.1-gnome-vfs-init.patch ---
--- gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-init.c.gnome-vfs-init
+++ gnome-vfs-2.18.1/libgnomevfs/gnome-vfs-init.c
@@ -111,9 +111,9 @@ gnome_vfs_init (void)
 	/*
 	char *bogus_argv[2] = { "dummy", NULL };
 	*/
-	
+
 	if (!ensure_dot_gnome_exists ()) {
-		return FALSE;
+		g_warning ("gnome_vfs_init(): .gnome does not exist");
 	}
 
  	if (!g_thread_supported ())


Index: gnome-vfs2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-vfs2/OLPC-2/gnome-vfs2.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- gnome-vfs2.spec	21 Jun 2007 23:38:38 -0000	1.159
+++ gnome-vfs2.spec	12 Dec 2007 23:17:03 -0000	1.160
@@ -14,7 +14,7 @@
 Summary: The GNOME virtual file-system libraries
 Name: gnome-vfs2
 Version: 2.18.1
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Source0: http://ftp.gnome.org/pub/gnome/source/gnome-vfs/2.17/gnome-vfs-%{version}.tar.bz2
@@ -73,6 +73,9 @@
 #Fix ftp symlink crash (#435823)
 Patch10: gnome-vfs-2.18.1-ftp-symlink.patch
 
+# Don't exit init if unable to create ~/.gnome
+Patch11: gnome-vfs-2.18.1-gnome-vfs-init.patch
+
 %description
 GNOME VFS is the GNOME virtual file system. It is the foundation of
 the Nautilus file manager. It provides a modular architecture and
@@ -129,6 +132,8 @@
 
 %patch10 -p1 -b .ftp_symlink
 
+%patch11 -p1 -b .gnome-vfs-init
+
 %build
 
 if pkg-config openssl ; then
@@ -231,6 +236,9 @@
 %config %{_sysconfdir}/gnome-vfs-2.0/modules/smb-module.conf
 
 %changelog
+* Wed Dec  5 2007 <reinier at heeres.eu> - 2.18.1-7
+- gnome_vfs_init(), remove return if failing to create ~/.gnome
+
 * Thu Jun 21 2007  <johnp at redhat.com> - 2.18.1-6
 - BR GConf2-dbus-devel instead of GConf2-devel