GDBus: Fix up i18n

gio/gcredentials.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
 #include <gobject/gvaluecollector.h>
 
 #include "gcredentials.h"
@@ -34,6 +33,8 @@
 #include <unistd.h>
 #endif
 
+#include "glibintl.h"
+
 /**
  * SECTION:gcredentials
  * @short_description: An object containing credentials

gio/gdbus-tool.c

@@ -22,12 +22,14 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
+#include <string.h>
 
 #include <gio/gio.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include <gi18n.h>
+
 /* ---------------------------------------------------------------------------------------------------- */
 
 G_GNUC_UNUSED static void completion_debug (const gchar *format, ...);

gio/gdbusaddress.c

@@ -23,8 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-
+#include <string.h>
-#include <glib/gi18n.h>
 
 #include "gdbusutils.h"
 #include "gdbusaddress.h"
@@ -36,6 +35,8 @@
 #include <gio/gunixsocketaddress.h>
 #endif
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusaddress
  * @title: D-Bus Addresses

gio/gdbusauth.c

@@ -22,8 +22,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include "gdbusauth.h"
 #include "gdbusauthmechanismanon.h"
 #include "gdbusauthmechanismexternal.h"
@@ -44,6 +42,8 @@
 #include <sys/socket.h>
 #endif
 
+#include "glibintl.h"
+
 #define DEBUG_ENABLED 1
 
 static void

gio/gdbusauthmechanism.c

@@ -22,14 +22,14 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include "gdbusauthmechanism.h"
 #include "gcredentials.h"
 #include "gdbuserror.h"
 #include "gioenumtypes.h"
 #include "giostream.h"
 
+#include "glibintl.h"
+
 /* ---------------------------------------------------------------------------------------------------- */
 
 struct _GDBusAuthMechanismPrivate

gio/gdbusauthmechanismanon.c

@@ -22,12 +22,12 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include "gdbusauthmechanismanon.h"
 #include "gdbuserror.h"
 #include "gioenumtypes.h"
 
+#include "glibintl.h"
+
 struct _GDBusAuthMechanismAnonPrivate
 {
   gboolean is_client;

gio/gdbusauthmechanismexternal.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
+#include <string.h>
 
 #include "gdbusauthmechanismexternal.h"
 #include "gcredentials.h"
@@ -34,6 +34,8 @@
 #include <unistd.h>
 #endif
 
+#include "glibintl.h"
+
 struct _GDBusAuthMechanismExternalPrivate
 {
   gboolean is_client;

gio/gdbusauthmechanismsha1.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
+#include <string.h>
 
 #include "gdbusauthmechanismsha1.h"
 #include "gcredentials.h"
@@ -40,6 +40,8 @@
 
 #include <glib/gstdio.h>
 
+#include "glibintl.h"
+
 struct _GDBusAuthMechanismSha1Private
 {
   gboolean is_client;

gio/gdbusauthobserver.c

@@ -22,14 +22,14 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 #include "gdbusauthobserver.h"
 #include "gio-marshal.h"
 #include "gcredentials.h"
 #include "gioenumtypes.h"
 #include "giostream.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusauthobserver
  * @short_description: Object used for authenticating connections

gio/gdbusconnection.c

@@ -49,20 +49,9 @@
 #include "config.h"
 
 #include <stdlib.h>
-
+#include <string.h>
-#include <glib/gi18n.h>
-
-#ifdef G_OS_UNIX
-#include <gio/gunixconnection.h>
-#include <gio/gunixfdmessage.h>
-#endif
-
-#include <unistd.h>
-#include <sys/types.h>
-#include <stdlib.h>
 
 #include "gdbusauth.h"
-
 #include "gdbusutils.h"
 #include "gdbusaddress.h"
 #include "gdbusmessage.h"
@@ -74,6 +63,20 @@
 #include "gdbusprivate.h"
 #include "gdbusauthobserver.h"
 #include "gio-marshal.h"
+#include "ginitable.h"
+#include "gasyncinitable.h"
+#include "giostream.h"
+#include "gasyncresult.h"
+#include "gsimpleasyncresult.h"
+
+#ifdef G_OS_UNIX
+#include <gio/gunixconnection.h>
+#include <gio/gunixfdmessage.h>
+#include <unistd.h>
+#include <sys/types.h>
+#endif
+
+#include "glibintl.h"
 
 /**
  * SECTION:gdbusconnection

gio/gdbuserror.c

@@ -23,8 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-
+#include <string.h>
-#include <glib/gi18n.h>
 
 #include "gdbuserror.h"
 #include "gioenums.h"
@@ -32,6 +31,8 @@
 #include "gioerror.h"
 #include "gdbusprivate.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbuserror
  * @title: GDBusError

gio/gdbusintrospection.c

@@ -23,11 +23,12 @@
 #include "config.h"
 
 #include <stdlib.h>
-
+#include <string.h>
-#include <glib/gi18n.h>
 
 #include "gdbusintrospection.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusintrospection
  * @title: Introspection XML

gio/gdbusmessage.c

@@ -22,7 +22,7 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
+#include <string.h>
 
 #include "gdbusutils.h"
 #include "gdbusmessage.h"
@@ -44,6 +44,7 @@
 #include <errno.h>
 #endif
 
+#include "glibintl.h"
 
 /**
  * SECTION:gdbusmessage

gio/gdbusmethodinvocation.c

@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
 
 #include "gdbusutils.h"
 #include "gdbusconnection.h"
@@ -33,6 +32,8 @@
 #include "gdbuserror.h"
 #include "gdbusprivate.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusmethodinvocation
  * @short_description: Object for handling remote calls

gio/gdbusnameowning.c

@@ -24,14 +24,14 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
-
 #include "gdbusutils.h"
 #include "gdbusnameowning.h"
 #include "gdbuserror.h"
 #include "gdbusprivate.h"
 #include "gdbusconnection.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusnameowning
  * @title: Owning Bus Names

gio/gdbusnamewatching.c

@@ -23,8 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-
+#include <string.h>
-#include <glib/gi18n.h>
 
 #include "gdbusutils.h"
 #include "gdbusnamewatching.h"
@@ -32,6 +31,8 @@
 #include "gdbusprivate.h"
 #include "gdbusconnection.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusnamewatching
  * @title: Watching Bus Names

gio/gdbusprivate.c

@@ -25,8 +25,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
-
 #ifdef G_OS_UNIX
 #include <gio/gunixconnection.h>
 #include <gio/gunixfdmessage.h>
@@ -35,10 +33,24 @@
 #endif
 
 #include "giotypes.h"
+#include "gsocket.h"
 #include "gdbusprivate.h"
 #include "gdbusmessage.h"
 #include "gdbuserror.h"
 #include "gdbusintrospection.h"
+#include "gasyncresult.h"
+#include "gsimpleasyncresult.h"
+#include "ginputstream.h"
+#include "giostream.h"
+#include "gsocketcontrolmessage.h"
+
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#include "gunixfdmessage.h"
+#include "gunixconnection.h"
+#endif
+
+#include "glibintl.h"
 
 /* ---------------------------------------------------------------------------------------------------- */
 

gio/gdbusproxy.c

@@ -23,7 +23,8 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <string.h>
+
 #include <gobject/gvaluecollector.h>
 
 #include "gdbusutils.h"
@@ -39,6 +40,8 @@
 #include "gasyncresult.h"
 #include "gsimpleasyncresult.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusproxy
  * @short_description: Base class for proxies

gio/gdbusproxywatching.c

@@ -24,8 +24,6 @@
 
 #include <stdlib.h>
 
-#include <glib/gi18n.h>
-
 #include "gdbusutils.h"
 #include "gdbusnamewatching.h"
 #include "gdbusproxywatching.h"
@@ -35,6 +33,8 @@
 #include "gdbusnamewatching.h"
 #include "gcancellable.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusproxywatching
  * @title: Watching Proxies

gio/gdbusserver.c

@@ -23,14 +23,9 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
+#include <string.h>
-#include <unistd.h>
 #include <errno.h>
 
-#ifdef G_OS_UNIX
-#include <gio/gunixsocketaddress.h>
-#endif
-
 #include "giotypes.h"
 #include "gdbusaddress.h"
 #include "gdbusutils.h"
@@ -40,6 +35,15 @@
 #include "gdbusprivate.h"
 #include "gdbusauthobserver.h"
 #include "gio-marshal.h"
+#include "ginitable.h"
+#include "gsocketservice.h"
+
+#ifdef G_OS_UNIX
+#include <unistd.h>
+#include "gunixsocketaddress.h"
+#endif
+
+#include "glibintl.h"
 
 /**
  * SECTION:gdbusserver

gio/gdbusutils.c

@@ -25,10 +25,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <glib/gi18n.h>
-
 #include "gdbusutils.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusutils
  * @title: D-Bus Utilities

gio/gunixcredentialsmessage.c

@@ -31,8 +31,6 @@
 
 #include "config.h"
 
-#include <glib/gi18n.h>
-
 /* ---------------------------------------------------------------------------------------------------- */
 #ifdef __linux__
 
@@ -58,6 +56,8 @@
 #include "gunixcredentialsmessage.h"
 #include "gcredentials.h"
 
+#include "glibintl.h"
+
 struct _GUnixCredentialsMessagePrivate
 {
   GCredentials *credentials;