tracker r2663 - in trunk: . src/tracker-indexer

[carlosg svn gnome org]

Author: carlosg
Date: Fri Dec  5 08:58:43 2008
New Revision: 2663
URL: http://svn.gnome.org/viewvc/tracker?rev=2663&view=rev

Log:
2008-12-05  Carlos Garnacho  <carlos imendio com>

        * src/tracker-indexer/tracker-module.h: Added, all-in-one header for
        developing tracker indexer modules.
        * src/tracker-indexer/Makefile.am: Install that new header.

        * src/tracker-indexer/tracker-module-file.h:
        * src/tracker-indexer/tracker-module-iteratable.h:
        * src/tracker-indexer/tracker-module-metadata-utils.h:
        * src/tracker-indexer/tracker-module-metadata.h: Prevent these files
        to be included directly from external modules. Only tracker-module.h
        should be included.

Added:
   trunk/src/tracker-indexer/tracker-module.h
      - copied, changed from r2662, /trunk/src/tracker-indexer/tracker-module-metadata-utils.h
Modified:
   trunk/ChangeLog
   trunk/src/tracker-indexer/Makefile.am
   trunk/src/tracker-indexer/tracker-module-file.h
   trunk/src/tracker-indexer/tracker-module-iteratable.h
   trunk/src/tracker-indexer/tracker-module-metadata-utils.h
   trunk/src/tracker-indexer/tracker-module-metadata.h

Modified: trunk/src/tracker-indexer/Makefile.am
==============================================================================
--- trunk/src/tracker-indexer/Makefile.am	(original)
+++ trunk/src/tracker-indexer/Makefile.am	Fri Dec  5 08:58:43 2008
@@ -26,6 +26,7 @@
 	tracker-module-metadata.c
 
 libtracker_moduleinclude_HEADERS =					\
+	tracker-module.h						\
 	tracker-module-file.h						\
 	tracker-module-iteratable.h					\
 	tracker-module-metadata-utils.h					\

Modified: trunk/src/tracker-indexer/tracker-module-file.h
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-file.h	(original)
+++ trunk/src/tracker-indexer/tracker-module-file.h	Fri Dec  5 08:58:43 2008
@@ -26,6 +26,11 @@
 
 G_BEGIN_DECLS
 
+#if !defined (__TRACKER_MODULE_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-module/tracker-module.h> must be included directly."
+#endif
+
+
 #define TRACKER_TYPE_MODULE_FILE         (tracker_module_file_get_type())
 #define TRACKER_MODULE_FILE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MODULE_FILE, TrackerModuleFile))
 #define TRACKER_MODULE_FILE_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_MODULE_FILE, TrackerModuleFileClass))

Modified: trunk/src/tracker-indexer/tracker-module-iteratable.h
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-iteratable.h	(original)
+++ trunk/src/tracker-indexer/tracker-module-iteratable.h	Fri Dec  5 08:58:43 2008
@@ -25,6 +25,11 @@
 
 G_BEGIN_DECLS
 
+#if !defined (__TRACKER_MODULE_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-module/tracker-module.h> must be included directly."
+#endif
+
+
 #define TRACKER_TYPE_MODULE_ITERATABLE         (tracker_module_iteratable_get_type ())
 #define TRACKER_MODULE_ITERATABLE(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MODULE_ITERATABLE, TrackerModuleIteratable))
 #define TRACKER_IS_MODULE_ITERATABLE(o)        (G_TYPE_CHECK_INSTANCE_TYPE ((o), TRACKER_TYPE_MODULE_ITERATABLE))

Modified: trunk/src/tracker-indexer/tracker-module-metadata-utils.h
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-metadata-utils.h	(original)
+++ trunk/src/tracker-indexer/tracker-module-metadata-utils.h	Fri Dec  5 08:58:43 2008
@@ -22,11 +22,16 @@
 #ifndef __TRACKER_METADATA_UTILS_H__
 #define __TRACKER_METADATA_UTILS_H__
 
-#include <libtracker-data/tracker-data-metadata.h>
-#include <tracker-indexer/tracker-module-file.h>
+#include "tracker-module-metadata.h"
+#include "tracker-module-file.h"
 
 G_BEGIN_DECLS
 
+#if !defined (__TRACKER_MODULE_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-module/tracker-module.h> must be included directly."
+#endif
+
+
 TrackerModuleMetadata *tracker_module_metadata_utils_get_data (GFile *file);
 gchar *		       tracker_module_metadata_utils_get_text (GFile *file);
 

Modified: trunk/src/tracker-indexer/tracker-module-metadata.h
==============================================================================
--- trunk/src/tracker-indexer/tracker-module-metadata.h	(original)
+++ trunk/src/tracker-indexer/tracker-module-metadata.h	Fri Dec  5 08:58:43 2008
@@ -27,6 +27,11 @@
 
 G_BEGIN_DECLS
 
+#if !defined (__TRACKER_MODULE_INSIDE__) && !defined (TRACKER_COMPILATION)
+#error "only <libtracker-module/tracker-module.h> must be included directly."
+#endif
+
+
 #define TRACKER_TYPE_MODULE_METADATA	     (tracker_module_metadata_get_type())
 #define TRACKER_MODULE_METADATA(o)	     (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_MODULE_METADATA, TrackerModuleMetadata))
 #define TRACKER_MODULE_METADATA_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c),    TRACKER_TYPE_MODULE_METADATA, TrackerModuleMetadataClass))

Copied: trunk/src/tracker-indexer/tracker-module.h (from r2662, /trunk/src/tracker-indexer/tracker-module-metadata-utils.h)
==============================================================================
--- /trunk/src/tracker-indexer/tracker-module-metadata-utils.h	(original)
+++ trunk/src/tracker-indexer/tracker-module.h	Fri Dec  5 08:58:43 2008
@@ -1,8 +1,8 @@
 /* -*- 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
-
+ * Copyright (C) 2008, Nokia (urho konttori nokia com)
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public
  * License as published by the Free Software Foundation; either
@@ -19,17 +19,20 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKER_METADATA_UTILS_H__
-#define __TRACKER_METADATA_UTILS_H__
+#ifndef __TRACKER_MODULE_H__
+#define __TRACKER_MODULE_H__
 
-#include <libtracker-data/tracker-data-metadata.h>
-#include <tracker-indexer/tracker-module-file.h>
+#include <glib.h>
 
 G_BEGIN_DECLS
 
-TrackerModuleMetadata *tracker_module_metadata_utils_get_data (GFile *file);
-gchar *		       tracker_module_metadata_utils_get_text (GFile *file);
+#define __TRACKER_MODULE_INSIDE__
+
+#include "tracker-module-file.h"
+#include "tracker-module-iteratable.h"
+#include "tracker-module-metadata.h"
+#include "tracker-module-metadata-utils.h"
 
-G_END_DECLS
+#undef __TRACKER_MODULE_INSIDE__
 
-#endif /* __TRACKER_METADATA_UTILS_H__ */
+#endif /* __TRACKER_MODULE_H__ */