From 9350af560c7316c7acd9eadf2457690b9d3b4200 Mon Sep 17 00:00:00 2001
From: Sam Thursfield <sam@afuera.me.uk>
Date: Thu, 30 Jul 2020 17:53:51 +0200
Subject: libtracker-sparql: Don't expose internal db interface errors

We should not return TrackerDBInterfaceError, from the internal
libtracker-data library, from public functions in libtracker-sparql.

This problem is noticable as we register D-Bus error codes only for the
public TrackerSparqlError type.

Before, apps would show error messages like this:

    GDBus.Error:org.gtk.GDBus.UnmappedGError.Quark._tracker_2ddb_2dinterface_2derror_2dquark.Code0: example error message

After this patch, the error is:

     GDBus.Error:org.freedesktop.Tracker.Error.QueryFailed: example error message
---
 .../reference/libtracker-sparql/libtracker-sparql-docs.xml |  1 +
 .../libtracker-sparql/libtracker-sparql-sections.txt       | 14 ++++++++++----
 docs/reference/libtracker-sparql/libtracker-sparql.types   |  1 -
 3 files changed, 11 insertions(+), 5 deletions(-)

(limited to 'docs')

diff --git a/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml b/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml
index 473376198..4b5793f77 100644
--- a/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml
+++ b/docs/reference/libtracker-sparql/libtracker-sparql-docs.xml
@@ -38,6 +38,7 @@
     <xi:include href="xml/tracker-endpoint.xml"/>
     <xi:include href="xml/tracker-misc.xml"/>
     <xi:include href="xml/tracker-version.xml"/>
+    <xi:include href="xml/tracker-sparql-error.xml"/>
   </part>
 
   <part id="base-ontology">
diff --git a/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt b/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
index e7480374d..e78d96b0a 100644
--- a/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
+++ b/docs/reference/libtracker-sparql/libtracker-sparql-sections.txt
@@ -98,7 +98,6 @@ TRACKER_TYPE_NAMESPACE_MANAGER
 <SECTION>
 <FILE>tracker-sparql-connection</FILE>
 <TITLE>TrackerSparqlConnection</TITLE>
-TrackerSparqlError
 TrackerSparqlConnection
 TrackerSparqlConnectionFlags
 tracker_sparql_connection_new
@@ -136,14 +135,21 @@ TRACKER_TYPE_SPARQL_VALUE_TYPE
 tracker_sparql_connection_get_type
 TRACKER_TYPE_SPARQL_CONNECTION_FLAGS
 tracker_sparql_connection_flags_get_type
-TRACKER_TYPE_SPARQL_ERROR
-tracker_sparql_error_get_type
 <SUBSECTION Private>
 TrackerSparqlConnectionPrivate
-tracker_sparql_error_quark
 tracker_sparql_connection_construct
 </SECTION>
 
+<SECTION>
+<FILE>tracker-sparql-error</FILE>
+<TITLE>TrackerSparqlError</TITLE>
+TrackerSparqlError
+<SUBSECTION Standard>
+TRACKER_TYPE_SPARQL_ERROR
+<SUBSECTION Private>
+tracker_sparql_error_quark
+</SECTION>
+
 <SECTION>
 <FILE>tracker-sparql-statement</FILE>
 <TITLE>TrackerSparqlStatement</TITLE>
diff --git a/docs/reference/libtracker-sparql/libtracker-sparql.types b/docs/reference/libtracker-sparql/libtracker-sparql.types
index 51cfb2ea4..21681e1ee 100644
--- a/docs/reference/libtracker-sparql/libtracker-sparql.types
+++ b/docs/reference/libtracker-sparql/libtracker-sparql.types
@@ -10,5 +10,4 @@ tracker_resource_get_type
 tracker_sparql_connection_get_type
 tracker_sparql_connection_flags_get_type
 tracker_sparql_cursor_get_type
-tracker_sparql_error_get_type
 tracker_sparql_statement_get_type
-- 
cgit v1.2.1