Rename some symbols to use lower glib-2.0 version

Change-Id: If7ddb341658a98e96b8992c987eee846cc037bc7

diff --git a/glib-networking.map b/glib-networking.map
index 2418609..4aee4ec 100644 (file)
--- a/glib-networking.map
+++ b/glib-networking.map
@@ -1,8 +1,8 @@
 {
 global:
-  g_io_*_load;
-  g_io_*_unload;
-  g_io_*_query;
+  g_io_module_load;
+  g_io_module_unload;
+  g_io_module_query;
   _gnutls_global_init_skip;
 local:
   *;

diff --git a/proxy/gnome/gnome-proxy-module.c b/proxy/gnome/gnome-proxy-module.c
index b125810..665a878 100644 (file)
--- a/proxy/gnome/gnome-proxy-module.c
+++ b/proxy/gnome/gnome-proxy-module.c
@@ -27,7 +27,7 @@
 
 
 G_MODULE_EXPORT 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)
 }
 
 G_MODULE_EXPORT void
-g_io_gnomeproxy_unload (GIOModule *module)
+g_io_module_unload (GIOModule *module)
 {
 }
 
 G_MODULE_EXPORT gchar **
-g_io_gnomeproxy_query (void)
+g_io_module_query (void)
 {
   gchar *eps[] = {
     G_PROXY_RESOLVER_EXTENSION_POINT_NAME,

diff --git a/proxy/libproxy/libproxy-module.c b/proxy/libproxy/libproxy-module.c
index 8fcaf9e..da780d3 100644 (file)
--- 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 8dd09ca..d3e921d 100644 (file)
--- a/tls/gnutls/gnutls-module.c
+++ b/tls/gnutls/gnutls-module.c
@@ -31,7 +31,7 @@
 
 
 G_MODULE_EXPORT void
-g_io_gnutls_load (GIOModule *module)
+g_io_module_load (GIOModule *module)
 {
   gchar *locale_dir;
 #ifdef G_OS_WIN32
@@ -54,12 +54,12 @@ g_io_gnutls_load (GIOModule *module)
 }
 
 G_MODULE_EXPORT void
-g_io_gnutls_unload (GIOModule *module)
+g_io_module_unload (GIOModule *module)
 {
 }
 
 G_MODULE_EXPORT gchar **
-g_io_gnutls_query (void)
+g_io_module_query (void)
 {
   gchar *eps[] = {
     G_TLS_BACKEND_EXTENSION_POINT_NAME,

diff --git a/tls/openssl/openssl-module.c b/tls/openssl/openssl-module.c
index 3b6c84c..efb9090 100644 (file)
--- a/tls/openssl/openssl-module.c
+++ b/tls/openssl/openssl-module.c
@@ -31,7 +31,7 @@
 
 
 G_MODULE_EXPORT void
-g_io_openssl_load (GIOModule *module)
+g_io_module_load (GIOModule *module)
 {
   gchar *locale_dir;
 #ifdef G_OS_WIN32
@@ -54,12 +54,12 @@ g_io_openssl_load (GIOModule *module)
 }
 
 G_MODULE_EXPORT void
-g_io_openssl_unload (GIOModule *module)
+g_io_module_unload (GIOModule *module)
 {
 }
 
 G_MODULE_EXPORT gchar **
-g_io_openssl_query (void)
+g_io_module_query (void)
 {
   return g_strsplit (G_TLS_BACKEND_EXTENSION_POINT_NAME, "!", -1);
 }