Merge branch 'master' into 'master'

Add G_BEGIN/END_DECLS to remaining headers included from tracker-sparql.h

See merge request GNOME/tracker!403

10 files changed, 40 insertions, 0 deletions

diff --git a/src/libtracker-sparql/tracker-batch.h b/src/libtracker-sparql/tracker-batch.h
index 16e6a1099..352771642 100644
--- a/src/libtracker-sparql/tracker-batch.h
+++ b/src/libtracker-sparql/tracker-batch.h
@@ -29,6 +29,8 @@
 #include <libtracker-sparql/tracker-resource.h>
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 #define TRACKER_TYPE_BATCH tracker_batch_get_type ()
 
 TRACKER_AVAILABLE_IN_ALL
@@ -67,4 +69,6 @@ gboolean tracker_batch_execute_finish (TrackerBatch  *batch,
                                        GAsyncResult  *res,
                                        GError       **error);
 
+G_END_DECLS
+
 #endif /* __TRACKER_BATCH_H__ */
diff --git a/src/libtracker-sparql/tracker-connection.h b/src/libtracker-sparql/tracker-connection.h
index d992adbcd..e8969860f 100644
--- a/src/libtracker-sparql/tracker-connection.h
+++ b/src/libtracker-sparql/tracker-connection.h
@@ -29,6 +29,8 @@
 #include <libtracker-sparql/tracker-version.h>
 #include <gio/gio.h>
 
+G_BEGIN_DECLS
+
 /**
  * TrackerSparqlConnectionFlags:
  * @TRACKER_SPARQL_CONNECTION_FLAGS_NONE: No flags.
@@ -210,4 +212,6 @@ gboolean tracker_sparql_connection_close_finish (TrackerSparqlConnection  *conne
                                                  GAsyncResult             *res,
                                                  GError                  **error);
 
+G_END_DECLS
+
 #endif /* __TRACKER_SPARQL_CONNECTION_H__ */
diff --git a/src/libtracker-sparql/tracker-cursor.h b/src/libtracker-sparql/tracker-cursor.h
index 9d57cbf23..ac4bc6355 100644
--- a/src/libtracker-sparql/tracker-cursor.h
+++ b/src/libtracker-sparql/tracker-cursor.h
@@ -26,6 +26,8 @@
 #include <gio/gio.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 /**
  * TrackerSparqlCursor:
  *
@@ -114,4 +116,6 @@ gboolean tracker_sparql_cursor_next_finish (TrackerSparqlCursor  *cursor,
 TRACKER_AVAILABLE_IN_ALL
 void tracker_sparql_cursor_rewind (TrackerSparqlCursor *cursor);
 
+G_END_DECLS
+
 #endif /* __TRACKER_SPARQL_CURSOR_H__ */
diff --git a/src/libtracker-sparql/tracker-endpoint-dbus.h b/src/libtracker-sparql/tracker-endpoint-dbus.h
index 36673ab41..f0ade8a09 100644
--- a/src/libtracker-sparql/tracker-endpoint-dbus.h
+++ b/src/libtracker-sparql/tracker-endpoint-dbus.h
@@ -29,6 +29,8 @@
 #include <libtracker-sparql/tracker-endpoint.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 #define TRACKER_TYPE_ENDPOINT_DBUS         (tracker_endpoint_dbus_get_type())
 #define TRACKER_ENDPOINT_DBUS(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_ENDPOINT_DBUS, TrackerEndpointDBus))
 #define TRACKER_ENDPOINT_DBUS_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_ENDPOINT_DBUS, TrackerEndpointDBusClass))
@@ -57,4 +59,6 @@ tracker_endpoint_dbus_new (TrackerSparqlConnection  *sparql_connection,
                            GCancellable             *cancellable,
                            GError                  **error);
 
+G_END_DECLS
+
 #endif /* __TRACKER_ENDPOINT_DBUS_H__ */
diff --git a/src/libtracker-sparql/tracker-endpoint-http.h b/src/libtracker-sparql/tracker-endpoint-http.h
index e808698b8..97a1c3c65 100644
--- a/src/libtracker-sparql/tracker-endpoint-http.h
+++ b/src/libtracker-sparql/tracker-endpoint-http.h
@@ -29,6 +29,8 @@
 #include <libtracker-sparql/tracker-endpoint.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 #define TRACKER_TYPE_ENDPOINT_HTTP         (tracker_endpoint_http_get_type())
 #define TRACKER_ENDPOINT_HTTP(o)           (G_TYPE_CHECK_INSTANCE_CAST ((o), TRACKER_TYPE_ENDPOINT_HTTP, TrackerEndpointHttp))
 #define TRACKER_ENDPOINT_HTTP_CLASS(c)     (G_TYPE_CHECK_CLASS_CAST ((c), TRACKER_TYPE_ENDPOINT_HTTP, TrackerEndpointHttpClass))
@@ -56,4 +58,6 @@ TrackerEndpointHttp * tracker_endpoint_http_new (TrackerSparqlConnection  *sparq
                                                  GCancellable             *cancellable,
                                                  GError                  **error);
 
+G_END_DECLS
+
 #endif /* TRACKER_ENDPOINT_HTTP_H */
diff --git a/src/libtracker-sparql/tracker-endpoint.h b/src/libtracker-sparql/tracker-endpoint.h
index 237b5b19a..b764f5e35 100644
--- a/src/libtracker-sparql/tracker-endpoint.h
+++ b/src/libtracker-sparql/tracker-endpoint.h
@@ -30,6 +30,8 @@
 #include <libtracker-sparql/tracker-connection.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 /**
  * TrackerEndpoint:
  *
@@ -43,4 +45,6 @@ G_DECLARE_DERIVABLE_TYPE (TrackerEndpoint, tracker_endpoint, TRACKER, ENDPOINT,
 TRACKER_AVAILABLE_IN_ALL
 TrackerSparqlConnection * tracker_endpoint_get_sparql_connection (TrackerEndpoint *endpoint);
 
+G_END_DECLS
+
 #endif /* __TRACKER_ENDPOINT_H__ */
diff --git a/src/libtracker-sparql/tracker-error.h b/src/libtracker-sparql/tracker-error.h
index 7bd16a83e..68c48d094 100644
--- a/src/libtracker-sparql/tracker-error.h
+++ b/src/libtracker-sparql/tracker-error.h
@@ -24,6 +24,8 @@
 #include <gio/gio.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 /**
  * SECTION: tracker-sparql-error
  * @short_description: Error codes
@@ -75,4 +77,6 @@ typedef enum {
 TRACKER_AVAILABLE_IN_ALL
 GQuark tracker_sparql_error_quark (void);
 
+G_END_DECLS
+
 #endif
diff --git a/src/libtracker-sparql/tracker-notifier.h b/src/libtracker-sparql/tracker-notifier.h
index fe4505542..962d03198 100644
--- a/src/libtracker-sparql/tracker-notifier.h
+++ b/src/libtracker-sparql/tracker-notifier.h
@@ -27,6 +27,8 @@
 #include <gio/gio.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 #define TRACKER_TYPE_NOTIFIER (tracker_notifier_get_type ())
 #define TRACKER_TYPE_NOTIFIER_EVENT (tracker_notifier_event_get_type ())
 
@@ -82,4 +84,6 @@ gint64        tracker_notifier_event_get_id         (TrackerNotifierEvent *event
 TRACKER_AVAILABLE_IN_ALL
 const gchar * tracker_notifier_event_get_urn        (TrackerNotifierEvent *event);
 
+G_END_DECLS
+
 #endif /* __TRACKER_NOTIFIER_H__ */
diff --git a/src/libtracker-sparql/tracker-statement.h b/src/libtracker-sparql/tracker-statement.h
index 9e4d26af4..a25a593a0 100644
--- a/src/libtracker-sparql/tracker-statement.h
+++ b/src/libtracker-sparql/tracker-statement.h
@@ -26,6 +26,8 @@
 #include <gio/gio.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 /**
  * TrackerSparqlStatement:
  *
@@ -88,4 +90,6 @@ TrackerSparqlCursor * tracker_sparql_statement_execute_finish (TrackerSparqlStat
 TRACKER_AVAILABLE_IN_ALL
 void tracker_sparql_statement_clear_bindings (TrackerSparqlStatement *stmt);
 
+G_END_DECLS
+
 #endif /* __TRACKER_SPARQL_STATEMENT_H__ */
diff --git a/src/libtracker-sparql/tracker-utils.h b/src/libtracker-sparql/tracker-utils.h
index 36c7d1c8f..b2ff199ec 100644
--- a/src/libtracker-sparql/tracker-utils.h
+++ b/src/libtracker-sparql/tracker-utils.h
@@ -23,6 +23,8 @@
 #include <gio/gio.h>
 #include <libtracker-sparql/tracker-version.h>
 
+G_BEGIN_DECLS
+
 TRACKER_AVAILABLE_IN_ALL
 gchar * tracker_sparql_escape_uri_vprintf (const gchar *format,
                                            va_list      args);
@@ -41,4 +43,6 @@ TRACKER_AVAILABLE_IN_ALL
 GFile *
 tracker_sparql_get_ontology_nepomuk (void);
 
+G_END_DECLS
+
 #endif /* __TRACKER_UTILS_H__ */