[tracker/miner-fs-monitor-created-event-fixes: 1/3] libtracker-miner: minor coding style changes

[Aleksander Morgado <aleksm src gnome org>]

commit 02fd710f7a71dd8b4c5b7d9596790879786770b6
Author: Aleksander Morgado <aleksander lanedo com>
Date:   Wed Jan 19 14:35:55 2011 +0100

    libtracker-miner: minor coding style changes

 src/libtracker-miner/tracker-monitor.c |   80 +++++++++++++++++++++-----------
 1 files changed, 53 insertions(+), 27 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-monitor.c b/src/libtracker-miner/tracker-monitor.c
index 08c5fe7..302bd8a 100644
--- a/src/libtracker-miner/tracker-monitor.c
+++ b/src/libtracker-miner/tracker-monitor.c
@@ -717,23 +717,22 @@ event_pairs_process_in_ht (TrackerMonitor *monitor,
 		EventData *event_data = value;
 		glong seconds;
 
+		/* Event didn't expire yet, keep it */
 		seconds = now->tv_sec - event_data->start_time.tv_sec;
-
-		if (seconds < 2) {
+		if (seconds < 2)
 			continue;
-		} else {
-			g_debug ("Event '%s' for URI '%s' has timed out (%ld seconds have elapsed)",
-			         monitor_event_to_string (event_data->event_type),
-			         event_data->file_uri,
-			         seconds);
-			/* STEAL the item from the HT, so that disposal methods
-			 * for key and value are not called. */
-			g_hash_table_iter_steal (&iter);
-			/* Unref the key, as no longer needed */
-			g_object_unref (key);
-			/* Add the expired event to our temp list */
-			expired_events = g_list_append (expired_events, event_data);
-		}
+
+		g_debug ("Event '%s' for URI '%s' has timed out (%ld seconds have elapsed)",
+		         monitor_event_to_string (event_data->event_type),
+		         event_data->file_uri,
+		         seconds);
+		/* STEAL the item from the HT, so that disposal methods
+		 * for key and value are not called. */
+		g_hash_table_iter_steal (&iter);
+		/* Unref the key, as no longer needed */
+		g_object_unref (key);
+		/* Add the expired event to our temp list */
+		expired_events = g_list_append (expired_events, event_data);
 	}
 
 	for (l = expired_events; l; l = g_list_next (l)) {
@@ -772,10 +771,10 @@ event_pairs_timeout_cb (gpointer user_data)
 
 static void
 monitor_event_cb (GFileMonitor	    *file_monitor,
-                  GFile		    *file,
-                  GFile		    *other_file,
+                  GFile	            *file,
+                  GFile	            *other_file,
                   GFileMonitorEvent  event_type,
-                  gpointer	     user_data)
+                  gpointer           user_data)
 {
 	TrackerMonitor *monitor;
 	gchar *file_uri;
@@ -840,7 +839,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 			 */
 			g_hash_table_replace (monitor->private->pre_update,
 			                      g_object_ref (file),
-			                      event_data_new (file, NULL, FALSE, event_type));
+			                      event_data_new (file,
+			                                      NULL,
+			                                      FALSE,
+			                                      G_FILE_MONITOR_EVENT_CREATED));
 			break;
 		}
 
@@ -904,7 +906,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 				/* Insert new update item in cache */
 				g_hash_table_insert (monitor->private->pre_update,
 				                     g_object_ref (file),
-				                     event_data_new (file, NULL, FALSE, event_type));
+				                     event_data_new (file,
+				                                     NULL,
+				                                     FALSE,
+				                                     G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT));
 			}
 #else
 			/* If no blacklisting desired, emit event right away */
@@ -914,7 +919,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 			} else {
 				EventData *new_event;
 
-				new_event = event_data_new (file, NULL, FALSE, event_type);
+				new_event = event_data_new (file,
+				                            NULL,
+				                            FALSE,
+				                            G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT);
 				emit_signal_for_event (monitor, new_event);
 				event_data_free (new_event);
 			}
@@ -946,7 +954,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 			}
 #endif /* ENABLE_FILE_BLACKLISTING */
 
-			new_event = event_data_new (file, NULL, FALSE, event_type);
+			new_event = event_data_new (file,
+			                            NULL,
+			                            FALSE,
+			                            G_FILE_MONITOR_EVENT_DELETED);
 			emit_signal_for_event (monitor, new_event);
 			event_data_free (new_event);
 			break;
@@ -1012,7 +1023,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 			}
 #endif /* ENABLE_FILE_BLACKLISTING */
 
-			new_event = event_data_new (file, other_file, FALSE, event_type);
+			new_event = event_data_new (file,
+			                            other_file,
+			                            FALSE,
+			                            G_FILE_MONITOR_EVENT_MOVED);
 			emit_signal_for_event (monitor, new_event);
 			event_data_free (new_event);
 			break;
@@ -1044,7 +1058,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 			if (!g_hash_table_lookup (monitor->private->pre_update, file)) {
 				g_hash_table_insert (monitor->private->pre_update,
 				                     g_object_ref (file),
-				                     event_data_new (file, NULL, TRUE, event_type));
+				                     event_data_new (file,
+				                                     NULL,
+				                                     TRUE,
+				                                     event_type));
 			}
 
 			break;
@@ -1077,7 +1094,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 				/* If no previous, add to HT */
 				g_hash_table_replace (monitor->private->pre_delete,
 				                      g_object_ref (file),
-				                      event_data_new (file, NULL, TRUE, event_type));
+				                      event_data_new (file,
+				                                      NULL,
+				                                      TRUE,
+				                                      G_FILE_MONITOR_EVENT_DELETED));
 			}
 
 			break;
@@ -1100,7 +1120,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 			    previous_delete_event_data->event_type == G_FILE_MONITOR_EVENT_DELETED) {
 				EventData *new_event;
 
-				new_event = event_data_new (file, other_file, TRUE, G_FILE_MONITOR_EVENT_MOVED);
+				new_event = event_data_new (file,
+				                            other_file,
+				                            TRUE,
+				                            G_FILE_MONITOR_EVENT_MOVED);
 				g_debug ("Processing DELETE(A) + MOVE(A->B) as MOVE(A->B) for directory '%s->%s'",
 				         new_event->file_uri,
 				         new_event->other_file_uri);
@@ -1114,7 +1137,10 @@ monitor_event_cb (GFileMonitor	    *file_monitor,
 				/* If no previous, add to HT */
 				g_hash_table_replace (monitor->private->pre_delete,
 				                      g_object_ref (file),
-				                      event_data_new (file, other_file, TRUE, event_type));
+				                      event_data_new (file,
+				                                      other_file,
+				                                      TRUE,
+				                                      G_FILE_MONITOR_EVENT_MOVED));
 			}
 
 			break;