diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | atk.defs | 8 | ||||
| -rw-r--r-- | gtk/gtk.override | 12 |
3 files changed, 21 insertions, 7 deletions
@@ -1,3 +1,11 @@ +2001-12-09 James Henstridge <james@daa.com.au> + + * atk.defs (text_attribute_get_name): rename. + (text_attribute_get_value): rename. + + * gtk/gtk.override (_wrap_gtk_input_add_full): use + PyObject_AsFileDescriptor to convert the first arg to the fd. + 2001-12-07 Matt Wilson <msw@redhat.com> * gtk/gtk.defs (GtkTable.get_row_spacing): one more missing defs @@ -1467,16 +1467,16 @@ (return-type "none") ) -(define-function attribute_get_name - (c-name "atk_attribute_get_name") +(define-function text_attribute_get_name + (c-name "atk_text_attribute_get_name") (return-type "const-gchar*") (parameters '("AtkTextAttribute" "attr") ) ) -(define-function attribute_get_value - (c-name "atk_attribute_get_value") +(define-function text_attribute_get_value + (c-name "atk_text_attribute_get_value") (return-type "const-gchar*") (parameters '("AtkTextAttribute" "attr") diff --git a/gtk/gtk.override b/gtk/gtk.override index e6dfaad3..c5a7aa69 100644 --- a/gtk/gtk.override +++ b/gtk/gtk.override @@ -1959,13 +1959,19 @@ static PyObject * _wrap_gtk_input_add_full(PyObject *self, PyObject *args, PyObject *kwargs) { static char *kwlist[] = { "source", "condition", "callback", NULL }; + PyObject *py_source, *callback; int source; GdkInputCondition condition; - PyObject *callback; - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "iiO:input_add", kwlist, - &source, &condition, &callback)) + if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OiO:input_add", kwlist, + &py_source, &condition, &callback)) return NULL; + source = PyObject_AsFileDescriptor(py_source); + if (PyErr_Occurred()) { + PyErr_Clear(); + PyErr_SetString(PyExc_TypeError, "1st arg not a file descriptor"); + return NULL; + } if (!PyCallable_Check(callback)) { PyErr_SetString(PyExc_TypeError, "3rd arg not callable."); return NULL; |