Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/gamin/ChangeLog,v
retrieving revision 1.166
diff -u -B -p -r1.166 ChangeLog
--- ChangeLog	9 May 2005 13:45:54 -0000	1.166
+++ ChangeLog	9 May 2005 23:49:28 -0000
@@ -1,3 +1,8 @@
+Mon May  9 00:48:31 BST 2005 Daniel Drake <dsd@gentoo.org>
+
+	* server/gam_inotify.c server/local_inotify.h: Update for
+	  inotify 0.23-6 API changes
+
 Mon May  9 15:45:22 CEST 2005 Daniel Veillard <veillard@redhat.com>
 
 	* server/server_config.h server/*.c: force compilation with
Index: server/gam_inotify.c
===================================================================
RCS file: /cvs/gnome/gamin/server/gam_inotify.c,v
retrieving revision 1.20
diff -u -B -p -r1.20 gam_inotify.c
--- server/gam_inotify.c	9 May 2005 13:45:55 -0000	1.20
+++ server/gam_inotify.c	9 May 2005 23:49:29 -0000
@@ -66,7 +66,7 @@ static gboolean have_consume_idler = FAL
 
 static int inotify_device_fd = -1;
 
-static guint should_poll_mask = IN_MODIFY|IN_ATTRIB|IN_CLOSE_WRITE|IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE_SUBDIR|IN_DELETE_FILE|IN_CREATE_SUBDIR|IN_CREATE_FILE|IN_DELETE_SELF|IN_UNMOUNT;
+static guint should_poll_mask = IN_MODIFY|IN_ATTRIB|IN_CLOSE_WRITE|IN_MOVED_FROM|IN_MOVED_TO|IN_DELETE|IN_CREATE|IN_DELETE_SELF|IN_UNMOUNT;
 
 static void print_mask(int mask)
 {
@@ -102,21 +102,13 @@ static void print_mask(int mask)
     {
         GAM_DEBUG(DEBUG_INFO, "MOVE_TO\n");
     }
-    if (mask & IN_DELETE_SUBDIR)
+    if (mask & IN_DELETE)
     {
-        GAM_DEBUG(DEBUG_INFO, "DELETE_SUBDIR\n");
+        GAM_DEBUG(DEBUG_INFO, "DELETE\n");
     }
-    if (mask & IN_DELETE_FILE)
-    {
-        GAM_DEBUG(DEBUG_INFO, "DELETE_FILE\n");
-    }
-    if (mask & IN_CREATE_SUBDIR)
+    if (mask & IN_CREATE)
     {
         GAM_DEBUG(DEBUG_INFO, "CREATE_SUBDIR\n");
-    }
-    if (mask & IN_CREATE_FILE)
-    {
-        GAM_DEBUG(DEBUG_INFO, "CREATE_FILE\n");
     }
     if (mask & IN_DELETE_SELF)
     {
Index: server/local_inotify.h
===================================================================
RCS file: /cvs/gnome/gamin/server/local_inotify.h,v
retrieving revision 1.7
diff -u -B -p -r1.7 local_inotify.h
--- server/local_inotify.h	2 May 2005 08:11:26 -0000	1.7
+++ server/local_inotify.h	9 May 2005 23:49:29 -0000
@@ -42,11 +42,9 @@ struct inotify_watch_request {
 #define IN_OPEN			0x00000020	/* File was opened */
 #define IN_MOVED_FROM		0x00000040	/* File was moved from X */
 #define IN_MOVED_TO		0x00000080	/* File was moved to Y */
-#define IN_DELETE_SUBDIR	0x00000100	/* Subdir was deleted */
-#define IN_DELETE_FILE		0x00000200	/* Subfile was deleted */
-#define IN_CREATE_SUBDIR	0x00000400	/* Subdir was created */
-#define IN_CREATE_FILE		0x00000800	/* Subfile was created */
-#define IN_DELETE_SELF		0x00001000	/* Self was deleted */
+#define IN_CREATE		0x00000100	/* Subfile was created */
+#define IN_DELETE		0x00000200	/* Subfile was deleted */
+#define IN_DELETE_SELF		0x00000400	/* Self was deleted */
 
 /* the following are legal events.  they are sent as needed to any watch */
 #define IN_UNMOUNT		0x00002000	/* Backing fs was unmounted */
@@ -58,6 +56,7 @@ struct inotify_watch_request {
 #define IN_MOVE			(IN_MOVED_FROM | IN_MOVED_TO) /* moves */
 
 /* special flags */
+#define IN_ISDIR		0x40000000	/* event occurred against dir */
 #define IN_ONESHOT		0x80000000	/* only send event once */
 
 /*
@@ -67,8 +66,7 @@ struct inotify_watch_request {
  */
 #define IN_ALL_EVENTS	(IN_ACCESS | IN_MODIFY | IN_ATTRIB | IN_CLOSE_WRITE | \
 			 IN_CLOSE_NOWRITE | IN_OPEN | IN_MOVED_FROM | \
-			 IN_MOVED_TO | IN_DELETE_SUBDIR | IN_DELETE_FILE | \
-			 IN_CREATE_SUBDIR | IN_CREATE_FILE | IN_DELETE_SELF)
+			 IN_MOVED_TO | IN_DELETE | IN_CREATE | IN_DELETE_SELF)
 
 #define INOTIFY_IOCTL_MAGIC	'Q'
 #define INOTIFY_IOCTL_MAXNR	2