[pygobject] [gi] use the right argument type for callback
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [pygobject] [gi] use the right argument type for callback
- Date: Fri, 21 Jan 2011 15:22:26 +0000 (UTC)
commit ce521011d7f6d7f082aaea76fa05c5af9f6e93f5
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Fri Jan 21 16:20:23 2011 +0100
[gi] use the right argument type for callback
gi/pygi-foreign-cairo.c | 8 ++++----
gi/pygi-foreign-gvariant.c | 4 ++--
gi/pygi-foreign-gvariant.h | 2 +-
gi/pygi-foreign.c | 2 +-
gi/pygi.h | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gi/pygi-foreign-cairo.c b/gi/pygi-foreign-cairo.c
index f6a7567..0264b71 100644
--- a/gi/pygi-foreign-cairo.c
+++ b/gi/pygi-foreign-cairo.c
@@ -56,9 +56,9 @@ cairo_context_to_arg (PyObject *value,
}
PyObject *
-cairo_context_from_arg (GITypeInfo *type_info, GIArgument *arg)
+cairo_context_from_arg (GITypeInfo *type_info, gpointer data)
{
- cairo_t *context = (cairo_t*) arg;
+ cairo_t *context = (cairo_t*) data;
cairo_reference (context);
@@ -95,9 +95,9 @@ cairo_surface_to_arg (PyObject *value,
}
PyObject *
-cairo_surface_from_arg (GITypeInfo *type_info, GIArgument *arg)
+cairo_surface_from_arg (GITypeInfo *type_info, gpointer data)
{
- cairo_surface_t *surface = (cairo_surface_t*) arg;
+ cairo_surface_t *surface = (cairo_surface_t*) data;
cairo_surface_reference (surface);
diff --git a/gi/pygi-foreign-gvariant.c b/gi/pygi-foreign-gvariant.c
index ac16395..3c8ae8d 100644
--- a/gi/pygi-foreign-gvariant.c
+++ b/gi/pygi-foreign-gvariant.c
@@ -42,9 +42,9 @@ g_variant_to_arg (PyObject *value,
PyObject *
g_variant_from_arg (GITypeInfo *type_info,
- GIArgument *arg)
+ gpointer data)
{
- GVariant *variant = (GVariant *) arg;
+ GVariant *variant = (GVariant *) data;
GITypeInfo *interface_info = g_type_info_get_interface (type_info);
PyObject *type = _pygi_type_import_by_gi_info (interface_info);
diff --git a/gi/pygi-foreign-gvariant.h b/gi/pygi-foreign-gvariant.h
index 6de8c57..b0c9781 100644
--- a/gi/pygi-foreign-gvariant.h
+++ b/gi/pygi-foreign-gvariant.h
@@ -32,7 +32,7 @@ PyObject *g_variant_to_arg(PyObject *value,
GIArgument *arg);
PyObject *g_variant_from_arg(GITypeInfo *type_info,
- GIArgument *arg);
+ gpointer data);
PyObject *g_variant_release_foreign (GIBaseInfo *base_info,
gpointer struct_);
diff --git a/gi/pygi-foreign.c b/gi/pygi-foreign.c
index 75d5bb9..5c9a88a 100644
--- a/gi/pygi-foreign.c
+++ b/gi/pygi-foreign.c
@@ -165,7 +165,7 @@ pygi_register_foreign_struct_real (const char* namespace_,
PyGIArgOverrideFromGIArgumentFunc from_func,
PyGIArgOverrideReleaseFunc release_func)
{
- PyGIForeignStruct *new_struct = g_slice_new0 (PyGIForeignStruct);
+ PyGIForeignStruct *new_struct = g_slice_new (PyGIForeignStruct);
new_struct->namespace = namespace_;
new_struct->name = name;
new_struct->to_func = to_func;
diff --git a/gi/pygi.h b/gi/pygi.h
index 03f71a4..2765b40 100644
--- a/gi/pygi.h
+++ b/gi/pygi.h
@@ -60,7 +60,7 @@ typedef PyObject * (*PyGIArgOverrideToGIArgumentFunc) (PyObject *value,
GITransfer transfer,
GIArgument *arg);
typedef PyObject * (*PyGIArgOverrideFromGIArgumentFunc) (GITypeInfo *type_info,
- GIArgument *arg);
+ gpointer data);
typedef PyObject * (*PyGIArgOverrideReleaseFunc) (GITypeInfo *type_info,
gpointer struct_);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]