Imported Upstream version 3.11.90

diff --git a/ChangeLog b/ChangeLog
index fe30f0d..0b234c2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,41 @@
+commit 9b345b153e86ca6c9b7290cf2ad3b38f6ad9d0e5
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Wed Feb 12 10:28:35 2014 -0800
+
+    Use GObject type checking for instance arguments
+
+    Add a g_type_is_a check to interface/object instance arguments
+    in addition
+    to the Python IsInstance check. This loosens restrictions on
+    overrides which
+    don't use gi.overrides.override() and is needed to keep API
+    compatibility
+    which broke with commit:
+    https://git.gnome.org/browse/pygobject/commit/?id=d5925b76
+
+    https://bugzilla.gnome.org/show_bug.cgi?id=724009
+
+ gi/pygi-object.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+commit 419e13e1717b725d5c6815bae9672649b0afddd4
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Mon Feb 3 15:58:30 2014 -0800
+
+    configure.ac: post release version bump to 3.11.90
+
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+commit 57bceaac1d84ffd03f49d8e83a4c8507c9127a41
+Author: Simon Feltman <sfeltman@src.gnome.org>
+Date:   Mon Feb 3 15:51:27 2014 -0800
+
+    release 3.11.5
+
+ NEWS | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
 commit 058d944e3b9ef9157e912e6374b54a2eb5f7f5d1
 Author: Simon Feltman <sfeltman@src.gnome.org>
 Date:   Mon Feb 3 06:45:09 2014 -0800

diff --git a/NEWS b/NEWS
index f1db3c9..45cbb0c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+3.11.90 17-Feb-2014
+        - Use GObject type checking for instance arguments (Simon Feltman) (#724009)
+        - configure.ac: post release version bump to 3.11.90 (Simon Feltman)
+
 3.11.5  03-Feb-2014
         - cache refactoring: Move all cache marshalers into files based on type
           (Simon Feltman) (#709700)

diff --git a/PKG-INFO b/PKG-INFO
index eac9485..1899a6a 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: PyGObject
-Version: 3.11.5
+Version: 3.11.90
 Summary: Python bindings for GObject
 Home-page: http://www.pygtk.org/
 Author: James Henstridge
@@ -8,7 +8,7 @@ Author-email: james@daa.com.au
 Maintainer: Johan Dahlin
 Maintainer-email: johan@gnome.org
 License: GNU LGPL
-Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.11/pygobject-3.11.5.tar.gz
+Download-url: ftp://ftp.gnome.org/pub/GNOME/sources/pygobject/3.11/pygobject-3.11.90.tar.gz
 Description: Python bindings for GLib and GObject
 Platform: POSIX, Windows
 Classifier: Development Status :: 5 - Production/Stable

diff --git a/configure b/configure
index 726ef29..ee6b1df 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for pygobject 3.11.5.
+# Generated by GNU Autoconf 2.69 for pygobject 3.11.90.
 #
 # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject>.
 #
@@ -591,8 +591,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='pygobject'
 PACKAGE_TARNAME='pygobject'
-PACKAGE_VERSION='3.11.5'
-PACKAGE_STRING='pygobject 3.11.5'
+PACKAGE_VERSION='3.11.90'
+PACKAGE_STRING='pygobject 3.11.90'
 PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=pygobject'
 PACKAGE_URL='https://live.gnome.org/PyGObject/'
 
@@ -1398,7 +1398,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures pygobject 3.11.5 to adapt to many kinds of systems.
+\`configure' configures pygobject 3.11.90 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1468,7 +1468,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of pygobject 3.11.5:";;
+     short | recursive ) echo "Configuration of pygobject 3.11.90:";;
    esac
   cat <<\_ACEOF
 
@@ -1605,7 +1605,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-pygobject configure 3.11.5
+pygobject configure 3.11.90
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1883,7 +1883,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by pygobject $as_me 3.11.5, which was
+It was created by pygobject $as_me 3.11.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2247,9 +2247,9 @@ $as_echo "#define PYGOBJECT_MINOR_VERSION 11" >>confdefs.h
 PYGOBJECT_MINOR_VERSION=11
 
 
-$as_echo "#define PYGOBJECT_MICRO_VERSION 5" >>confdefs.h
+$as_echo "#define PYGOBJECT_MICRO_VERSION 90" >>confdefs.h
 
-PYGOBJECT_MICRO_VERSION=5
+PYGOBJECT_MICRO_VERSION=90
 
 
 ac_config_headers="$ac_config_headers config.h"
@@ -2760,7 +2760,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='pygobject'
- VERSION='3.11.5'
+ VERSION='3.11.90'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -15291,7 +15291,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by pygobject $as_me 3.11.5, which was
+This file was extended by pygobject $as_me 3.11.90, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15358,7 +15358,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-pygobject config.status 3.11.5
+pygobject config.status 3.11.90
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 93305f9..a4d4683 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ m4_define(python3_min_ver, 3.1)
 dnl the pygobject version number
 m4_define(pygobject_major_version, 3)
 m4_define(pygobject_minor_version, 11)
-m4_define(pygobject_micro_version, 5)
+m4_define(pygobject_micro_version, 90)
 m4_define(pygobject_version, pygobject_major_version.pygobject_minor_version.pygobject_micro_version)
 
 dnl versions of packages we require ...

diff --git a/gi/pygi-object.c b/gi/pygi-object.c
index 2aefee1..29cd518 100644 (file)
--- a/gi/pygi-object.c
+++ b/gi/pygi-object.c
@@ -129,13 +129,17 @@ _pygi_marshal_from_py_interface_object (PyGIInvokeState   *state,
                                         gpointer          *cleanup_data)
 {
     gboolean res = FALSE;
+    GObject *gobj = NULL;
+    PyGIInterfaceCache *iface_cache = (PyGIInterfaceCache *)arg_cache;
 
     if (py_arg == Py_None) {
         arg->v_pointer = NULL;
         return TRUE;
     }
 
-    if (!PyObject_IsInstance (py_arg, ( (PyGIInterfaceCache *)arg_cache)->py_type)) {
+    gobj = pygobject_get (py_arg);
+    if (!PyObject_IsInstance (py_arg, iface_cache->py_type) &&
+            !g_type_is_a (G_OBJECT_TYPE (gobj), iface_cache->g_type)) {
         PyObject *module = PyObject_GetAttrString(py_arg, "__module__");
 
         PyErr_Format (PyExc_TypeError, "argument %s: Expected %s, but got %s%s%s",