tracker r2482 - in trunk: . src/trackerd

[mr svn gnome org]

Author: mr
Date: Mon Nov 10 17:08:39 2008
New Revision: 2482
URL: http://svn.gnome.org/viewvc/tracker?rev=2482&view=rev

Log:
	* configure.ac:
	* src/trackerd/tracker-monitor.c: (black_list_check_items_cb):
	Fixed check for inotify and also fixed build when we don't have it.


Modified:
   trunk/ChangeLog
   trunk/configure.ac
   trunk/src/trackerd/tracker-monitor.c

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Nov 10 17:08:39 2008
@@ -226,30 +226,6 @@
 AC_SUBST(DESKBAR_MODULE_DIR)
 
 ####################################################################
-# Compiler warning checks
-####################################################################
-
-AC_ARG_ENABLE(warnings,
-              AS_HELP_STRING([--disable-warnings], [disable GCC warnings]),,
-              [enable_warnings=yes])
-
-# Only use -Wall if we have gcc
-if test "x$GCC" = "xyes"; then
-   if test "x$enable_warnings" = "xyes"; then
-      CFLAGS="\
-	-Wall \
-	-Wunused \
-	-Wchar-subscripts \
-	-Wmissing-declarations \
-	-Wmissing-prototypes \
-	-Wnested-externs \
-	-Wpointer-arith \
-	-Wsign-compare \
-	$CFLAGS"
-   fi
-fi
-
-####################################################################
 # gettext/intltool support
 ####################################################################
 
@@ -522,16 +498,8 @@
 #  libinotify
 ####################################################################
 
-AC_MSG_CHECKING(for inotify)
-AC_TRY_COMPILE(,
-	[
-        #include <sys/inotify.h>
-
-        inotify_init(void);
-	],
-	have_inotify=no; AC_MSG_RESULT(no),
-	have_inotify=yes; AC_MSG_RESULT(yes),
-)
+have_inotify=no
+AC_CHECK_HEADERS([sys/inotify.h],[have_inotify=yes])
 
 AM_CONDITIONAL(HAVE_INOTIFY, test "$have_inotify" = "yes")
 
@@ -1190,7 +1158,7 @@
 	Enable unit tests:			$have_unit_tests
 	Enable unac accent stripper:	  	$enable_unac
 
-	Support for file monitoring:           	gio
+	Support for file monitoring:           	gio (w/ libinotify: $have_inotify)
 	Support for ioprio:			$have_ioprio
 	Support for HAL:                    	$have_hal
 

Modified: trunk/src/trackerd/tracker-monitor.c
==============================================================================
--- trunk/src/trackerd/tracker-monitor.c	(original)
+++ trunk/src/trackerd/tracker-monitor.c	Mon Nov 10 17:08:39 2008
@@ -676,6 +676,7 @@
 				continue;
 			}
 
+#ifdef USE_LIBINOTIFY
 			switch (event->event_type) {
 			case IN_MODIFY:
 			case IN_CLOSE_WRITE:
@@ -712,6 +713,13 @@
 					       is_directory);
 				break;
 			}
+#else  /* USE_LIBINOTIFY */
+			g_signal_emit (monitor,
+				       signals[ITEM_UPDATED], 0,
+				       module_name,
+				       key,
+				       is_directory);
+#endif /* USE_LIBINOTIFY */
 		}
 
 		/* Remove from hash tables (i.e. white list it) */