[glibmm] Gio: Correct TlsDatabase/TlsFileDatbase derivation.

[Murray Cumming <murrayc src gnome org>]

commit 6b966ecb0435775f6a7f84dece93b779b7ee42d3
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Mar 26 11:20:41 2013 +0100

    Gio: Correct TlsDatabase/TlsFileDatbase derivation.
    
        * gio/src/tlsdatabase.hg:
        * gio/src/tlsfiledatabase.hg: TlsFileDatabase
        should derive from TlsDatabase, not the other
        way around. However, we do not use TlsFileDatabase,
        and it is odd (an interface that requires a
        non-interface other than GObject) so maybe we should
        not provide it yet anyway.

 ChangeLog                  |   12 ++++++++++++
 gio/src/tlsdatabase.hg     |    4 +---
 gio/src/tlsfiledatabase.hg |    8 ++++++--
 3 files changed, 19 insertions(+), 5 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 30be934..9da95d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2013-03-25  Murray Cumming  <murrayc murrayc com>
 
+       Gio: Correct TlsDatabase/TlsFileDatbase derivation.
+
+       * gio/src/tlsdatabase.hg:
+       * gio/src/tlsfiledatabase.hg: TlsFileDatabase
+       should derive from TlsDatabase, not the other
+       way around. However, we do not use TlsFileDatabase,
+       and it is odd (an interface that requires a
+       non-interface other than GObject) so maybe we should
+       not provide it yet anyway.
+
+2013-03-25  Murray Cumming  <murrayc murrayc com>
+
        Gio: Add some TODOs about changing the base classes.
 
        * gio/src/actionmap.hg
diff --git a/gio/src/tlsdatabase.hg b/gio/src/tlsdatabase.hg
index 4653eb2..3b2a425 100644
--- a/gio/src/tlsdatabase.hg
+++ b/gio/src/tlsdatabase.hg
@@ -18,7 +18,6 @@
 #include <glibmm/object.h>
 #include <giomm/asyncresult.h>
 #include <giomm/enums.h>
-#include <giomm/tlsfiledatabase.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/object_p.h)
@@ -51,10 +50,9 @@ class TlsInteraction;
  * It is used internally by TlsConnection.
  * @newin{2,36}
  */
-class TlsDatabase : public Glib::Object, public TlsFileDatabase
+class TlsDatabase : public Glib::Object
 {
   _CLASS_GOBJECT(TlsDatabase, GTlsDatabase, G_TLS_DATABASE, Glib::Object, GObject)
-  _IMPLEMENTS_INTERFACE(TlsFileDatabase)
 
 protected:
   _CTOR_DEFAULT
diff --git a/gio/src/tlsfiledatabase.hg b/gio/src/tlsfiledatabase.hg
index 3a92906..6b67abe 100644
--- a/gio/src/tlsfiledatabase.hg
+++ b/gio/src/tlsfiledatabase.hg
@@ -15,10 +15,12 @@
  * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <giomm/tlsdatabase.h>
 #include <glibmm/interface.h>
 
 _DEFS(giomm,gio)
 _PINCLUDE(glibmm/private/interface_p.h)
+_PINCLUDE(giomm/private/tlsdatabase_p.h)
 _PINCLUDE(gio/gio.h)
 
 #ifndef DOXYGEN_SHOULD_SKIP_THIS
@@ -30,11 +32,13 @@ namespace Gio
 
 /** TlsFileDatabase - TLS file based database type.
  * TlsFileDatabase is implemented by TlsDatabase objects which load their
- * certificate information from a file. It is in interface which TLS library
+ * certificate information from a file. It is an interface which TLS library
  * specific subtypes implement.
  * @newin{2,36}
  */
-class TlsFileDatabase : public Glib::Interface
+class TlsFileDatabase
+: public Glib::Interface,
+  public TlsDatabase
 {
   _CLASS_INTERFACE(TlsFileDatabase, GTlsFileDatabase, G_TLS_FILE_DATABASE, GTlsFileDatabaseInterface)