? compile ? codegen/check-oldstyle-constructors.py ? tests/test_glade.py Index: ChangeLog =================================================================== RCS file: /cvs/gnome/gnome-python/pygtk/ChangeLog,v retrieving revision 1.1324 diff -u -p -d -r1.1324 ChangeLog --- ChangeLog 14 Oct 2005 17:03:11 -0000 1.1324 +++ ChangeLog 15 Oct 2005 16:45:45 -0000 @@ -1,3 +1,9 @@ +2005-10-15 Gustavo J. A. M. Carneiro + + * gtk/gtktreeview.override (pygtk_set_search_equal_func_marshal): + Add some NULL parameter checks. Use PyObject_IsTrue instead of + comparing agains PyTrue. + 2005-10-14 Johan Dahlin * tests/Makefile.am (tests): Index: gtk/gtktreeview.override =================================================================== RCS file: /cvs/gnome/gnome-python/pygtk/gtk/gtktreeview.override,v retrieving revision 1.59 diff -u -p -d -r1.59 gtktreeview.override --- gtk/gtktreeview.override 13 Sep 2005 20:42:11 -0000 1.59 +++ gtk/gtktreeview.override 15 Oct 2005 16:45:47 -0000 @@ -2999,7 +2999,10 @@ pygtk_set_search_equal_func_marshal(GtkT PyObject *retobj; gboolean ret = FALSE; - g_assert (cunote->func); + /* gracefully guard against NULL values */ + g_return_value_if_fail(cunote->func, TRUE); + g_return_value_if_fail(key, TRUE); + g_return_value_if_fail(iter, TRUE); state = pyg_gil_state_ensure(); @@ -3017,7 +3020,7 @@ pygtk_set_search_equal_func_marshal(GtkT py_model, py_column, py_key, py_iter); if (retobj) - ret = retobj == Py_True ? TRUE : FALSE; + ret = (PyObject_IsTrue(retobj)? TRUE : FALSE); if (PyErr_Occurred()) { PyErr_Print(); }