brasero r597 - in trunk: . src

[lmedinas svn gnome org]

Author: lmedinas
Date: Wed Jan 16 23:46:01 2008
New Revision: 597
URL: http://svn.gnome.org/viewvc/brasero?rev=597&view=rev

Log:
2008-01-16  Luis Medinas  <lmedinas svn gnome org>

        * src/Makefile.am:
        * src/brasero-audio-disc.c: 
(brasero_audio_disc_start_monitoring):
        * src/brasero-data-disc.c:
        (brasero_data_disc_start_monitoring_real):
        * src/inotify-syscalls.h:
        * src/inotify.h:

        Use linux kernel inotify instead of using our own old.
        Fixes bgo #510022.


Removed:
   trunk/src/inotify-syscalls.h
   trunk/src/inotify.h
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/brasero-audio-disc.c
   trunk/src/brasero-data-disc.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Jan 16 23:46:01 2008
@@ -58,10 +58,8 @@
 	brasero-disc-copy-dialog.h         \
 	brasero-blank-dialog.c         \
 	brasero-blank-dialog.h         \
-	inotify.h         \
 	brasero-metadata.c         \
 	brasero-metadata.h         \
-	inotify-syscalls.h         \
 	brasero-filtered-window.c         \
 	brasero-filtered-window.h         \
 	brasero-disc.c         \

Modified: trunk/src/brasero-audio-disc.c
==============================================================================
--- trunk/src/brasero-audio-disc.c	(original)
+++ trunk/src/brasero-audio-disc.c	Wed Jan 16 23:46:01 2008
@@ -76,8 +76,9 @@
 #include "eggtreemultidnd.h"
 
 #ifdef BUILD_INOTIFY
-#include "inotify.h"
-#include "inotify-syscalls.h"
+
+#include "sys/inotify.h"
+
 #endif
 
 static void brasero_audio_disc_class_init (BraseroAudioDiscClass *klass);
@@ -3237,7 +3238,7 @@
 		gchar *parent;
 		int dev_fd;
 		char *path;
-		__u32 mask;
+		uint32_t mask;
 		int wd;
 
 		/* we want to be able to catch files being renamed in the same

Modified: trunk/src/brasero-data-disc.c
==============================================================================
--- trunk/src/brasero-data-disc.c	(original)
+++ trunk/src/brasero-data-disc.c	Wed Jan 16 23:46:01 2008
@@ -80,8 +80,7 @@
 
 #ifdef BUILD_INOTIFY
 
-#include "inotify.h"
-#include "inotify-syscalls.h"
+#include "sys/inotify.h"
 
 #endif
 
@@ -12908,9 +12907,9 @@
 brasero_data_disc_start_monitoring_real (BraseroDataDisc *disc,
 					 BraseroFile *file)
 {
-	gchar *path;
+	const gchar *path;
 	gint dev_fd;
-	__u32 mask;
+	uint32_t mask;
 
 	path = gnome_vfs_get_local_path_from_uri (file->uri);