[glib] Catch up with G_TYPE_VARIANT changes
- From: David Zeuthen <davidz src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] Catch up with G_TYPE_VARIANT changes
- Date: Thu, 17 Jun 2010 19:29:09 +0000 (UTC)
commit 0a7e6255b37efd2005bb86a5843921d4adc3bdf8
Author: David Zeuthen <davidz redhat com>
Date: Thu Jun 17 15:27:18 2010 -0400
Catch up with G_TYPE_VARIANT changes
The GType for a GVariant is now a fundamental GType instead of a boxed
one so use the right marshaller.
Signed-off-by: David Zeuthen <davidz redhat com>
gio/gdbusproxy.c | 4 ++--
gio/gio-marshal.list | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/gio/gdbusproxy.c b/gio/gdbusproxy.c
index 78e4fa4..1629c13 100644
--- a/gio/gdbusproxy.c
+++ b/gio/gdbusproxy.c
@@ -494,7 +494,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
G_STRUCT_OFFSET (GDBusProxyClass, g_properties_changed),
NULL,
NULL,
- _gio_marshal_VOID__BOXED_BOXED,
+ _gio_marshal_VOID__VARIANT_BOXED,
G_TYPE_NONE,
2,
G_TYPE_VARIANT,
@@ -517,7 +517,7 @@ g_dbus_proxy_class_init (GDBusProxyClass *klass)
G_STRUCT_OFFSET (GDBusProxyClass, g_signal),
NULL,
NULL,
- _gio_marshal_VOID__STRING_STRING_BOXED,
+ _gio_marshal_VOID__STRING_STRING_VARIANT,
G_TYPE_NONE,
3,
G_TYPE_STRING,
diff --git a/gio/gio-marshal.list b/gio/gio-marshal.list
index f4abf4d..f7a25ef 100644
--- a/gio/gio-marshal.list
+++ b/gio/gio-marshal.list
@@ -15,3 +15,5 @@ VOID:INT
VOID:STRING,INT
VOID:STRING,UINT
VOID:BOXED,BOXED
+VOID:VARIANT,BOXED
+VOID:STRING,STRING,VARIANT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]