[glib-networking] proxy, tls: Setup gettext in g_io_module_load().

[Dan Winship <danw src gnome org>]

commit 2634fa51a0c78db3d8eeb60e30c42bc3e82e8334
Author: Ting-Wei Lan <lantw src gnome org>
Date:   Sat Apr 23 22:25:54 2016 +0800

    proxy, tls: Setup gettext in g_io_module_load().
    
    It is required to properly show error messages on some locales.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=765466

 glib-networking.mk               |    1 +
 proxy/gnome/gnome-proxy-module.c |    4 ++++
 proxy/libproxy/libproxy-module.c |    4 ++++
 tls/gnutls/gnutls-module.c       |    3 +++
 4 files changed, 12 insertions(+), 0 deletions(-)
---
diff --git a/glib-networking.mk b/glib-networking.mk
index 29b6a6a..f6b8253 100644
--- a/glib-networking.mk
+++ b/glib-networking.mk
@@ -6,6 +6,7 @@ giomoduledir = $(GIO_MODULE_DIR)
 
 AM_CPPFLAGS =                          \
        -DG_LOG_DOMAIN=\"GLib-Net\"     \
+       -DLOCALE_DIR=\""$(localedir)"\" \
        -DG_DISABLE_DEPRECATED          \
        $(GLIB_CFLAGS)                  \
        $(NULL)
diff --git a/proxy/gnome/gnome-proxy-module.c b/proxy/gnome/gnome-proxy-module.c
index 88d0a27..9c5b319 100644
--- a/proxy/gnome/gnome-proxy-module.c
+++ b/proxy/gnome/gnome-proxy-module.c
@@ -19,6 +19,8 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
+
 #include "gproxyresolvergnome.h"
 
 
@@ -26,6 +28,8 @@ void
 g_io_module_load (GIOModule *module)
 {
   g_proxy_resolver_gnome_register (module);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }
 
 void
diff --git a/proxy/libproxy/libproxy-module.c b/proxy/libproxy/libproxy-module.c
index 6957644..ec80f0f 100644
--- a/proxy/libproxy/libproxy-module.c
+++ b/proxy/libproxy/libproxy-module.c
@@ -21,6 +21,8 @@
 
 #include "config.h"
 
+#include <glib/gi18n-lib.h>
+
 #include "glibproxyresolver.h"
 
 
@@ -28,6 +30,8 @@ void
 g_io_module_load (GIOModule *module)
 {
   g_libproxy_resolver_register (module);
+  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }
 
 void
diff --git a/tls/gnutls/gnutls-module.c b/tls/gnutls/gnutls-module.c
index 1552c6d..e5bbc8b 100644
--- a/tls/gnutls/gnutls-module.c
+++ b/tls/gnutls/gnutls-module.c
@@ -23,6 +23,7 @@
 #include "config.h"
 
 #include <gio/gio.h>
+#include <glib/gi18n-lib.h>
 
 #include "gtlsbackend-gnutls.h"
 #include "gtlsbackend-gnutls-pkcs11.h"
@@ -35,6 +36,8 @@ g_io_module_load (GIOModule *module)
 #ifdef HAVE_PKCS11
   g_tls_backend_gnutls_pkcs11_register (module);
 #endif
+  bindtextdomain (GETTEXT_PACKAGE, LOCALE_DIR);
+  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
 }
 
 void