[tracker/writeback-refactor-rebase] libtracker-miner: Fix #ifndefs for priority-queue, sparql-buffer and task-pool

[Martyn James Russell <mr src gnome org>]

commit 0a260362a6c32c381d10d820559f903036388b1c
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Jul 26 17:11:28 2011 +0100

    libtracker-miner: Fix #ifndefs for priority-queue, sparql-buffer and task-pool
    
    This is a consistency fix.

 src/libtracker-miner/tracker-priority-queue.h |    6 +++---
 src/libtracker-miner/tracker-sparql-buffer.h  |    9 +++++----
 src/libtracker-miner/tracker-task-pool.h      |    8 +++-----
 3 files changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/src/libtracker-miner/tracker-priority-queue.h b/src/libtracker-miner/tracker-priority-queue.h
index 7426e10..067dd69 100644
--- a/src/libtracker-miner/tracker-priority-queue.h
+++ b/src/libtracker-miner/tracker-priority-queue.h
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_PRIORITY_QUEUE_H__
-#define __TRACKER_PRIORITY_QUEUE_H__
+#ifndef __LIBTRACKER_MINER_PRIORITY_QUEUE_H__
+#define __LIBTRACKER_MINER_PRIORITY_QUEUE_H__
 
 #include <glib.h>
 
@@ -61,4 +61,4 @@ gpointer tracker_priority_queue_pop     (TrackerPriorityQueue *queue,
 
 G_END_DECLS
 
-#endif /* __TRACKER_PRIORITY_QUEUE_H__ */
+#endif /* __LIBTRACKER_TRACKER_PRIORITY_QUEUE_H__ */
diff --git a/src/libtracker-miner/tracker-sparql-buffer.h b/src/libtracker-miner/tracker-sparql-buffer.h
index 919ad9a..dd9ba8a 100644
--- a/src/libtracker-miner/tracker-sparql-buffer.h
+++ b/src/libtracker-miner/tracker-sparql-buffer.h
@@ -17,13 +17,14 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_SPARQL_BUFFER_H__
-#define __TRACKER_SPARQL_BUFFER_H__
+#ifndef __LIBTRACKER_MINER_SPARQL_BUFFER_H__
+#define __LIBTRACKER_MINER_SPARQL_BUFFER_H__
 
-#include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
+
 #include <libtracker-sparql/tracker-sparql.h>
+
 #include "tracker-task-pool.h"
 
 G_BEGIN_DECLS
@@ -81,4 +82,4 @@ TrackerTask *        tracker_sparql_task_new_bulk            (GFile
 
 G_END_DECLS
 
-#endif /* __TRACKER_METADATA_EXTRACT_POOL_H__ */
+#endif /* __LIBTRACKER_MINER_SPARQL_BUFFER_H__ */
diff --git a/src/libtracker-miner/tracker-task-pool.h b/src/libtracker-miner/tracker-task-pool.h
index fff5537..391d38c 100644
--- a/src/libtracker-miner/tracker-task-pool.h
+++ b/src/libtracker-miner/tracker-task-pool.h
@@ -17,10 +17,9 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_TASK_POOL_H__
-#define __TRACKER_TASK_POOL_H__
+#ifndef __LIBTRACKER_MINER_TASK_POOL_H__
+#define __LIBTRACKER_MINER_TASK_POOL_H__
 
-#include <glib.h>
 #include <glib-object.h>
 #include <gio/gio.h>
 
@@ -86,7 +85,6 @@ void          tracker_task_unref       (TrackerTask    *task);
 gpointer      tracker_task_get_data    (TrackerTask    *task);
 
 
-
 G_END_DECLS
 
-#endif /* __TRACKER_TASK_POOL_H__ */
+#endif /* __LIBTRACKER_MINER_TASK_POOL_H__ */