[pygobject] Merge pyglib-private.h into pyglib.h

[Christoph Reiter <creiter src gnome org>]

commit ef7a6dad8cea6a3b9547cfae00bf15ebb9eb756e
Author: Christoph Reiter <creiter src gnome org>
Date:   Tue May 31 15:44:36 2016 +0200

    Merge pyglib-private.h into pyglib.h
    
    No need for another header
    
    https://bugzilla.gnome.org/show_bug.cgi?id=767084

 gi/Makefile.am        |    1 -
 gi/gimodule.c         |    2 +-
 gi/glibmodule.c       |    1 -
 gi/pygi-resulttuple.c |    2 +-
 gi/pygi-source.c      |    1 -
 gi/pyglib-private.h   |   40 ----------------------------------------
 gi/pyglib.c           |    1 -
 gi/pyglib.h           |    6 ++++++
 gi/pygoptioncontext.c |    1 -
 gi/pygoptiongroup.c   |    1 -
 gi/pygspawn.c         |    1 -
 11 files changed, 8 insertions(+), 49 deletions(-)
---
diff --git a/gi/Makefile.am b/gi/Makefile.am
index 5e73d70..3dee504 100644
--- a/gi/Makefile.am
+++ b/gi/Makefile.am
@@ -62,7 +62,6 @@ _gi_la_SOURCES = \
        pygspawn.h \
        pyglib.c \
        pyglib.h \
-       pyglib-private.h \
        pyglib-python-compat.h \
        gimodule.c \
        pygi-repository.c \
diff --git a/gi/gimodule.c b/gi/gimodule.c
index aa1b8a7..9206a50 100644
--- a/gi/gimodule.c
+++ b/gi/gimodule.c
@@ -21,7 +21,7 @@
  * USA
  */
 
-#include "pyglib-private.h"
+#include "pyglib.h"
 #include "pygobject-private.h"
 #include "pyginterface.h"
 #include "pygi-repository.h"
diff --git a/gi/glibmodule.c b/gi/glibmodule.c
index 297805a..63b84c8 100644
--- a/gi/glibmodule.c
+++ b/gi/glibmodule.c
@@ -26,7 +26,6 @@
 #include <Python.h>
 #include <glib.h>
 #include "pyglib.h"
-#include "pyglib-private.h"
 #include "pygoptioncontext.h"
 #include "pygoptiongroup.h"
 #include "pygspawn.h"
diff --git a/gi/pygi-resulttuple.c b/gi/pygi-resulttuple.c
index 9d0b455..8ddfeae 100644
--- a/gi/pygi-resulttuple.c
+++ b/gi/pygi-resulttuple.c
@@ -18,7 +18,7 @@
  */
 
 #include "pygi-resulttuple.h"
-#include "pyglib-private.h"
+#include "pyglib.h"
 
 static char repr_format_key[] = "__repr_format";
 static char tuple_indices_key[] = "__tuple_indices";
diff --git a/gi/pygi-source.c b/gi/pygi-source.c
index c1d318c..1a84788 100644
--- a/gi/pygi-source.c
+++ b/gi/pygi-source.c
@@ -29,7 +29,6 @@
 #include "pygi-boxed.h"
 #include "pygi-type.h"
 #include "pyglib.h"
-#include "pyglib-private.h"
 #include "pygi-source.h"
 
 typedef struct
diff --git a/gi/pyglib.c b/gi/pyglib.c
index 8db9b17..b83d605 100644
--- a/gi/pyglib.c
+++ b/gi/pyglib.c
@@ -24,7 +24,6 @@
 #include <Python.h>
 #include <pythread.h>
 #include "pyglib.h"
-#include "pyglib-private.h"
 #include "pygoptioncontext.h"
 #include "pygoptiongroup.h"
 
diff --git a/gi/pyglib.h b/gi/pyglib.h
index 00228dd..37bdfa5 100644
--- a/gi/pyglib.h
+++ b/gi/pyglib.h
@@ -24,6 +24,8 @@
 
 #include <glib.h>
 
+#include <pyglib-python-compat.h>
+
 G_BEGIN_DECLS
 
 typedef void (*PyGLibThreadsEnabledFunc) (void);
@@ -53,6 +55,10 @@ PyObject* _pyglib_generic_long_richcompare(long a, long b, int op);
        return;                                         \
     PyDict_SetItemString(d, name, (PyObject *)&type);
 
+gboolean _pyglib_handler_marshal(gpointer user_data);
+void _pyglib_destroy_notify(gpointer user_data);
+
+extern PyObject *pyglib__glib_module_create (void);
 
 G_END_DECLS
 
diff --git a/gi/pygoptioncontext.c b/gi/pygoptioncontext.c
index ab439f0..3b2babd 100644
--- a/gi/pygoptioncontext.c
+++ b/gi/pygoptioncontext.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <pyglib.h>
-#include "pyglib-private.h"
 #include "pygoptioncontext.h"
 #include "pygi-error.h"
 
diff --git a/gi/pygoptiongroup.c b/gi/pygoptiongroup.c
index 3248b18..bd57489 100644
--- a/gi/pygoptiongroup.c
+++ b/gi/pygoptiongroup.c
@@ -23,7 +23,6 @@
 #endif
 
 #include <pyglib.h>
-#include "pyglib-private.h"
 #include "pygoptiongroup.h"
 #include "pygi-error.h"
 
diff --git a/gi/pygspawn.c b/gi/pygspawn.c
index 3851ad9..c66c50f 100644
--- a/gi/pygspawn.c
+++ b/gi/pygspawn.c
@@ -23,7 +23,6 @@
 #include <glib.h>
 
 #include "pyglib.h"
-#include "pyglib-private.h"
 
 #include "pygspawn.h"
 #include "pygi-error.h"