[tracker] Fixes NB#179798: Wrong detection of ignored directory as a directory

[Aleksander Morgado <aleksm src gnome org>]

commit 4136af51496349a83e8e1c1b05d6c3898c03f7f5
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Wed Jul 14 10:43:48 2010 +0200

    Fixes NB#179798: Wrong detection of ignored directory as a directory

 src/libtracker-miner/tracker-monitor.c |   28 ++++++++++++++++++++--------
 1 files changed, 20 insertions(+), 8 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 6aa00a2..1cb52fa 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -739,15 +739,27 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 
 	/* Get URIs as paths may not be in UTF-8 */
 	file_uri = g_file_get_uri (file);
-	other_file_uri = other_file ? g_file_get_uri (other_file) : NULL;
 
-	g_debug ("Received monitor event:%d->'%s' for file:'%s' and other file:'%s'",
-	         event_type,
-	         monitor_event_to_string (event_type),
-	         file_uri,
-	         other_file_uri ? other_file_uri : "");
-
-	is_directory = check_is_directory (monitor, file);
+	if (!other_file) {
+		other_file_uri = NULL;
+		g_debug ("Received monitor event:%d (%s) for file:'%s'",
+		         event_type,
+		         monitor_event_to_string (event_type),
+		         file_uri);
+		is_directory = check_is_directory (monitor, file);
+	} else {
+		other_file_uri = g_file_get_uri (other_file);
+		g_debug ("Received monitor event:%d (%s) for files '%s'->'%s'",
+		         event_type,
+		         monitor_event_to_string (event_type),
+		         file_uri,
+		         other_file_uri);
+
+		/* If we have other_file, it means an item was moved from file to other_file;
+		 * so, it makes sense to check if the other_file is directory instead of
+		 * the origin file, as this one will not exist any more */
+		is_directory = check_is_directory (monitor, other_file);
+	}
 
 #ifdef PAUSE_ON_IO
 	if (monitor->private->unpause_timeout_id != 0) {