aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libdbusmenu-glib/client-marshal.c12
-rw-r--r--libdbusmenu-glib/client-marshal.h4
-rw-r--r--libdbusmenu-glib/menuitem-marshal.c12
-rw-r--r--libdbusmenu-glib/menuitem-marshal.h4
-rw-r--r--libdbusmenu-glib/server-marshal.c12
-rw-r--r--libdbusmenu-glib/server-marshal.h4
6 files changed, 24 insertions, 24 deletions
diff --git a/libdbusmenu-glib/client-marshal.c b/libdbusmenu-glib/client-marshal.c
index 56b0100..1fabb99 100644
--- a/libdbusmenu-glib/client-marshal.c
+++ b/libdbusmenu-glib/client-marshal.c
@@ -86,23 +86,23 @@ _dbusmenu_client_marshal_VOID__OBJECT_UINT (GClosure *closure,
data2);
}
-/* VOID:OBJECT,STRING,POINTER,UINT,POINTER (./client-marshal.list:2) */
+/* VOID:OBJECT,STRING,VARIANT,UINT,POINTER (./client-marshal.list:2) */
void
-_dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER (GClosure *closure,
+_dbusmenu_client_marshal_VOID__OBJECT_STRING_VARIANT_UINT_POINTER (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__OBJECT_STRING_POINTER_UINT_POINTER) (gpointer data1,
+ typedef void (*GMarshalFunc_VOID__OBJECT_STRING_VARIANT_UINT_POINTER) (gpointer data1,
gpointer arg_1,
gpointer arg_2,
gpointer arg_3,
guint arg_4,
gpointer arg_5,
gpointer data2);
- register GMarshalFunc_VOID__OBJECT_STRING_POINTER_UINT_POINTER callback;
+ register GMarshalFunc_VOID__OBJECT_STRING_VARIANT_UINT_POINTER callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -118,12 +118,12 @@ _dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER (GClosure
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
- callback = (GMarshalFunc_VOID__OBJECT_STRING_POINTER_UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
+ callback = (GMarshalFunc_VOID__OBJECT_STRING_VARIANT_UINT_POINTER) (marshal_data ? marshal_data : cc->callback);
callback (data1,
g_marshal_value_peek_object (param_values + 1),
g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_pointer (param_values + 3),
+ g_marshal_value_peek_variant (param_values + 3),
g_marshal_value_peek_uint (param_values + 4),
g_marshal_value_peek_pointer (param_values + 5),
data2);
diff --git a/libdbusmenu-glib/client-marshal.h b/libdbusmenu-glib/client-marshal.h
index 9c43fc9..f12ddde 100644
--- a/libdbusmenu-glib/client-marshal.h
+++ b/libdbusmenu-glib/client-marshal.h
@@ -14,8 +14,8 @@ extern void _dbusmenu_client_marshal_VOID__OBJECT_UINT (GClosure *closure,
gpointer invocation_hint,
gpointer marshal_data);
-/* VOID:OBJECT,STRING,POINTER,UINT,POINTER (./client-marshal.list:2) */
-extern void _dbusmenu_client_marshal_VOID__OBJECT_STRING_POINTER_UINT_POINTER (GClosure *closure,
+/* VOID:OBJECT,STRING,VARIANT,UINT,POINTER (./client-marshal.list:2) */
+extern void _dbusmenu_client_marshal_VOID__OBJECT_STRING_VARIANT_UINT_POINTER (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
diff --git a/libdbusmenu-glib/menuitem-marshal.c b/libdbusmenu-glib/menuitem-marshal.c
index d6ac0a6..bb2b6d7 100644
--- a/libdbusmenu-glib/menuitem-marshal.c
+++ b/libdbusmenu-glib/menuitem-marshal.c
@@ -49,20 +49,20 @@
#endif /* !G_ENABLE_DEBUG */
-/* VOID:STRING,POINTER (./menuitem-marshal.list:1) */
+/* VOID:STRING,VARIANT (./menuitem-marshal.list:1) */
void
-_dbusmenu_menuitem_marshal_VOID__STRING_POINTER (GClosure *closure,
+_dbusmenu_menuitem_marshal_VOID__STRING_VARIANT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__STRING_POINTER) (gpointer data1,
+ typedef void (*GMarshalFunc_VOID__STRING_VARIANT) (gpointer data1,
gpointer arg_1,
gpointer arg_2,
gpointer data2);
- register GMarshalFunc_VOID__STRING_POINTER callback;
+ register GMarshalFunc_VOID__STRING_VARIANT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -78,11 +78,11 @@ _dbusmenu_menuitem_marshal_VOID__STRING_POINTER (GClosure *closure,
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
- callback = (GMarshalFunc_VOID__STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+ callback = (GMarshalFunc_VOID__STRING_VARIANT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
g_marshal_value_peek_string (param_values + 1),
- g_marshal_value_peek_pointer (param_values + 2),
+ g_marshal_value_peek_variant (param_values + 2),
data2);
}
diff --git a/libdbusmenu-glib/menuitem-marshal.h b/libdbusmenu-glib/menuitem-marshal.h
index c072d4a..0cde7ad 100644
--- a/libdbusmenu-glib/menuitem-marshal.h
+++ b/libdbusmenu-glib/menuitem-marshal.h
@@ -6,8 +6,8 @@
G_BEGIN_DECLS
-/* VOID:STRING,POINTER (./menuitem-marshal.list:1) */
-extern void _dbusmenu_menuitem_marshal_VOID__STRING_POINTER (GClosure *closure,
+/* VOID:STRING,VARIANT (./menuitem-marshal.list:1) */
+extern void _dbusmenu_menuitem_marshal_VOID__STRING_VARIANT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,
diff --git a/libdbusmenu-glib/server-marshal.c b/libdbusmenu-glib/server-marshal.c
index 68552f6..61393f4 100644
--- a/libdbusmenu-glib/server-marshal.c
+++ b/libdbusmenu-glib/server-marshal.c
@@ -49,21 +49,21 @@
#endif /* !G_ENABLE_DEBUG */
-/* VOID:INT,STRING,POINTER (./server-marshal.list:1) */
+/* VOID:INT,STRING,VARIANT (./server-marshal.list:1) */
void
-_dbusmenu_server_marshal_VOID__INT_STRING_POINTER (GClosure *closure,
+_dbusmenu_server_marshal_VOID__INT_STRING_VARIANT (GClosure *closure,
GValue *return_value G_GNUC_UNUSED,
guint n_param_values,
const GValue *param_values,
gpointer invocation_hint G_GNUC_UNUSED,
gpointer marshal_data)
{
- typedef void (*GMarshalFunc_VOID__INT_STRING_POINTER) (gpointer data1,
+ typedef void (*GMarshalFunc_VOID__INT_STRING_VARIANT) (gpointer data1,
gint arg_1,
gpointer arg_2,
gpointer arg_3,
gpointer data2);
- register GMarshalFunc_VOID__INT_STRING_POINTER callback;
+ register GMarshalFunc_VOID__INT_STRING_VARIANT callback;
register GCClosure *cc = (GCClosure*) closure;
register gpointer data1, data2;
@@ -79,12 +79,12 @@ _dbusmenu_server_marshal_VOID__INT_STRING_POINTER (GClosure *closure,
data1 = g_value_peek_pointer (param_values + 0);
data2 = closure->data;
}
- callback = (GMarshalFunc_VOID__INT_STRING_POINTER) (marshal_data ? marshal_data : cc->callback);
+ callback = (GMarshalFunc_VOID__INT_STRING_VARIANT) (marshal_data ? marshal_data : cc->callback);
callback (data1,
g_marshal_value_peek_int (param_values + 1),
g_marshal_value_peek_string (param_values + 2),
- g_marshal_value_peek_pointer (param_values + 3),
+ g_marshal_value_peek_variant (param_values + 3),
data2);
}
diff --git a/libdbusmenu-glib/server-marshal.h b/libdbusmenu-glib/server-marshal.h
index a561738..3123132 100644
--- a/libdbusmenu-glib/server-marshal.h
+++ b/libdbusmenu-glib/server-marshal.h
@@ -6,8 +6,8 @@
G_BEGIN_DECLS
-/* VOID:INT,STRING,POINTER (./server-marshal.list:1) */
-extern void _dbusmenu_server_marshal_VOID__INT_STRING_POINTER (GClosure *closure,
+/* VOID:INT,STRING,VARIANT (./server-marshal.list:1) */
+extern void _dbusmenu_server_marshal_VOID__INT_STRING_VARIANT (GClosure *closure,
GValue *return_value,
guint n_param_values,
const GValue *param_values,