detached b182548

fix(gen): marshal callback strings from C ABI pointers

commit
b1825488ed925caa8bae0f2d7e5aed371e5e1cea
author
brice · · 2026-02-08 06:23 UTC
parent
abab680
signature
GPG VerifiedCD88F9E564E0102646FB6077A1A07C7C7C3E349D · arch-gpg Verified for the committer email
15 files · +94 -82
Unified
UnifiedSplit
M internal/gir/types/template.go +12 -0
@@ -32,6 +32,8 @@ type CallbackParam struct {
3232 TypeName string
3333 // PureTypes are the pure argument types for the closure
3434 PureTypes []string
35+ // CallArgs are expressions used when invoking cbFn from closure args
36+ CallArgs []string
3537 // RetRaw is the return type for the closure (e.g., "bool")
3638 RetRaw string
3739 // Nullable indicates if the callback can be nil
@@ -358,12 +360,22 @@ func (f *funcArgsTemplate) Add(p Parameter, ins string, ns string, kinds KindMap
358360 }
359361
360362 qualifiedPureTypes := qualifyCallbackTypes(cbArgs.Pure.Types, cbNs, ns)
363+ callArgs := make([]string, len(qualifiedPureTypes))
364+ for i := range qualifiedPureTypes {
365+ callArgs[i] = fmt.Sprintf("arg%d", i)
366+ if qualifiedPureTypes[i] == "string" {
367+ // C callback string parameters are char* pointers in ABI.
368+ qualifiedPureTypes[i] = "uintptr"
369+ callArgs[i] = fmt.Sprintf("core.GoString(arg%d)", i)
370+ }
371+ }
361372 qualifiedRetRaw := qualifyCallbackType(retRaw, cbNs, ns)
362373
363374 f.Callbacks = append(f.Callbacks, CallbackParam{
364375 Name: varName,
365376 TypeName: strings.TrimPrefix(goType, "*"),
366377 PureTypes: qualifiedPureTypes,
378+ CallArgs: callArgs,
367379 RetRaw: qualifiedRetRaw,
368380 Nullable: p.Nullable,
369381 })
@@ -32,6 +32,8 @@ type CallbackParam struct {
32 TypeName string32 TypeName string
33 // PureTypes are the pure argument types for the closure33 // PureTypes are the pure argument types for the closure
34 PureTypes []string34 PureTypes []string
35+ // CallArgs are expressions used when invoking cbFn from closure args
36+ CallArgs []string
35 // RetRaw is the return type for the closure (e.g., "bool")37 // RetRaw is the return type for the closure (e.g., "bool")
36 RetRaw string38 RetRaw string
37 // Nullable indicates if the callback can be nil39 // Nullable indicates if the callback can be nil
@@ -358,12 +360,22 @@ func (f *funcArgsTemplate) Add(p Parameter, ins string, ns string, kinds KindMap
358 }360 }
359 361
360 qualifiedPureTypes := qualifyCallbackTypes(cbArgs.Pure.Types, cbNs, ns)362 qualifiedPureTypes := qualifyCallbackTypes(cbArgs.Pure.Types, cbNs, ns)
363+ callArgs := make([]string, len(qualifiedPureTypes))
364+ for i := range qualifiedPureTypes {
365+ callArgs[i] = fmt.Sprintf("arg%d", i)
366+ if qualifiedPureTypes[i] == "string" {
367+ // C callback string parameters are char* pointers in ABI.
368+ qualifiedPureTypes[i] = "uintptr"
369+ callArgs[i] = fmt.Sprintf("core.GoString(arg%d)", i)
370+ }
371+ }
361 qualifiedRetRaw := qualifyCallbackType(retRaw, cbNs, ns)372 qualifiedRetRaw := qualifyCallbackType(retRaw, cbNs, ns)
362 373
363 f.Callbacks = append(f.Callbacks, CallbackParam{374 f.Callbacks = append(f.Callbacks, CallbackParam{
364 Name: varName,375 Name: varName,
365 TypeName: strings.TrimPrefix(goType, "*"),376 TypeName: strings.TrimPrefix(goType, "*"),
366 PureTypes: qualifiedPureTypes,377 PureTypes: qualifiedPureTypes,
378+ CallArgs: callArgs,
367 RetRaw: qualifiedRetRaw,379 RetRaw: qualifiedRetRaw,
368 Nullable: p.Nullable,380 Nullable: p.Nullable,
369 })381 })
M templates/go +24 -24
@@ -84,10 +84,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
8484 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
8585 {{.Name}}Ref = cbRefPtr
8686 } else {
87- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
88- cbFn := *{{.Name}}
89- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})
90- }
87+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
88+ cbFn := *{{.Name}}
89+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
90+ }
9191 {{.Name}}Ref = purego.NewCallback(fcb)
9292 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
9393 }
@@ -116,10 +116,10 @@ func (x *{{$outer.Name}}) {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
116116 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
117117 {{.Name}}Ref = cbRefPtr
118118 } else {
119- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
120- cbFn := *{{.Name}}
121- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})
122- }
119+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
120+ cbFn := *{{.Name}}
121+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
122+ }
123123 {{.Name}}Ref = purego.NewCallback(fcb)
124124 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
125125 }
@@ -301,10 +301,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
301301 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
302302 {{.Name}}Ref = cbRefPtr
303303 } else {
304- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
305- cbFn := *{{.Name}}
306- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})
307- }
304+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
305+ cbFn := *{{.Name}}
306+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
307+ }
308308 {{.Name}}Ref = purego.NewCallback(fcb)
309309 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
310310 }
@@ -356,10 +356,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
356356 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
357357 {{.Name}}Ref = cbRefPtr
358358 } else {
359- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
360- cbFn := *{{.Name}}
361- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})
362- }
359+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
360+ cbFn := *{{.Name}}
361+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
362+ }
363363 {{.Name}}Ref = purego.NewCallback(fcb)
364364 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
365365 }
@@ -388,10 +388,10 @@ func (x *{{$outer.Name}}) {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
388388 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
389389 {{.Name}}Ref = cbRefPtr
390390 } else {
391- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
392- cbFn := *{{.Name}}
393- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})
394- }
391+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
392+ cbFn := *{{.Name}}
393+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
394+ }
395395 {{.Name}}Ref = purego.NewCallback(fcb)
396396 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
397397 }
@@ -531,10 +531,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
531531 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
532532 {{.Name}}Ref = cbRefPtr
533533 } else {
534- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
535- cbFn := *{{.Name}}
536- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})
537- }
534+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
535+ cbFn := *{{.Name}}
536+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
537+ }
538538 {{.Name}}Ref = purego.NewCallback(fcb)
539539 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
540540 }
@@ -84,10 +84,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
84 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {84 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
85 {{.Name}}Ref = cbRefPtr85 {{.Name}}Ref = cbRefPtr
86 } else {86 } else {
87- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {87+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
88- cbFn := *{{.Name}}88+ cbFn := *{{.Name}}
89- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})89+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
90- }90+ }
91 {{.Name}}Ref = purego.NewCallback(fcb)91 {{.Name}}Ref = purego.NewCallback(fcb)
92 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})92 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
93 }93 }
@@ -116,10 +116,10 @@ func (x *{{$outer.Name}}) {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
116 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {116 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
117 {{.Name}}Ref = cbRefPtr117 {{.Name}}Ref = cbRefPtr
118 } else {118 } else {
119- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {119+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
120- cbFn := *{{.Name}}120+ cbFn := *{{.Name}}
121- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})121+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
122- }122+ }
123 {{.Name}}Ref = purego.NewCallback(fcb)123 {{.Name}}Ref = purego.NewCallback(fcb)
124 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})124 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
125 }125 }
@@ -301,10 +301,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
301 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {301 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
302 {{.Name}}Ref = cbRefPtr302 {{.Name}}Ref = cbRefPtr
303 } else {303 } else {
304- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {304+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
305- cbFn := *{{.Name}}305+ cbFn := *{{.Name}}
306- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})306+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
307- }307+ }
308 {{.Name}}Ref = purego.NewCallback(fcb)308 {{.Name}}Ref = purego.NewCallback(fcb)
309 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})309 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
310 }310 }
@@ -356,10 +356,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
356 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {356 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
357 {{.Name}}Ref = cbRefPtr357 {{.Name}}Ref = cbRefPtr
358 } else {358 } else {
359- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {359+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
360- cbFn := *{{.Name}}360+ cbFn := *{{.Name}}
361- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})361+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
362- }362+ }
363 {{.Name}}Ref = purego.NewCallback(fcb)363 {{.Name}}Ref = purego.NewCallback(fcb)
364 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})364 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
365 }365 }
@@ -388,10 +388,10 @@ func (x *{{$outer.Name}}) {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
388 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {388 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
389 {{.Name}}Ref = cbRefPtr389 {{.Name}}Ref = cbRefPtr
390 } else {390 } else {
391- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {391+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
392- cbFn := *{{.Name}}392+ cbFn := *{{.Name}}
393- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})393+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
394- }394+ }
395 {{.Name}}Ref = purego.NewCallback(fcb)395 {{.Name}}Ref = purego.NewCallback(fcb)
396 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})396 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
397 }397 }
@@ -531,10 +531,10 @@ func {{.Name}}({{conv .Args.API.Full}}) {{.Ret.Return}} {
531 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {531 if cbRefPtr, ok := {{if $NotGLib}}glib.{{end}}GetCallback({{.Name}}Ptr); ok {
532 {{.Name}}Ref = cbRefPtr532 {{.Name}}Ref = cbRefPtr
533 } else {533 } else {
534- fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {534+ fcb := func({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}} {{$t}}{{end}}) {{.RetRaw}} {
535- cbFn := *{{.Name}}535+ cbFn := *{{.Name}}
536- {{if .RetRaw}}return {{end}}cbFn({{range $i, $t := .PureTypes}}{{if $i}}, {{end}}arg{{$i}}{{end}})536+ {{if .RetRaw}}return {{end}}cbFn({{range $i, $a := .CallArgs}}{{if $i}}, {{end}}{{$a}}{{end}})
537- }537+ }
538 {{.Name}}Ref = purego.NewCallback(fcb)538 {{.Name}}Ref = purego.NewCallback(fcb)
539 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})539 {{if $NotGLib}}glib.{{end}}SaveCallbackWithClosure({{.Name}}Ptr, {{.Name}}Ref, {{.Name}})
540 }540 }
M v4/gio/gdbusconnection.go +2 -2
@@ -1579,9 +1579,9 @@ func (x *DBusConnection) SignalSubscribe(SenderVar *string, InterfaceNameVar *st
15791579 if cbRefPtr, ok := glib.GetCallback(CallbackVarPtr); ok {
15801580 CallbackVarRef = cbRefPtr
15811581 } else {
1582- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 string, arg4 string, arg5 *glib.Variant, arg6 uintptr) {
1582+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 *glib.Variant, arg6 uintptr) {
15831583 cbFn := *CallbackVar
1584- cbFn(arg0, arg1, arg2, arg3, arg4, arg5, arg6)
1584+ cbFn(arg0, core.GoString(arg1), core.GoString(arg2), core.GoString(arg3), core.GoString(arg4), arg5, arg6)
15851585 }
15861586 CallbackVarRef = purego.NewCallback(fcb)
15871587 glib.SaveCallbackWithClosure(CallbackVarPtr, CallbackVarRef, CallbackVar)
@@ -1579,9 +1579,9 @@ func (x *DBusConnection) SignalSubscribe(SenderVar *string, InterfaceNameVar *st
1579 if cbRefPtr, ok := glib.GetCallback(CallbackVarPtr); ok {1579 if cbRefPtr, ok := glib.GetCallback(CallbackVarPtr); ok {
1580 CallbackVarRef = cbRefPtr1580 CallbackVarRef = cbRefPtr
1581 } else {1581 } else {
1582- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 string, arg4 string, arg5 *glib.Variant, arg6 uintptr) {1582+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 *glib.Variant, arg6 uintptr) {
1583 cbFn := *CallbackVar1583 cbFn := *CallbackVar
1584- cbFn(arg0, arg1, arg2, arg3, arg4, arg5, arg6)1584+ cbFn(arg0, core.GoString(arg1), core.GoString(arg2), core.GoString(arg3), core.GoString(arg4), arg5, arg6)
1585 }1585 }
1586 CallbackVarRef = purego.NewCallback(fcb)1586 CallbackVarRef = purego.NewCallback(fcb)
1587 glib.SaveCallbackWithClosure(CallbackVarPtr, CallbackVarRef, CallbackVar)1587 glib.SaveCallbackWithClosure(CallbackVarPtr, CallbackVarRef, CallbackVar)
M v4/gio/gdbusnameowning.go +10 -10
@@ -79,9 +79,9 @@ func BusOwnName(BusTypeVar BusType, NameVar string, FlagsVar BusNameOwnerFlags,
7979 if cbRefPtr, ok := glib.GetCallback(BusAcquiredHandlerVarPtr); ok {
8080 BusAcquiredHandlerVarRef = cbRefPtr
8181 } else {
82- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
82+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
8383 cbFn := *BusAcquiredHandlerVar
84- cbFn(arg0, arg1, arg2)
84+ cbFn(arg0, core.GoString(arg1), arg2)
8585 }
8686 BusAcquiredHandlerVarRef = purego.NewCallback(fcb)
8787 glib.SaveCallbackWithClosure(BusAcquiredHandlerVarPtr, BusAcquiredHandlerVarRef, BusAcquiredHandlerVar)
@@ -94,9 +94,9 @@ func BusOwnName(BusTypeVar BusType, NameVar string, FlagsVar BusNameOwnerFlags,
9494 if cbRefPtr, ok := glib.GetCallback(NameAcquiredHandlerVarPtr); ok {
9595 NameAcquiredHandlerVarRef = cbRefPtr
9696 } else {
97- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
97+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
9898 cbFn := *NameAcquiredHandlerVar
99- cbFn(arg0, arg1, arg2)
99+ cbFn(arg0, core.GoString(arg1), arg2)
100100 }
101101 NameAcquiredHandlerVarRef = purego.NewCallback(fcb)
102102 glib.SaveCallbackWithClosure(NameAcquiredHandlerVarPtr, NameAcquiredHandlerVarRef, NameAcquiredHandlerVar)
@@ -109,9 +109,9 @@ func BusOwnName(BusTypeVar BusType, NameVar string, FlagsVar BusNameOwnerFlags,
109109 if cbRefPtr, ok := glib.GetCallback(NameLostHandlerVarPtr); ok {
110110 NameLostHandlerVarRef = cbRefPtr
111111 } else {
112- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
112+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
113113 cbFn := *NameLostHandlerVar
114- cbFn(arg0, arg1, arg2)
114+ cbFn(arg0, core.GoString(arg1), arg2)
115115 }
116116 NameLostHandlerVarRef = purego.NewCallback(fcb)
117117 glib.SaveCallbackWithClosure(NameLostHandlerVarPtr, NameLostHandlerVarRef, NameLostHandlerVar)
@@ -149,9 +149,9 @@ func BusOwnNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Flags
149149 if cbRefPtr, ok := glib.GetCallback(NameAcquiredHandlerVarPtr); ok {
150150 NameAcquiredHandlerVarRef = cbRefPtr
151151 } else {
152- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
152+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
153153 cbFn := *NameAcquiredHandlerVar
154- cbFn(arg0, arg1, arg2)
154+ cbFn(arg0, core.GoString(arg1), arg2)
155155 }
156156 NameAcquiredHandlerVarRef = purego.NewCallback(fcb)
157157 glib.SaveCallbackWithClosure(NameAcquiredHandlerVarPtr, NameAcquiredHandlerVarRef, NameAcquiredHandlerVar)
@@ -164,9 +164,9 @@ func BusOwnNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Flags
164164 if cbRefPtr, ok := glib.GetCallback(NameLostHandlerVarPtr); ok {
165165 NameLostHandlerVarRef = cbRefPtr
166166 } else {
167- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
167+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
168168 cbFn := *NameLostHandlerVar
169- cbFn(arg0, arg1, arg2)
169+ cbFn(arg0, core.GoString(arg1), arg2)
170170 }
171171 NameLostHandlerVarRef = purego.NewCallback(fcb)
172172 glib.SaveCallbackWithClosure(NameLostHandlerVarPtr, NameLostHandlerVarRef, NameLostHandlerVar)
@@ -79,9 +79,9 @@ func BusOwnName(BusTypeVar BusType, NameVar string, FlagsVar BusNameOwnerFlags,
79 if cbRefPtr, ok := glib.GetCallback(BusAcquiredHandlerVarPtr); ok {79 if cbRefPtr, ok := glib.GetCallback(BusAcquiredHandlerVarPtr); ok {
80 BusAcquiredHandlerVarRef = cbRefPtr80 BusAcquiredHandlerVarRef = cbRefPtr
81 } else {81 } else {
82- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {82+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
83 cbFn := *BusAcquiredHandlerVar83 cbFn := *BusAcquiredHandlerVar
84- cbFn(arg0, arg1, arg2)84+ cbFn(arg0, core.GoString(arg1), arg2)
85 }85 }
86 BusAcquiredHandlerVarRef = purego.NewCallback(fcb)86 BusAcquiredHandlerVarRef = purego.NewCallback(fcb)
87 glib.SaveCallbackWithClosure(BusAcquiredHandlerVarPtr, BusAcquiredHandlerVarRef, BusAcquiredHandlerVar)87 glib.SaveCallbackWithClosure(BusAcquiredHandlerVarPtr, BusAcquiredHandlerVarRef, BusAcquiredHandlerVar)
@@ -94,9 +94,9 @@ func BusOwnName(BusTypeVar BusType, NameVar string, FlagsVar BusNameOwnerFlags,
94 if cbRefPtr, ok := glib.GetCallback(NameAcquiredHandlerVarPtr); ok {94 if cbRefPtr, ok := glib.GetCallback(NameAcquiredHandlerVarPtr); ok {
95 NameAcquiredHandlerVarRef = cbRefPtr95 NameAcquiredHandlerVarRef = cbRefPtr
96 } else {96 } else {
97- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {97+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
98 cbFn := *NameAcquiredHandlerVar98 cbFn := *NameAcquiredHandlerVar
99- cbFn(arg0, arg1, arg2)99+ cbFn(arg0, core.GoString(arg1), arg2)
100 }100 }
101 NameAcquiredHandlerVarRef = purego.NewCallback(fcb)101 NameAcquiredHandlerVarRef = purego.NewCallback(fcb)
102 glib.SaveCallbackWithClosure(NameAcquiredHandlerVarPtr, NameAcquiredHandlerVarRef, NameAcquiredHandlerVar)102 glib.SaveCallbackWithClosure(NameAcquiredHandlerVarPtr, NameAcquiredHandlerVarRef, NameAcquiredHandlerVar)
@@ -109,9 +109,9 @@ func BusOwnName(BusTypeVar BusType, NameVar string, FlagsVar BusNameOwnerFlags,
109 if cbRefPtr, ok := glib.GetCallback(NameLostHandlerVarPtr); ok {109 if cbRefPtr, ok := glib.GetCallback(NameLostHandlerVarPtr); ok {
110 NameLostHandlerVarRef = cbRefPtr110 NameLostHandlerVarRef = cbRefPtr
111 } else {111 } else {
112- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {112+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
113 cbFn := *NameLostHandlerVar113 cbFn := *NameLostHandlerVar
114- cbFn(arg0, arg1, arg2)114+ cbFn(arg0, core.GoString(arg1), arg2)
115 }115 }
116 NameLostHandlerVarRef = purego.NewCallback(fcb)116 NameLostHandlerVarRef = purego.NewCallback(fcb)
117 glib.SaveCallbackWithClosure(NameLostHandlerVarPtr, NameLostHandlerVarRef, NameLostHandlerVar)117 glib.SaveCallbackWithClosure(NameLostHandlerVarPtr, NameLostHandlerVarRef, NameLostHandlerVar)
@@ -149,9 +149,9 @@ func BusOwnNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Flags
149 if cbRefPtr, ok := glib.GetCallback(NameAcquiredHandlerVarPtr); ok {149 if cbRefPtr, ok := glib.GetCallback(NameAcquiredHandlerVarPtr); ok {
150 NameAcquiredHandlerVarRef = cbRefPtr150 NameAcquiredHandlerVarRef = cbRefPtr
151 } else {151 } else {
152- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {152+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
153 cbFn := *NameAcquiredHandlerVar153 cbFn := *NameAcquiredHandlerVar
154- cbFn(arg0, arg1, arg2)154+ cbFn(arg0, core.GoString(arg1), arg2)
155 }155 }
156 NameAcquiredHandlerVarRef = purego.NewCallback(fcb)156 NameAcquiredHandlerVarRef = purego.NewCallback(fcb)
157 glib.SaveCallbackWithClosure(NameAcquiredHandlerVarPtr, NameAcquiredHandlerVarRef, NameAcquiredHandlerVar)157 glib.SaveCallbackWithClosure(NameAcquiredHandlerVarPtr, NameAcquiredHandlerVarRef, NameAcquiredHandlerVar)
@@ -164,9 +164,9 @@ func BusOwnNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Flags
164 if cbRefPtr, ok := glib.GetCallback(NameLostHandlerVarPtr); ok {164 if cbRefPtr, ok := glib.GetCallback(NameLostHandlerVarPtr); ok {
165 NameLostHandlerVarRef = cbRefPtr165 NameLostHandlerVarRef = cbRefPtr
166 } else {166 } else {
167- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {167+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
168 cbFn := *NameLostHandlerVar168 cbFn := *NameLostHandlerVar
169- cbFn(arg0, arg1, arg2)169+ cbFn(arg0, core.GoString(arg1), arg2)
170 }170 }
171 NameLostHandlerVarRef = purego.NewCallback(fcb)171 NameLostHandlerVarRef = purego.NewCallback(fcb)
172 glib.SaveCallbackWithClosure(NameLostHandlerVarPtr, NameLostHandlerVarRef, NameLostHandlerVar)172 glib.SaveCallbackWithClosure(NameLostHandlerVarPtr, NameLostHandlerVarRef, NameLostHandlerVar)
M v4/gio/gdbusnamewatching.go +8 -8
@@ -75,9 +75,9 @@ func BusWatchName(BusTypeVar BusType, NameVar string, FlagsVar BusNameWatcherFla
7575 if cbRefPtr, ok := glib.GetCallback(NameAppearedHandlerVarPtr); ok {
7676 NameAppearedHandlerVarRef = cbRefPtr
7777 } else {
78- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) {
78+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) {
7979 cbFn := *NameAppearedHandlerVar
80- cbFn(arg0, arg1, arg2, arg3)
80+ cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
8181 }
8282 NameAppearedHandlerVarRef = purego.NewCallback(fcb)
8383 glib.SaveCallbackWithClosure(NameAppearedHandlerVarPtr, NameAppearedHandlerVarRef, NameAppearedHandlerVar)
@@ -90,9 +90,9 @@ func BusWatchName(BusTypeVar BusType, NameVar string, FlagsVar BusNameWatcherFla
9090 if cbRefPtr, ok := glib.GetCallback(NameVanishedHandlerVarPtr); ok {
9191 NameVanishedHandlerVarRef = cbRefPtr
9292 } else {
93- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
93+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
9494 cbFn := *NameVanishedHandlerVar
95- cbFn(arg0, arg1, arg2)
95+ cbFn(arg0, core.GoString(arg1), arg2)
9696 }
9797 NameVanishedHandlerVarRef = purego.NewCallback(fcb)
9898 glib.SaveCallbackWithClosure(NameVanishedHandlerVarPtr, NameVanishedHandlerVarRef, NameVanishedHandlerVar)
@@ -130,9 +130,9 @@ func BusWatchNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Fla
130130 if cbRefPtr, ok := glib.GetCallback(NameAppearedHandlerVarPtr); ok {
131131 NameAppearedHandlerVarRef = cbRefPtr
132132 } else {
133- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) {
133+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) {
134134 cbFn := *NameAppearedHandlerVar
135- cbFn(arg0, arg1, arg2, arg3)
135+ cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
136136 }
137137 NameAppearedHandlerVarRef = purego.NewCallback(fcb)
138138 glib.SaveCallbackWithClosure(NameAppearedHandlerVarPtr, NameAppearedHandlerVarRef, NameAppearedHandlerVar)
@@ -145,9 +145,9 @@ func BusWatchNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Fla
145145 if cbRefPtr, ok := glib.GetCallback(NameVanishedHandlerVarPtr); ok {
146146 NameVanishedHandlerVarRef = cbRefPtr
147147 } else {
148- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {
148+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
149149 cbFn := *NameVanishedHandlerVar
150- cbFn(arg0, arg1, arg2)
150+ cbFn(arg0, core.GoString(arg1), arg2)
151151 }
152152 NameVanishedHandlerVarRef = purego.NewCallback(fcb)
153153 glib.SaveCallbackWithClosure(NameVanishedHandlerVarPtr, NameVanishedHandlerVarRef, NameVanishedHandlerVar)
@@ -75,9 +75,9 @@ func BusWatchName(BusTypeVar BusType, NameVar string, FlagsVar BusNameWatcherFla
75 if cbRefPtr, ok := glib.GetCallback(NameAppearedHandlerVarPtr); ok {75 if cbRefPtr, ok := glib.GetCallback(NameAppearedHandlerVarPtr); ok {
76 NameAppearedHandlerVarRef = cbRefPtr76 NameAppearedHandlerVarRef = cbRefPtr
77 } else {77 } else {
78- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) {78+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) {
79 cbFn := *NameAppearedHandlerVar79 cbFn := *NameAppearedHandlerVar
80- cbFn(arg0, arg1, arg2, arg3)80+ cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
81 }81 }
82 NameAppearedHandlerVarRef = purego.NewCallback(fcb)82 NameAppearedHandlerVarRef = purego.NewCallback(fcb)
83 glib.SaveCallbackWithClosure(NameAppearedHandlerVarPtr, NameAppearedHandlerVarRef, NameAppearedHandlerVar)83 glib.SaveCallbackWithClosure(NameAppearedHandlerVarPtr, NameAppearedHandlerVarRef, NameAppearedHandlerVar)
@@ -90,9 +90,9 @@ func BusWatchName(BusTypeVar BusType, NameVar string, FlagsVar BusNameWatcherFla
90 if cbRefPtr, ok := glib.GetCallback(NameVanishedHandlerVarPtr); ok {90 if cbRefPtr, ok := glib.GetCallback(NameVanishedHandlerVarPtr); ok {
91 NameVanishedHandlerVarRef = cbRefPtr91 NameVanishedHandlerVarRef = cbRefPtr
92 } else {92 } else {
93- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {93+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
94 cbFn := *NameVanishedHandlerVar94 cbFn := *NameVanishedHandlerVar
95- cbFn(arg0, arg1, arg2)95+ cbFn(arg0, core.GoString(arg1), arg2)
96 }96 }
97 NameVanishedHandlerVarRef = purego.NewCallback(fcb)97 NameVanishedHandlerVarRef = purego.NewCallback(fcb)
98 glib.SaveCallbackWithClosure(NameVanishedHandlerVarPtr, NameVanishedHandlerVarRef, NameVanishedHandlerVar)98 glib.SaveCallbackWithClosure(NameVanishedHandlerVarPtr, NameVanishedHandlerVarRef, NameVanishedHandlerVar)
@@ -130,9 +130,9 @@ func BusWatchNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Fla
130 if cbRefPtr, ok := glib.GetCallback(NameAppearedHandlerVarPtr); ok {130 if cbRefPtr, ok := glib.GetCallback(NameAppearedHandlerVarPtr); ok {
131 NameAppearedHandlerVarRef = cbRefPtr131 NameAppearedHandlerVarRef = cbRefPtr
132 } else {132 } else {
133- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) {133+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) {
134 cbFn := *NameAppearedHandlerVar134 cbFn := *NameAppearedHandlerVar
135- cbFn(arg0, arg1, arg2, arg3)135+ cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
136 }136 }
137 NameAppearedHandlerVarRef = purego.NewCallback(fcb)137 NameAppearedHandlerVarRef = purego.NewCallback(fcb)
138 glib.SaveCallbackWithClosure(NameAppearedHandlerVarPtr, NameAppearedHandlerVarRef, NameAppearedHandlerVar)138 glib.SaveCallbackWithClosure(NameAppearedHandlerVarPtr, NameAppearedHandlerVarRef, NameAppearedHandlerVar)
@@ -145,9 +145,9 @@ func BusWatchNameOnConnection(ConnectionVar *DBusConnection, NameVar string, Fla
145 if cbRefPtr, ok := glib.GetCallback(NameVanishedHandlerVarPtr); ok {145 if cbRefPtr, ok := glib.GetCallback(NameVanishedHandlerVarPtr); ok {
146 NameVanishedHandlerVarRef = cbRefPtr146 NameVanishedHandlerVarRef = cbRefPtr
147 } else {147 } else {
148- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) {148+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
149 cbFn := *NameVanishedHandlerVar149 cbFn := *NameVanishedHandlerVar
150- cbFn(arg0, arg1, arg2)150+ cbFn(arg0, core.GoString(arg1), arg2)
151 }151 }
152 NameVanishedHandlerVarRef = purego.NewCallback(fcb)152 NameVanishedHandlerVarRef = purego.NewCallback(fcb)
153 glib.SaveCallbackWithClosure(NameVanishedHandlerVarPtr, NameVanishedHandlerVarRef, NameVanishedHandlerVar)153 glib.SaveCallbackWithClosure(NameVanishedHandlerVarPtr, NameVanishedHandlerVarRef, NameVanishedHandlerVar)
M v4/gio/gdbusobjectmanagerclient.go +8 -8
@@ -241,9 +241,9 @@ func NewDBusObjectManagerClientForBusSync(BusTypeVar BusType, FlagsVar DBusObjec
241241 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
242242 GetProxyTypeFuncVarRef = cbRefPtr
243243 } else {
244- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {
244+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
245245 cbFn := *GetProxyTypeFuncVar
246- return cbFn(arg0, arg1, arg2, arg3)
246+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
247247 }
248248 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
249249 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -296,9 +296,9 @@ func NewDBusObjectManagerClientSync(ConnectionVar *DBusConnection, FlagsVar DBus
296296 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
297297 GetProxyTypeFuncVarRef = cbRefPtr
298298 } else {
299- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {
299+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
300300 cbFn := *GetProxyTypeFuncVar
301- return cbFn(arg0, arg1, arg2, arg3)
301+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
302302 }
303303 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
304304 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -743,9 +743,9 @@ func DBusObjectManagerClientNew(ConnectionVar *DBusConnection, FlagsVar DBusObje
743743 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
744744 GetProxyTypeFuncVarRef = cbRefPtr
745745 } else {
746- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {
746+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
747747 cbFn := *GetProxyTypeFuncVar
748- return cbFn(arg0, arg1, arg2, arg3)
748+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
749749 }
750750 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
751751 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -805,9 +805,9 @@ func DBusObjectManagerClientNewForBus(BusTypeVar BusType, FlagsVar DBusObjectMan
805805 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
806806 GetProxyTypeFuncVarRef = cbRefPtr
807807 } else {
808- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {
808+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
809809 cbFn := *GetProxyTypeFuncVar
810- return cbFn(arg0, arg1, arg2, arg3)
810+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
811811 }
812812 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
813813 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -241,9 +241,9 @@ func NewDBusObjectManagerClientForBusSync(BusTypeVar BusType, FlagsVar DBusObjec
241 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {241 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
242 GetProxyTypeFuncVarRef = cbRefPtr242 GetProxyTypeFuncVarRef = cbRefPtr
243 } else {243 } else {
244- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {244+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
245 cbFn := *GetProxyTypeFuncVar245 cbFn := *GetProxyTypeFuncVar
246- return cbFn(arg0, arg1, arg2, arg3)246+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
247 }247 }
248 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)248 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
249 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)249 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -296,9 +296,9 @@ func NewDBusObjectManagerClientSync(ConnectionVar *DBusConnection, FlagsVar DBus
296 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {296 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
297 GetProxyTypeFuncVarRef = cbRefPtr297 GetProxyTypeFuncVarRef = cbRefPtr
298 } else {298 } else {
299- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {299+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
300 cbFn := *GetProxyTypeFuncVar300 cbFn := *GetProxyTypeFuncVar
301- return cbFn(arg0, arg1, arg2, arg3)301+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
302 }302 }
303 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)303 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
304 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)304 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -743,9 +743,9 @@ func DBusObjectManagerClientNew(ConnectionVar *DBusConnection, FlagsVar DBusObje
743 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {743 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
744 GetProxyTypeFuncVarRef = cbRefPtr744 GetProxyTypeFuncVarRef = cbRefPtr
745 } else {745 } else {
746- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {746+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
747 cbFn := *GetProxyTypeFuncVar747 cbFn := *GetProxyTypeFuncVar
748- return cbFn(arg0, arg1, arg2, arg3)748+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
749 }749 }
750 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)750 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
751 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)751 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
@@ -805,9 +805,9 @@ func DBusObjectManagerClientNewForBus(BusTypeVar BusType, FlagsVar DBusObjectMan
805 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {805 if cbRefPtr, ok := glib.GetCallback(GetProxyTypeFuncVarPtr); ok {
806 GetProxyTypeFuncVarRef = cbRefPtr806 GetProxyTypeFuncVarRef = cbRefPtr
807 } else {807 } else {
808- fcb := func(arg0 uintptr, arg1 string, arg2 string, arg3 uintptr) types.GType {808+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr, arg3 uintptr) types.GType {
809 cbFn := *GetProxyTypeFuncVar809 cbFn := *GetProxyTypeFuncVar
810- return cbFn(arg0, arg1, arg2, arg3)810+ return cbFn(arg0, core.GoString(arg1), core.GoString(arg2), arg3)
811 }811 }
812 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)812 GetProxyTypeFuncVarRef = purego.NewCallback(fcb)
813 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)813 glib.SaveCallbackWithClosure(GetProxyTypeFuncVarPtr, GetProxyTypeFuncVarRef, GetProxyTypeFuncVar)
M v4/gio/gvfs.go +4 -4
@@ -620,9 +620,9 @@ func (x *Vfs) RegisterUriScheme(SchemeVar string, UriFuncVar *VfsFileLookupFunc,
620620 if cbRefPtr, ok := glib.GetCallback(UriFuncVarPtr); ok {
621621 UriFuncVarRef = cbRefPtr
622622 } else {
623- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) uintptr {
623+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) uintptr {
624624 cbFn := *UriFuncVar
625- return cbFn(arg0, arg1, arg2)
625+ return cbFn(arg0, core.GoString(arg1), arg2)
626626 }
627627 UriFuncVarRef = purego.NewCallback(fcb)
628628 glib.SaveCallbackWithClosure(UriFuncVarPtr, UriFuncVarRef, UriFuncVar)
@@ -650,9 +650,9 @@ func (x *Vfs) RegisterUriScheme(SchemeVar string, UriFuncVar *VfsFileLookupFunc,
650650 if cbRefPtr, ok := glib.GetCallback(ParseNameFuncVarPtr); ok {
651651 ParseNameFuncVarRef = cbRefPtr
652652 } else {
653- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) uintptr {
653+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) uintptr {
654654 cbFn := *ParseNameFuncVar
655- return cbFn(arg0, arg1, arg2)
655+ return cbFn(arg0, core.GoString(arg1), arg2)
656656 }
657657 ParseNameFuncVarRef = purego.NewCallback(fcb)
658658 glib.SaveCallbackWithClosure(ParseNameFuncVarPtr, ParseNameFuncVarRef, ParseNameFuncVar)
@@ -620,9 +620,9 @@ func (x *Vfs) RegisterUriScheme(SchemeVar string, UriFuncVar *VfsFileLookupFunc,
620 if cbRefPtr, ok := glib.GetCallback(UriFuncVarPtr); ok {620 if cbRefPtr, ok := glib.GetCallback(UriFuncVarPtr); ok {
621 UriFuncVarRef = cbRefPtr621 UriFuncVarRef = cbRefPtr
622 } else {622 } else {
623- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) uintptr {623+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) uintptr {
624 cbFn := *UriFuncVar624 cbFn := *UriFuncVar
625- return cbFn(arg0, arg1, arg2)625+ return cbFn(arg0, core.GoString(arg1), arg2)
626 }626 }
627 UriFuncVarRef = purego.NewCallback(fcb)627 UriFuncVarRef = purego.NewCallback(fcb)
628 glib.SaveCallbackWithClosure(UriFuncVarPtr, UriFuncVarRef, UriFuncVar)628 glib.SaveCallbackWithClosure(UriFuncVarPtr, UriFuncVarRef, UriFuncVar)
@@ -650,9 +650,9 @@ func (x *Vfs) RegisterUriScheme(SchemeVar string, UriFuncVar *VfsFileLookupFunc,
650 if cbRefPtr, ok := glib.GetCallback(ParseNameFuncVarPtr); ok {650 if cbRefPtr, ok := glib.GetCallback(ParseNameFuncVarPtr); ok {
651 ParseNameFuncVarRef = cbRefPtr651 ParseNameFuncVarRef = cbRefPtr
652 } else {652 } else {
653- fcb := func(arg0 uintptr, arg1 string, arg2 uintptr) uintptr {653+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) uintptr {
654 cbFn := *ParseNameFuncVar654 cbFn := *ParseNameFuncVar
655- return cbFn(arg0, arg1, arg2)655+ return cbFn(arg0, core.GoString(arg1), arg2)
656 }656 }
657 ParseNameFuncVarRef = purego.NewCallback(fcb)657 ParseNameFuncVarRef = purego.NewCallback(fcb)
658 glib.SaveCallbackWithClosure(ParseNameFuncVarPtr, ParseNameFuncVarRef, ParseNameFuncVar)658 glib.SaveCallbackWithClosure(ParseNameFuncVarPtr, ParseNameFuncVarRef, ParseNameFuncVar)
M v4/glib/gcompletion.go +2 -2
@@ -137,9 +137,9 @@ func (x *Completion) SetCompare(StrncmpFuncVar *CompletionStrncmpFunc) {
137137 if cbRefPtr, ok := GetCallback(StrncmpFuncVarPtr); ok {
138138 StrncmpFuncVarRef = cbRefPtr
139139 } else {
140- fcb := func(arg0 string, arg1 string, arg2 uint) int {
140+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uint) int {
141141 cbFn := *StrncmpFuncVar
142- return cbFn(arg0, arg1, arg2)
142+ return cbFn(core.GoString(arg0), core.GoString(arg1), arg2)
143143 }
144144 StrncmpFuncVarRef = purego.NewCallback(fcb)
145145 SaveCallbackWithClosure(StrncmpFuncVarPtr, StrncmpFuncVarRef, StrncmpFuncVar)
@@ -137,9 +137,9 @@ func (x *Completion) SetCompare(StrncmpFuncVar *CompletionStrncmpFunc) {
137 if cbRefPtr, ok := GetCallback(StrncmpFuncVarPtr); ok {137 if cbRefPtr, ok := GetCallback(StrncmpFuncVarPtr); ok {
138 StrncmpFuncVarRef = cbRefPtr138 StrncmpFuncVarRef = cbRefPtr
139 } else {139 } else {
140- fcb := func(arg0 string, arg1 string, arg2 uint) int {140+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uint) int {
141 cbFn := *StrncmpFuncVar141 cbFn := *StrncmpFuncVar
142- return cbFn(arg0, arg1, arg2)142+ return cbFn(core.GoString(arg0), core.GoString(arg1), arg2)
143 }143 }
144 StrncmpFuncVarRef = purego.NewCallback(fcb)144 StrncmpFuncVarRef = purego.NewCallback(fcb)
145 SaveCallbackWithClosure(StrncmpFuncVarPtr, StrncmpFuncVarRef, StrncmpFuncVar)145 SaveCallbackWithClosure(StrncmpFuncVarPtr, StrncmpFuncVarRef, StrncmpFuncVar)
M v4/glib/gmessages.go +10 -10
@@ -354,9 +354,9 @@ func LogSetDefaultHandler(LogFuncVar *LogFunc, UserDataVar uintptr) uintptr {
354354 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
355355 LogFuncVarRef = cbRefPtr
356356 } else {
357- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) {
357+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) {
358358 cbFn := *LogFuncVar
359- cbFn(arg0, arg1, arg2, arg3)
359+ cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
360360 }
361361 LogFuncVarRef = purego.NewCallback(fcb)
362362 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -442,9 +442,9 @@ func LogSetHandler(LogDomainVar *string, LogLevelsVar LogLevelFlags, LogFuncVar
442442 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
443443 LogFuncVarRef = cbRefPtr
444444 } else {
445- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) {
445+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) {
446446 cbFn := *LogFuncVar
447- cbFn(arg0, arg1, arg2, arg3)
447+ cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
448448 }
449449 LogFuncVarRef = purego.NewCallback(fcb)
450450 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -475,9 +475,9 @@ func LogSetHandlerFull(LogDomainVar *string, LogLevelsVar LogLevelFlags, LogFunc
475475 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
476476 LogFuncVarRef = cbRefPtr
477477 } else {
478- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) {
478+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) {
479479 cbFn := *LogFuncVar
480- cbFn(arg0, arg1, arg2, arg3)
480+ cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
481481 }
482482 LogFuncVarRef = purego.NewCallback(fcb)
483483 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -1052,9 +1052,9 @@ func SetPrintHandler(FuncVar *PrintFunc) uintptr {
10521052 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
10531053 FuncVarRef = cbRefPtr
10541054 } else {
1055- fcb := func(arg0 string) {
1055+ fcb := func(arg0 uintptr) {
10561056 cbFn := *FuncVar
1057- cbFn(arg0)
1057+ cbFn(core.GoString(arg0))
10581058 }
10591059 FuncVarRef = purego.NewCallback(fcb)
10601060 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -1090,9 +1090,9 @@ func SetPrinterrHandler(FuncVar *PrintFunc) uintptr {
10901090 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
10911091 FuncVarRef = cbRefPtr
10921092 } else {
1093- fcb := func(arg0 string) {
1093+ fcb := func(arg0 uintptr) {
10941094 cbFn := *FuncVar
1095- cbFn(arg0)
1095+ cbFn(core.GoString(arg0))
10961096 }
10971097 FuncVarRef = purego.NewCallback(fcb)
10981098 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -354,9 +354,9 @@ func LogSetDefaultHandler(LogFuncVar *LogFunc, UserDataVar uintptr) uintptr {
354 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {354 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
355 LogFuncVarRef = cbRefPtr355 LogFuncVarRef = cbRefPtr
356 } else {356 } else {
357- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) {357+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) {
358 cbFn := *LogFuncVar358 cbFn := *LogFuncVar
359- cbFn(arg0, arg1, arg2, arg3)359+ cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
360 }360 }
361 LogFuncVarRef = purego.NewCallback(fcb)361 LogFuncVarRef = purego.NewCallback(fcb)
362 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)362 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -442,9 +442,9 @@ func LogSetHandler(LogDomainVar *string, LogLevelsVar LogLevelFlags, LogFuncVar
442 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {442 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
443 LogFuncVarRef = cbRefPtr443 LogFuncVarRef = cbRefPtr
444 } else {444 } else {
445- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) {445+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) {
446 cbFn := *LogFuncVar446 cbFn := *LogFuncVar
447- cbFn(arg0, arg1, arg2, arg3)447+ cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
448 }448 }
449 LogFuncVarRef = purego.NewCallback(fcb)449 LogFuncVarRef = purego.NewCallback(fcb)
450 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)450 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -475,9 +475,9 @@ func LogSetHandlerFull(LogDomainVar *string, LogLevelsVar LogLevelFlags, LogFunc
475 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {475 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
476 LogFuncVarRef = cbRefPtr476 LogFuncVarRef = cbRefPtr
477 } else {477 } else {
478- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) {478+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) {
479 cbFn := *LogFuncVar479 cbFn := *LogFuncVar
480- cbFn(arg0, arg1, arg2, arg3)480+ cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
481 }481 }
482 LogFuncVarRef = purego.NewCallback(fcb)482 LogFuncVarRef = purego.NewCallback(fcb)
483 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)483 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -1052,9 +1052,9 @@ func SetPrintHandler(FuncVar *PrintFunc) uintptr {
1052 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {1052 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
1053 FuncVarRef = cbRefPtr1053 FuncVarRef = cbRefPtr
1054 } else {1054 } else {
1055- fcb := func(arg0 string) {1055+ fcb := func(arg0 uintptr) {
1056 cbFn := *FuncVar1056 cbFn := *FuncVar
1057- cbFn(arg0)1057+ cbFn(core.GoString(arg0))
1058 }1058 }
1059 FuncVarRef = purego.NewCallback(fcb)1059 FuncVarRef = purego.NewCallback(fcb)
1060 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)1060 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -1090,9 +1090,9 @@ func SetPrinterrHandler(FuncVar *PrintFunc) uintptr {
1090 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {1090 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
1091 FuncVarRef = cbRefPtr1091 FuncVarRef = cbRefPtr
1092 } else {1092 } else {
1093- fcb := func(arg0 string) {1093+ fcb := func(arg0 uintptr) {
1094 cbFn := *FuncVar1094 cbFn := *FuncVar
1095- cbFn(arg0)1095+ cbFn(core.GoString(arg0))
1096 }1096 }
1097 FuncVarRef = purego.NewCallback(fcb)1097 FuncVarRef = purego.NewCallback(fcb)
1098 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)1098 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
M v4/glib/goption.go +4 -4
@@ -329,9 +329,9 @@ func (x *OptionContext) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr
329329 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
330330 FuncVarRef = cbRefPtr
331331 } else {
332- fcb := func(arg0 string, arg1 uintptr) string {
332+ fcb := func(arg0 uintptr, arg1 uintptr) string {
333333 cbFn := *FuncVar
334- return cbFn(arg0, arg1)
334+ return cbFn(core.GoString(arg0), arg1)
335335 }
336336 FuncVarRef = purego.NewCallback(fcb)
337337 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -579,9 +579,9 @@ func (x *OptionGroup) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr,
579579 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
580580 FuncVarRef = cbRefPtr
581581 } else {
582- fcb := func(arg0 string, arg1 uintptr) string {
582+ fcb := func(arg0 uintptr, arg1 uintptr) string {
583583 cbFn := *FuncVar
584- return cbFn(arg0, arg1)
584+ return cbFn(core.GoString(arg0), arg1)
585585 }
586586 FuncVarRef = purego.NewCallback(fcb)
587587 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -329,9 +329,9 @@ func (x *OptionContext) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr
329 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {329 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
330 FuncVarRef = cbRefPtr330 FuncVarRef = cbRefPtr
331 } else {331 } else {
332- fcb := func(arg0 string, arg1 uintptr) string {332+ fcb := func(arg0 uintptr, arg1 uintptr) string {
333 cbFn := *FuncVar333 cbFn := *FuncVar
334- return cbFn(arg0, arg1)334+ return cbFn(core.GoString(arg0), arg1)
335 }335 }
336 FuncVarRef = purego.NewCallback(fcb)336 FuncVarRef = purego.NewCallback(fcb)
337 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)337 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -579,9 +579,9 @@ func (x *OptionGroup) SetTranslateFunc(FuncVar *TranslateFunc, DataVar uintptr,
579 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {579 if cbRefPtr, ok := GetCallback(FuncVarPtr); ok {
580 FuncVarRef = cbRefPtr580 FuncVarRef = cbRefPtr
581 } else {581 } else {
582- fcb := func(arg0 string, arg1 uintptr) string {582+ fcb := func(arg0 uintptr, arg1 uintptr) string {
583 cbFn := *FuncVar583 cbFn := *FuncVar
584- return cbFn(arg0, arg1)584+ return cbFn(core.GoString(arg0), arg1)
585 }585 }
586 FuncVarRef = purego.NewCallback(fcb)586 FuncVarRef = purego.NewCallback(fcb)
587 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)587 SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
M v4/glib/gtestutils.go +2 -2
@@ -1053,9 +1053,9 @@ func TestLogSetFatalHandler(LogFuncVar *TestLogFatalFunc, UserDataVar uintptr) {
10531053 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
10541054 LogFuncVarRef = cbRefPtr
10551055 } else {
1056- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) bool {
1056+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) bool {
10571057 cbFn := *LogFuncVar
1058- return cbFn(arg0, arg1, arg2, arg3)
1058+ return cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
10591059 }
10601060 LogFuncVarRef = purego.NewCallback(fcb)
10611061 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
@@ -1053,9 +1053,9 @@ func TestLogSetFatalHandler(LogFuncVar *TestLogFatalFunc, UserDataVar uintptr) {
1053 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {1053 if cbRefPtr, ok := GetCallback(LogFuncVarPtr); ok {
1054 LogFuncVarRef = cbRefPtr1054 LogFuncVarRef = cbRefPtr
1055 } else {1055 } else {
1056- fcb := func(arg0 string, arg1 LogLevelFlags, arg2 string, arg3 uintptr) bool {1056+ fcb := func(arg0 uintptr, arg1 LogLevelFlags, arg2 uintptr, arg3 uintptr) bool {
1057 cbFn := *LogFuncVar1057 cbFn := *LogFuncVar
1058- return cbFn(arg0, arg1, arg2, arg3)1058+ return cbFn(core.GoString(arg0), arg1, core.GoString(arg2), arg3)
1059 }1059 }
1060 LogFuncVarRef = purego.NewCallback(fcb)1060 LogFuncVarRef = purego.NewCallback(fcb)
1061 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)1061 SaveCallbackWithClosure(LogFuncVarPtr, LogFuncVarRef, LogFuncVar)
M v4/gtk/gtkentrycompletion.go +2 -2
@@ -291,9 +291,9 @@ func (x *EntryCompletion) SetMatchFunc(FuncVar *EntryCompletionMatchFunc, FuncDa
291291 if cbRefPtr, ok := glib.GetCallback(FuncVarPtr); ok {
292292 FuncVarRef = cbRefPtr
293293 } else {
294- fcb := func(arg0 uintptr, arg1 string, arg2 *TreeIter, arg3 uintptr) bool {
294+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 *TreeIter, arg3 uintptr) bool {
295295 cbFn := *FuncVar
296- return cbFn(arg0, arg1, arg2, arg3)
296+ return cbFn(arg0, core.GoString(arg1), arg2, arg3)
297297 }
298298 FuncVarRef = purego.NewCallback(fcb)
299299 glib.SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -291,9 +291,9 @@ func (x *EntryCompletion) SetMatchFunc(FuncVar *EntryCompletionMatchFunc, FuncDa
291 if cbRefPtr, ok := glib.GetCallback(FuncVarPtr); ok {291 if cbRefPtr, ok := glib.GetCallback(FuncVarPtr); ok {
292 FuncVarRef = cbRefPtr292 FuncVarRef = cbRefPtr
293 } else {293 } else {
294- fcb := func(arg0 uintptr, arg1 string, arg2 *TreeIter, arg3 uintptr) bool {294+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 *TreeIter, arg3 uintptr) bool {
295 cbFn := *FuncVar295 cbFn := *FuncVar
296- return cbFn(arg0, arg1, arg2, arg3)296+ return cbFn(arg0, core.GoString(arg1), arg2, arg3)
297 }297 }
298 FuncVarRef = purego.NewCallback(fcb)298 FuncVarRef = purego.NewCallback(fcb)
299 glib.SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)299 glib.SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
M v4/gtk/gtkprintsettings.go +2 -2
@@ -262,9 +262,9 @@ func (x *PrintSettings) Foreach(FuncVar *PrintSettingsFunc, UserDataVar uintptr)
262262 if cbRefPtr, ok := glib.GetCallback(FuncVarPtr); ok {
263263 FuncVarRef = cbRefPtr
264264 } else {
265- fcb := func(arg0 string, arg1 string, arg2 uintptr) {
265+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
266266 cbFn := *FuncVar
267- cbFn(arg0, arg1, arg2)
267+ cbFn(core.GoString(arg0), core.GoString(arg1), arg2)
268268 }
269269 FuncVarRef = purego.NewCallback(fcb)
270270 glib.SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
@@ -262,9 +262,9 @@ func (x *PrintSettings) Foreach(FuncVar *PrintSettingsFunc, UserDataVar uintptr)
262 if cbRefPtr, ok := glib.GetCallback(FuncVarPtr); ok {262 if cbRefPtr, ok := glib.GetCallback(FuncVarPtr); ok {
263 FuncVarRef = cbRefPtr263 FuncVarRef = cbRefPtr
264 } else {264 } else {
265- fcb := func(arg0 string, arg1 string, arg2 uintptr) {265+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 uintptr) {
266 cbFn := *FuncVar266 cbFn := *FuncVar
267- cbFn(arg0, arg1, arg2)267+ cbFn(core.GoString(arg0), core.GoString(arg1), arg2)
268 }268 }
269 FuncVarRef = purego.NewCallback(fcb)269 FuncVarRef = purego.NewCallback(fcb)
270 glib.SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)270 glib.SaveCallbackWithClosure(FuncVarPtr, FuncVarRef, FuncVar)
M v4/gtk/gtktreeview.go +2 -2
@@ -1711,9 +1711,9 @@ func (x *TreeView) SetSearchEqualFunc(SearchEqualFuncVar *TreeViewSearchEqualFun
17111711 if cbRefPtr, ok := glib.GetCallback(SearchEqualFuncVarPtr); ok {
17121712 SearchEqualFuncVarRef = cbRefPtr
17131713 } else {
1714- fcb := func(arg0 uintptr, arg1 int, arg2 string, arg3 *TreeIter, arg4 uintptr) bool {
1714+ fcb := func(arg0 uintptr, arg1 int, arg2 uintptr, arg3 *TreeIter, arg4 uintptr) bool {
17151715 cbFn := *SearchEqualFuncVar
1716- return cbFn(arg0, arg1, arg2, arg3, arg4)
1716+ return cbFn(arg0, arg1, core.GoString(arg2), arg3, arg4)
17171717 }
17181718 SearchEqualFuncVarRef = purego.NewCallback(fcb)
17191719 glib.SaveCallbackWithClosure(SearchEqualFuncVarPtr, SearchEqualFuncVarRef, SearchEqualFuncVar)
@@ -1711,9 +1711,9 @@ func (x *TreeView) SetSearchEqualFunc(SearchEqualFuncVar *TreeViewSearchEqualFun
1711 if cbRefPtr, ok := glib.GetCallback(SearchEqualFuncVarPtr); ok {1711 if cbRefPtr, ok := glib.GetCallback(SearchEqualFuncVarPtr); ok {
1712 SearchEqualFuncVarRef = cbRefPtr1712 SearchEqualFuncVarRef = cbRefPtr
1713 } else {1713 } else {
1714- fcb := func(arg0 uintptr, arg1 int, arg2 string, arg3 *TreeIter, arg4 uintptr) bool {1714+ fcb := func(arg0 uintptr, arg1 int, arg2 uintptr, arg3 *TreeIter, arg4 uintptr) bool {
1715 cbFn := *SearchEqualFuncVar1715 cbFn := *SearchEqualFuncVar
1716- return cbFn(arg0, arg1, arg2, arg3, arg4)1716+ return cbFn(arg0, arg1, core.GoString(arg2), arg3, arg4)
1717 }1717 }
1718 SearchEqualFuncVarRef = purego.NewCallback(fcb)1718 SearchEqualFuncVarRef = purego.NewCallback(fcb)
1719 glib.SaveCallbackWithClosure(SearchEqualFuncVarPtr, SearchEqualFuncVarRef, SearchEqualFuncVar)1719 glib.SaveCallbackWithClosure(SearchEqualFuncVarPtr, SearchEqualFuncVarRef, SearchEqualFuncVar)
M v4/gtk/gtkwidget.go +2 -2
@@ -373,9 +373,9 @@ func (x *WidgetClass) InstallAction(ActionNameVar string, ParameterTypeVar *stri
373373 if cbRefPtr, ok := glib.GetCallback(ActivateVarPtr); ok {
374374 ActivateVarRef = cbRefPtr
375375 } else {
376- fcb := func(arg0 uintptr, arg1 string, arg2 *glib.Variant) {
376+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 *glib.Variant) {
377377 cbFn := *ActivateVar
378- cbFn(arg0, arg1, arg2)
378+ cbFn(arg0, core.GoString(arg1), arg2)
379379 }
380380 ActivateVarRef = purego.NewCallback(fcb)
381381 glib.SaveCallbackWithClosure(ActivateVarPtr, ActivateVarRef, ActivateVar)
@@ -373,9 +373,9 @@ func (x *WidgetClass) InstallAction(ActionNameVar string, ParameterTypeVar *stri
373 if cbRefPtr, ok := glib.GetCallback(ActivateVarPtr); ok {373 if cbRefPtr, ok := glib.GetCallback(ActivateVarPtr); ok {
374 ActivateVarRef = cbRefPtr374 ActivateVarRef = cbRefPtr
375 } else {375 } else {
376- fcb := func(arg0 uintptr, arg1 string, arg2 *glib.Variant) {376+ fcb := func(arg0 uintptr, arg1 uintptr, arg2 *glib.Variant) {
377 cbFn := *ActivateVar377 cbFn := *ActivateVar
378- cbFn(arg0, arg1, arg2)378+ cbFn(arg0, core.GoString(arg1), arg2)
379 }379 }
380 ActivateVarRef = purego.NewCallback(fcb)380 ActivateVarRef = purego.NewCallback(fcb)
381 glib.SaveCallbackWithClosure(ActivateVarPtr, ActivateVarRef, ActivateVar)381 glib.SaveCallbackWithClosure(ActivateVarPtr, ActivateVarRef, ActivateVar)

Keyboard shortcuts

Single-key shortcuts are on. ctrl k and esc work whatever this says.

ctrl k :
go to a section, branch, tag, file or repository
?
this list
j k
move the row cursor down / up
enter
open the row under the cursor; on Files, a directory opens or closes in place
↑ ↓ ← → home end
in the file tree (focus on a row): previous / next row, close / open a directory or go to its parent / first entry, first / last row. They never open a file
l h
on Files: open a directory or a file / close a directory or go up to its parent, then to the parent page. Elsewhere: into the side panel (on a merge request, its files) / back to the content; there j k move between its controls
g g G
first / last row
/
filter the list; on Files, find a file anywhere in the repository (esc clears, enter opens the best match)
b
switch branch or tag
g s g f g c g b g m g i g r g a
tabs: summary, files, commits, branches & tags, merge requests, issues, releases, actions (when available)
g h
home
w
wide mode: use the whole width of the screen, or not (remembered)
y
copy a permalink pinned to the commit
d u x
diff: split / unified / collapse or expand all
e E
diff: the whole file in view / every file, with the lines the hunks hide
n
merge request: next note in the diff
esc
close a dialog, leave a field

Branches 1

Tags 102

↑↓ moveenter openesc close