tracker r2629 - in branches/turtle: . src/tracker-indexer

[pvanhoof svn gnome org]

Author: pvanhoof
Date: Mon Dec  1 15:28:18 2008
New Revision: 2629
URL: http://svn.gnome.org/viewvc/tracker?rev=2629&view=rev

Log:
2008-12-01  Philip Van Hoof  <philip codeminded be>

	* src/tracker-indexer/tracker-indexer.c: The if-then-else here was just 
	wrong. We were always writing something, even if the removed file was 
	not on a removable device.



Modified:
   branches/turtle/ChangeLog
   branches/turtle/src/tracker-indexer/tracker-indexer.c

Modified: branches/turtle/src/tracker-indexer/tracker-indexer.c
==============================================================================
--- branches/turtle/src/tracker-indexer/tracker-indexer.c	(original)
+++ branches/turtle/src/tracker-indexer/tracker-indexer.c	Mon Dec  1 15:28:18 2008
@@ -1548,22 +1548,25 @@
 	if (tracker_hal_path_is_on_removable_device (indexer->private->hal,
 						     path, 
 						     &mount_point,
-						     NULL) &&
-	    tracker_hal_path_is_on_removable_device (indexer->private->hal,
+						     NULL) ) {
+
+		if (tracker_hal_path_is_on_removable_device (indexer->private->hal,
 						     other_path, 
 						     NULL,
 						     NULL) ) {
 
-		tracker_removable_device_add_move (indexer, 
-						   mount_point, 
-						   path, 
-						   other_path,
-						   tracker_service_get_name (service));
-	} else {
-		tracker_removable_device_add_removal (indexer, 
-						      mount_point, 
-						      path,
-						      tracker_service_get_name (service));
+			tracker_removable_device_add_move (indexer, 
+							   mount_point, 
+							   path, 
+							   other_path,
+							   tracker_service_get_name (service));
+
+		} else {
+			tracker_removable_device_add_removal (indexer, 
+							      mount_point, 
+							      path,
+							      tracker_service_get_name (service));
+		}
 	}
 
 	g_free (mount_point);