[tracker/miner-web: 55/77] tracker-miner-fs: Fix power management with DeviceKit-power

[Adrien Bustany <abustany src gnome org>]

commit 18d164501bc2a7e098d39fda48aa555791ca656d
Author: Jürg Billeter <j bitron ch>
Date:   Thu Feb 25 17:36:29 2010 +0100

    tracker-miner-fs: Fix power management with DeviceKit-power

 src/tracker-miner-fs/tracker-miner-files.c |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/tracker-miner-fs/tracker-miner-files.c b/src/tracker-miner-fs/tracker-miner-files.c
index f64986f..9c15dd1 100644
--- a/src/tracker-miner-fs/tracker-miner-files.c
+++ b/src/tracker-miner-fs/tracker-miner-files.c
@@ -197,7 +197,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
 	                  G_CALLBACK (mount_point_removed_cb),
 	                  mf);
 
-#ifdef HAVE_HAL
+#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
 	priv->power = tracker_power_new ();
 
 	g_signal_connect (priv->power, "notify::on-low-battery",
@@ -206,7 +206,7 @@ tracker_miner_files_init (TrackerMinerFiles *mf)
 	g_signal_connect (priv->power, "notify::on-battery",
 	                  G_CALLBACK (battery_status_cb),
 	                  mf);
-#endif /* HAVE_HAL */
+#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
 
 	priv->volume_monitor = g_volume_monitor_get ();
 	g_signal_connect (priv->volume_monitor, "mount-pre-unmount",
@@ -291,9 +291,9 @@ miner_files_finalize (GObject *object)
                 g_slist_free (priv->index_single_directories);
         }
 
-#ifdef HAVE_HAL
+#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
 	g_object_unref (priv->power);
-#endif /* HAVE_HAL */
+#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
 
 	g_object_unref (priv->storage);
 
@@ -330,9 +330,9 @@ miner_files_constructed (GObject *object)
 		mounts = tracker_storage_get_removable_device_roots (mf->private->storage);
 	}
 
-#ifdef HAVE_HAL
+#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
 	check_battery_status (mf);
-#endif /* HAVE_HAL */
+#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
 
 	g_message ("Setting up directories to iterate from config (IndexSingleDirectory)");
 
@@ -793,7 +793,7 @@ mount_point_added_cb (TrackerStorage *storage,
 	g_free (urn);
 }
 
-#ifdef HAVE_HAL
+#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
 
 static void
 set_up_throttle (TrackerMinerFiles *mf,
@@ -871,7 +871,7 @@ battery_status_cb (GObject    *object,
 	check_battery_status (mf);
 }
 
-#endif /* HAVE_HAL */
+#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
 
 static void
 mount_pre_unmount_cb (GVolumeMonitor    *volume_monitor,