[tracker/tracker-0.8] Fixed changes made to cherry-picked f27579c768e2e86c431dcbfac59dfdc51554b5a4

[Martyn James Russell <mr src gnome org>]

commit 9bd3718d52c8e6a9067342066664daca57aaa93f
Author: Martyn Russell <martyn lanedo com>
Date:   Thu May 27 14:44:45 2010 +0100

    Fixed changes made to cherry-picked f27579c768e2e86c431dcbfac59dfdc51554b5a4
    
    upower/devkit #define breakage

 src/miners/fs/tracker-miner-files.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/miners/fs/tracker-miner-files.c b/src/miners/fs/tracker-miner-files.c
index 24eb60a..eb6bd23 100644
--- a/src/miners/fs/tracker-miner-files.c
+++ b/src/miners/fs/tracker-miner-files.c
@@ -73,10 +73,10 @@ struct TrackerMinerFilesPrivate {
 
 	guint low_battery_pause_cookie;
 
-#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
 	TrackerPower *power;
 	gulong finished_handler;
-#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
 
 	DBusGProxy *extractor_proxy;
 
@@ -521,7 +521,7 @@ miner_files_constructed (GObject *object)
 	                  G_CALLBACK (ignore_directories_cb),
 	                  mf);
 
-#if defined(HAVE_UPOWER) || defined(HAVE_HAL)
+#if defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL)
 
 	g_signal_connect (mf->private->config, "notify::index-on-battery",
 	                  G_CALLBACK (index_on_battery_cb),
@@ -530,7 +530,7 @@ miner_files_constructed (GObject *object)
 	                  G_CALLBACK (index_on_battery_cb),
 	                  mf);
 
-#endif /* defined(HAVE_UPOWER) || defined(HAVE_HAL) */
+#endif /* defined(HAVE_DEVKIT_POWER) || defined(HAVE_HAL) */
 
 	g_slist_foreach (mounts, (GFunc) g_free, NULL);
 	g_slist_free (mounts);