summaryrefslogtreecommitdiffstats
path: root/gobject
diff options
context:
space:
mode:
authorJohan Dahlin <jdahlin@async.com.br>2008-04-08 14:27:54 +0000
committerJohan Dahlin <johan@src.gnome.org>2008-04-08 14:27:54 +0000
commita60fd2b2679c18174cefc11a3ac5573bfe1d6d15 (patch)
treeaeff5c0669cce22b8cb2a1d276cb1a165630e09d /gobject
parenta9dbdaaf11f703ed609b5a5591c3de2e8bcfa4d4 (diff)
downloadpygobject-a60fd2b2679c18174cefc11a3ac5573bfe1d6d15.tar.gz
pygobject-a60fd2b2679c18174cefc11a3ac5573bfe1d6d15.tar.xz
pygobject-a60fd2b2679c18174cefc11a3ac5573bfe1d6d15.zip
Unbreak Source.prepare (#523075, Bryan Silverthorn)
2008-04-08 Johan Dahlin <jdahlin@async.com.br> * gobject/pygsource.c: * tests/test_source.py: Unbreak Source.prepare (#523075, Bryan Silverthorn) svn path=/trunk/; revision=766
Diffstat (limited to 'gobject')
-rw-r--r--gobject/pygsource.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/gobject/pygsource.c b/gobject/pygsource.c
index 900bd4f..9e831e5 100644
--- a/gobject/pygsource.c
+++ b/gobject/pygsource.c
@@ -418,14 +418,12 @@ pyg_source_prepare(GSource *source, gint *timeout)
}
ret = PyObject_IsTrue(PyTuple_GET_ITEM(t, 0));
-
- if (ret) {
*timeout = PyInt_AsLong(PyTuple_GET_ITEM(t, 1));
+
if (*timeout == -1 && PyErr_Occurred()) {
ret = FALSE;
goto bail;
}
- }
got_err = FALSE;