[tracker/libtracker-miner: 2/2] Fix compile without HAL or DeviceKit

[Adrien Bustany <abustany src gnome org>]

commit 2560da2f1e0a044511d4130b7a9022adec834c9a
Author: Adrien Bustany <madcat mymadcat com>
Date:   Mon Sep 7 19:48:32 2009 -0400

    Fix compile without HAL or DeviceKit

 src/tracker-miner-fs/tracker-indexer.c |   57 ++++++++++++++++++--------------
 1 files changed, 32 insertions(+), 25 deletions(-)
---
diff --git a/src/tracker-miner-fs/tracker-indexer.c b/src/tracker-miner-fs/tracker-indexer.c
index bf951fd..220f602 100644
--- a/src/tracker-miner-fs/tracker-indexer.c
+++ b/src/tracker-miner-fs/tracker-indexer.c
@@ -412,7 +412,7 @@ schedule_flush (TrackerIndexer *indexer,
 							    indexer);
 }
 
-void 
+void
 tracker_indexer_transaction_commit (TrackerIndexer *indexer)
 {
 	stop_transaction (indexer);
@@ -477,6 +477,13 @@ notify_on_battery_cb (GObject *gobject,
 	set_up_throttle (TRACKER_INDEXER (user_data));
 }
 
+#else
+
+static void
+set_up_throttle (TrackerIndexer *indexer)
+{
+}
+
 #endif /* HAVE_HAL || HAVE_DEVKIT_POWER */
 
 static void
@@ -1047,7 +1054,7 @@ indexer_constructed (GObject *object)
 
 	set_up_throttle (indexer);
 
-	tracker_status_init (indexer->private->config, 
+	tracker_status_init (indexer->private->config,
 			     indexer->private->power);
 
 #ifdef HAVE_HAL
@@ -1280,7 +1287,7 @@ tracker_indexer_init (TrackerIndexer *indexer)
 	/* Set up volume monitor */
 	priv->volume_monitor = g_volume_monitor_get ();
 	g_signal_connect (priv->volume_monitor, "mount-pre-unmount",
-			  G_CALLBACK (mount_pre_unmount_cb), 
+			  G_CALLBACK (mount_pre_unmount_cb),
 			  indexer);
 }
 
@@ -1412,7 +1419,7 @@ item_add_or_update (TrackerIndexer        *indexer,
 		start_transaction (indexer);
 	}
 
-	g_debug ("Adding item '%s'", 
+	g_debug ("Adding item '%s'",
 		 uri);
 
 	item_add_to_datasource (indexer, uri, info->module_file, sparql);
@@ -1441,13 +1448,13 @@ item_add_or_update (TrackerIndexer        *indexer,
 
 #ifdef HAVE_HAL
 	if (tracker_storage_uri_is_on_removable_device (indexer->private->storage,
-							uri, 
+							uri,
 							&mount_point,
 							NULL)) {
 
-		tracker_removable_device_add_metadata (indexer, 
-						       mount_point, 
-						       uri, 
+		tracker_removable_device_add_metadata (indexer,
+						       mount_point,
+						       uri,
 						       sparql);
 	}
 #endif
@@ -1560,21 +1567,21 @@ item_move (TrackerIndexer  *indexer,
 
 #ifdef HAVE_HAL
 	if (tracker_storage_uri_is_on_removable_device (indexer->private->storage,
-							source_uri, 
+							source_uri,
 							&mount_point,
 							NULL) ) {
 		if (tracker_storage_uri_is_on_removable_device (indexer->private->storage,
-								uri, 
+								uri,
 								NULL,
 								NULL) ) {
 
-			tracker_removable_device_add_move (indexer, 
-							   mount_point, 
-							   source_uri, 
+			tracker_removable_device_add_move (indexer,
+							   mount_point,
+							   source_uri,
 							   uri);
 		} else {
-			tracker_removable_device_add_removal (indexer, 
-							      mount_point, 
+			tracker_removable_device_add_removal (indexer,
+							      mount_point,
 							      source_uri);
 		}
 
@@ -1599,7 +1606,7 @@ item_remove (TrackerIndexer *indexer,
 	gchar *mount_point = NULL;
 	gchar *sparql;
 
-	g_debug ("Removing item: '%s' (no metadata was given by module)", 
+	g_debug ("Removing item: '%s' (no metadata was given by module)",
 		 uri);
 
 	if (G_UNLIKELY (!indexer->private->in_transaction)) {
@@ -1632,7 +1639,7 @@ item_remove (TrackerIndexer *indexer,
 
 #ifdef HAVE_HAL
 	if (tracker_storage_uri_is_on_removable_device (indexer->private->storage,
-							uri, 
+							uri,
 							&mount_point,
 							NULL)) {
 
@@ -1893,7 +1900,7 @@ process_module (TrackerIndexer *indexer,
 
 #ifdef FIX
 	dirs = tracker_module_config_get_monitor_recurse_directories (module_name);
-#else 
+#else
 	dirs = NULL;
 #endif
 
@@ -1964,7 +1971,7 @@ process_func (gpointer data)
 
 			/* Signal stopped and clean up */
 			check_stopped (indexer, FALSE);
-			
+
 			return FALSE;
 		}
 
@@ -1991,7 +1998,7 @@ TrackerIndexer *
 tracker_indexer_new (TrackerConfig  *config,
 		     TrackerStorage *storage)
 {
-	return g_object_new (TRACKER_TYPE_INDEXER, 
+	return g_object_new (TRACKER_TYPE_INDEXER,
 			     "config", config,
 			     "storage", storage,
 			     NULL);
@@ -2069,7 +2076,7 @@ state_to_string (TrackerIndexerState state)
 	gchar   *str, *p;
 
 	s = g_string_new ("");
-	
+
 	if (state & TRACKER_INDEXER_STATE_INDEX_OVERLOADED) {
 		s = g_string_append (s, "INDEX_OVERLOADED | ");
 	}
@@ -2087,7 +2094,7 @@ state_to_string (TrackerIndexerState state)
 	if (p) {
 		/* Go back one to the space before '|' */
 		p--;
-		
+
 		/* NULL terminate here */
 		*p = '\0';
 	}
@@ -2281,7 +2288,7 @@ tracker_indexer_file_move (TrackerIndexer	  *indexer,
 /* TODO: Fix volume handling in tracker-store / tracker-indexer */
 
 #if 0
-void            
+void
 tracker_indexer_volume_disable_all (TrackerIndexer         *indexer,
 				    DBusGMethodInvocation  *context,
 				    GError                **error)
@@ -2320,7 +2327,7 @@ tracker_indexer_volume_update_state (TrackerIndexer         *indexer,
 	tracker_dbus_request_new (request_id,
 				  "DBus request to update volume "
 				  "UUID:'%s', path:'%s', enabled:%s",
-				  volume_uuid, 
+				  volume_uuid,
 				  path,
 				  enabled ? "yes" : "no");
 
@@ -2330,7 +2337,7 @@ tracker_indexer_volume_update_state (TrackerIndexer         *indexer,
 		tracker_data_update_disable_volume (volume_uuid);
 	}
 
-	/* tracker_turtle_process_ttl will be spinning the mainloop, therefore 
+	/* tracker_turtle_process_ttl will be spinning the mainloop, therefore
 	   we can already return the DBus method */
 
 	dbus_g_method_return (context);