diff options
| author | James Henstridge <james@daa.com.au> | 2001-09-14 13:37:13 +0000 |
|---|---|---|
| committer | James Henstridge <jamesh@src.gnome.org> | 2001-09-14 13:37:13 +0000 |
| commit | e0a5d37e65edd79ba27bdaf6e993b4e588de06c1 (patch) | |
| tree | 8b7c56c16536c7352d61d2e0022384f6f0164550 | |
| parent | 3a419d5e5e8877618284d8fc4bf77d67cc62970d (diff) | |
| download | pygobject-e0a5d37e65edd79ba27bdaf6e993b4e588de06c1.tar.gz pygobject-e0a5d37e65edd79ba27bdaf6e993b4e588de06c1.tar.xz pygobject-e0a5d37e65edd79ba27bdaf6e993b4e588de06c1.zip | |
same change.
2001-09-14 James Henstridge <james@daa.com.au>
* pygobject.h (pyg_register_boxed_custom): same change.
* gobjectmodule.c (pyg_register_boxed_custom): rename from
pyg_boxed_register to avoid confusion.
| -rw-r--r-- | gobject/gobjectmodule.c | 8 | ||||
| -rw-r--r-- | gobject/pygobject.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gobject/gobjectmodule.c b/gobject/gobjectmodule.c index 4a4a1de..bc53e68 100644 --- a/gobject/gobjectmodule.c +++ b/gobject/gobjectmodule.c @@ -623,9 +623,9 @@ static GHashTable *boxed_marshalers; GUINT_TO_POINTER(boxed_type))) static void -pyg_boxed_register(GType boxed_type, - PyObject *(* from_func)(const GValue *value), - int (* to_func)(GValue *value, PyObject *obj)) +pyg_register_boxed_custom(GType boxed_type, + PyObject *(* from_func)(const GValue *value), + int (* to_func)(GValue *value, PyObject *obj)) { PyGBoxedMarshal *bm = g_new(PyGBoxedMarshal, 1); @@ -2127,7 +2127,7 @@ static struct _PyGObject_Functions functions = { pyg_type_from_object, pyg_enum_get_value, pyg_flags_get_value, - pyg_boxed_register, + pyg_register_boxed_custom, pyg_value_from_pyobject, pyg_value_as_pyobject, diff --git a/gobject/pygobject.h b/gobject/pygobject.h index 4cccd23..61d579f 100644 --- a/gobject/pygobject.h +++ b/gobject/pygobject.h @@ -40,7 +40,7 @@ struct _PyGObject_Functions { GType (* type_from_object)(PyObject *obj); gint (* enum_get_value)(GType enum_type, PyObject *obj, gint *val); gint (* flags_get_value)(GType flag_type, PyObject *obj, gint *val); - void (* boxed_register)(GType boxed_type, + void (* register_boxed_custom)(GType boxed_type, PyObject *(* from_func)(const GValue *value), int (* to_func)(GValue *value, PyObject *obj)); int (* value_from_pyobject)(GValue *value, PyObject *obj); @@ -73,7 +73,7 @@ struct _PyGObject_Functions *_PyGObject_API; #define pyg_type_from_object (_PyGObject_API->type_from_object) #define pyg_enum_get_value (_PyGObject_API->enum_get_value) #define pyg_flags_get_value (_PyGObject_API->flags_get_value) -#define pyg_boxed_register (_PyGObject_API->boxed_register) +#define pyg_register_boxed_custom (_PyGObject_API->register_boxed_custom) #define pyg_value_from_pyobject (_PyGObject_API->value_from_pyobject) #define pyg_value_as_pyobject (_PyGObject_API->value_as_pyobject) #define pyg_register_interface (_PyGObject_API->register_interface) |