[glib/gdbus-merge] GDBus: Fix up i18n

[David Zeuthen <davidz src gnome org>]

commit fb1b4599a0effe728f42da8748b469a62f91ed8d
Author: David Zeuthen <davidz redhat com>
Date:   Thu May 6 16:34:23 2010 -0400

    GDBus: Fix up i18n

 gio/gcredentials.c               |    3 ++-
 gio/gdbus-tool.c                 |    4 +++-
 gio/gdbusaddress.c               |    5 +++--
 gio/gdbusauth.c                  |    4 ++--
 gio/gdbusauthmechanism.c         |    4 ++--
 gio/gdbusauthmechanismanon.c     |    4 ++--
 gio/gdbusauthmechanismexternal.c |    4 +++-
 gio/gdbusauthmechanismsha1.c     |    4 +++-
 gio/gdbusauthobserver.c          |    4 ++--
 gio/gdbusconnection.c            |   27 +++++++++++++++------------
 gio/gdbuserror.c                 |    5 +++--
 gio/gdbusintrospection.c         |    5 +++--
 gio/gdbusmessage.c               |    3 ++-
 gio/gdbusmethodinvocation.c      |    3 ++-
 gio/gdbusnameowning.c            |    4 ++--
 gio/gdbusnamewatching.c          |    5 +++--
 gio/gdbusprivate.c               |   16 ++++++++++++++--
 gio/gdbusproxy.c                 |    5 ++++-
 gio/gdbusproxywatching.c         |    4 ++--
 gio/gdbusserver.c                |   16 ++++++++++------
 gio/gdbusutils.c                 |    4 ++--
 gio/gunixcredentialsmessage.c    |    4 ++--
 22 files changed, 86 insertions(+), 51 deletions(-)
---
diff --git a/gio/gcredentials.c b/gio/gcredentials.c
index 2f3c7ce..7a57225 100644
--- a/gio/gcredentials.c
+++ b/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
diff --git a/gio/gdbus-tool.c b/gio/gdbus-tool.c
index b3233cf..573b53d 100644
--- a/gio/gdbus-tool.c
+++ b/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, ...);
diff --git a/gio/gdbusaddress.c b/gio/gdbusaddress.c
index 2c1041e..8379b04 100644
--- a/gio/gdbusaddress.c
+++ b/gio/gdbusaddress.c
@@ -23,8 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-
-#include <glib/gi18n.h>
+#include <string.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
diff --git a/gio/gdbusauth.c b/gio/gdbusauth.c
index 2d47060..2cfb74e 100644
--- a/gio/gdbusauth.c
+++ b/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
diff --git a/gio/gdbusauthmechanism.c b/gio/gdbusauthmechanism.c
index 72eff74..a62b267 100644
--- a/gio/gdbusauthmechanism.c
+++ b/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
diff --git a/gio/gdbusauthmechanismanon.c b/gio/gdbusauthmechanismanon.c
index 4c666ec..c5a0f3c 100644
--- a/gio/gdbusauthmechanismanon.c
+++ b/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;
diff --git a/gio/gdbusauthmechanismexternal.c b/gio/gdbusauthmechanismexternal.c
index bf8d931..3307e85 100644
--- a/gio/gdbusauthmechanismexternal.c
+++ b/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;
diff --git a/gio/gdbusauthmechanismsha1.c b/gio/gdbusauthmechanismsha1.c
index ee94e49..bc9ed25 100644
--- a/gio/gdbusauthmechanismsha1.c
+++ b/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;
diff --git a/gio/gdbusauthobserver.c b/gio/gdbusauthobserver.c
index b114da9..54d335f 100644
--- a/gio/gdbusauthobserver.c
+++ b/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
diff --git a/gio/gdbusconnection.c b/gio/gdbusconnection.c
index 77c3690..835291e 100644
--- a/gio/gdbusconnection.c
+++ b/gio/gdbusconnection.c
@@ -49,20 +49,9 @@
 #include "config.h"
 
 #include <stdlib.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 <string.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
diff --git a/gio/gdbuserror.c b/gio/gdbuserror.c
index 5a372ff..0bfd906 100644
--- a/gio/gdbuserror.c
+++ b/gio/gdbuserror.c
@@ -23,8 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-
-#include <glib/gi18n.h>
+#include <string.h>
 
 #include "gdbuserror.h"
 #include "gioenums.h"
@@ -32,6 +31,8 @@
 #include "gioerror.h"
 #include "gdbusprivate.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbuserror
  * @title: GDBusError
diff --git a/gio/gdbusintrospection.c b/gio/gdbusintrospection.c
index fd26d40..b128d9f 100644
--- a/gio/gdbusintrospection.c
+++ b/gio/gdbusintrospection.c
@@ -23,11 +23,12 @@
 #include "config.h"
 
 #include <stdlib.h>
-
-#include <glib/gi18n.h>
+#include <string.h>
 
 #include "gdbusintrospection.h"
 
+#include "glibintl.h"
+
 /**
  * SECTION:gdbusintrospection
  * @title: Introspection XML
diff --git a/gio/gdbusmessage.c b/gio/gdbusmessage.c
index 9eff732..839ef55 100644
--- a/gio/gdbusmessage.c
+++ b/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
diff --git a/gio/gdbusmethodinvocation.c b/gio/gdbusmethodinvocation.c
index 1dfb315..b2f99ef 100644
--- a/gio/gdbusmethodinvocation.c
+++ b/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
diff --git a/gio/gdbusnameowning.c b/gio/gdbusnameowning.c
index dab4801..e947429 100644
--- a/gio/gdbusnameowning.c
+++ b/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
diff --git a/gio/gdbusnamewatching.c b/gio/gdbusnamewatching.c
index f6126e5..a68255b 100644
--- a/gio/gdbusnamewatching.c
+++ b/gio/gdbusnamewatching.c
@@ -23,8 +23,7 @@
 #include "config.h"
 
 #include <stdlib.h>
-
-#include <glib/gi18n.h>
+#include <string.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
diff --git a/gio/gdbusprivate.c b/gio/gdbusprivate.c
index 8f7ac8d..64ea7d9 100644
--- a/gio/gdbusprivate.c
+++ b/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"
 
 /* ---------------------------------------------------------------------------------------------------- */
 
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index 204aa74..ded62c9 100644
--- a/gio/gdbusproxy.c
+++ b/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
diff --git a/gio/gdbusproxywatching.c b/gio/gdbusproxywatching.c
index 9ac7da8..a3baa22 100644
--- a/gio/gdbusproxywatching.c
+++ b/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
diff --git a/gio/gdbusserver.c b/gio/gdbusserver.c
index bee5c90..fda660a 100644
--- a/gio/gdbusserver.c
+++ b/gio/gdbusserver.c
@@ -23,14 +23,9 @@
 #include "config.h"
 
 #include <stdlib.h>
-#include <glib/gi18n.h>
-#include <unistd.h>
+#include <string.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
diff --git a/gio/gdbusutils.c b/gio/gdbusutils.c
index 08770c6..265ec2a 100644
--- a/gio/gdbusutils.c
+++ b/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
diff --git a/gio/gunixcredentialsmessage.c b/gio/gunixcredentialsmessage.c
index 156a124..2be5c5d 100644
--- a/gio/gunixcredentialsmessage.c
+++ b/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;