[pygi] Bump required GLib version to 2.22



commit af9e4e086d160fe7fb24758ed81753e784b198a8
Author: Simon van der Linden <svdlinden src gnome org>
Date:   Fri Jan 22 22:16:32 2010 +0100

    Bump required GLib version to 2.22
    
    Since PyGObject now depends on GLib 2.22.4, there is no need to keep PyGI
    backward-compatible.

 configure.ac      |    2 +-
 gi/pygi-private.h |   20 --------------------
 2 files changed, 1 insertions(+), 21 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9726fcf..70e247f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,7 +38,7 @@ PKG_CHECK_MODULES(FFI, libffi >= 3.0)
 
 # GNOME
 PKG_CHECK_MODULES(GNOME,
-	glib-2.0 >= 2.20
+	glib-2.0 >= 2.22.4
 	gobject-introspection-1.0 >= 0.6.10
 	pygobject-2.0 >= 2.20
 	pycairo >= 1.0.2
diff --git a/gi/pygi-private.h b/gi/pygi-private.h
index 74716be..7d80b7d 100644
--- a/gi/pygi-private.h
+++ b/gi/pygi-private.h
@@ -46,26 +46,6 @@ G_BEGIN_DECLS
     } \
 } G_STMT_END
 
-#if GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION == 20
-/* Private stuff copied from glib-2.20.x sources */
-struct _GRealArray
-{
-    guint8 *data;
-    guint   len;
-    guint   alloc;
-    guint   elt_size;
-    guint   zero_terminated : 1;
-    guint   clear : 1;
-};
-
-static inline guint
-g_array_get_element_size (GArray *array)
-{
-    struct _GRealArray *rarray = (struct _GRealArray*) array;
-    return rarray->elt_size;
-}
-#endif
-
 /* Redefine g_array_index because we want it to return the i-th element, casted
  * to the type t, of the array a, and not the i-th element of the array a
  * casted to the type t. */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]