[maemo-commits] [maemo-commits] r11158 - in projects/haf/trunk/osso-gnome-vfs2: . debian debian/patches

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-04-19 18:36:00 +0300 (Thu, 19 Apr 2007)
New Revision: 11158

Added:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-inotify-add-umount-to-missing-list.diff
Modified:
   projects/haf/trunk/osso-gnome-vfs2/ChangeLog
   projects/haf/trunk/osso-gnome-vfs2/debian/changelog
Log:
	* debian/patches/29-inotify-add-umount-to-missing-list.diff: Added
	patch from upstream which fixes issues with monitors set on
	uris which are not available after unmounting a volume. This was
	patially responsible for NB#54464 and fixes GNOME bug #431366.


Modified: projects/haf/trunk/osso-gnome-vfs2/ChangeLog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2007-04-19 13:07:08 UTC (rev 11157)
+++ projects/haf/trunk/osso-gnome-vfs2/ChangeLog	2007-04-19 15:36:00 UTC (rev 11158)
@@ -1,3 +1,10 @@
+2007-04-19  Martyn Russell  <martyn at imendio.com>
+
+	* debian/patches/29-inotify-add-umount-to-missing-list.diff: Added
+	patch from upstream which fixes issues with monitors set on
+	uris which are not available after unmounting a volume. This was
+	patially responsible for NB#54464 and fixes GNOME bug #431366.
+
 2007-02-01  Richard Hult  <richard at imendio.com>
 
 	* configure.in: Merge patch from 2.17.x to disable HTTP debug output.

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/changelog
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-04-19 13:07:08 UTC (rev 11157)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/changelog	2007-04-19 15:36:00 UTC (rev 11158)
@@ -1,5 +1,6 @@
 osso-gnome-vfs2 (2.16.3-1osso14) unstable; urgency=low
 
+  * Added a patch 29 to fix upstream bug with umounting monitored uris 
   * Add missing #DEBHELPER# marker in libosso-gnomevfs2-common.postinst
 
  -- Richard Hult <richard at imendio.com>  Fri, 13 Apr 2007 09:42:07 +0200

Added: projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-inotify-add-umount-to-missing-list.diff
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-inotify-add-umount-to-missing-list.diff	2007-04-19 13:07:08 UTC (rev 11157)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-inotify-add-umount-to-missing-list.diff	2007-04-19 15:36:00 UTC (rev 11158)
@@ -0,0 +1,16 @@
+Index: modules/inotify-path.c
+===================================================================
+--- modules/inotify-path.c	(revision 5322)
++++ modules/inotify-path.c	(working copy)
+@@ -376,8 +376,8 @@
+ 	if (event->mask & IP_INOTIFY_MASK)
+ 		ip_event_dispatch (dir_list, pair_dir_list, event);
+ 
+-	/* We have to manage the missing list when we get a DELETE event. */
+-	if (event->mask & IN_DELETE_SELF || event->mask & IN_MOVE_SELF)
++	/* We have to manage the missing list when we get a DELETE/UNMOUNT event. */
++	if (event->mask & IN_DELETE_SELF || event->mask & IN_MOVE_SELF || event->mask & IN_UNMOUNT)
+ 	{
+ 		/* Add all subscriptions to missing list */
+ 		g_list_foreach (dir_list, ip_wd_delete, NULL);
+