r12993 - /desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch
joss at users.alioth.debian.org
joss at users.alioth.debian.org
Sat Oct 6 15:04:01 UTC 2007
Author: joss
Date: Sat Oct 6 15:04:01 2007
New Revision: 12993
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12993
Log:
Make the new function public so that the file method isn't b0rked.
Modified:
desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch
Modified: desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch?rev=12993&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/24_home_dir_fakeroot.patch Sat Oct 6 15:04:01 2007
@@ -1,20 +1,20 @@
Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c
===================================================================
--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-application-registry.c 2007-10-06 12:01:42.746725988 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c 2007-10-06 12:02:12.668431129 +0200
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-application-registry.c 2007-10-06 17:02:20.298627491 +0200
@@ -965,7 +965,7 @@
NULL);
gnome_registry_dir.system_dir = TRUE;
- user_registry_dir.dirname = g_build_filename (g_get_home_dir(),
-+ user_registry_dir.dirname = g_build_filename (_gnome_vfs_get_home_dir(),
++ user_registry_dir.dirname = g_build_filename (gnome_vfs_get_home_dir(),
".gnome",
"application-info",
NULL);
Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c
===================================================================
--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-init.c 2007-10-06 11:25:05.997540386 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c 2007-10-06 12:01:27.329847430 +0200
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-init.c 2007-10-06 17:02:48.224218879 +0200
@@ -59,29 +59,6 @@
static GPrivate * private_is_primary_thread;
@@ -51,14 +51,14 @@
- if (!ensure_dot_gnome_exists ()) {
+ /* The first call also checks that ~/.gnome2 is writable. */
-+ if (!_gnome_vfs_get_home_dir ()) {
++ if (!gnome_vfs_get_home_dir ()) {
return FALSE;
}
Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c
===================================================================
--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.c 2007-10-06 11:25:16.930163401 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c 2007-10-06 12:01:15.081149417 +0200
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.c 2007-10-06 17:03:32.626749235 +0200
@@ -1086,3 +1086,54 @@
}
#endif
@@ -87,7 +87,7 @@
+}
+
+/**
-+ * _gnome_vfs_get_home_dir:
++ * gnome_vfs_get_home_dir:
+ *
+ * If ~/.gnome2 is writable, return the home directory
+ * Otherwise, return the contents of the HOME environment variable
@@ -96,7 +96,7 @@
+ * Do not free the value returned.
+ */
+const gchar *
-+_gnome_vfs_get_home_dir (void)
++gnome_vfs_get_home_dir (void)
+{
+ static gchar *home = NULL;
+
@@ -117,12 +117,12 @@
Index: gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h
===================================================================
--- gnome-vfs-2.20.0.orig/libgnomevfs/gnome-vfs-private-utils.h 2007-10-06 11:25:16.958164997 +0200
-+++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h 2007-10-06 11:58:20.991228597 +0200
++++ gnome-vfs-2.20.0/libgnomevfs/gnome-vfs-private-utils.h 2007-10-06 17:00:55.753809556 +0200
@@ -124,6 +124,8 @@
#endif
-+const gchar *_gnome_vfs_get_home_dir (void);
++const gchar *gnome_vfs_get_home_dir (void);
+
G_END_DECLS
@@ -130,13 +130,13 @@
Index: gnome-vfs-2.20.0/modules/file-method.c
===================================================================
--- gnome-vfs-2.20.0.orig/modules/file-method.c 2007-10-06 12:06:41.527752548 +0200
-+++ gnome-vfs-2.20.0/modules/file-method.c 2007-10-06 12:11:08.982993954 +0200
++++ gnome-vfs-2.20.0/modules/file-method.c 2007-10-06 17:01:44.860607993 +0200
@@ -1536,7 +1536,7 @@
GList *p;
char *buffer, *escaped_path, *escaped_mount_point;
- cache_file_parent = append_to_path (g_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
-+ cache_file_parent = append_to_path (_gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
++ cache_file_parent = append_to_path (gnome_vfs_get_home_dir (), TRASH_ENTRY_CACHE_PARENT);
cache_file_path = append_to_path (cache_file_parent, TRASH_ENTRY_CACHE_NAME);
if (mkdir_recursive (cache_file_parent, 0777) != 0) {
@@ -145,7 +145,7 @@
/* read in the entries from disk */
- cache_file_path = g_build_filename (g_get_home_dir (),
-+ cache_file_path = g_build_filename (_gnome_vfs_get_home_dir (),
++ cache_file_path = g_build_filename (gnome_vfs_get_home_dir (),
TRASH_ENTRY_CACHE_PARENT,
TRASH_ENTRY_CACHE_NAME,
NULL);
@@ -154,7 +154,7 @@
/* We will need the URI and the stat structure for the home directory. */
- home_directory = g_get_home_dir ();
-+ home_directory = _gnome_vfs_get_home_dir ();
++ home_directory = gnome_vfs_get_home_dir ();
if (gnome_vfs_context_check_cancellation (context)) {
g_free (full_name_near);
More information about the pkg-gnome-commits
mailing list