tracker r2292 - in trunk: . src/tracker-extract src/trackerd

[mr svn gnome org]

Author: mr
Date: Thu Oct  2 11:38:50 2008
New Revision: 2292
URL: http://svn.gnome.org/viewvc/tracker?rev=2292&view=rev

Log:
	* src/tracker-extract/Makefile.am: Fix the linking order here.

	* src/trackerd/tracker-monitor.c:
	(libinotify_event_check_timeout_cb),
	(libinotify_monitor_event_cb): Don't use IN_MOVE_SELF for the
	ITEM_DELETED event. This meant that when we get this convenience
	event from inotify, we were signalling a delete event (which is
	wrong since we support proper move events now) and delete file
	changes are signalled to the indexer BEFORE all other events. So
	the indexer would get DELETE followed by MOVE and not find the
	source to MOVE in the database.


Modified:
   trunk/ChangeLog
   trunk/src/tracker-extract/Makefile.am
   trunk/src/trackerd/tracker-monitor.c

Modified: trunk/src/tracker-extract/Makefile.am
==============================================================================
--- trunk/src/tracker-extract/Makefile.am	(original)
+++ trunk/src/tracker-extract/Makefile.am	Thu Oct  2 11:38:50 2008
@@ -100,8 +100,8 @@
 libextract_ps_la_SOURCES = tracker-extract-ps.c
 libextract_ps_la_LDFLAGS = $(module_flags)
 libextract_ps_la_LIBADD = 						\
-	$(GLIB2_LIBS) 							\
-	$(top_builddir)/src/libtracker-common/libtracker-common.la
+	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
+	$(GLIB2_LIBS)
 
 # Totem
 libextract_totem_la_SOURCES = tracker-extract-totem.c
@@ -159,6 +159,6 @@
 
 tracker_extract_LDADD = 						\
 	$(top_builddir)/src/libtracker-common/libtracker-common.la	\
-	$(GLIB2_LIBS)							\
+	$(GMODULE_LIBS)							\
 	$(GTHREAD_LIBS)							\
-	$(GMODULE_LIBS)
+	$(GLIB2_LIBS)

Modified: trunk/src/trackerd/tracker-monitor.c
==============================================================================
--- trunk/src/trackerd/tracker-monitor.c	(original)
+++ trunk/src/trackerd/tracker-monitor.c	Thu Oct  2 11:38:50 2008
@@ -897,11 +897,10 @@
 							  &is_directory);
 
 		switch (event_type) {
-		case IN_MOVE_SELF:
 		case IN_MOVED_FROM:
 		case IN_DELETE:
 		case IN_DELETE_SELF:
-			/* So we new the source, but not the
+			/* So we knew the source, but not the
 			 * target location for the event.
 			 */
 			g_signal_emit (monitor,
@@ -1111,7 +1110,6 @@
 				       is_directory);
 			break;
 
-		case IN_MOVE_SELF:
 		case IN_MOVED_FROM:
 		case IN_DELETE:
 		case IN_DELETE_SELF:
@@ -1174,6 +1172,12 @@
 				       is_directory);
 			break;
 
+		case IN_MOVE_SELF:
+			/* We ignore this one because it is a
+			 * convenience state and we handle the
+			 * MOVE_TO and MOVE_FROM already. 
+			 */
+
 		case IN_Q_OVERFLOW:
 		case IN_OPEN:
 		case IN_CLOSE_NOWRITE: