r44342 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch patches/series

[laney at users.alioth.debian.org]

Author: laney
Date: Mon May 11 15:30:32 2015
New Revision: 44342

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=44342
Log:
* d/p/0001-Fix-trashing-on-overlayfs.patch: Take patch from
* d/p/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch: Take
  patch from upstream bug to send the right event when moving files outside
  a monitored directory.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=44342&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Mon May 11 15:30:32 2015
@@ -13,8 +13,11 @@
     installed). Applied upstream for 2.45.2.
 
   [ Iain Lane ]
-  * debian/patches/0001-Fix-trashing-on-overlayfs.patch: Take patch from
+  * d/p/0001-Fix-trashing-on-overlayfs.patch: Take patch from
     upstream bug to fix trashing on overlayfs.
+  * d/p/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch: Take
+    patch from upstream bug to send the right event when moving files outside
+    a monitored directory.
 
  -- Simon McVittie <smcv at debian.org>  Mon, 04 May 2015 12:15:17 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch?rev=44342&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch	[utf-8] Mon May 11 15:30:32 2015
@@ -0,0 +1,39 @@
+From 8a8c7a1aa514eb3c279e77368352076f06bf50c0 Mon Sep 17 00:00:00 2001
+From: Iain Lane <iain at orangesquash.org.uk>
+Date: Mon, 11 May 2015 14:19:52 +0100
+Subject: [PATCH] glocalfilemonitor: Send DELETED event when there is no
+ 'other' file
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The documentation states "If using […] G_FILE_MONITOR_SEND_MOVED flag
+and event_type is G_FILE_MONITOR_EVENT_MOVED, […] other_file will be set
+to a GFile containing the new path. In all the other cases, other_file
+will be set to NULL."
+
+There's code in the wild which expects a non-null other_file when it
+gets a MOVED event.
+
+When moving a file outside of a monitored directory, send DELETED. This
+is the pre-2.45 behaviour.
+---
+ gio/glocalfilemonitor.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/gio/glocalfilemonitor.c b/gio/glocalfilemonitor.c
+index 8a5c442..31ba1a7 100644
+--- a/gio/glocalfilemonitor.c
++++ b/gio/glocalfilemonitor.c
+@@ -385,7 +385,7 @@ g_file_monitor_source_handle_event (GFileMonitorSource *fms,
+       g_assert (!rename_to);
+       if (fms->flags & G_FILE_MONITOR_WATCH_MOVES)
+         g_file_monitor_source_send_event (fms, G_FILE_MONITOR_EVENT_MOVED_OUT, child, other);
+-      else if (fms->flags & G_FILE_MONITOR_SEND_MOVED)
++      else if (fms->flags & G_FILE_MONITOR_SEND_MOVED && other)
+         g_file_monitor_source_send_event (fms, G_FILE_MONITOR_EVENT_MOVED, child, other);
+       else
+         g_file_monitor_source_send_event (fms, G_FILE_MONITOR_EVENT_DELETED, child, NULL);
+-- 
+2.1.4
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=44342&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Mon May 11 15:30:32 2015
@@ -20,3 +20,4 @@
 regex-test-do-not-assert-that-system-PCRE-still-has-.patch
 gdbus-serialization-use-check_serialization-instead-.patch
 0001-Fix-trashing-on-overlayfs.patch
+0001-glocalfilemonitor-Send-DELETED-event-when-there-is-n.patch