Merge pull request #349 from bnema/fix/rollback-lazy-puregotk
fix(deps): emergency rollback puregotk lazy registration regression
905 files · +25263 -27842
M go.mod +1 -1
| @@ -11,7 +11,7 @@ require ( | |||
| 11 | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | |
| 12 | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | |
| 13 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | |
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | |
| 14 | + | github.com/bnema/puregotk v0.7.0 | |
| 15 | 15 | github.com/charmbracelet/bubbles v1.0.0 | |
| 16 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | |
| 17 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | |
| @@ -11,7 +11,7 @@ require ( | |||||
| 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | 11 | github.com/bnema/purego-pipewire v0.1.5-0.20260714124450-6504b9cdf02a | ||
| 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | 12 | github.com/bnema/purego-sqlite v0.1.4-0.20260714131321-3614fe683b9c | ||
| 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | 13 | github.com/bnema/purego-webp v0.2.1-0.20260714152238-7bc9c402fdf6 | ||
| 14 | - | github.com/bnema/puregotk v0.7.1-0.20260714170452-0b6b9b901234 | 14 | + | github.com/bnema/puregotk v0.7.0 |
| 15 | github.com/charmbracelet/bubbles v1.0.0 | 15 | github.com/charmbracelet/bubbles v1.0.0 | ||
| 16 | github.com/charmbracelet/bubbletea v1.3.10 | 16 | github.com/charmbracelet/bubbletea v1.3.10 | ||
| 17 | github.com/charmbracelet/lipgloss v1.1.0 | 17 | github.com/charmbracelet/lipgloss v1.1.0 | ||
M go.sum +0 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/internal/core/core.go +4 -197 generated file: collapsed
M vendor/github.com/bnema/puregotk/pkg/core/core.go +0 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-dialog.go +64 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-about-window.go +62 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-accent-color.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-action-row.go +29 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-alert-dialog.go +47 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-target.go +27 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation-util.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-animation.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-application.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-avatar.go +25 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-banner.go +26 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bin.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-bottom-sheet.go +38 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint-bin.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-breakpoint.go +37 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-content.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-button-row.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-dots.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel-indicator-lines.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-carousel.go +37 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-layout.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp-scrollable.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-clamp.go +22 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-combo-row.go +33 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-dialog.go +38 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-easing.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-entry-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-enum-list-model.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-expander-row.go +33 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-flap.go +48 -61 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-fold-threshold-policy.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-header-bar.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-inline-view-switcher.go +24 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout-slot.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-layout.go +17 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-leaflet.go +56 -69 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-length-unit.go +14 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-main.go +15 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-message-dialog.go +44 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-multi-layout-view.go +23 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-direction.go +1 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-split-view.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-navigation-view.go +49 -60 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-overlay-split-view.go +38 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-password-entry-row.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-dialog.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-group.go +26 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-page.go +33 -38 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-row.go +22 -18 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-preferences-window.go +29 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcut-label.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-dialog.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-item.go +25 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-shortcuts-section.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-item.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar-section.go +27 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-sidebar.go +39 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spin-row.go +34 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner-paintable.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spinner.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-split-button.go +34 -39 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-animation.go +30 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-spring-params.go +21 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-squeezer.go +44 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-status-page.go +24 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-style-manager.go +28 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipe-tracker.go +30 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-swipeable.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-switch-row.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-bar.go +32 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-button.go +16 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-overview.go +37 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-tab-view.go +87 -123 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-timed-animation.go +28 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast-overlay.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toast.go +36 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toggle-group.go +51 -64 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-toolbar-view.go +35 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-version.go +16 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-stack.go +62 -78 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-bar.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-sidebar.go +22 -15 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher-title.go +23 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-view-switcher.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window-title.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-window.go +22 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-box.go +46 -66 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/adw/adw-wrap-layout.go +46 -57 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/cairo/main.go +79 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkapplaunchcontext.go +17 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairo.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcairocontext.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcicpparams.go +25 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkclipboard.go +32 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcolorstate.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentdeserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentformats.go +31 -28 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentprovider.go +28 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcontentserializer.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkcursor.go +21 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevice.go +33 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicepad.go +22 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdevicetool.go +18 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplay.go +43 -51 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdisplaymanager.go +20 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexture.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdmabuftexturebuilder.go +41 -53 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrag.go +28 -20 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurface.go +14 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdragsurfacesize.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrawcontext.go +18 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkdrop.go +24 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkenums.go +1 -21 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkevents.go +118 -120 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframeclock.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkframetimings.go +20 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkglcontext.go +36 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexture.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkgltexturebuilder.go +35 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkkeys.go +22 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexture.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmemorytexturebuilder.go +35 -42 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkmonitor.go +27 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpaintable.go +33 -63 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpango.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpixbuf.go +12 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopup.go +26 -47 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkpopuplayout.go +32 -36 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkrgba.go +21 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkseat.go +20 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksnapshot.go +0 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdksurface.go +40 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktexture.go +31 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevel.go +66 -157 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevellayout.go +25 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktoplevelsize.go +16 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdktypes.go +72 -95 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdk/gdkvulkancontext.go +13 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-animation.go +32 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-core.go +0 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-io.go +23 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-loader.go +22 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf-transform.go +1 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/gdk-pixbuf.go +79 -102 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gdkpixbuf/main.go +17 -5 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gaction.go +31 -59 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactiongroup.go +39 -96 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gactionmap.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gappinfo.go +116 -244 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplication.go +55 -79 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gapplicationcommandline.go +27 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncinitable.go +22 -25
| @@ -67,7 +67,7 @@ func (x *AsyncInitableIface) OverrideInitFinish(cb func(AsyncInitable, AsyncResu | |||
| 67 | 67 | if cb == nil { | |
| 68 | 68 | x.xInitFinish = 0 | |
| 69 | 69 | } else { | |
| 70 | - | x.xInitFinish = purego.NewCallback(func(InitableVarp uintptr, ResVarp uintptr, cerrp **glib.Error) bool { | |
| 70 | + | x.xInitFinish = purego.NewCallback(func(InitableVarp uintptr, ResVarp uintptr) bool { | |
| 71 | 71 | return cb(&AsyncInitableBase{Ptr: InitableVarp}, &AsyncResultBase{Ptr: ResVarp}) | |
| 72 | 72 | }) | |
| 73 | 73 | } | |
| @@ -79,11 +79,10 @@ func (x *AsyncInitableIface) GetInitFinish() func(AsyncInitable, AsyncResult) bo | |||
| 79 | 79 | if x.xInitFinish == 0 { | |
| 80 | 80 | return nil | |
| 81 | 81 | } | |
| 82 | - | var rawCallback func(InitableVarp uintptr, ResVarp uintptr, cerrp **glib.Error) bool | |
| 82 | + | var rawCallback func(InitableVarp uintptr, ResVarp uintptr) bool | |
| 83 | 83 | purego.RegisterFunc(&rawCallback, x.xInitFinish) | |
| 84 | 84 | return func(InitableVar AsyncInitable, ResVar AsyncResult) bool { | |
| 85 | - | var cerr *glib.Error | |
| 86 | - | return rawCallback(InitableVar.GoPointer(), ResVar.GoPointer(), &cerr) | |
| 85 | + | return rawCallback(InitableVar.GoPointer(), ResVar.GoPointer()) | |
| 87 | 86 | } | |
| 88 | 87 | } | |
| 89 | 88 | ||
| @@ -208,7 +207,6 @@ type AsyncInitable interface { | |||
| 208 | 207 | var xAsyncInitableGLibType func() types.GType | |
| 209 | 208 | ||
| 210 | 209 | func AsyncInitableGLibType() types.GType { | |
| 211 | - | core.LazyRegister(&xAsyncInitableGLibType, "GIO", "g_async_initable_get_type", false) | |
| 212 | 210 | return xAsyncInitableGLibType() | |
| 213 | 211 | } | |
| 214 | 212 | ||
| @@ -298,26 +296,11 @@ func (x *AsyncInitableBase) NewFinish(ResVar AsyncResult) (*gobject.Object, erro | |||
| 298 | 296 | return cls, cerr | |
| 299 | 297 | } | |
| 300 | 298 | ||
| 301 | - | var XGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr) = func(instance uintptr, IoPriorityVarp int, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |
| 302 | - | core.LazyRegister(&xXGAsyncInitableInitAsync, "GIO", "g_async_initable_init_async", false) | |
| 303 | - | xXGAsyncInitableInitAsync(instance, IoPriorityVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |
| 304 | - | } | |
| 305 | - | ||
| 306 | - | var ( | |
| 307 | - | xXGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr) | |
| 308 | - | XGAsyncInitableInitFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResVarp uintptr, cerrp **glib.Error) bool { | |
| 309 | - | core.LazyRegister(&xXGAsyncInitableInitFinish, "GIO", "g_async_initable_init_finish", false) | |
| 310 | - | return xXGAsyncInitableInitFinish(instance, ResVarp, cerrp) | |
| 311 | - | } | |
| 312 | - | ) | |
| 313 | 299 | var ( | |
| 314 | - | xXGAsyncInitableInitFinish func(uintptr, uintptr, **glib.Error) bool | |
| 315 | - | XGAsyncInitableNewFinish func(uintptr, uintptr, **glib.Error) uintptr = func(instance uintptr, ResVarp uintptr, cerrp **glib.Error) uintptr { | |
| 316 | - | core.LazyRegister(&xXGAsyncInitableNewFinish, "GIO", "g_async_initable_new_finish", false) | |
| 317 | - | return xXGAsyncInitableNewFinish(instance, ResVarp, cerrp) | |
| 318 | - | } | |
| 300 | + | XGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr) | |
| 301 | + | XGAsyncInitableInitFinish func(uintptr, uintptr, **glib.Error) bool | |
| 302 | + | XGAsyncInitableNewFinish func(uintptr, uintptr, **glib.Error) uintptr | |
| 319 | 303 | ) | |
| 320 | - | var xXGAsyncInitableNewFinish func(uintptr, uintptr, **glib.Error) uintptr | |
| 321 | 304 | ||
| 322 | 305 | var xAsyncInitableNewvAsync func(types.GType, uint, *gobject.Parameter, int, uintptr, uintptr, uintptr) | |
| 323 | 306 | ||
| @@ -328,12 +311,26 @@ var xAsyncInitableNewvAsync func(types.GType, uint, *gobject.Parameter, int, uin | |||
| 328 | 311 | // then call g_async_initable_new_finish() to get the new object and check | |
| 329 | 312 | // for any errors. | |
| 330 | 313 | func AsyncInitableNewvAsync(ObjectTypeVar types.GType, NParametersVar uint, ParametersVar *gobject.Parameter, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 331 | - | core.LazyRegister(&xAsyncInitableNewvAsync, "GIO", "g_async_initable_newv_async", false) | |
| 332 | - | ||
| 333 | 314 | xAsyncInitableNewvAsync(ObjectTypeVar, NParametersVar, ParametersVar, IoPriorityVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 334 | 315 | } | |
| 335 | 316 | ||
| 336 | 317 | func init() { | |
| 337 | 318 | core.SetPackageName("GIO", "gio-2.0") | |
| 338 | 319 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 320 | + | var libs []uintptr | |
| 321 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 322 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 323 | + | if err != nil { | |
| 324 | + | panic(err) | |
| 325 | + | } | |
| 326 | + | libs = append(libs, lib) | |
| 327 | + | } | |
| 328 | + | ||
| 329 | + | core.PuregoSafeRegister(&xAsyncInitableNewvAsync, libs, "g_async_initable_newv_async") | |
| 330 | + | ||
| 331 | + | core.PuregoSafeRegister(&xAsyncInitableGLibType, libs, "g_async_initable_get_type") | |
| 332 | + | ||
| 333 | + | core.PuregoSafeRegister(&XGAsyncInitableInitAsync, libs, "g_async_initable_init_async") | |
| 334 | + | core.PuregoSafeRegister(&XGAsyncInitableInitFinish, libs, "g_async_initable_init_finish") | |
| 335 | + | core.PuregoSafeRegister(&XGAsyncInitableNewFinish, libs, "g_async_initable_new_finish") | |
| 339 | 336 | } | |
| @@ -67,7 +67,7 @@ func (x *AsyncInitableIface) OverrideInitFinish(cb func(AsyncInitable, AsyncResu | |||||
| 67 | if cb == nil { | 67 | if cb == nil { | ||
| 68 | x.xInitFinish = 0 | 68 | x.xInitFinish = 0 | ||
| 69 | } else { | 69 | } else { | ||
| 70 | - | x.xInitFinish = purego.NewCallback(func(InitableVarp uintptr, ResVarp uintptr, cerrp **glib.Error) bool { | 70 | + | x.xInitFinish = purego.NewCallback(func(InitableVarp uintptr, ResVarp uintptr) bool { |
| 71 | return cb(&AsyncInitableBase{Ptr: InitableVarp}, &AsyncResultBase{Ptr: ResVarp}) | 71 | return cb(&AsyncInitableBase{Ptr: InitableVarp}, &AsyncResultBase{Ptr: ResVarp}) | ||
| 72 | }) | 72 | }) | ||
| 73 | } | 73 | } | ||
| @@ -79,11 +79,10 @@ func (x *AsyncInitableIface) GetInitFinish() func(AsyncInitable, AsyncResult) bo | |||||
| 79 | if x.xInitFinish == 0 { | 79 | if x.xInitFinish == 0 { | ||
| 80 | return nil | 80 | return nil | ||
| 81 | } | 81 | } | ||
| 82 | - | var rawCallback func(InitableVarp uintptr, ResVarp uintptr, cerrp **glib.Error) bool | 82 | + | var rawCallback func(InitableVarp uintptr, ResVarp uintptr) bool |
| 83 | purego.RegisterFunc(&rawCallback, x.xInitFinish) | 83 | purego.RegisterFunc(&rawCallback, x.xInitFinish) | ||
| 84 | return func(InitableVar AsyncInitable, ResVar AsyncResult) bool { | 84 | return func(InitableVar AsyncInitable, ResVar AsyncResult) bool { | ||
| 85 | - | var cerr *glib.Error | 85 | + | return rawCallback(InitableVar.GoPointer(), ResVar.GoPointer()) |
| 86 | - | return rawCallback(InitableVar.GoPointer(), ResVar.GoPointer(), &cerr) | |||
| 87 | } | 86 | } | ||
| 88 | } | 87 | } | ||
| 89 | 88 | ||||
| @@ -208,7 +207,6 @@ type AsyncInitable interface { | |||||
| 208 | var xAsyncInitableGLibType func() types.GType | 207 | var xAsyncInitableGLibType func() types.GType | ||
| 209 | 208 | ||||
| 210 | func AsyncInitableGLibType() types.GType { | 209 | func AsyncInitableGLibType() types.GType { | ||
| 211 | - | core.LazyRegister(&xAsyncInitableGLibType, "GIO", "g_async_initable_get_type", false) | |||
| 212 | return xAsyncInitableGLibType() | 210 | return xAsyncInitableGLibType() | ||
| 213 | } | 211 | } | ||
| 214 | 212 | ||||
| @@ -298,26 +296,11 @@ func (x *AsyncInitableBase) NewFinish(ResVar AsyncResult) (*gobject.Object, erro | |||||
| 298 | return cls, cerr | 296 | return cls, cerr | ||
| 299 | } | 297 | } | ||
| 300 | 298 | ||||
| 301 | - | var XGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr) = func(instance uintptr, IoPriorityVarp int, CancellableVarp uintptr, CallbackVarp uintptr, UserDataVarp uintptr) { | |||
| 302 | - | core.LazyRegister(&xXGAsyncInitableInitAsync, "GIO", "g_async_initable_init_async", false) | |||
| 303 | - | xXGAsyncInitableInitAsync(instance, IoPriorityVarp, CancellableVarp, CallbackVarp, UserDataVarp) | |||
| 304 | - | } | |||
| 305 | - | ||||
| 306 | - | var ( | |||
| 307 | - | xXGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr) | |||
| 308 | - | XGAsyncInitableInitFinish func(uintptr, uintptr, **glib.Error) bool = func(instance uintptr, ResVarp uintptr, cerrp **glib.Error) bool { | |||
| 309 | - | core.LazyRegister(&xXGAsyncInitableInitFinish, "GIO", "g_async_initable_init_finish", false) | |||
| 310 | - | return xXGAsyncInitableInitFinish(instance, ResVarp, cerrp) | |||
| 311 | - | } | |||
| 312 | - | ) | |||
| 313 | var ( | 299 | var ( | ||
| 314 | - | xXGAsyncInitableInitFinish func(uintptr, uintptr, **glib.Error) bool | 300 | + | XGAsyncInitableInitAsync func(uintptr, int, uintptr, uintptr, uintptr) |
| 315 | - | XGAsyncInitableNewFinish func(uintptr, uintptr, **glib.Error) uintptr = func(instance uintptr, ResVarp uintptr, cerrp **glib.Error) uintptr { | 301 | + | XGAsyncInitableInitFinish func(uintptr, uintptr, **glib.Error) bool |
| 316 | - | core.LazyRegister(&xXGAsyncInitableNewFinish, "GIO", "g_async_initable_new_finish", false) | 302 | + | XGAsyncInitableNewFinish func(uintptr, uintptr, **glib.Error) uintptr |
| 317 | - | return xXGAsyncInitableNewFinish(instance, ResVarp, cerrp) | |||
| 318 | - | } | |||
| 319 | ) | 303 | ) | ||
| 320 | - | var xXGAsyncInitableNewFinish func(uintptr, uintptr, **glib.Error) uintptr | |||
| 321 | 304 | ||||
| 322 | var xAsyncInitableNewvAsync func(types.GType, uint, *gobject.Parameter, int, uintptr, uintptr, uintptr) | 305 | var xAsyncInitableNewvAsync func(types.GType, uint, *gobject.Parameter, int, uintptr, uintptr, uintptr) | ||
| 323 | 306 | ||||
| @@ -328,12 +311,26 @@ var xAsyncInitableNewvAsync func(types.GType, uint, *gobject.Parameter, int, uin | |||||
| 328 | // then call g_async_initable_new_finish() to get the new object and check | 311 | // then call g_async_initable_new_finish() to get the new object and check | ||
| 329 | // for any errors. | 312 | // for any errors. | ||
| 330 | func AsyncInitableNewvAsync(ObjectTypeVar types.GType, NParametersVar uint, ParametersVar *gobject.Parameter, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 313 | func AsyncInitableNewvAsync(ObjectTypeVar types.GType, NParametersVar uint, ParametersVar *gobject.Parameter, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 331 | - | core.LazyRegister(&xAsyncInitableNewvAsync, "GIO", "g_async_initable_newv_async", false) | |||
| 332 | - | ||||
| 333 | xAsyncInitableNewvAsync(ObjectTypeVar, NParametersVar, ParametersVar, IoPriorityVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 314 | xAsyncInitableNewvAsync(ObjectTypeVar, NParametersVar, ParametersVar, IoPriorityVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 334 | } | 315 | } | ||
| 335 | 316 | ||||
| 336 | func init() { | 317 | func init() { | ||
| 337 | core.SetPackageName("GIO", "gio-2.0") | 318 | core.SetPackageName("GIO", "gio-2.0") | ||
| 338 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 319 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 320 | + | var libs []uintptr | |||
| 321 | + | for _, libPath := range core.GetPaths("GIO") { | |||
| 322 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 323 | + | if err != nil { | |||
| 324 | + | panic(err) | |||
| 325 | + | } | |||
| 326 | + | libs = append(libs, lib) | |||
| 327 | + | } | |||
| 328 | + | ||||
| 329 | + | core.PuregoSafeRegister(&xAsyncInitableNewvAsync, libs, "g_async_initable_newv_async") | |||
| 330 | + | ||||
| 331 | + | core.PuregoSafeRegister(&xAsyncInitableGLibType, libs, "g_async_initable_get_type") | |||
| 332 | + | ||||
| 333 | + | core.PuregoSafeRegister(&XGAsyncInitableInitAsync, libs, "g_async_initable_init_async") | |||
| 334 | + | core.PuregoSafeRegister(&XGAsyncInitableInitFinish, libs, "g_async_initable_init_finish") | |||
| 335 | + | core.PuregoSafeRegister(&XGAsyncInitableNewFinish, libs, "g_async_initable_new_finish") | |||
| 339 | } | 336 | } | ||