summaryrefslogtreecommitdiffstats
path: root/gobject
diff options
context:
space:
mode:
authorJames Livingstone <doclivingstone@gmail.com>2007-04-30 02:50:06 +0000
committerJohan Dahlin <johan@src.gnome.org>2007-04-30 02:50:06 +0000
commitd96aaf253b925d4e84374f5c7e79398c21eff72f (patch)
tree7952699d708c6034cc1051db3bef0717e698c320 /gobject
parent958b9aa52ce7a5c774f26f92adea06579242b28a (diff)
downloadpygobject-d96aaf253b925d4e84374f5c7e79398c21eff72f.tar.gz
pygobject-d96aaf253b925d4e84374f5c7e79398c21eff72f.tar.xz
pygobject-d96aaf253b925d4e84374f5c7e79398c21eff72f.zip
reviewed by: Johan Dahlin <johan@gnome.org>
2007-04-29 James Livingstone <doclivingstone@gmail.com> reviewed by: Johan Dahlin <johan@gnome.org> * gobject/pygtype.c: (pyg_value_from_pyobject): * tests/test_signal.py: Add a missing else to avoid throwing a TypeError. Includes a test written by Ed Catmur. Fixes #374653 svn path=/trunk/; revision=657
Diffstat (limited to 'gobject')
-rw-r--r--gobject/pygtype.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gobject/pygtype.c b/gobject/pygtype.c
index 5606e2a..59ba580 100644
--- a/gobject/pygtype.c
+++ b/gobject/pygtype.c
@@ -849,7 +849,7 @@ pyg_value_from_pyobject(GValue *value, PyObject *obj)
if (obj == Py_None)
g_value_set_boxed(value, NULL);
- if (G_VALUE_HOLDS(value, PY_TYPE_OBJECT))
+ else if (G_VALUE_HOLDS(value, PY_TYPE_OBJECT))
g_value_set_boxed(value, obj);
else if (PyObject_TypeCheck(obj, &PyGBoxed_Type) &&
G_VALUE_HOLDS(value, ((PyGBoxed *)obj)->gtype))