tracker r2948 - in trunk: . src/libtracker-common

[mr svn gnome org]

Author: mr
Date: Fri Feb 20 09:21:10 2009
New Revision: 2948
URL: http://svn.gnome.org/viewvc/tracker?rev=2948&view=rev

Log:
	* src/libtracker-common/tracker-dbus.[ch]:
	* src/libtracker-common/tracker-field.h:
	* src/libtracker-common/tracker-ontology.h:
	* src/libtracker-common/tracker-parser.h:
	* src/libtracker-common/tracker-service.h: Fixed the #defines for
	these headers so they don't possibly conflict with same name
	headers in the future.


Modified:
   trunk/ChangeLog
   trunk/src/libtracker-common/tracker-dbus.c
   trunk/src/libtracker-common/tracker-dbus.h
   trunk/src/libtracker-common/tracker-field.h
   trunk/src/libtracker-common/tracker-ontology.h
   trunk/src/libtracker-common/tracker-parser.h
   trunk/src/libtracker-common/tracker-service.h

Modified: trunk/src/libtracker-common/tracker-dbus.c
==============================================================================
--- trunk/src/libtracker-common/tracker-dbus.c	(original)
+++ trunk/src/libtracker-common/tracker-dbus.c	Fri Feb 20 09:21:10 2009
@@ -19,10 +19,10 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#include "tracker-dbus.h"
-
 #include <gio/gio.h>
 
+#include "tracker-dbus.h"
+
 struct TrackerDBusRequestHandler {
 	TrackerDBusRequestFunc new;
 	TrackerDBusRequestFunc done;

Modified: trunk/src/libtracker-common/tracker-dbus.h
==============================================================================
--- trunk/src/libtracker-common/tracker-dbus.h	(original)
+++ trunk/src/libtracker-common/tracker-dbus.h	Fri Feb 20 09:21:10 2009
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __LIBTRACKER_DBUS_H__
-#define __LIBTRACKER_DBUS_H__
+#ifndef __LIBTRACKER_COMMON_DBUS_H__
+#define __LIBTRACKER_COMMON_DBUS_H__
 
 #if !defined (__LIBTRACKER_COMMON_INSIDE__) && !defined (TRACKER_COMPILATION)
 #error "only <libtracker-common/tracker-common.h> must be included directly."
@@ -123,4 +123,4 @@
 
 G_END_DECLS
 
-#endif /* __LIBTRACKER_DBUS_H__ */
+#endif /* __LIBTRACKER_COMMON_DBUS_H__ */

Modified: trunk/src/libtracker-common/tracker-field.h
==============================================================================
--- trunk/src/libtracker-common/tracker-field.h	(original)
+++ trunk/src/libtracker-common/tracker-field.h	Fri Feb 20 09:21:10 2009
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_FIELD_H__
-#define __TRACKERD_FIELD_H__
+#ifndef __LIBTRACKER_COMMON_FIELD_H__
+#define __LIBTRACKER_COMMON_FIELD_H__
 
 #include <glib-object.h>
 
@@ -112,5 +112,5 @@
 
 G_END_DECLS
 
-#endif /* __TRACKERD_FIELD_H__ */
+#endif /* __LIBTRACKER_COMMON_FIELD_H__ */
 

Modified: trunk/src/libtracker-common/tracker-ontology.h
==============================================================================
--- trunk/src/libtracker-common/tracker-ontology.h	(original)
+++ trunk/src/libtracker-common/tracker-ontology.h	Fri Feb 20 09:21:10 2009
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_ONTOLOGY_H__
-#define __TRACKERD_ONTOLOGY_H__
+#ifndef __LIBTRACKER_COMMON_ONTOLOGY_H__
+#define __LIBTRACKER_COMMON_ONTOLOGY_H__
 
 #include <glib-object.h>
 
@@ -81,5 +81,5 @@
 
 G_END_DECLS
 
-#endif /* __TRACKERD_ONTOLOGY_H__ */
+#endif /* __LIBTRACKER_COMMON_ONTOLOGY_H__ */
 

Modified: trunk/src/libtracker-common/tracker-parser.h
==============================================================================
--- trunk/src/libtracker-common/tracker-parser.h	(original)
+++ trunk/src/libtracker-common/tracker-parser.h	Fri Feb 20 09:21:10 2009
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_PARSER_H__
-#define __TRACKERD_PARSER_H__
+#ifndef __LIBTRACKER_TRACKER_COMMON_PARSER_H__
+#define __LIBTRACKER_TRACKER_COMMON_PARSER_H__
 
 #include <glib.h>
 

Modified: trunk/src/libtracker-common/tracker-service.h
==============================================================================
--- trunk/src/libtracker-common/tracker-service.h	(original)
+++ trunk/src/libtracker-common/tracker-service.h	Fri Feb 20 09:21:10 2009
@@ -19,8 +19,8 @@
  * Boston, MA  02110-1301, USA.
  */
 
-#ifndef __TRACKERD_SERVICES_H__
-#define __TRACKERD_SERVICES_H__
+#ifndef __LIBTRACKER_COMMON_SERVICES_H__
+#define __LIBTRACKER_COMMON_SERVICES_H__
 
 #include <glib-object.h>
 
@@ -116,5 +116,5 @@
 
 G_END_DECLS
 
-#endif /* __TRACKERD_SERVICE_H__ */
+#endif /* __LIBTRACKER_COMMON_SERVICE_H__ */