diff options
| author | Ted Gould <ted@gould.cx> | 2011-01-13 10:11:17 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-01-13 10:11:17 -0600 |
| commit | b76ed9c7f918123610e5e56bb9cdd1025d34caa1 (patch) | |
| tree | 0905e58eb310c29710bcf881ae87f72904f3f153 /libdbusmenu-glib/server-marshal.c | |
| parent | f0c24c976f319d0b087adc0c8bc694cf930aa30b (diff) | |
| parent | 2cfbfcab8a2c73227619eb3cd7a79e1fe17a8b43 (diff) | |
| download | libdbusmenu-b76ed9c7f918123610e5e56bb9cdd1025d34caa1.tar.gz libdbusmenu-b76ed9c7f918123610e5e56bb9cdd1025d34caa1.tar.bz2 libdbusmenu-b76ed9c7f918123610e5e56bb9cdd1025d34caa1.zip | |
Import upstream version 0.3.91
Diffstat (limited to 'libdbusmenu-glib/server-marshal.c')
| -rw-r--r-- | libdbusmenu-glib/server-marshal.c | 12 |
1 files changed, 6 insertions, 6 deletions
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); } |