[pygobject] Rename GArgument to GIArgument
- From: Tomeu Vizoso <tomeuv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] Rename GArgument to GIArgument
- Date: Wed, 1 Sep 2010 09:38:31 +0000 (UTC)
commit b7bf4269682a3335f5e0a52b46fa721af134d09a
Author: Tomeu Vizoso <tomeu vizoso collabora co uk>
Date: Wed Sep 1 11:03:40 2010 +0200
Rename GArgument to GIArgument
gi/pygi-argument.c | 52 ++++++++++++++++++++++----------------------
gi/pygi-argument.h | 10 ++++----
gi/pygi-closure.c | 34 ++++++++++++++--------------
gi/pygi-foreign-cairo.c | 8 +++---
gi/pygi-foreign-gvariant.c | 4 +-
gi/pygi-foreign-gvariant.h | 4 +-
gi/pygi-foreign.c | 12 +++++-----
gi/pygi-foreign.h | 8 +++---
gi/pygi-info.c | 8 +++---
gi/pygi-invoke.c | 28 +++++++++++-----------
gi/pygi-property.c | 4 +-
gi/pygi.h | 16 ++++++------
12 files changed, 94 insertions(+), 94 deletions(-)
---
diff --git a/gi/pygi-argument.c b/gi/pygi-argument.c
index d198158..affc54e 100644
--- a/gi/pygi-argument.c
+++ b/gi/pygi-argument.c
@@ -3,7 +3,7 @@
*
* Copyright (C) 2005-2009 Johan Dahlin <johan gnome org>
*
- * pygi-argument.c: GArgument - PyObject conversion functions.
+ * pygi-argument.c: GIArgument - PyObject conversion functions.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -571,8 +571,8 @@ check_number_release:
}
GArray *
-_pygi_argument_to_array (GArgument *arg,
- GArgument *args[],
+_pygi_argument_to_array (GIArgument *arg,
+ GIArgument *args[],
GITypeInfo *type_info,
gboolean is_method)
{
@@ -618,15 +618,15 @@ _pygi_argument_to_array (GArgument *arg,
return g_array;
}
-GArgument
+GIArgument
_pygi_argument_from_object (PyObject *object,
GITypeInfo *type_info,
GITransfer transfer)
{
- GArgument arg;
+ GIArgument arg;
GITypeTag type_tag;
- memset(&arg, 0, sizeof(GArgument));
+ memset(&arg, 0, sizeof(GIArgument));
type_tag = g_type_info_get_tag (type_info);
switch (type_tag) {
@@ -829,7 +829,7 @@ _pygi_argument_from_object (PyObject *object,
for (i = 0; i < length; i++) {
PyObject *py_item;
- GArgument item;
+ GIArgument item;
py_item = PySequence_GetItem (object, i);
if (py_item == NULL) {
@@ -849,7 +849,7 @@ _pygi_argument_from_object (PyObject *object,
array_item_error:
/* Free everything we have converted so far. */
- _pygi_argument_release ( (GArgument *) &array, type_info,
+ _pygi_argument_release ( (GIArgument *) &array, type_info,
GI_TRANSFER_NOTHING, GI_DIRECTION_IN);
array = NULL;
@@ -1004,7 +1004,7 @@ array_item_error:
for (i = length - 1; i >= 0; i--) {
PyObject *py_item;
- GArgument item;
+ GIArgument item;
py_item = PySequence_GetItem (object, i);
if (py_item == NULL) {
@@ -1029,7 +1029,7 @@ array_item_error:
list_item_error:
/* Free everything we have converted so far. */
- _pygi_argument_release ( (GArgument *) &list, type_info,
+ _pygi_argument_release ( (GIArgument *) &list, type_info,
GI_TRANSFER_NOTHING, GI_DIRECTION_IN);
list = NULL;
@@ -1109,8 +1109,8 @@ list_item_error:
for (i = 0; i < length; i++) {
PyObject *py_key;
PyObject *py_value;
- GArgument key;
- GArgument value;
+ GIArgument key;
+ GIArgument value;
py_key = PyList_GET_ITEM (keys, i);
py_value = PyList_GET_ITEM (values, i);
@@ -1131,7 +1131,7 @@ list_item_error:
hash_table_item_error:
/* Free everything we have converted so far. */
- _pygi_argument_release ( (GArgument *) &hash_table, type_info,
+ _pygi_argument_release ( (GIArgument *) &hash_table, type_info,
GI_TRANSFER_NOTHING, GI_DIRECTION_IN);
hash_table = NULL;
@@ -1158,7 +1158,7 @@ hash_table_release:
}
PyObject *
-_pygi_argument_to_object (GArgument *arg,
+_pygi_argument_to_object (GIArgument *arg,
GITypeInfo *type_info,
GITransfer transfer)
{
@@ -1297,7 +1297,7 @@ _pygi_argument_to_object (GArgument *arg,
item_size = g_array_get_element_size (array);
for (i = 0; i < array->len; i++) {
- GArgument item;
+ GIArgument item;
PyObject *py_item;
gboolean is_struct = FALSE;
@@ -1314,9 +1314,9 @@ _pygi_argument_to_object (GArgument *arg,
}
if (is_struct) {
- item.v_pointer = &_g_array_index (array, GArgument, i);
+ item.v_pointer = &_g_array_index (array, GIArgument, i);
} else {
- memcpy (&item, &_g_array_index (array, GArgument, i), item_size);
+ memcpy (&item, &_g_array_index (array, GIArgument, i), item_size);
}
py_item = _pygi_argument_to_object (&item, item_type_info, item_transfer);
@@ -1491,7 +1491,7 @@ _pygi_argument_to_object (GArgument *arg,
item_transfer = transfer == GI_TRANSFER_CONTAINER ? GI_TRANSFER_NOTHING : transfer;
for (i = 0; list != NULL; list = g_slist_next (list), i++) {
- GArgument item;
+ GIArgument item;
PyObject *py_item;
item.v_pointer = list->data;
@@ -1515,8 +1515,8 @@ _pygi_argument_to_object (GArgument *arg,
GITypeInfo *value_type_info;
GITransfer item_transfer;
GHashTableIter hash_table_iter;
- GArgument key;
- GArgument value;
+ GIArgument key;
+ GIArgument value;
if (arg->v_pointer == NULL) {
object = Py_None;
@@ -1580,7 +1580,7 @@ _pygi_argument_to_object (GArgument *arg,
}
void
-_pygi_argument_release (GArgument *arg,
+_pygi_argument_release (GIArgument *arg,
GITypeInfo *type_info,
GITransfer transfer,
GIDirection direction)
@@ -1638,8 +1638,8 @@ _pygi_argument_release (GArgument *arg,
/* Free the items */
for (i = 0; i < array->len; i++) {
- GArgument *item;
- item = &_g_array_index (array, GArgument, i);
+ GIArgument *item;
+ item = &_g_array_index (array, GIArgument, i);
_pygi_argument_release (item, item_type_info, item_transfer, direction);
}
@@ -1749,7 +1749,7 @@ _pygi_argument_release (GArgument *arg,
/* Free the items */
for (item = list; item != NULL; item = g_slist_next (item)) {
- _pygi_argument_release ( (GArgument *) &item->data, item_type_info,
+ _pygi_argument_release ( (GIArgument *) &item->data, item_type_info,
item_transfer, direction);
}
@@ -1802,9 +1802,9 @@ _pygi_argument_release (GArgument *arg,
g_hash_table_iter_init (&hash_table_iter, hash_table);
while (g_hash_table_iter_next (&hash_table_iter, &key, &value)) {
- _pygi_argument_release ( (GArgument *) &key, key_type_info,
+ _pygi_argument_release ( (GIArgument *) &key, key_type_info,
item_transfer, direction);
- _pygi_argument_release ( (GArgument *) &value, value_type_info,
+ _pygi_argument_release ( (GIArgument *) &value, value_type_info,
item_transfer, direction);
}
diff --git a/gi/pygi-argument.h b/gi/pygi-argument.h
index 821737a..ee5d661 100644
--- a/gi/pygi-argument.h
+++ b/gi/pygi-argument.h
@@ -40,21 +40,21 @@ gint _pygi_g_registered_type_info_check_object (GIRegisteredTypeInfo *info,
PyObject *object);
-GArray* _pygi_argument_to_array (GArgument *arg,
- GArgument *args[],
+GArray* _pygi_argument_to_array (GIArgument *arg,
+ GIArgument *args[],
GITypeInfo *type_info,
gboolean is_method);
-GArgument _pygi_argument_from_object (PyObject *object,
+GIArgument _pygi_argument_from_object (PyObject *object,
GITypeInfo *type_info,
GITransfer transfer);
-PyObject* _pygi_argument_to_object (GArgument *arg,
+PyObject* _pygi_argument_to_object (GIArgument *arg,
GITypeInfo *type_info,
GITransfer transfer);
-void _pygi_argument_release (GArgument *arg,
+void _pygi_argument_release (GIArgument *arg,
GITypeInfo *type_info,
GITransfer transfer,
GIDirection direction);
diff --git a/gi/pygi-closure.c b/gi/pygi-closure.c
index b26d5b1..1e2ce05 100644
--- a/gi/pygi-closure.c
+++ b/gi/pygi-closure.c
@@ -28,7 +28,7 @@
static GSList* async_free_list;
-static GArgument *
+static GIArgument *
_pygi_closure_convert_ffi_arguments (GICallableInfo *callable_info, void **args)
{
gint num_args, i;
@@ -36,10 +36,10 @@ _pygi_closure_convert_ffi_arguments (GICallableInfo *callable_info, void **args)
GITypeInfo *arg_type;
GITypeTag tag;
GIDirection direction;
- GArgument *g_args;
+ GIArgument *g_args;
num_args = g_callable_info_get_n_args (callable_info);
- g_args = g_new0 (GArgument, num_args);
+ g_args = g_new0 (GIArgument, num_args);
for (i = 0; i < num_args; i++) {
arg_info = g_callable_info_get_arg (callable_info, i);
@@ -130,13 +130,13 @@ _pygi_closure_convert_ffi_arguments (GICallableInfo *callable_info, void **args)
static gboolean
_pygi_closure_convert_arguments (GICallableInfo *callable_info, void **args,
void *user_data, PyObject **py_args,
- GArgument **out_args)
+ GIArgument **out_args)
{
int n_args = g_callable_info_get_n_args (callable_info);
int n_in_args = 0;
int n_out_args = 0;
int i;
- GArgument *g_args = NULL;
+ GIArgument *g_args = NULL;
*py_args = NULL;
*py_args = PyTuple_New (n_args);
@@ -144,7 +144,7 @@ _pygi_closure_convert_arguments (GICallableInfo *callable_info, void **args,
goto error;
*out_args = NULL;
- *out_args = g_new0 (GArgument, n_args);
+ *out_args = g_new0 (GIArgument, n_args);
g_args = _pygi_closure_convert_ffi_arguments (callable_info, args);
for (i = 0; i < n_args; i++) {
@@ -156,7 +156,7 @@ _pygi_closure_convert_arguments (GICallableInfo *callable_info, void **args,
GITypeTag arg_tag = g_type_info_get_tag (arg_type);
GITransfer transfer = g_arg_info_get_ownership_transfer (arg_info);
PyObject *value;
- GArgument *arg;
+ GIArgument *arg;
if (direction == GI_DIRECTION_IN && arg_tag == GI_TYPE_TAG_VOID &&
g_type_info_is_pointer (arg_type)) {
@@ -170,9 +170,9 @@ _pygi_closure_convert_arguments (GICallableInfo *callable_info, void **args,
}
} else {
if (direction == GI_DIRECTION_IN)
- arg = (GArgument*) &g_args[i];
+ arg = (GIArgument*) &g_args[i];
else
- arg = (GArgument*) g_args[i].v_pointer;
+ arg = (GIArgument*) g_args[i].v_pointer;
value = _pygi_argument_to_object (arg, arg_type, transfer);
if (value == NULL) {
@@ -214,7 +214,7 @@ error:
static void
_pygi_closure_set_out_arguments (GICallableInfo *callable_info,
- PyObject *py_retval, GArgument *out_args,
+ PyObject *py_retval, GIArgument *out_args,
void *resp)
{
int n_args, i, i_py_retval, i_out_args;
@@ -225,15 +225,15 @@ _pygi_closure_set_out_arguments (GICallableInfo *callable_info,
return_type_info = g_callable_info_get_return_type (callable_info);
return_type_tag = g_type_info_get_tag (return_type_info);
if (return_type_tag != GI_TYPE_TAG_VOID) {
- GArgument arg;
+ GIArgument arg;
GITransfer transfer = g_callable_info_get_caller_owns (callable_info);
if (PyTuple_Check (py_retval)) {
PyObject *item = PyTuple_GET_ITEM (py_retval, 0);
arg = _pygi_argument_from_object (item, return_type_info, transfer);
- * ( (GArgument*) resp) = arg;
+ * ( (GIArgument*) resp) = arg;
} else {
arg = _pygi_argument_from_object (py_retval, return_type_info, transfer);
- * ( (GArgument*) resp) = arg;
+ * ( (GIArgument*) resp) = arg;
}
i_py_retval++;
}
@@ -248,14 +248,14 @@ _pygi_closure_set_out_arguments (GICallableInfo *callable_info,
if (direction == GI_DIRECTION_OUT || direction == GI_DIRECTION_INOUT) {
GITransfer transfer = g_arg_info_get_ownership_transfer (arg_info);
- GArgument arg;
+ GIArgument arg;
if (PyTuple_Check (py_retval)) {
PyObject *item = PyTuple_GET_ITEM (py_retval, i_py_retval);
arg = _pygi_argument_from_object (item, type_info, transfer);
- * ( (GArgument*) out_args[i_out_args].v_pointer) = arg;
+ * ( (GIArgument*) out_args[i_out_args].v_pointer) = arg;
} else if (i_py_retval == 0) {
arg = _pygi_argument_from_object (py_retval, type_info, transfer);
- * ( (GArgument*) out_args[i_out_args].v_pointer) = arg;
+ * ( (GIArgument*) out_args[i_out_args].v_pointer) = arg;
} else
g_assert_not_reached();
@@ -280,7 +280,7 @@ _pygi_closure_handle (ffi_cif *cif,
GITypeInfo *return_type;
PyObject *retval;
PyObject *py_args;
- GArgument *out_args = NULL;
+ GIArgument *out_args = NULL;
/* Lock the GIL as we are coming into this code without the lock and we
may be executing python code */
diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
index 8320173..21692c5 100644
--- a/gi/pygi-foreign-cairo.c
+++ b/gi/pygi-foreign-cairo.c
@@ -33,7 +33,7 @@ PyObject *
cairo_context_to_arg (PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg)
+ GIArgument *arg)
{
cairo_t *cr;
@@ -49,7 +49,7 @@ cairo_context_to_arg (PyObject *value,
}
PyObject *
-cairo_context_from_arg (GITypeInfo *type_info, GArgument *arg)
+cairo_context_from_arg (GITypeInfo *type_info, GIArgument *arg)
{
cairo_t *context = (cairo_t*) arg;
@@ -71,7 +71,7 @@ PyObject *
cairo_surface_to_arg (PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg)
+ GIArgument *arg)
{
cairo_surface_t *surface;
@@ -88,7 +88,7 @@ cairo_surface_to_arg (PyObject *value,
}
PyObject *
-cairo_surface_from_arg (GITypeInfo *type_info, GArgument *arg)
+cairo_surface_from_arg (GITypeInfo *type_info, GIArgument *arg)
{
cairo_surface_t *surface = (cairo_surface_t*) arg;
diff --git a/gi/pygi-foreign-gvariant.c b/gi/pygi-foreign-gvariant.c
index 917fa1c..81afaaa 100644
--- a/gi/pygi-foreign-gvariant.c
+++ b/gi/pygi-foreign-gvariant.c
@@ -30,7 +30,7 @@ PyObject *
g_variant_to_arg (PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg)
+ GIArgument *arg)
{
g_assert (transfer == GI_TRANSFER_NOTHING);
@@ -42,7 +42,7 @@ g_variant_to_arg (PyObject *value,
PyObject *
g_variant_from_arg (GITypeInfo *type_info,
- GArgument *arg)
+ GIArgument *arg)
{
GVariant *variant = (GVariant *) arg;
GITypeInfo *interface_info = g_type_info_get_interface (type_info);
diff --git a/gi/pygi-foreign-gvariant.h b/gi/pygi-foreign-gvariant.h
index bdc0313..6de8c57 100644
--- a/gi/pygi-foreign-gvariant.h
+++ b/gi/pygi-foreign-gvariant.h
@@ -29,10 +29,10 @@
PyObject *g_variant_to_arg(PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg);
+ GIArgument *arg);
PyObject *g_variant_from_arg(GITypeInfo *type_info,
- GArgument *arg);
+ GIArgument *arg);
PyObject *g_variant_release_foreign (GIBaseInfo *base_info,
gpointer struct_);
diff --git a/gi/pygi-foreign.c b/gi/pygi-foreign.c
index c80c42d..f80b43c 100644
--- a/gi/pygi-foreign.c
+++ b/gi/pygi-foreign.c
@@ -31,8 +31,8 @@
typedef struct {
const char *namespace;
const char *name;
- PyGIArgOverrideToGArgumentFunc to_func;
- PyGIArgOverrideFromGArgumentFunc from_func;
+ PyGIArgOverrideToGIArgumentFunc to_func;
+ PyGIArgOverrideFromGIArgumentFunc from_func;
PyGIArgOverrideReleaseFunc release_func;
} PyGIForeignStruct;
@@ -107,7 +107,7 @@ PyObject *
pygi_struct_foreign_convert_to_g_argument (PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg)
+ GIArgument *arg)
{
GIBaseInfo *base_info = g_type_info_get_interface (type_info);
PyGIForeignStruct *foreign_struct = pygi_struct_foreign_lookup (base_info);
@@ -124,7 +124,7 @@ pygi_struct_foreign_convert_to_g_argument (PyObject *value,
PyObject *
pygi_struct_foreign_convert_from_g_argument (GITypeInfo *type_info,
- GArgument *arg)
+ GIArgument *arg)
{
GIBaseInfo *base_info = g_type_info_get_interface (type_info);
PyGIForeignStruct *foreign_struct = pygi_struct_foreign_lookup (base_info);
@@ -158,8 +158,8 @@ pygi_struct_foreign_release (GIBaseInfo *base_info,
void
pygi_register_foreign_struct_real (const char* namespace_,
const char* name,
- PyGIArgOverrideToGArgumentFunc to_func,
- PyGIArgOverrideFromGArgumentFunc from_func,
+ PyGIArgOverrideToGIArgumentFunc to_func,
+ PyGIArgOverrideFromGIArgumentFunc from_func,
PyGIArgOverrideReleaseFunc release_func)
{
PyGIForeignStruct *new_struct = g_slice_new0 (PyGIForeignStruct);
diff --git a/gi/pygi-foreign.h b/gi/pygi-foreign.h
index 9582960..b57f892 100644
--- a/gi/pygi-foreign.h
+++ b/gi/pygi-foreign.h
@@ -33,16 +33,16 @@
PyObject *pygi_struct_foreign_convert_to_g_argument (PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg);
+ GIArgument *arg);
PyObject *pygi_struct_foreign_convert_from_g_argument (GITypeInfo *type_info,
- GArgument *arg);
+ GIArgument *arg);
PyObject *pygi_struct_foreign_release (GITypeInfo *type_info,
gpointer struct_);
void pygi_register_foreign_struct_real (const char* namespace_,
const char* name,
- PyGIArgOverrideToGArgumentFunc to_func,
- PyGIArgOverrideFromGArgumentFunc from_func,
+ PyGIArgOverrideToGIArgumentFunc to_func,
+ PyGIArgOverrideFromGIArgumentFunc from_func,
PyGIArgOverrideReleaseFunc release_func);
#endif /* __PYGI_FOREIGN_H__ */
diff --git a/gi/pygi-info.c b/gi/pygi-info.c
index 46b9785..785d86b 100644
--- a/gi/pygi-info.c
+++ b/gi/pygi-info.c
@@ -968,7 +968,7 @@ static PyObject *
_wrap_g_constant_info_get_value (PyGIBaseInfo *self)
{
GITypeInfo *type_info;
- GArgument value;
+ GIArgument value;
PyObject *py_value;
if (g_constant_info_get_value ( (GIConstantInfo *) self->info, &value) < 0) {
@@ -1022,10 +1022,10 @@ _wrap_g_field_info_get_value (PyGIBaseInfo *self,
GIInfoType container_info_type;
gpointer pointer;
GITypeInfo *field_type_info;
- GArgument value;
+ GIArgument value;
PyObject *py_value = NULL;
- memset(&value, 0, sizeof(GArgument));
+ memset(&value, 0, sizeof(GIArgument));
if (!PyArg_ParseTuple (args, "O:FieldInfo.get_value", &instance)) {
return NULL;
@@ -1131,7 +1131,7 @@ _wrap_g_field_info_set_value (PyGIBaseInfo *self,
GIInfoType container_info_type;
gpointer pointer;
GITypeInfo *field_type_info;
- GArgument value;
+ GIArgument value;
PyObject *retval = NULL;
if (!PyArg_ParseTuple (args, "OO:FieldInfo.set_value", &instance, &py_value)) {
diff --git a/gi/pygi-invoke.c b/gi/pygi-invoke.c
index ba331f3..52fddcf 100644
--- a/gi/pygi-invoke.c
+++ b/gi/pygi-invoke.c
@@ -49,14 +49,14 @@ struct invocation_state
GITypeInfo *return_type_info;
GITypeTag return_type_tag;
- GArgument **args;
+ GIArgument **args;
gboolean *args_is_auxiliary;
- GArgument *in_args;
- GArgument *out_args;
- GArgument *out_values;
- GArgument *backup_args;
- GArgument return_arg;
+ GIArgument *in_args;
+ GIArgument *out_args;
+ GIArgument *out_values;
+ GIArgument *backup_args;
+ GIArgument return_arg;
PyObject *return_value;
};
@@ -281,10 +281,10 @@ _prepare_invocation_state (struct invocation_state *state,
}
state->args = g_slice_alloc0 (sizeof (gpointer) * state->n_args);
- state->in_args = g_slice_alloc0 (sizeof (GArgument) * state->n_in_args);
- state->out_args = g_slice_alloc0 (sizeof (GArgument) * state->n_out_args);
- state->out_values = g_slice_alloc0 (sizeof (GArgument) * state->n_out_args);
- state->backup_args = g_slice_alloc0 (sizeof (GArgument) * state->n_backup_args);
+ state->in_args = g_slice_alloc0 (sizeof (GIArgument) * state->n_in_args);
+ state->out_args = g_slice_alloc0 (sizeof (GIArgument) * state->n_out_args);
+ state->out_values = g_slice_alloc0 (sizeof (GIArgument) * state->n_out_args);
+ state->backup_args = g_slice_alloc0 (sizeof (GIArgument) * state->n_backup_args);
/* Bind args so we can use an unique index. */
{
@@ -868,19 +868,19 @@ _free_invocation_state (struct invocation_state *state)
}
if (state->in_args != NULL) {
- g_slice_free1 (sizeof (GArgument) * state->n_in_args, state->in_args);
+ g_slice_free1 (sizeof (GIArgument) * state->n_in_args, state->in_args);
}
if (state->out_args != NULL) {
- g_slice_free1 (sizeof (GArgument) * state->n_out_args, state->out_args);
+ g_slice_free1 (sizeof (GIArgument) * state->n_out_args, state->out_args);
}
if (state->out_values != NULL) {
- g_slice_free1 (sizeof (GArgument) * state->n_out_args, state->out_values);
+ g_slice_free1 (sizeof (GIArgument) * state->n_out_args, state->out_values);
}
if (state->backup_args != NULL) {
- g_slice_free1 (sizeof (GArgument) * state->n_backup_args, state->backup_args);
+ g_slice_free1 (sizeof (GIArgument) * state->n_backup_args, state->backup_args);
}
if (PyErr_Occurred()) {
diff --git a/gi/pygi-property.c b/gi/pygi-property.c
index bf5efe3..d9732c6 100644
--- a/gi/pygi-property.c
+++ b/gi/pygi-property.c
@@ -91,7 +91,7 @@ pygi_get_property_value_real (PyGObject *instance,
char *property_name = g_strdup (attr_name);
GParamSpec *pspec = NULL;
GValue value = { 0, };
- GArgument arg = { 0, };
+ GIArgument arg = { 0, };
PyObject *py_value = NULL;
GITypeInfo *type_info = NULL;
GITransfer transfer;
@@ -165,7 +165,7 @@ pygi_set_property_value_real (PyGObject *instance,
GITypeTag type_tag;
GITransfer transfer;
GValue value = { 0, };
- GArgument arg = { 0, };
+ GIArgument arg = { 0, };
GParamSpec *pspec = NULL;
gint ret_value = -1;
diff --git a/gi/pygi.h b/gi/pygi.h
index 93b5322..d1eaf05 100644
--- a/gi/pygi.h
+++ b/gi/pygi.h
@@ -52,12 +52,12 @@ typedef struct {
gsize size;
} PyGIBoxed;
-typedef PyObject * (*PyGIArgOverrideToGArgumentFunc) (PyObject *value,
+typedef PyObject * (*PyGIArgOverrideToGIArgumentFunc) (PyObject *value,
GITypeInfo *type_info,
GITransfer transfer,
- GArgument *arg);
-typedef PyObject * (*PyGIArgOverrideFromGArgumentFunc) (GITypeInfo *type_info,
- GArgument *arg);
+ GIArgument *arg);
+typedef PyObject * (*PyGIArgOverrideFromGIArgumentFunc) (GITypeInfo *type_info,
+ GIArgument *arg);
typedef PyObject * (*PyGIArgOverrideReleaseFunc) (GITypeInfo *type_info,
gpointer struct_);
@@ -70,8 +70,8 @@ struct PyGI_API {
PyObject *value);
void (*register_foreign_struct) (const char* namespace_,
const char* name,
- PyGIArgOverrideToGArgumentFunc to_func,
- PyGIArgOverrideFromGArgumentFunc from_func,
+ PyGIArgOverrideToGIArgumentFunc to_func,
+ PyGIArgOverrideFromGIArgumentFunc from_func,
PyGIArgOverrideReleaseFunc release_func);
};
@@ -125,8 +125,8 @@ pygi_set_property_value (PyGObject *instance,
static inline PyObject *
pygi_register_foreign_struct (const char* namespace_,
const char* name,
- PyGIArgOverrideToGArgumentFunc to_func,
- PyGIArgOverrideFromGArgumentFunc from_func,
+ PyGIArgOverrideToGIArgumentFunc to_func,
+ PyGIArgOverrideFromGIArgumentFunc from_func,
PyGIArgOverrideReleaseFunc release_func)
{
if (_pygi_import() < 0) {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
