[tracker/libtracker-miner] Fix build issues

[Martyn James Russell <mr src gnome org>]

commit 920ca527f13ebb75f5780d03301543a460ae1880
Author: Martyn Russell <martyn imendio com>
Date:   Fri Jul 31 12:17:09 2009 +0100

    Fix build issues

 src/libtracker-miner/tracker-dbus.c          |    5 +++--
 src/libtracker-miner/tracker-miner-crawler.c |    6 ++++--
 src/libtracker-miner/tracker-miner-crawler.h |    2 ++
 src/libtracker-miner/tracker-miner-dbus.h    |    4 +++-
 src/libtracker-miner/tracker-miner.c         |    4 ++--
 src/libtracker-miner/tracker-miner.h         |    5 ++---
 src/tracker-miner-fs/tracker-miner.c         |    6 +++---
 src/tracker-miner-fs/tracker-miner.h         |   12 ++++++------
 8 files changed, 25 insertions(+), 19 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-dbus.c b/src/libtracker-miner/tracker-dbus.c
index c6f4e44..fe09a59 100644
--- a/src/libtracker-miner/tracker-dbus.c
+++ b/src/libtracker-miner/tracker-dbus.c
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
  * Copyright (C) 2008, Nokia
  *
  * This library is free software; you can redistribute it and/or
@@ -19,8 +18,10 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include <string.h>
 #include "config.h"
+
+#include <string.h>
+
 #include "tracker-dbus.h"
 #include "tracker-miner-dbus.h"
 #include "tracker-miner-glue.h"
diff --git a/src/libtracker-miner/tracker-miner-crawler.c b/src/libtracker-miner/tracker-miner-crawler.c
index 8679f83..1a6aeb1 100644
--- a/src/libtracker-miner/tracker-miner-crawler.c
+++ b/src/libtracker-miner/tracker-miner-crawler.c
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
  * Copyright (C) 2008, Nokia
 
  * This library is free software; you can redistribute it and/or
@@ -19,10 +18,13 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include "config.h"
+
+#include <libtracker-common/tracker-storage.h>
+
 #include "tracker-miner-crawler.h"
 #include "tracker-config.h"
 #include "tracker-processor.h"
-#include <libtracker-common/tracker-storage.h>
 
 #define TRACKER_MINER_CRAWLER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_MINER_CRAWLER, TrackerMinerCrawlerPrivate))
 
diff --git a/src/libtracker-miner/tracker-miner-crawler.h b/src/libtracker-miner/tracker-miner-crawler.h
index f72f270..b435cb4 100644
--- a/src/libtracker-miner/tracker-miner-crawler.h
+++ b/src/libtracker-miner/tracker-miner-crawler.h
@@ -22,6 +22,8 @@
 #ifndef __TRACKER_MINER_CRAWLER_H__
 #define __TRACKER_MINER_CRAWLER_H__
 
+#include "config.h"
+
 #include "tracker-miner.h"
 
 G_BEGIN_DECLS
diff --git a/src/libtracker-miner/tracker-miner-dbus.h b/src/libtracker-miner/tracker-miner-dbus.h
index b2967f0..9088d86 100644
--- a/src/libtracker-miner/tracker-miner-dbus.h
+++ b/src/libtracker-miner/tracker-miner-dbus.h
@@ -1,6 +1,5 @@
 /* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
 /*
- * Copyright (C) 2006, Mr Jamie McCracken (jamiemcc gnome org)
  * Copyright (C) 2008, Nokia
 
  * This library is free software; you can redistribute it and/or
@@ -24,6 +23,9 @@
 
 #include <glib-object.h>
 
+#include "tracker-dbus.h"
+#include "tracker-miner.h"
+
 G_BEGIN_DECLS
 
 void tracker_miner_pause  (TrackerMiner           *miner,
diff --git a/src/libtracker-miner/tracker-miner.c b/src/libtracker-miner/tracker-miner.c
index e97b1e4..f28f51e 100644
--- a/src/libtracker-miner/tracker-miner.c
+++ b/src/libtracker-miner/tracker-miner.c
@@ -19,10 +19,10 @@
  * Boston, MA  02110-1301, USA.
  */
 
+#include <libtracker/tracker.h>
+
 #include "tracker-miner.h"
-#include "tracker-dbus.h"
 #include "tracker-miner-dbus.h"
-#include <libtracker/tracker.h>
 
 #define TRACKER_MINER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TRACKER_TYPE_MINER, TrackerMinerPrivate))
 
diff --git a/src/libtracker-miner/tracker-miner.h b/src/libtracker-miner/tracker-miner.h
index b87488b..6afebd3 100644
--- a/src/libtracker-miner/tracker-miner.h
+++ b/src/libtracker-miner/tracker-miner.h
@@ -57,9 +57,8 @@ struct TrackerMinerClass {
 
 GType    tracker_miner_get_type    (void) G_GNUC_CONST;
 
-G_CONST_RETURN gchar * tracker_miner_get_name (TrackerMiner *miner);
-
-void                   tracker_miner_start    (TrackerMiner *miner);
+G_CONST_RETURN gchar *tracker_miner_get_name (TrackerMiner           *miner);
+void                  tracker_miner_start    (TrackerMiner           *miner);
 
 
 G_END_DECLS
diff --git a/src/tracker-miner-fs/tracker-miner.c b/src/tracker-miner-fs/tracker-miner.c
index ee5fa2c..15d4a56 100644
--- a/src/tracker-miner-fs/tracker-miner.c
+++ b/src/tracker-miner-fs/tracker-miner.c
@@ -159,9 +159,9 @@ tracker_miner_pause (TrackerMiner	    *miner,
 }
 
 void
-tracker_miner_continue (TrackerMiner	       *miner,
-			DBusGMethodInvocation  *context,
-			GError		      **error)
+tracker_miner_resume (TrackerMiner	       *miner,
+		      DBusGMethodInvocation  *context,
+		      GError		      **error)
 {
 	TrackerMinerPrivate *priv;
 	guint request_id;
diff --git a/src/tracker-miner-fs/tracker-miner.h b/src/tracker-miner-fs/tracker-miner.h
index 7b044e4..e3e9f5a 100644
--- a/src/tracker-miner-fs/tracker-miner.h
+++ b/src/tracker-miner-fs/tracker-miner.h
@@ -62,12 +62,12 @@ TrackerMiner *tracker_miner_new      (TrackerIndexer *indexer);
 
 
 /* DBus methods */
-void          tracker_miner_pause    (TrackerMiner           *miner,
-				      DBusGMethodInvocation  *context,
-				      GError                **error);
-void          tracker_miner_continue (TrackerMiner           *miner,
-				      DBusGMethodInvocation  *context,
-				      GError                **error);
+void          tracker_miner_pause  (TrackerMiner           *miner,
+				    DBusGMethodInvocation  *context,
+				    GError                **error);
+void          tracker_miner_resume (TrackerMiner           *miner,
+				    DBusGMethodInvocation  *context,
+				    GError                **error);
 
 G_END_DECLS