Revert "chore(deps): pin puregotk nil-signal fix"
This reverts commit a161e348e2093172038390b0906448f0ae979a0d.
- commit
- 40378d5e4fd2372d054e49168ab2a6f67aedd0fd
- author
- brice · · 2026-07-14 17:59 UTC
- parent
- 8d647bb
- signature
- GPG Verified
CD88F9E564E0102646FB6077A1A07C7C7C3E349D· arch-gpg Verified for the committer email
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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gasyncresult.go +19 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedinputstream.go +29 -26
| @@ -51,7 +51,7 @@ func (x *BufferedInputStreamClass) OverrideFill(cb func(*BufferedInputStream, in | |||
| 51 | 51 | if cb == nil { | |
| 52 | 52 | x.xFill = 0 | |
| 53 | 53 | } else { | |
| 54 | - | x.xFill = purego.NewCallback(func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr, cerrp **glib.Error) int { | |
| 54 | + | x.xFill = purego.NewCallback(func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr) int { | |
| 55 | 55 | return cb(BufferedInputStreamNewFromInternalPtr(StreamVarp), CountVarp, CancellableNewFromInternalPtr(CancellableVarp)) | |
| 56 | 56 | }) | |
| 57 | 57 | } | |
| @@ -62,11 +62,10 @@ func (x *BufferedInputStreamClass) GetFill() func(*BufferedInputStream, int, *Ca | |||
| 62 | 62 | if x.xFill == 0 { | |
| 63 | 63 | return nil | |
| 64 | 64 | } | |
| 65 | - | var rawCallback func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr, cerrp **glib.Error) int | |
| 65 | + | var rawCallback func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr) int | |
| 66 | 66 | purego.RegisterFunc(&rawCallback, x.xFill) | |
| 67 | 67 | return func(StreamVar *BufferedInputStream, CountVar int, CancellableVar *Cancellable) int { | |
| 68 | - | var cerr *glib.Error | |
| 69 | - | return rawCallback(StreamVar.GoPointer(), CountVar, CancellableVar.GoPointer(), &cerr) | |
| 68 | + | return rawCallback(StreamVar.GoPointer(), CountVar, CancellableVar.GoPointer()) | |
| 70 | 69 | } | |
| 71 | 70 | } | |
| 72 | 71 | ||
| @@ -98,7 +97,7 @@ func (x *BufferedInputStreamClass) OverrideFillFinish(cb func(*BufferedInputStre | |||
| 98 | 97 | if cb == nil { | |
| 99 | 98 | x.xFillFinish = 0 | |
| 100 | 99 | } else { | |
| 101 | - | x.xFillFinish = purego.NewCallback(func(StreamVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) int { | |
| 100 | + | x.xFillFinish = purego.NewCallback(func(StreamVarp uintptr, ResultVarp uintptr) int { | |
| 102 | 101 | return cb(BufferedInputStreamNewFromInternalPtr(StreamVarp), &AsyncResultBase{Ptr: ResultVarp}) | |
| 103 | 102 | }) | |
| 104 | 103 | } | |
| @@ -109,11 +108,10 @@ func (x *BufferedInputStreamClass) GetFillFinish() func(*BufferedInputStream, As | |||
| 109 | 108 | if x.xFillFinish == 0 { | |
| 110 | 109 | return nil | |
| 111 | 110 | } | |
| 112 | - | var rawCallback func(StreamVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) int | |
| 111 | + | var rawCallback func(StreamVarp uintptr, ResultVarp uintptr) int | |
| 113 | 112 | purego.RegisterFunc(&rawCallback, x.xFillFinish) | |
| 114 | 113 | return func(StreamVar *BufferedInputStream, ResultVar AsyncResult) int { | |
| 115 | - | var cerr *glib.Error | |
| 116 | - | return rawCallback(StreamVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| 114 | + | return rawCallback(StreamVar.GoPointer(), ResultVar.GoPointer()) | |
| 117 | 115 | } | |
| 118 | 116 | } | |
| 119 | 117 | ||
| @@ -268,7 +266,6 @@ type BufferedInputStream struct { | |||
| 268 | 266 | var xBufferedInputStreamGLibType func() types.GType | |
| 269 | 267 | ||
| 270 | 268 | func BufferedInputStreamGLibType() types.GType { | |
| 271 | - | core.LazyRegister(&xBufferedInputStreamGLibType, "GIO", "g_buffered_input_stream_get_type", false) | |
| 272 | 269 | return xBufferedInputStreamGLibType() | |
| 273 | 270 | } | |
| 274 | 271 | ||
| @@ -283,7 +280,6 @@ var xNewBufferedInputStream func(uintptr) uintptr | |||
| 283 | 280 | // Creates a new [class@Gio.InputStream] from the given @base_stream, with | |
| 284 | 281 | // a buffer set to the default size (4 kilobytes). | |
| 285 | 282 | func NewBufferedInputStream(BaseStreamVar *InputStream) *BufferedInputStream { | |
| 286 | - | core.LazyRegister(&xNewBufferedInputStream, "GIO", "g_buffered_input_stream_new", false) | |
| 287 | 283 | var cls *BufferedInputStream | |
| 288 | 284 | ||
| 289 | 285 | cret := xNewBufferedInputStream(BaseStreamVar.GoPointer()) | |
| @@ -301,7 +297,6 @@ var xNewBufferedInputStreamSized func(uintptr, uint) uintptr | |||
| 301 | 297 | // Creates a new [class@Gio.BufferedInputStream] from the given @base_stream, | |
| 302 | 298 | // with a buffer set to @size. | |
| 303 | 299 | func NewBufferedInputStreamSized(BaseStreamVar *InputStream, SizeVar uint) *BufferedInputStream { | |
| 304 | - | core.LazyRegister(&xNewBufferedInputStreamSized, "GIO", "g_buffered_input_stream_new_sized", false) | |
| 305 | 300 | var cls *BufferedInputStream | |
| 306 | 301 | ||
| 307 | 302 | cret := xNewBufferedInputStreamSized(BaseStreamVar.GoPointer(), SizeVar) | |
| @@ -342,7 +337,6 @@ var xBufferedInputStreamFill func(uintptr, int, uintptr, **glib.Error) int | |||
| 342 | 337 | // For the asynchronous, non-blocking, version of this function, see | |
| 343 | 338 | // [method@Gio.BufferedInputStream.fill_async]. | |
| 344 | 339 | func (x *BufferedInputStream) Fill(CountVar int, CancellableVar *Cancellable) (int, error) { | |
| 345 | - | core.LazyRegister(&xBufferedInputStreamFill, "GIO", "g_buffered_input_stream_fill", false) | |
| 346 | 340 | var cerr *glib.Error | |
| 347 | 341 | ||
| 348 | 342 | cret := xBufferedInputStreamFill(x.GoPointer(), CountVar, CancellableVar.GoPointer(), &cerr) | |
| @@ -361,8 +355,6 @@ var xBufferedInputStreamFillAsync func(uintptr, int, int, uintptr, uintptr, uint | |||
| 361 | 355 | // If @count is `-1` then the attempted read size is equal to the number | |
| 362 | 356 | // of bytes that are required to fill the buffer. | |
| 363 | 357 | func (x *BufferedInputStream) FillAsync(CountVar int, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 364 | - | core.LazyRegister(&xBufferedInputStreamFillAsync, "GIO", "g_buffered_input_stream_fill_async", false) | |
| 365 | - | ||
| 366 | 358 | xBufferedInputStreamFillAsync(x.GoPointer(), CountVar, IoPriorityVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 367 | 359 | } | |
| 368 | 360 | ||
| @@ -370,7 +362,6 @@ var xBufferedInputStreamFillFinish func(uintptr, uintptr, **glib.Error) int | |||
| 370 | 362 | ||
| 371 | 363 | // Finishes an asynchronous read. | |
| 372 | 364 | func (x *BufferedInputStream) FillFinish(ResultVar AsyncResult) (int, error) { | |
| 373 | - | core.LazyRegister(&xBufferedInputStreamFillFinish, "GIO", "g_buffered_input_stream_fill_finish", false) | |
| 374 | 365 | var cerr *glib.Error | |
| 375 | 366 | ||
| 376 | 367 | cret := xBufferedInputStreamFillFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | |
| @@ -384,8 +375,6 @@ var xBufferedInputStreamGetAvailable func(uintptr) uint | |||
| 384 | 375 | ||
| 385 | 376 | // Gets the size of the available data within the stream. | |
| 386 | 377 | func (x *BufferedInputStream) GetAvailable() uint { | |
| 387 | - | core.LazyRegister(&xBufferedInputStreamGetAvailable, "GIO", "g_buffered_input_stream_get_available", false) | |
| 388 | - | ||
| 389 | 378 | cret := xBufferedInputStreamGetAvailable(x.GoPointer()) | |
| 390 | 379 | return cret | |
| 391 | 380 | } | |
| @@ -394,8 +383,6 @@ var xBufferedInputStreamGetBufferSize func(uintptr) uint | |||
| 394 | 383 | ||
| 395 | 384 | // Gets the size of the input buffer. | |
| 396 | 385 | func (x *BufferedInputStream) GetBufferSize() uint { | |
| 397 | - | core.LazyRegister(&xBufferedInputStreamGetBufferSize, "GIO", "g_buffered_input_stream_get_buffer_size", false) | |
| 398 | - | ||
| 399 | 386 | cret := xBufferedInputStreamGetBufferSize(x.GoPointer()) | |
| 400 | 387 | return cret | |
| 401 | 388 | } | |
| @@ -405,8 +392,6 @@ var xBufferedInputStreamPeek func(uintptr, []byte, uint, uint) uint | |||
| 405 | 392 | // Peeks in the buffered input, copying @count bytes of data from @offset bytes | |
| 406 | 393 | // in the buffered input into @buffer. | |
| 407 | 394 | func (x *BufferedInputStream) Peek(BufferVar []byte, OffsetVar uint, CountVar uint) uint { | |
| 408 | - | core.LazyRegister(&xBufferedInputStreamPeek, "GIO", "g_buffered_input_stream_peek", false) | |
| 409 | - | ||
| 410 | 395 | cret := xBufferedInputStreamPeek(x.GoPointer(), BufferVar, OffsetVar, CountVar) | |
| 411 | 396 | return cret | |
| 412 | 397 | } | |
| @@ -417,8 +402,6 @@ var xBufferedInputStreamPeekBuffer func(uintptr, *uint) uintptr | |||
| 417 | 402 | // buffer must not be modified and will become invalid when reading from | |
| 418 | 403 | // the stream or filling the buffer. | |
| 419 | 404 | func (x *BufferedInputStream) PeekBuffer(CountVar *uint) uintptr { | |
| 420 | - | core.LazyRegister(&xBufferedInputStreamPeekBuffer, "GIO", "g_buffered_input_stream_peek_buffer", false) | |
| 421 | - | ||
| 422 | 405 | cret := xBufferedInputStreamPeekBuffer(x.GoPointer(), CountVar) | |
| 423 | 406 | return cret | |
| 424 | 407 | } | |
| @@ -439,7 +422,6 @@ var xBufferedInputStreamBufferedInputStreamReadByte func(uintptr, uintptr, **gli | |||
| 439 | 422 | // | |
| 440 | 423 | // On error `-1` is returned and @error is set accordingly. | |
| 441 | 424 | func (x *BufferedInputStream) BufferedInputStreamReadByte(CancellableVar *Cancellable) (int, error) { | |
| 442 | - | core.LazyRegister(&xBufferedInputStreamBufferedInputStreamReadByte, "GIO", "g_buffered_input_stream_read_byte", false) | |
| 443 | 425 | var cerr *glib.Error | |
| 444 | 426 | ||
| 445 | 427 | cret := xBufferedInputStreamBufferedInputStreamReadByte(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | |
| @@ -455,8 +437,6 @@ var xBufferedInputStreamSetBufferSize func(uintptr, uint) | |||
| 455 | 437 | // size of the contents of the buffer. The buffer can never be resized | |
| 456 | 438 | // smaller than its current contents. | |
| 457 | 439 | func (x *BufferedInputStream) SetBufferSize(SizeVar uint) { | |
| 458 | - | core.LazyRegister(&xBufferedInputStreamSetBufferSize, "GIO", "g_buffered_input_stream_set_buffer_size", false) | |
| 459 | - | ||
| 460 | 440 | xBufferedInputStreamSetBufferSize(x.GoPointer(), SizeVar) | |
| 461 | 441 | } | |
| 462 | 442 | ||
| @@ -553,4 +533,27 @@ func (x *BufferedInputStream) Truncate(OffsetVar int64, CancellableVar *Cancella | |||
| 553 | 533 | func init() { | |
| 554 | 534 | core.SetPackageName("GIO", "gio-2.0") | |
| 555 | 535 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 536 | + | var libs []uintptr | |
| 537 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 538 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 539 | + | if err != nil { | |
| 540 | + | panic(err) | |
| 541 | + | } | |
| 542 | + | libs = append(libs, lib) | |
| 543 | + | } | |
| 544 | + | ||
| 545 | + | core.PuregoSafeRegister(&xBufferedInputStreamGLibType, libs, "g_buffered_input_stream_get_type") | |
| 546 | + | ||
| 547 | + | core.PuregoSafeRegister(&xNewBufferedInputStream, libs, "g_buffered_input_stream_new") | |
| 548 | + | core.PuregoSafeRegister(&xNewBufferedInputStreamSized, libs, "g_buffered_input_stream_new_sized") | |
| 549 | + | ||
| 550 | + | core.PuregoSafeRegister(&xBufferedInputStreamFill, libs, "g_buffered_input_stream_fill") | |
| 551 | + | core.PuregoSafeRegister(&xBufferedInputStreamFillAsync, libs, "g_buffered_input_stream_fill_async") | |
| 552 | + | core.PuregoSafeRegister(&xBufferedInputStreamFillFinish, libs, "g_buffered_input_stream_fill_finish") | |
| 553 | + | core.PuregoSafeRegister(&xBufferedInputStreamGetAvailable, libs, "g_buffered_input_stream_get_available") | |
| 554 | + | core.PuregoSafeRegister(&xBufferedInputStreamGetBufferSize, libs, "g_buffered_input_stream_get_buffer_size") | |
| 555 | + | core.PuregoSafeRegister(&xBufferedInputStreamPeek, libs, "g_buffered_input_stream_peek") | |
| 556 | + | core.PuregoSafeRegister(&xBufferedInputStreamPeekBuffer, libs, "g_buffered_input_stream_peek_buffer") | |
| 557 | + | core.PuregoSafeRegister(&xBufferedInputStreamBufferedInputStreamReadByte, libs, "g_buffered_input_stream_read_byte") | |
| 558 | + | core.PuregoSafeRegister(&xBufferedInputStreamSetBufferSize, libs, "g_buffered_input_stream_set_buffer_size") | |
| 556 | 559 | } | |
| @@ -51,7 +51,7 @@ func (x *BufferedInputStreamClass) OverrideFill(cb func(*BufferedInputStream, in | |||||
| 51 | if cb == nil { | 51 | if cb == nil { | ||
| 52 | x.xFill = 0 | 52 | x.xFill = 0 | ||
| 53 | } else { | 53 | } else { | ||
| 54 | - | x.xFill = purego.NewCallback(func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr, cerrp **glib.Error) int { | 54 | + | x.xFill = purego.NewCallback(func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr) int { |
| 55 | return cb(BufferedInputStreamNewFromInternalPtr(StreamVarp), CountVarp, CancellableNewFromInternalPtr(CancellableVarp)) | 55 | return cb(BufferedInputStreamNewFromInternalPtr(StreamVarp), CountVarp, CancellableNewFromInternalPtr(CancellableVarp)) | ||
| 56 | }) | 56 | }) | ||
| 57 | } | 57 | } | ||
| @@ -62,11 +62,10 @@ func (x *BufferedInputStreamClass) GetFill() func(*BufferedInputStream, int, *Ca | |||||
| 62 | if x.xFill == 0 { | 62 | if x.xFill == 0 { | ||
| 63 | return nil | 63 | return nil | ||
| 64 | } | 64 | } | ||
| 65 | - | var rawCallback func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr, cerrp **glib.Error) int | 65 | + | var rawCallback func(StreamVarp uintptr, CountVarp int, CancellableVarp uintptr) int |
| 66 | purego.RegisterFunc(&rawCallback, x.xFill) | 66 | purego.RegisterFunc(&rawCallback, x.xFill) | ||
| 67 | return func(StreamVar *BufferedInputStream, CountVar int, CancellableVar *Cancellable) int { | 67 | return func(StreamVar *BufferedInputStream, CountVar int, CancellableVar *Cancellable) int { | ||
| 68 | - | var cerr *glib.Error | 68 | + | return rawCallback(StreamVar.GoPointer(), CountVar, CancellableVar.GoPointer()) |
| 69 | - | return rawCallback(StreamVar.GoPointer(), CountVar, CancellableVar.GoPointer(), &cerr) | |||
| 70 | } | 69 | } | ||
| 71 | } | 70 | } | ||
| 72 | 71 | ||||
| @@ -98,7 +97,7 @@ func (x *BufferedInputStreamClass) OverrideFillFinish(cb func(*BufferedInputStre | |||||
| 98 | if cb == nil { | 97 | if cb == nil { | ||
| 99 | x.xFillFinish = 0 | 98 | x.xFillFinish = 0 | ||
| 100 | } else { | 99 | } else { | ||
| 101 | - | x.xFillFinish = purego.NewCallback(func(StreamVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) int { | 100 | + | x.xFillFinish = purego.NewCallback(func(StreamVarp uintptr, ResultVarp uintptr) int { |
| 102 | return cb(BufferedInputStreamNewFromInternalPtr(StreamVarp), &AsyncResultBase{Ptr: ResultVarp}) | 101 | return cb(BufferedInputStreamNewFromInternalPtr(StreamVarp), &AsyncResultBase{Ptr: ResultVarp}) | ||
| 103 | }) | 102 | }) | ||
| 104 | } | 103 | } | ||
| @@ -109,11 +108,10 @@ func (x *BufferedInputStreamClass) GetFillFinish() func(*BufferedInputStream, As | |||||
| 109 | if x.xFillFinish == 0 { | 108 | if x.xFillFinish == 0 { | ||
| 110 | return nil | 109 | return nil | ||
| 111 | } | 110 | } | ||
| 112 | - | var rawCallback func(StreamVarp uintptr, ResultVarp uintptr, cerrp **glib.Error) int | 111 | + | var rawCallback func(StreamVarp uintptr, ResultVarp uintptr) int |
| 113 | purego.RegisterFunc(&rawCallback, x.xFillFinish) | 112 | purego.RegisterFunc(&rawCallback, x.xFillFinish) | ||
| 114 | return func(StreamVar *BufferedInputStream, ResultVar AsyncResult) int { | 113 | return func(StreamVar *BufferedInputStream, ResultVar AsyncResult) int { | ||
| 115 | - | var cerr *glib.Error | 114 | + | return rawCallback(StreamVar.GoPointer(), ResultVar.GoPointer()) |
| 116 | - | return rawCallback(StreamVar.GoPointer(), ResultVar.GoPointer(), &cerr) | |||
| 117 | } | 115 | } | ||
| 118 | } | 116 | } | ||
| 119 | 117 | ||||
| @@ -268,7 +266,6 @@ type BufferedInputStream struct { | |||||
| 268 | var xBufferedInputStreamGLibType func() types.GType | 266 | var xBufferedInputStreamGLibType func() types.GType | ||
| 269 | 267 | ||||
| 270 | func BufferedInputStreamGLibType() types.GType { | 268 | func BufferedInputStreamGLibType() types.GType { | ||
| 271 | - | core.LazyRegister(&xBufferedInputStreamGLibType, "GIO", "g_buffered_input_stream_get_type", false) | |||
| 272 | return xBufferedInputStreamGLibType() | 269 | return xBufferedInputStreamGLibType() | ||
| 273 | } | 270 | } | ||
| 274 | 271 | ||||
| @@ -283,7 +280,6 @@ var xNewBufferedInputStream func(uintptr) uintptr | |||||
| 283 | // Creates a new [class@Gio.InputStream] from the given @base_stream, with | 280 | // Creates a new [class@Gio.InputStream] from the given @base_stream, with | ||
| 284 | // a buffer set to the default size (4 kilobytes). | 281 | // a buffer set to the default size (4 kilobytes). | ||
| 285 | func NewBufferedInputStream(BaseStreamVar *InputStream) *BufferedInputStream { | 282 | func NewBufferedInputStream(BaseStreamVar *InputStream) *BufferedInputStream { | ||
| 286 | - | core.LazyRegister(&xNewBufferedInputStream, "GIO", "g_buffered_input_stream_new", false) | |||
| 287 | var cls *BufferedInputStream | 283 | var cls *BufferedInputStream | ||
| 288 | 284 | ||||
| 289 | cret := xNewBufferedInputStream(BaseStreamVar.GoPointer()) | 285 | cret := xNewBufferedInputStream(BaseStreamVar.GoPointer()) | ||
| @@ -301,7 +297,6 @@ var xNewBufferedInputStreamSized func(uintptr, uint) uintptr | |||||
| 301 | // Creates a new [class@Gio.BufferedInputStream] from the given @base_stream, | 297 | // Creates a new [class@Gio.BufferedInputStream] from the given @base_stream, | ||
| 302 | // with a buffer set to @size. | 298 | // with a buffer set to @size. | ||
| 303 | func NewBufferedInputStreamSized(BaseStreamVar *InputStream, SizeVar uint) *BufferedInputStream { | 299 | func NewBufferedInputStreamSized(BaseStreamVar *InputStream, SizeVar uint) *BufferedInputStream { | ||
| 304 | - | core.LazyRegister(&xNewBufferedInputStreamSized, "GIO", "g_buffered_input_stream_new_sized", false) | |||
| 305 | var cls *BufferedInputStream | 300 | var cls *BufferedInputStream | ||
| 306 | 301 | ||||
| 307 | cret := xNewBufferedInputStreamSized(BaseStreamVar.GoPointer(), SizeVar) | 302 | cret := xNewBufferedInputStreamSized(BaseStreamVar.GoPointer(), SizeVar) | ||
| @@ -342,7 +337,6 @@ var xBufferedInputStreamFill func(uintptr, int, uintptr, **glib.Error) int | |||||
| 342 | // For the asynchronous, non-blocking, version of this function, see | 337 | // For the asynchronous, non-blocking, version of this function, see | ||
| 343 | // [method@Gio.BufferedInputStream.fill_async]. | 338 | // [method@Gio.BufferedInputStream.fill_async]. | ||
| 344 | func (x *BufferedInputStream) Fill(CountVar int, CancellableVar *Cancellable) (int, error) { | 339 | func (x *BufferedInputStream) Fill(CountVar int, CancellableVar *Cancellable) (int, error) { | ||
| 345 | - | core.LazyRegister(&xBufferedInputStreamFill, "GIO", "g_buffered_input_stream_fill", false) | |||
| 346 | var cerr *glib.Error | 340 | var cerr *glib.Error | ||
| 347 | 341 | ||||
| 348 | cret := xBufferedInputStreamFill(x.GoPointer(), CountVar, CancellableVar.GoPointer(), &cerr) | 342 | cret := xBufferedInputStreamFill(x.GoPointer(), CountVar, CancellableVar.GoPointer(), &cerr) | ||
| @@ -361,8 +355,6 @@ var xBufferedInputStreamFillAsync func(uintptr, int, int, uintptr, uintptr, uint | |||||
| 361 | // If @count is `-1` then the attempted read size is equal to the number | 355 | // If @count is `-1` then the attempted read size is equal to the number | ||
| 362 | // of bytes that are required to fill the buffer. | 356 | // of bytes that are required to fill the buffer. | ||
| 363 | func (x *BufferedInputStream) FillAsync(CountVar int, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 357 | func (x *BufferedInputStream) FillAsync(CountVar int, IoPriorityVar int, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 364 | - | core.LazyRegister(&xBufferedInputStreamFillAsync, "GIO", "g_buffered_input_stream_fill_async", false) | |||
| 365 | - | ||||
| 366 | xBufferedInputStreamFillAsync(x.GoPointer(), CountVar, IoPriorityVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 358 | xBufferedInputStreamFillAsync(x.GoPointer(), CountVar, IoPriorityVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 367 | } | 359 | } | ||
| 368 | 360 | ||||
| @@ -370,7 +362,6 @@ var xBufferedInputStreamFillFinish func(uintptr, uintptr, **glib.Error) int | |||||
| 370 | 362 | ||||
| 371 | // Finishes an asynchronous read. | 363 | // Finishes an asynchronous read. | ||
| 372 | func (x *BufferedInputStream) FillFinish(ResultVar AsyncResult) (int, error) { | 364 | func (x *BufferedInputStream) FillFinish(ResultVar AsyncResult) (int, error) { | ||
| 373 | - | core.LazyRegister(&xBufferedInputStreamFillFinish, "GIO", "g_buffered_input_stream_fill_finish", false) | |||
| 374 | var cerr *glib.Error | 365 | var cerr *glib.Error | ||
| 375 | 366 | ||||
| 376 | cret := xBufferedInputStreamFillFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | 367 | cret := xBufferedInputStreamFillFinish(x.GoPointer(), ResultVar.GoPointer(), &cerr) | ||
| @@ -384,8 +375,6 @@ var xBufferedInputStreamGetAvailable func(uintptr) uint | |||||
| 384 | 375 | ||||
| 385 | // Gets the size of the available data within the stream. | 376 | // Gets the size of the available data within the stream. | ||
| 386 | func (x *BufferedInputStream) GetAvailable() uint { | 377 | func (x *BufferedInputStream) GetAvailable() uint { | ||
| 387 | - | core.LazyRegister(&xBufferedInputStreamGetAvailable, "GIO", "g_buffered_input_stream_get_available", false) | |||
| 388 | - | ||||
| 389 | cret := xBufferedInputStreamGetAvailable(x.GoPointer()) | 378 | cret := xBufferedInputStreamGetAvailable(x.GoPointer()) | ||
| 390 | return cret | 379 | return cret | ||
| 391 | } | 380 | } | ||
| @@ -394,8 +383,6 @@ var xBufferedInputStreamGetBufferSize func(uintptr) uint | |||||
| 394 | 383 | ||||
| 395 | // Gets the size of the input buffer. | 384 | // Gets the size of the input buffer. | ||
| 396 | func (x *BufferedInputStream) GetBufferSize() uint { | 385 | func (x *BufferedInputStream) GetBufferSize() uint { | ||
| 397 | - | core.LazyRegister(&xBufferedInputStreamGetBufferSize, "GIO", "g_buffered_input_stream_get_buffer_size", false) | |||
| 398 | - | ||||
| 399 | cret := xBufferedInputStreamGetBufferSize(x.GoPointer()) | 386 | cret := xBufferedInputStreamGetBufferSize(x.GoPointer()) | ||
| 400 | return cret | 387 | return cret | ||
| 401 | } | 388 | } | ||
| @@ -405,8 +392,6 @@ var xBufferedInputStreamPeek func(uintptr, []byte, uint, uint) uint | |||||
| 405 | // Peeks in the buffered input, copying @count bytes of data from @offset bytes | 392 | // Peeks in the buffered input, copying @count bytes of data from @offset bytes | ||
| 406 | // in the buffered input into @buffer. | 393 | // in the buffered input into @buffer. | ||
| 407 | func (x *BufferedInputStream) Peek(BufferVar []byte, OffsetVar uint, CountVar uint) uint { | 394 | func (x *BufferedInputStream) Peek(BufferVar []byte, OffsetVar uint, CountVar uint) uint { | ||
| 408 | - | core.LazyRegister(&xBufferedInputStreamPeek, "GIO", "g_buffered_input_stream_peek", false) | |||
| 409 | - | ||||
| 410 | cret := xBufferedInputStreamPeek(x.GoPointer(), BufferVar, OffsetVar, CountVar) | 395 | cret := xBufferedInputStreamPeek(x.GoPointer(), BufferVar, OffsetVar, CountVar) | ||
| 411 | return cret | 396 | return cret | ||
| 412 | } | 397 | } | ||
| @@ -417,8 +402,6 @@ var xBufferedInputStreamPeekBuffer func(uintptr, *uint) uintptr | |||||
| 417 | // buffer must not be modified and will become invalid when reading from | 402 | // buffer must not be modified and will become invalid when reading from | ||
| 418 | // the stream or filling the buffer. | 403 | // the stream or filling the buffer. | ||
| 419 | func (x *BufferedInputStream) PeekBuffer(CountVar *uint) uintptr { | 404 | func (x *BufferedInputStream) PeekBuffer(CountVar *uint) uintptr { | ||
| 420 | - | core.LazyRegister(&xBufferedInputStreamPeekBuffer, "GIO", "g_buffered_input_stream_peek_buffer", false) | |||
| 421 | - | ||||
| 422 | cret := xBufferedInputStreamPeekBuffer(x.GoPointer(), CountVar) | 405 | cret := xBufferedInputStreamPeekBuffer(x.GoPointer(), CountVar) | ||
| 423 | return cret | 406 | return cret | ||
| 424 | } | 407 | } | ||
| @@ -439,7 +422,6 @@ var xBufferedInputStreamBufferedInputStreamReadByte func(uintptr, uintptr, **gli | |||||
| 439 | // | 422 | // | ||
| 440 | // On error `-1` is returned and @error is set accordingly. | 423 | // On error `-1` is returned and @error is set accordingly. | ||
| 441 | func (x *BufferedInputStream) BufferedInputStreamReadByte(CancellableVar *Cancellable) (int, error) { | 424 | func (x *BufferedInputStream) BufferedInputStreamReadByte(CancellableVar *Cancellable) (int, error) { | ||
| 442 | - | core.LazyRegister(&xBufferedInputStreamBufferedInputStreamReadByte, "GIO", "g_buffered_input_stream_read_byte", false) | |||
| 443 | var cerr *glib.Error | 425 | var cerr *glib.Error | ||
| 444 | 426 | ||||
| 445 | cret := xBufferedInputStreamBufferedInputStreamReadByte(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | 427 | cret := xBufferedInputStreamBufferedInputStreamReadByte(x.GoPointer(), CancellableVar.GoPointer(), &cerr) | ||
| @@ -455,8 +437,6 @@ var xBufferedInputStreamSetBufferSize func(uintptr, uint) | |||||
| 455 | // size of the contents of the buffer. The buffer can never be resized | 437 | // size of the contents of the buffer. The buffer can never be resized | ||
| 456 | // smaller than its current contents. | 438 | // smaller than its current contents. | ||
| 457 | func (x *BufferedInputStream) SetBufferSize(SizeVar uint) { | 439 | func (x *BufferedInputStream) SetBufferSize(SizeVar uint) { | ||
| 458 | - | core.LazyRegister(&xBufferedInputStreamSetBufferSize, "GIO", "g_buffered_input_stream_set_buffer_size", false) | |||
| 459 | - | ||||
| 460 | xBufferedInputStreamSetBufferSize(x.GoPointer(), SizeVar) | 440 | xBufferedInputStreamSetBufferSize(x.GoPointer(), SizeVar) | ||
| 461 | } | 441 | } | ||
| 462 | 442 | ||||
| @@ -553,4 +533,27 @@ func (x *BufferedInputStream) Truncate(OffsetVar int64, CancellableVar *Cancella | |||||
| 553 | func init() { | 533 | func init() { | ||
| 554 | core.SetPackageName("GIO", "gio-2.0") | 534 | core.SetPackageName("GIO", "gio-2.0") | ||
| 555 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 535 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 536 | + | var libs []uintptr | |||
| 537 | + | for _, libPath := range core.GetPaths("GIO") { | |||
| 538 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 539 | + | if err != nil { | |||
| 540 | + | panic(err) | |||
| 541 | + | } | |||
| 542 | + | libs = append(libs, lib) | |||
| 543 | + | } | |||
| 544 | + | ||||
| 545 | + | core.PuregoSafeRegister(&xBufferedInputStreamGLibType, libs, "g_buffered_input_stream_get_type") | |||
| 546 | + | ||||
| 547 | + | core.PuregoSafeRegister(&xNewBufferedInputStream, libs, "g_buffered_input_stream_new") | |||
| 548 | + | core.PuregoSafeRegister(&xNewBufferedInputStreamSized, libs, "g_buffered_input_stream_new_sized") | |||
| 549 | + | ||||
| 550 | + | core.PuregoSafeRegister(&xBufferedInputStreamFill, libs, "g_buffered_input_stream_fill") | |||
| 551 | + | core.PuregoSafeRegister(&xBufferedInputStreamFillAsync, libs, "g_buffered_input_stream_fill_async") | |||
| 552 | + | core.PuregoSafeRegister(&xBufferedInputStreamFillFinish, libs, "g_buffered_input_stream_fill_finish") | |||
| 553 | + | core.PuregoSafeRegister(&xBufferedInputStreamGetAvailable, libs, "g_buffered_input_stream_get_available") | |||
| 554 | + | core.PuregoSafeRegister(&xBufferedInputStreamGetBufferSize, libs, "g_buffered_input_stream_get_buffer_size") | |||
| 555 | + | core.PuregoSafeRegister(&xBufferedInputStreamPeek, libs, "g_buffered_input_stream_peek") | |||
| 556 | + | core.PuregoSafeRegister(&xBufferedInputStreamPeekBuffer, libs, "g_buffered_input_stream_peek_buffer") | |||
| 557 | + | core.PuregoSafeRegister(&xBufferedInputStreamBufferedInputStreamReadByte, libs, "g_buffered_input_stream_read_byte") | |||
| 558 | + | core.PuregoSafeRegister(&xBufferedInputStreamSetBufferSize, libs, "g_buffered_input_stream_set_buffer_size") | |||
| 556 | } | 559 | } | ||