diff options
| author | Johan Dahlin <johan@gnome.org> | 2008-04-06 16:25:21 +0000 |
|---|---|---|
| committer | Johan Dahlin <johan@src.gnome.org> | 2008-04-06 16:25:21 +0000 |
| commit | bfddf0013060b64b55df5feb6cdacb17b970ae68 (patch) | |
| tree | 0205487debd0460099e2cb9b7ddd9ea12f00ef28 | |
| parent | 05d7fc1c6ebb47ad101fbc75f0812b085ee20fd3 (diff) | |
| download | pygobject-bfddf0013060b64b55df5feb6cdacb17b970ae68.tar.gz pygobject-bfddf0013060b64b55df5feb6cdacb17b970ae68.tar.xz pygobject-bfddf0013060b64b55df5feb6cdacb17b970ae68.zip | |
Ignore vararg functions and remove a couple of left overs in the generic
2008-04-06 Johan Dahlin <johan@gnome.org>
* gio/gio.override: Ignore vararg functions and remove a couple
of left overs in the generic marshaller.
svn path=/trunk/; revision=760
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | gio/gio.override | 14 |
2 files changed, 6 insertions, 11 deletions
@@ -1,5 +1,8 @@ 2008-04-06 Johan Dahlin <johan@gnome.org> + * gio/gio.override: Ignore vararg functions and remove a couple + of left overs in the generic marshaller. + * gio/gio.defs: Remove g_file_output_stream_truncate, g_file_output_stream_tell and g_file_input_stream_tell diff --git a/gio/gio.override b/gio/gio.override index ad26083..c7d1655 100644 --- a/gio/gio.override +++ b/gio/gio.override @@ -34,7 +34,6 @@ headers typedef struct { PyObject *callback; PyObject *data; - PyObject *buffer; } PyGAsyncRequestNotify; static void @@ -50,19 +49,9 @@ async_result_callback_marshal(GObject *source_object, { PyObject *ret; PyGILState_STATE state; - static GQuark quark = 0; state = pyg_gil_state_ensure(); - /* buffer is only used by read_async */ - if (notify->buffer) { - if (!quark) - quark = g_quark_from_string("pygio::buffer"); - Py_XINCREF(notify->buffer); - g_object_set_qdata_full(G_OBJECT(result), quark, - notify->buffer, py_decref_callback); - } - if (notify->data) ret = PyEval_CallFunction(notify->callback, "(OOO)", pygobject_new(source_object), @@ -90,6 +79,7 @@ async_result_callback_marshal(GObject *source_object, %% include gfile.override + gfileenumerator.override ginputstream.override goutputstream.override gvolumemonitor.override @@ -97,6 +87,8 @@ include ignore-glob *_get_type *free + g_simple_async_result_new_error + g_simple_async_report_error_in_idle %% override g_drive_get_volumes noargs static PyObject * |