libnm*: fix library gettext usage

Libraries need to include <gi18n-lib.h>, not <gi18n.h>, so that _()
will get defined to "dgettext (GETTEXT_DOMAIN, string)" rather than
"gettext (string)" (which will use the program's default domain, which
works fine for programs in the NetworkManager tree, but not for
external users). Likewise, we need to call bindtextdomain() so that
gettext can find the translations if the library is installed in a
different prefix from the program using it (and
bind_textdomain_codeset(), so it will know the translations are in
UTF-8 even if the locale isn't).

(The fact that no one noticed this was broken before is because the
libraries didn't really start returning useful translated strings much
until 0.9.10, and none of the out-of-tree clients have been updated to
actually show those strings to users yet.)

19 files changed, 19 insertions, 19 deletions

diff --git a/libnm/nm-device-adsl.c b/libnm/nm-device-adsl.c
index b509335837..99771548f8 100644
--- a/libnm/nm-device-adsl.c
+++ b/libnm/nm-device-adsl.c
@@ -29,7 +29,7 @@
 #include "nm-setting-connection.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 G_DEFINE_TYPE (NMDeviceAdsl, nm_device_adsl, NM_TYPE_DEVICE)
 
diff --git a/libnm/nm-device-bond.c b/libnm/nm-device-bond.c
index af6d3d18f7..6bb673233d 100644
--- a/libnm/nm-device-bond.c
+++ b/libnm/nm-device-bond.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-bridge.c b/libnm/nm-device-bridge.c
index 6d5367402e..ce28f2c2f4 100644
--- a/libnm/nm-device-bridge.c
+++ b/libnm/nm-device-bridge.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-bt.c b/libnm/nm-device-bt.c
index 0f949372e8..7752646457 100644
--- a/libnm/nm-device-bt.c
+++ b/libnm/nm-device-bt.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-ethernet.c b/libnm/nm-device-ethernet.c
index a8db0ffc06..be2cb4dc40 100644
--- a/libnm/nm-device-ethernet.c
+++ b/libnm/nm-device-ethernet.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-generic.c b/libnm/nm-device-generic.c
index 93c9dccc9b..3ed0fa7e63 100644
--- a/libnm/nm-device-generic.c
+++ b/libnm/nm-device-generic.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-device-generic.h"
 #include "nm-device-private.h"
diff --git a/libnm/nm-device-infiniband.c b/libnm/nm-device-infiniband.c
index 2d755ba44f..bce8a87aa2 100644
--- a/libnm/nm-device-infiniband.c
+++ b/libnm/nm-device-infiniband.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-modem.c b/libnm/nm-device-modem.c
index a2911f0841..dcbb447a2f 100644
--- a/libnm/nm-device-modem.c
+++ b/libnm/nm-device-modem.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-olpc-mesh.c b/libnm/nm-device-olpc-mesh.c
index b881687ffc..108e533982 100644
--- a/libnm/nm-device-olpc-mesh.c
+++ b/libnm/nm-device-olpc-mesh.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-team.c b/libnm/nm-device-team.c
index e892d827cc..cff1d71849 100644
--- a/libnm/nm-device-team.c
+++ b/libnm/nm-device-team.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-vlan.c b/libnm/nm-device-vlan.c
index 57acb7a8ef..b34b3e14d2 100644
--- a/libnm/nm-device-vlan.c
+++ b/libnm/nm-device-vlan.c
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-wifi.c b/libnm/nm-device-wifi.c
index 493bd79b56..4a19f2e5a5 100644
--- a/libnm/nm-device-wifi.c
+++ b/libnm/nm-device-wifi.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device-wimax.c b/libnm/nm-device-wimax.c
index e400057ab4..f199b669fa 100644
--- a/libnm/nm-device-wimax.c
+++ b/libnm/nm-device-wimax.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include "nm-glib-compat.h"
 
diff --git a/libnm/nm-device.c b/libnm/nm-device.c
index 66e9cc078d..e80ac707d8 100644
--- a/libnm/nm-device.c
+++ b/libnm/nm-device.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gudev/gudev.h>
 
 #include "nm-dbus-interface.h"
diff --git a/libnm/nm-manager.c b/libnm/nm-manager.c
index e0301fd34c..11c4db9f3b 100644
--- a/libnm/nm-manager.c
+++ b/libnm/nm-manager.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <nm-utils.h>
 
 #include "nm-manager.h"
diff --git a/libnm/nm-object.c b/libnm/nm-object.c
index 21a6ad7f8b..f02c09c2e2 100644
--- a/libnm/nm-object.c
+++ b/libnm/nm-object.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <nm-utils.h>
diff --git a/libnm/nm-remote-connection.c b/libnm/nm-remote-connection.c
index 0c5370588f..3afe7f8eb9 100644
--- a/libnm/nm-remote-connection.c
+++ b/libnm/nm-remote-connection.c
@@ -23,7 +23,7 @@
 
 #include <string.h>
 #include <gio/gio.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 
 #include <nm-dbus-interface.h>
 #include <nm-utils.h>
diff --git a/libnm/nm-remote-settings.c b/libnm/nm-remote-settings.c
index 633d25dba9..d37e366617 100644
--- a/libnm/nm-remote-settings.c
+++ b/libnm/nm-remote-settings.c
@@ -22,7 +22,7 @@
 #include "config.h"
 
 #include <string.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <nm-dbus-interface.h>
 #include <nm-connection.h>
 
diff --git a/libnm/nm-vpn-plugin-old.c b/libnm/nm-vpn-plugin-old.c
index c4d7de4326..e6843f7e18 100644
--- a/libnm/nm-vpn-plugin-old.c
+++ b/libnm/nm-vpn-plugin-old.c
@@ -29,7 +29,7 @@
 #include <signal.h>
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gio/gio.h>
 
 #include "nm-glib-compat.h"