[libpeas] Replace GArgument with GIArgument, and bump g-i dependency to 0.9.6
- From: Jonh Wendell <jwendell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libpeas] Replace GArgument with GIArgument, and bump g-i dependency to 0.9.6
- Date: Fri, 17 Sep 2010 13:10:02 +0000 (UTC)
commit b5c64812e2da65de4dd3228934c3bacad51b5972
Author: Jonh Wendell <jwendell gnome org>
Date: Fri Sep 17 10:08:49 2010 -0300
Replace GArgument with GIArgument, and bump g-i dependency to 0.9.6
configure.ac | 2 +-
libpeas/peas-extension-set.c | 10 +++++-----
libpeas/peas-extension-set.h | 4 ++--
libpeas/peas-extension-subclasses.c | 6 +++---
libpeas/peas-extension.c | 10 +++++-----
libpeas/peas-extension.h | 8 ++++----
libpeas/peas-introspection.c | 24 ++++++++++++------------
libpeas/peas-introspection.h | 10 +++++-----
loaders/c/peas-extension-c.c | 4 ++--
loaders/python/peas-extension-python.c | 4 ++--
loaders/seed/peas-extension-seed.c | 8 ++++----
11 files changed, 45 insertions(+), 45 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 6b71efa..c5fbe8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,7 +72,7 @@ PKG_CHECK_MODULES(PEAS, [
glib-2.0 >= 2.18.0
gobject-2.0 >= 2.23.6
gmodule-2.0 >= 2.18.0
- gobject-introspection-1.0 >= 0.9.0
+ gobject-introspection-1.0 >= 0.9.6
])
dnl ================================================================
diff --git a/libpeas/peas-extension-set.c b/libpeas/peas-extension-set.c
index 8da6c27..195d7fa 100644
--- a/libpeas/peas-extension-set.c
+++ b/libpeas/peas-extension-set.c
@@ -310,11 +310,11 @@ peas_extension_set_finalize (GObject *object)
static gboolean
peas_extension_set_call_real (PeasExtensionSet *set,
const gchar *method_name,
- GArgument *args)
+ GIArgument *args)
{
gboolean ret = TRUE;
GList *l;
- GArgument dummy;
+ GIArgument dummy;
for (l = set->priv->extensions; l; l = l->next)
{
@@ -496,13 +496,13 @@ peas_extension_set_call_valist (PeasExtensionSet *set,
va_list va_args)
{
GICallableInfo *callable_info;
- GArgument *args;
+ GIArgument *args;
g_return_val_if_fail (PEAS_IS_EXTENSION_SET (set), FALSE);
g_return_val_if_fail (method_name != NULL, FALSE);
callable_info = peas_gi_get_method_info (set->priv->exten_type, method_name);
- args = g_newa (GArgument, g_callable_info_get_n_args (callable_info));
+ args = g_newa (GIArgument, g_callable_info_get_n_args (callable_info));
peas_gi_valist_to_arguments (callable_info, va_args, args, NULL);
return peas_extension_set_callv (set, method_name, args);
@@ -523,7 +523,7 @@ peas_extension_set_call_valist (PeasExtensionSet *set,
gboolean
peas_extension_set_callv (PeasExtensionSet *set,
const gchar *method_name,
- GArgument *args)
+ GIArgument *args)
{
PeasExtensionSetClass *klass;
diff --git a/libpeas/peas-extension-set.h b/libpeas/peas-extension-set.h
index 5bee385..a8d3c5d 100644
--- a/libpeas/peas-extension-set.h
+++ b/libpeas/peas-extension-set.h
@@ -59,7 +59,7 @@ struct _PeasExtensionSetClass {
/* Virtual public methods */
gboolean (*call) (PeasExtensionSet *set,
const gchar *method,
- GArgument *args);
+ GIArgument *args);
/* Signals */
void (*extension_added) (PeasExtensionSet *set,
@@ -96,7 +96,7 @@ gboolean peas_extension_set_call_valist (PeasExtensionSet *set,
va_list va_args);
gboolean peas_extension_set_callv (PeasExtensionSet *set,
const gchar *method_name,
- GArgument *args);
+ GIArgument *args);
PeasExtension *peas_extension_set_get_extension (PeasExtensionSet *set,
PeasPluginInfo *info);
diff --git a/libpeas/peas-extension-subclasses.c b/libpeas/peas-extension-subclasses.c
index 03d4a17..9231eca 100644
--- a/libpeas/peas-extension-subclasses.c
+++ b/libpeas/peas-extension-subclasses.c
@@ -61,14 +61,14 @@ handle_method_impl (ffi_cif *cif,
GITypeInfo *return_type_info;
guint n_args, i;
PeasExtension *instance;
- GArgument *arguments;
- GArgument return_value;
+ GIArgument *arguments;
+ GIArgument return_value;
instance = *((PeasExtension **) args[0]);
g_assert (PEAS_IS_EXTENSION (instance));
n_args = g_callable_info_get_n_args (impl->info);
- arguments = g_newa (GArgument, n_args-1);
+ arguments = g_newa (GIArgument, n_args-1);
for (i = 1; i < n_args; i++)
{
diff --git a/libpeas/peas-extension.c b/libpeas/peas-extension.c
index d3e0deb..83f0e5f 100644
--- a/libpeas/peas-extension.c
+++ b/libpeas/peas-extension.c
@@ -213,8 +213,8 @@ peas_extension_call_valist (PeasExtension *exten,
{
GICallableInfo *callable_info;
GITypeInfo *retval_info;
- GArgument *gargs;
- GArgument retval;
+ GIArgument *gargs;
+ GIArgument retval;
gpointer retval_ptr;
gboolean ret;
@@ -225,7 +225,7 @@ peas_extension_call_valist (PeasExtension *exten,
if (callable_info == NULL)
return FALSE;
- gargs = g_newa (GArgument, g_callable_info_get_n_args (callable_info));
+ gargs = g_newa (GIArgument, g_callable_info_get_n_args (callable_info));
peas_gi_valist_to_arguments (callable_info, args, gargs, &retval_ptr);
ret = peas_extension_callv (exten, method_name, gargs, &retval);
@@ -243,8 +243,8 @@ peas_extension_call_valist (PeasExtension *exten,
gboolean
peas_extension_callv (PeasExtension *exten,
const gchar *method_name,
- GArgument *args,
- GArgument *return_value)
+ GIArgument *args,
+ GIArgument *return_value)
{
PeasExtensionClass *klass;
diff --git a/libpeas/peas-extension.h b/libpeas/peas-extension.h
index 8a2b89a..d47639e 100644
--- a/libpeas/peas-extension.h
+++ b/libpeas/peas-extension.h
@@ -67,8 +67,8 @@ struct _PeasExtensionClass {
/*< private >*/
gboolean (*call) (PeasExtension *exten,
const gchar *method,
- GArgument *args,
- GArgument *return_value);
+ GIArgument *args,
+ GIArgument *return_value);
};
/*
@@ -87,8 +87,8 @@ gboolean peas_extension_call_valist (PeasExtension *exten,
va_list args);
gboolean peas_extension_callv (PeasExtension *exten,
const gchar *method_name,
- GArgument *args,
- GArgument *return_value);
+ GIArgument *args,
+ GIArgument *return_value);
G_END_DECLS
diff --git a/libpeas/peas-introspection.c b/libpeas/peas-introspection.c
index 55ed3dd..e93ec51 100644
--- a/libpeas/peas-introspection.c
+++ b/libpeas/peas-introspection.c
@@ -28,14 +28,14 @@
void
peas_gi_valist_to_arguments (GICallableInfo *callable_info,
va_list va_args,
- GArgument *arguments,
+ GIArgument *arguments,
gpointer *return_value)
{
guint i, n_args;
GIArgInfo *arg_info;
GITypeInfo *arg_type_info;
GITypeInfo *retval_info;
- GArgument *cur_arg;
+ GIArgument *cur_arg;
n_args = g_callable_info_get_n_args (callable_info);
@@ -138,10 +138,10 @@ peas_gi_valist_to_arguments (GICallableInfo *callable_info,
static void
peas_gi_split_in_and_out_arguments (GICallableInfo *callable_info,
- GArgument *args,
- GArgument *in_args,
+ GIArgument *args,
+ GIArgument *in_args,
guint *n_in_args,
- GArgument *out_args,
+ GIArgument *out_args,
guint *n_out_args)
{
guint n_args, i;
@@ -173,7 +173,7 @@ peas_gi_split_in_and_out_arguments (GICallableInfo *callable_info,
void
peas_gi_argument_to_pointer (GITypeInfo *type_info,
- GArgument *arg,
+ GIArgument *arg,
gpointer ptr)
{
switch (g_type_info_get_tag (type_info))
@@ -236,7 +236,7 @@ peas_gi_argument_to_pointer (GITypeInfo *type_info,
void
peas_gi_pointer_to_argument (GITypeInfo *type_info,
gpointer ptr,
- GArgument *arg)
+ GIArgument *arg)
{
g_return_if_fail (ptr != NULL);
@@ -343,12 +343,12 @@ gboolean
peas_method_apply (GObject *instance,
GType iface_type,
const gchar *method_name,
- GArgument *args,
- GArgument *return_value)
+ GIArgument *args,
+ GIArgument *return_value)
{
GICallableInfo *func_info;
guint n_args, n_in_args, n_out_args;
- GArgument *in_args, *out_args;
+ GIArgument *in_args, *out_args;
gboolean ret = TRUE;
GError *error = NULL;
@@ -360,8 +360,8 @@ peas_method_apply (GObject *instance,
n_in_args = 0;
n_out_args = 0;
- in_args = g_newa (GArgument, n_args + 1);
- out_args = g_newa (GArgument, n_args);
+ in_args = g_newa (GIArgument, n_args + 1);
+ out_args = g_newa (GIArgument, n_args);
peas_gi_split_in_and_out_arguments (func_info, args,
in_args+1, &n_in_args,
diff --git a/libpeas/peas-introspection.h b/libpeas/peas-introspection.h
index dc15e45..7e63537 100644
--- a/libpeas/peas-introspection.h
+++ b/libpeas/peas-introspection.h
@@ -32,19 +32,19 @@ GICallableInfo *peas_gi_get_method_info (GType iface_type,
void peas_gi_valist_to_arguments (GICallableInfo *callable_info,
va_list va_args,
- GArgument *arguments,
+ GIArgument *arguments,
gpointer *return_value);
void peas_gi_argument_to_pointer (GITypeInfo *type_info,
- GArgument *arg,
+ GIArgument *arg,
gpointer ptr);
void peas_gi_pointer_to_argument (GITypeInfo *type_info,
gpointer ptr,
- GArgument *arg);
+ GIArgument *arg);
gboolean peas_method_apply (GObject *instance,
GType iface_type,
const gchar *method_name,
- GArgument *args,
- GArgument *return_value);
+ GIArgument *args,
+ GIArgument *return_value);
G_END_DECLS
diff --git a/loaders/c/peas-extension-c.c b/loaders/c/peas-extension-c.c
index 136c17f..1f628fe 100644
--- a/loaders/c/peas-extension-c.c
+++ b/loaders/c/peas-extension-c.c
@@ -38,8 +38,8 @@ peas_extension_c_init (PeasExtensionC *cexten)
static gboolean
peas_extension_c_call (PeasExtension *exten,
const gchar *method_name,
- GArgument *args,
- GArgument *retval)
+ GIArgument *args,
+ GIArgument *retval)
{
PeasExtensionC *cexten = PEAS_EXTENSION_C (exten);
GType gtype;
diff --git a/loaders/python/peas-extension-python.c b/loaders/python/peas-extension-python.c
index ef147a7..461b864 100644
--- a/loaders/python/peas-extension-python.c
+++ b/loaders/python/peas-extension-python.c
@@ -43,8 +43,8 @@ peas_extension_python_init (PeasExtensionPython *pyexten)
static gboolean
peas_extension_python_call (PeasExtension *exten,
const gchar *method_name,
- GArgument *args,
- GArgument *retval)
+ GIArgument *args,
+ GIArgument *retval)
{
PeasExtensionPython *pyexten = PEAS_EXTENSION_PYTHON (exten);
GType gtype;
diff --git a/loaders/seed/peas-extension-seed.c b/loaders/seed/peas-extension-seed.c
index ad3d933..e5327bb 100644
--- a/loaders/seed/peas-extension-seed.c
+++ b/loaders/seed/peas-extension-seed.c
@@ -39,7 +39,7 @@ enum {
typedef struct {
GITypeInfo *type_info;
- GArgument *ptr;
+ GIArgument *ptr;
} OutArg;
static void
@@ -90,7 +90,7 @@ peas_extension_seed_finalize (GObject *object)
static SeedValue
get_argument (SeedContext ctx,
- GArgument *arg,
+ GIArgument *arg,
GITypeInfo *arg_type_info,
SeedException *exc)
{
@@ -227,8 +227,8 @@ set_return_value (OutArg *arg,
static gboolean
peas_extension_seed_call (PeasExtension *exten,
const gchar *method_name,
- GArgument *args,
- GArgument *retval)
+ GIArgument *args,
+ GIArgument *retval)
{
PeasExtensionSeed *sexten = PEAS_EXTENSION_SEED (exten);
GType exten_type;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
