aboutsummaryrefslogtreecommitdiff
path: root/libdbusmenu-glib/server-marshal.c
diff options
context:
space:
mode:
authorEvgeni Golov <evgeni@debian.org>2010-07-29 11:56:50 +0200
committerEvgeni Golov <evgeni@debian.org>2010-07-29 11:56:50 +0200
commite29be6e137292cd7225144ff65a98b3b60524fb7 (patch)
tree1086bf862d15d56a3afb446b27d602231a1756f1 /libdbusmenu-glib/server-marshal.c
parent61d587dacc6ad1ad4a62b8028f80beca65a192f6 (diff)
parent4586704d8923456d9bd0ef71d59285e39034fe5c (diff)
downloadlibdbusmenu-e29be6e137292cd7225144ff65a98b3b60524fb7.tar.gz
libdbusmenu-e29be6e137292cd7225144ff65a98b3b60524fb7.tar.bz2
libdbusmenu-e29be6e137292cd7225144ff65a98b3b60524fb7.zip
* Merge latest upstream from Ubuntu.
* New upstream release.
Diffstat (limited to 'libdbusmenu-glib/server-marshal.c')
-rw-r--r--libdbusmenu-glib/server-marshal.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libdbusmenu-glib/server-marshal.c b/libdbusmenu-glib/server-marshal.c
index ab13b04..6730b16 100644
--- a/libdbusmenu-glib/server-marshal.c
+++ b/libdbusmenu-glib/server-marshal.c
@@ -21,6 +21,7 @@
#define g_marshal_value_peek_boxed(v) g_value_get_boxed (v)
#define g_marshal_value_peek_pointer(v) g_value_get_pointer (v)
#define g_marshal_value_peek_object(v) g_value_get_object (v)
+#define g_marshal_value_peek_variant(v) g_value_get_variant (v)
#else /* !G_ENABLE_DEBUG */
/* WARNING: This code accesses GValues directly, which is UNSUPPORTED API.
* Do not access GValues directly in your code. Instead, use the
@@ -44,6 +45,7 @@
#define g_marshal_value_peek_boxed(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_pointer(v) (v)->data[0].v_pointer
#define g_marshal_value_peek_object(v) (v)->data[0].v_pointer
+#define g_marshal_value_peek_variant(v) (v)->data[0].v_pointer
#endif /* !G_ENABLE_DEBUG */