--- a/ChangeLog	Fri Feb 19 19:49:23 2010 +0000
+++ b/ChangeLog	Sun Feb 21 19:35:46 2010 +0000
@@ -1,3 +1,7 @@
+2010-02-21  Christian Kelly  <[email protected]>
+
+	* patches/glib-04-gio-trash-only-home.diff: Minor re-working.
+
 2010-02-19  Brian Cameron  <[email protected]>
 
 	* base-specs/dbus-python.spec: Bump to 0.83.1.

--- a/patches/glib-04-gio-trash-only-home.diff	Fri Feb 19 19:49:23 2010 +0000
+++ b/patches/glib-04-gio-trash-only-home.diff	Sun Feb 21 19:35:46 2010 +0000
@@ -1,13 +1,5 @@
 --- glib-2.20.1/gio/glocalfile.c.ori	2009-04-15 03:46:56.161574399 +0100
 +++ glib-2.20.1/gio/glocalfile.c	2009-04-15 03:48:57.698109713 +0100
-@@ -1715,6 +1715,7 @@
-   int fd;
-   struct stat trash_stat, global_stat;
-   char *dirname, *globaldir;
-+  GFile *trash;
-   
-   if (g_lstat (local->filename, &file_stat) != 0)
-     {
 @@ -1732,123 +1733,26 @@
  
    is_homedir_trash = FALSE;
@@ -176,3 +168,14 @@
  
    /* TODO: Do we need to update mtime/atime here after the move? */
  
+diff -ruN glib-2.23.3.orig/gio/glocalfile.c glib-2.23.3/gio/glocalfile.c
+--- glib-2.23.3.orig/gio/glocalfile.c  2010-02-15 23:17:27.894234379 +0000
++++ glib-2.23.3/gio/glocalfile.c       2010-02-15 23:19:46.423246902 +0000
+@@ -1797,6 +1797,7 @@
+   int fd;
+   struct _g_stat_struct trash_stat, global_stat;
+   char *dirname, *globaldir;
++  GFile *trash;
+   
+   if (g_lstat (local->filename, &file_stat) != 0)
+     {