[gnio] Move glib merging helper stuff to new file config.h

[Alexander Larsson <alexl src gnome org>]

commit 57d3f9257c25c689e2e166aab7a03b7cead2b038
Author: Alexander Larsson <alexl redhat com>
Date:   Wed May 6 22:13:33 2009 +0200

    Move glib merging helper stuff to new file config.h
    
    GLib has a config.h that all files will need to include, so might as well
    have one. We also add various glib special defines and includes there
    to ease merging later.
---
 .gitignore    |    2 +-
 gio/config.h  |    6 ++++++
 gio/gsocket.c |    8 --------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 00f126b..b1e29c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,7 +7,7 @@ Makefile
 .deps
 .libs
 
-config.*
+/config.*
 aclocal.m4
 autom4te.cache
 configure
diff --git a/gio/config.h b/gio/config.h
new file mode 100644
index 0000000..f785517
--- /dev/null
+++ b/gio/config.h
@@ -0,0 +1,6 @@
+/* Helpful file to ease conversion to glib which uses config.h & co */
+
+#include <glib/gi18n-lib.h>
+
+#define P_(String) _(String)
+#define I_(string) g_intern_static_string (string)
diff --git a/gio/gsocket.c b/gio/gsocket.c
index 62df568..d570210 100644
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -23,15 +23,7 @@
  *          Ryan Lortie <desrt desrt ca>
  */
 
-/* TODO: On glib merge, switch this */
-#if 0
 #include "config.h"
-#include "glibintl.h"
-#else
-#include <glib/gi18n-lib.h>
-#define P_(String) _(String)
-#endif
-
 #include "gsocket.h"
 
 #include <errno.h>