diff options
| author | Ted Gould <ted@gould.cx> | 2010-12-08 10:28:41 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2010-12-08 10:28:41 -0600 |
| commit | 19d4f5072d6cd72bab67cbf0d9abe28de99a4b7c (patch) | |
| tree | 134d6edb6fe8a925680c09ad5f83be3ae8267276 /libdbusmenu-glib/server-marshal.c | |
| parent | bdb286fb7bdbf81d63c0c592beb5bbb94e1a82ae (diff) | |
| parent | 29393d8e8816ac771286a47a854dd96138a4a236 (diff) | |
| download | libdbusmenu-19d4f5072d6cd72bab67cbf0d9abe28de99a4b7c.tar.gz libdbusmenu-19d4f5072d6cd72bab67cbf0d9abe28de99a4b7c.tar.bz2 libdbusmenu-19d4f5072d6cd72bab67cbf0d9abe28de99a4b7c.zip | |
* Upstream Merge
* Porting from dbus-glib to GDBus
* debian/*.install: Changing to be the 0.4 version of the dbusmenu
API of all the filenames and paths.
* Autogen
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); } |