[glib-networking/gnutls426debug: 4/4] Revert "Allow static build of modules"

[Michael Catanzaro <mcatanzaro src gnome org>]

commit cf897f8b6aab0d64edad330c942f79aee109866b
Author: Michael Catanzaro <mcatanzaro igalia com>
Date:   Mon Apr 16 10:32:23 2018 -0500

    Revert "Allow static build of modules"
    
    This reverts commit 293b10ce2834559f7fe08586b336d8c6672bab96.

 proxy/gnome/gnome-proxy-module.c   |    6 +++---
 proxy/gnome/gproxyresolvergnome.c  |    2 --
 proxy/libproxy/glibproxyresolver.c |    2 --
 proxy/libproxy/libproxy-module.c   |    6 +++---
 tls/gnutls/gnutls-module.c         |    6 +++---
 tls/gnutls/gtlsbackend-gnutls.c    |    8 +-------
 6 files changed, 10 insertions(+), 20 deletions(-)
---
diff --git a/proxy/gnome/gnome-proxy-module.c b/proxy/gnome/gnome-proxy-module.c
index 497a740..a984d94 100644
--- a/proxy/gnome/gnome-proxy-module.c
+++ b/proxy/gnome/gnome-proxy-module.c
@@ -27,7 +27,7 @@
 
 
 void
-g_io_gnomeproxy_load (GIOModule *module)
+g_io_module_load (GIOModule *module)
 {
   gchar *locale_dir;
 #ifdef G_OS_WIN32
@@ -50,12 +50,12 @@ g_io_gnomeproxy_load (GIOModule *module)
 }
 
 void
-g_io_gnomeproxy_unload (GIOModule *module)
+g_io_module_unload (GIOModule *module)
 {
 }
 
 gchar **
-g_io_gnomeproxy_query (void)
+g_io_module_query (void)
 {
   gchar *eps[] = {
     G_PROXY_RESOLVER_EXTENSION_POINT_NAME,
diff --git a/proxy/gnome/gproxyresolvergnome.c b/proxy/gnome/gproxyresolvergnome.c
index 50b63cd..c7bdf5f 100644
--- a/proxy/gnome/gproxyresolvergnome.c
+++ b/proxy/gnome/gproxyresolvergnome.c
@@ -539,8 +539,6 @@ void
 g_proxy_resolver_gnome_register (GIOModule *module)
 {
   g_proxy_resolver_gnome_register_type (G_TYPE_MODULE (module));
-  if (module == NULL)
-    g_io_extension_point_register (G_PROXY_RESOLVER_EXTENSION_POINT_NAME);
   g_io_extension_point_implement (G_PROXY_RESOLVER_EXTENSION_POINT_NAME,
                                   g_proxy_resolver_gnome_get_type(),
                                   "gnome",
diff --git a/proxy/libproxy/glibproxyresolver.c b/proxy/libproxy/glibproxyresolver.c
index 402d5a3..2895c7a 100644
--- a/proxy/libproxy/glibproxyresolver.c
+++ b/proxy/libproxy/glibproxyresolver.c
@@ -233,8 +233,6 @@ void
 g_libproxy_resolver_register (GIOModule *module)
 {
   g_libproxy_resolver_register_type (G_TYPE_MODULE (module));
-  if (module == NULL)
-    g_io_extension_point_register (G_PROXY_RESOLVER_EXTENSION_POINT_NAME);
   g_io_extension_point_implement (G_PROXY_RESOLVER_EXTENSION_POINT_NAME,
                                   g_libproxy_resolver_get_type(),
                                   "libproxy",
diff --git a/proxy/libproxy/libproxy-module.c b/proxy/libproxy/libproxy-module.c
index 8fcaf9e..da780d3 100644
--- a/proxy/libproxy/libproxy-module.c
+++ b/proxy/libproxy/libproxy-module.c
@@ -29,7 +29,7 @@
 
 
 void
-g_io_libproxy_load (GIOModule *module)
+g_io_module_load (GIOModule *module)
 {
   gchar *locale_dir;
 #ifdef G_OS_WIN32
@@ -52,12 +52,12 @@ g_io_libproxy_load (GIOModule *module)
 }
 
 void
-g_io_libproxy_unload (GIOModule *module)
+g_io_module_unload (GIOModule *module)
 {
 }
 
 gchar **
-g_io_libproxy_query (void)
+g_io_module_query (void)
 {
   gchar *eps[] = {
     G_PROXY_RESOLVER_EXTENSION_POINT_NAME,
diff --git a/tls/gnutls/gnutls-module.c b/tls/gnutls/gnutls-module.c
index 3ebf0d4..25bc6ef 100644
--- a/tls/gnutls/gnutls-module.c
+++ b/tls/gnutls/gnutls-module.c
@@ -32,7 +32,7 @@
 
 
 void
-g_io_gnutls_load (GIOModule *module)
+g_io_module_load (GIOModule *module)
 {
   gchar *locale_dir;
 #ifdef G_OS_WIN32
@@ -58,12 +58,12 @@ g_io_gnutls_load (GIOModule *module)
 }
 
 void
-g_io_gnutls_unload (GIOModule *module)
+g_io_module_unload (GIOModule *module)
 {
 }
 
 gchar **
-g_io_gnutls_query (void)
+g_io_module_query (void)
 {
   gchar *eps[] = {
     G_TLS_BACKEND_EXTENSION_POINT_NAME,
diff --git a/tls/gnutls/gtlsbackend-gnutls.c b/tls/gnutls/gtlsbackend-gnutls.c
index d060f37..498e5b2 100644
--- a/tls/gnutls/gtlsbackend-gnutls.c
+++ b/tls/gnutls/gtlsbackend-gnutls.c
@@ -60,8 +60,6 @@ gtls_log_func (int level, const char *msg)
 static gpointer
 gtls_gnutls_init (gpointer data)
 {
-  GTypePlugin *plugin;
-
   gnutls_global_init ();
 
 #ifdef GTLS_GNUTLS_DEBUG
@@ -70,9 +68,7 @@ gtls_gnutls_init (gpointer data)
 #endif
 
   /* Leak the module to keep it from being unloaded. */
-  plugin = g_type_get_plugin (G_TYPE_TLS_BACKEND_GNUTLS);
-  if (plugin != NULL)
-    g_type_plugin_use (plugin);
+  g_type_plugin_use (g_type_get_plugin (G_TYPE_TLS_BACKEND_GNUTLS));
   return NULL;
 }
 
@@ -318,8 +314,6 @@ void
 g_tls_backend_gnutls_register (GIOModule *module)
 {
   g_tls_backend_gnutls_register_type (G_TYPE_MODULE (module));
-  if (module == NULL)
-    g_io_extension_point_register (G_TLS_BACKEND_EXTENSION_POINT_NAME);
   g_io_extension_point_implement (G_TLS_BACKEND_EXTENSION_POINT_NAME,
                                   g_tls_backend_gnutls_get_type(),
                                   "gnutls",