[glib-networking] Make GTlsDatabaseGnutlsPkcs11 inherit directly from GTlsDatabase

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 8f8f47b95f2da675f839cf133b9687eac3b6dfe8
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Sun Mar 4 19:52:08 2018 -0600

    Make GTlsDatabaseGnutlsPkcs11 inherit directly from GTlsDatabase
    
    This is pretty weird, because GTlsDatabaseGnutlsPkcs11 is no longer a
    GTlsDatabaseGnutls, but this is not meant to be the final state of
    things. This is just to avoid breaking GTlsDatabaseGnutlsPkcs11 with the
    massive changes that are about to land to GTlsDatabaseGnutls.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=753260

 tls/gnutls/gtlsdatabase-gnutls-pkcs11.c |    4 ++--
 tls/gnutls/gtlsdatabase-gnutls-pkcs11.h |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c b/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c
index 118e7d2..b9a09b6 100644
--- a/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c
+++ b/tls/gnutls/gtlsdatabase-gnutls-pkcs11.c
@@ -53,7 +53,7 @@ static void g_tls_database_gnutls_pkcs11_initable_iface_init (GInitableIface *if
 
 struct _GTlsDatabaseGnutlsPkcs11
 {
-  GTlsDatabaseGnutls parent_instance;
+  GTlsDatabase parent_instance;
 
   /* no changes after construction */
   CK_FUNCTION_LIST **modules;
@@ -62,7 +62,7 @@ struct _GTlsDatabaseGnutlsPkcs11
 };
 
 G_DEFINE_TYPE_WITH_CODE (GTlsDatabaseGnutlsPkcs11, g_tls_database_gnutls_pkcs11,
-                         G_TYPE_TLS_DATABASE_GNUTLS,
+                         G_TYPE_TLS_DATABASE,
                          G_IMPLEMENT_INTERFACE (G_TYPE_INITABLE,
                                                 g_tls_database_gnutls_pkcs11_initable_iface_init));
 
diff --git a/tls/gnutls/gtlsdatabase-gnutls-pkcs11.h b/tls/gnutls/gtlsdatabase-gnutls-pkcs11.h
index 7ae710b..cd7a52d 100644
--- a/tls/gnutls/gtlsdatabase-gnutls-pkcs11.h
+++ b/tls/gnutls/gtlsdatabase-gnutls-pkcs11.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 
 #define G_TYPE_TLS_DATABASE_GNUTLS_PKCS11            (g_tls_database_gnutls_pkcs11_get_type ())
 
-G_DECLARE_FINAL_TYPE (GTlsDatabaseGnutlsPkcs11, g_tls_database_gnutls_pkcs11, G, TLS_DATABASE_GNUTLS_PKCS11, 
GTlsDatabaseGnutls)
+G_DECLARE_FINAL_TYPE (GTlsDatabaseGnutlsPkcs11, g_tls_database_gnutls_pkcs11, G, TLS_DATABASE_GNUTLS_PKCS11, 
GTlsDatabase)
 
 GTlsDatabase*                g_tls_database_gnutls_pkcs11_new                   (GError **error);