luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-04-17 12:58:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'wip/refi64/fix-marshaller-args' into 'main'

Browse Source 
gdbus-codegen: Fix callback GUnixFDList parameter order

See merge request GNOME/glib!4524
This commit is contained in:
Philip Withnall 2025-02-27 14:21:43 +00:00
commit db26eb22fd
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/gdbus-2.0/codegen/dbustypes.py
View File

@ -461,7 +461,7 @@ class Method:
method_invocation_arg.gvalue_type = "object"
method_invocation_arg.gvalue_get = "g_marshal_value_peek_object"
method_invocation_arg.gclosure_marshaller = None
self.marshaller_in_args = [method_invocation_arg] + self.in_args
self.marshaller_in_args = [method_invocation_arg]
if self.unix_fd:
fd_list_arg = Arg("fd_list", None)
@ -469,7 +469,9 @@ class Method:
fd_list_arg.gvalue_type = "object"
fd_list_arg.gvalue_get = "g_marshal_value_peek_object"
fd_list_arg.gclosure_marshaller = None
self.marshaller_in_args.insert(0, fd_list_arg)
self.marshaller_in_args.append(fd_list_arg)
self.marshaller_in_args.extend(self.in_args)
for a in self.annotations:
a.post_process(interface_prefix, cns, cns_upper, cns_lower, self)

5
gio/tests/codegen.py
View File

@ -1352,6 +1352,11 @@ G_END_DECLS
self.assertIs(stripped_out.count(f"{func_name},"), 1)
self.assertIs(stripped_out.count(f"{func_name} ("), 1)
self.assertLess(
stripped_out.index("arg_method_invocation"),
stripped_out.index("arg_fd_list"),
)
index = 1
self.assertIs(
stripped_out.count(f"g_marshal_value_peek_object (param_values + {index})"),