[maemo-commits] [maemo-commits] r11243 - projects/haf/trunk/osso-gnome-vfs2/debian/patches

[From: subversion at stage.maemo.org]

Author: martyn
Date: 2007-04-24 17:54:30 +0300 (Tue, 24 Apr 2007)
New Revision: 11243

Modified:
   projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch
Log:
The upstream fix we have taken for patch 29 was updated, so we are updating the patch accordingly

Modified: projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch
===================================================================
--- projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch	2007-04-24 14:51:08 UTC (rev 11242)
+++ projects/haf/trunk/osso-gnome-vfs2/debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch	2007-04-24 14:54:30 UTC (rev 11243)
@@ -1,8 +1,50 @@
+Index: debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch
+===================================================================
+--- debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch	(revision 11242)
++++ debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch	(working copy)
+@@ -1,16 +1,2 @@
+-Index: modules/inotify-path.c
++Index: debian/patches/29-NB54464-inotify-add-umount-to-missing-list.patch
+ ===================================================================
+---- 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);
+-
+Index: modules/inotify-helper.c
+===================================================================
+--- modules/inotify-helper.c	(revision 11226)
++++ modules/inotify-helper.c	(working copy)
+@@ -210,6 +210,7 @@ ih_mask_to_EventType (guint32 mask)
+ 	case IN_MOVED_FROM:
+ 	case IN_DELETE:
+ 	case IN_DELETE_SELF:
++	case IN_UNMOUNT:
+ 		return GNOME_VFS_MONITOR_EVENT_DELETED;
+ 	break;
+ 	case IN_CREATE:
+@@ -220,7 +221,6 @@ ih_mask_to_EventType (guint32 mask)
+ 	case IN_OPEN:
+ 	case IN_CLOSE_WRITE:
+ 	case IN_CLOSE_NOWRITE:
+-	case IN_UNMOUNT:
+ 	case IN_ACCESS:
+ 	case IN_IGNORED:
+ 	default:
 Index: modules/inotify-path.c
 ===================================================================
---- modules/inotify-path.c	(revision 5322)
+--- modules/inotify-path.c	(revision 11226)
 +++ modules/inotify-path.c	(working copy)
-@@ -376,8 +376,8 @@
+@@ -376,8 +376,8 @@ ip_event_callback (ik_event_t *event)
  	if (event->mask & IP_INOTIFY_MASK)
  		ip_event_dispatch (dir_list, pair_dir_list, event);
  
@@ -13,4 +55,3 @@
  	{
  		/* Add all subscriptions to missing list */
  		g_list_foreach (dir_list, ip_wd_delete, NULL);
-