[tracker/writeback-refactor-rebase] tracker-extract, writeback: Don't use same #define for headers

[Martyn James Russell <mr src gnome org>]

commit d0dff48652269c12ce89c57c88b09199b717e152
Author: Martyn Russell <martyn lanedo com>
Date:   Tue Jul 26 16:09:29 2011 +0100

    tracker-extract,writeback: Don't use same #define for headers
    
    Both were using __TRACKER_CONTROLLER_H__

 src/tracker-extract/tracker-controller.h  |   16 ++++++++--------
 src/tracker-writeback/tracker-writeback.h |   10 +++++-----
 2 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/src/tracker-extract/tracker-controller.h b/src/tracker-extract/tracker-controller.h
index 67ef5d5..bed9602 100644
--- a/src/tracker-extract/tracker-controller.h
+++ b/src/tracker-extract/tracker-controller.h
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_CONTROLLER_H__
-#define __TRACKER_CONTROLLER_H__
+#ifndef __TRACKER_EXTRACT_CONTROLLER_H__
+#define __TRACKER_EXTRACT_CONTROLLER_H__
 
 #include "tracker-extract.h"
 #include <gio/gio.h>
@@ -46,12 +46,12 @@ struct TrackerControllerClass {
 
 GType               tracker_controller_get_type (void) G_GNUC_CONST;
 
-TrackerController * tracker_controller_new   (TrackerExtract     *extractor,
-                                              guint               shutdown_timeout,
-                                              GError            **error);
-gboolean            tracker_controller_start (TrackerController  *controller,
-                                              GError            **error);
+TrackerController * tracker_controller_new      (TrackerExtract     *extractor,
+                                                 guint               shutdown_timeout,
+                                                 GError            **error);
+gboolean            tracker_controller_start    (TrackerController  *controller,
+                                                 GError            **error);
 
 G_END_DECLS
 
-#endif /* __TRACKER_CONTROLLER_H__ */
+#endif /* __TRACKER_EXTRACT_CONTROLLER_H__ */
diff --git a/src/tracker-writeback/tracker-writeback.h b/src/tracker-writeback/tracker-writeback.h
index 371a947..72342ad 100644
--- a/src/tracker-writeback/tracker-writeback.h
+++ b/src/tracker-writeback/tracker-writeback.h
@@ -17,8 +17,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_CONTROLLER_H__
-#define __TRACKER_CONTROLLER_H__
+#ifndef __TRACKER_WRITEBACK_CONTROLLER_H__
+#define __TRACKER_WRITEBACK_CONTROLLER_H__
 
 #include <gio/gio.h>
 
@@ -48,9 +48,9 @@ struct TrackerControllerClass {
 
 GType               tracker_controller_get_type (void) G_GNUC_CONST;
 
-TrackerController * tracker_controller_new   (guint               shutdown_timeout,
-                                              GError            **error);
+TrackerController * tracker_controller_new      (guint    shutdown_timeout,
+                                                 GError **error);
 
 G_END_DECLS
 
-#endif /* __TRACKER_CONTROLLER_H__ */
+#endif /* __TRACKER_WRITEBACK_CONTROLLER_H__ */