summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gi/overrides/gstmodule.c9
-rw-r--r--testsuite/common.py2
2 files changed, 6 insertions, 5 deletions
diff --git a/gi/overrides/gstmodule.c b/gi/overrides/gstmodule.c
index 6f9a14b..3739aed 100644
--- a/gi/overrides/gstmodule.c
+++ b/gi/overrides/gstmodule.c
@@ -147,7 +147,8 @@ add_templates (gpointer gclass, PyObject * templates)
for (i = 0; i < len; i++) {
templ = (PyGObject *) PyTuple_GetItem (templates, i);
- if (GST_IS_PAD_TEMPLATE (pygobject_get (templ)) == FALSE) {
+ if (!pygobject_check (templates, &PyGObject_Type) ||
+ GST_IS_PAD_TEMPLATE (pygobject_get (templates)) == FALSE) {
PyErr_SetString (PyExc_TypeError,
"entries for __gsttemplates__ must be of type GstPadTemplate");
return -1;
@@ -161,11 +162,11 @@ add_templates (gpointer gclass, PyObject * templates)
}
return 0;
- }
-
- if (GST_IS_PAD_TEMPLATE (pygobject_get (templates)) == FALSE) {
+ } else if (!pygobject_check (templates, &PyGObject_Type) ||
+ GST_IS_PAD_TEMPLATE (pygobject_get (templates)) == FALSE) {
PyErr_SetString (PyExc_TypeError,
"entry for __gsttemplates__ must be of type GstPadTemplate");
+
return -1;
}
diff --git a/testsuite/common.py b/testsuite/common.py
index 9aab74c..d07eca2 100644
--- a/testsuite/common.py
+++ b/testsuite/common.py
@@ -31,7 +31,7 @@ import os
import gc
import unittest
import gi.overrides
-gi.overrides
+
from gi.repository import Gst