[tracker/tracker-0.6] Secondary fixes to initial patch for NB140966 after testing

[Martyn James Russell <mr src gnome org>]

commit b193128f51e52cdb4a1d3918a8618d24a390a198
Author: Martyn Russell <martyn lanedo com>
Date:   Thu Oct 1 17:37:28 2009 +0100

    Secondary fixes to initial patch for NB140966 after testing

 src/trackerd/tracker-monitor.c   |   12 ++++++++++--
 src/trackerd/tracker-processor.c |    7 ++++---
 2 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/src/trackerd/tracker-monitor.c b/src/trackerd/tracker-monitor.c
index ecf75fd..1967c6b 100644
--- a/src/trackerd/tracker-monitor.c
+++ b/src/trackerd/tracker-monitor.c
@@ -1231,7 +1231,11 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 				       other_file,
 				       is_directory, 
 				       TRUE);
-			tracker_monitor_update (monitor, module_name, file, other_file);
+
+			if (is_directory) {
+				tracker_monitor_update (monitor, module_name, file, other_file);
+			}
+
 			g_hash_table_remove (monitor->private->event_pairs,
 					     GUINT_TO_POINTER (cookie));
 		}
@@ -1295,7 +1299,11 @@ libinotify_monitor_event_cb (INotifyHandle *handle,
 				       file,
 				       is_directory,
 				       is_source_indexed);
-			tracker_monitor_update (monitor, module_name, other_file, file);
+
+			if (is_directory) {
+				tracker_monitor_update (monitor, module_name, other_file, file);
+			}
+
 			g_hash_table_remove (monitor->private->event_pairs,
 					     GUINT_TO_POINTER (cookie));
 		}
diff --git a/src/trackerd/tracker-processor.c b/src/trackerd/tracker-processor.c
index 1cb1ee7..ed076d6 100644
--- a/src/trackerd/tracker-processor.c
+++ b/src/trackerd/tracker-processor.c
@@ -826,8 +826,9 @@ item_queue_handlers_cb (gpointer user_data)
 						continue;
 					}
 					
-					strv_from[j++] = path_from;
-					strv_to[j++] = path_to;
+					strv_from[j] = path_from;
+					strv_to[j] = path_to;
+					j++;
 				}
 				
 				strv_from[j] = NULL;
@@ -835,7 +836,7 @@ item_queue_handlers_cb (gpointer user_data)
 
 				g_message ("Queue for module:'%s' moved items processed, sending first %d to the indexer",
 					   module_name,
-					   max_items);
+					   j);
 				
 				processor->private->finished_indexer = FALSE;