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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbufferedoutputstream.go +18 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gbytesicon.go +15 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcancellable.go +27 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcharsetconverter.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcontenttype.go +26 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverter.go +20 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverterinputstream.go +14 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gconverteroutputstream.go +14 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gcredentials.go +21 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatagrambased.go +30 -45 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdatainputstream.go +35 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdataoutputstream.go +23 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusactiongroup.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusaddress.go +17 -10
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | package gio | |
| 3 | 3 | ||
| 4 | 4 | import ( | |
| 5 | + | "github.com/bnema/purego" | |
| 5 | 6 | "github.com/bnema/puregotk/pkg/core" | |
| 6 | 7 | "github.com/bnema/puregotk/v4/glib" | |
| 7 | 8 | ) | |
| @@ -16,8 +17,6 @@ var xDbusAddressEscapeValue func(string) string | |||
| 16 | 17 | // which could be used in a D-Bus address like | |
| 17 | 18 | // `unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0`. | |
| 18 | 19 | func DbusAddressEscapeValue(StringVar string) string { | |
| 19 | - | core.LazyRegister(&xDbusAddressEscapeValue, "GIO", "g_dbus_address_escape_value", false) | |
| 20 | - | ||
| 21 | 20 | cret := xDbusAddressEscapeValue(StringVar) | |
| 22 | 21 | return cret | |
| 23 | 22 | } | |
| @@ -31,7 +30,6 @@ var xDbusAddressGetForBusSync func(BusType, uintptr, **glib.Error) string | |||
| 31 | 30 | // The returned address will be in the | |
| 32 | 31 | // [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses). | |
| 33 | 32 | func DbusAddressGetForBusSync(BusTypeVar BusType, CancellableVar *Cancellable) (string, error) { | |
| 34 | - | core.LazyRegister(&xDbusAddressGetForBusSync, "GIO", "g_dbus_address_get_for_bus_sync", false) | |
| 35 | 33 | var cerr *glib.Error | |
| 36 | 34 | ||
| 37 | 35 | cret := xDbusAddressGetForBusSync(BusTypeVar, CancellableVar.GoPointer(), &cerr) | |
| @@ -55,8 +53,6 @@ var xDbusAddressGetStream func(string, uintptr, uintptr, uintptr) | |||
| 55 | 53 | // This is an asynchronous failable function. See | |
| 56 | 54 | // g_dbus_address_get_stream_sync() for the synchronous version. | |
| 57 | 55 | func DbusAddressGetStream(AddressVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | |
| 58 | - | core.LazyRegister(&xDbusAddressGetStream, "GIO", "g_dbus_address_get_stream", false) | |
| 59 | - | ||
| 60 | 56 | xDbusAddressGetStream(AddressVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | |
| 61 | 57 | } | |
| 62 | 58 | ||
| @@ -67,7 +63,6 @@ var xDbusAddressGetStreamFinish func(uintptr, *string, **glib.Error) uintptr | |||
| 67 | 63 | // A server is not required to set a GUID, so @out_guid may be set to %NULL | |
| 68 | 64 | // even on success. | |
| 69 | 65 | func DbusAddressGetStreamFinish(ResVar AsyncResult, OutGuidVar *string) (*IOStream, error) { | |
| 70 | - | core.LazyRegister(&xDbusAddressGetStreamFinish, "GIO", "g_dbus_address_get_stream_finish", false) | |
| 71 | 66 | var cls *IOStream | |
| 72 | 67 | var cerr *glib.Error | |
| 73 | 68 | ||
| @@ -97,7 +92,6 @@ var xDbusAddressGetStreamSync func(string, *string, uintptr, **glib.Error) uintp | |||
| 97 | 92 | // This is a synchronous failable function. See | |
| 98 | 93 | // g_dbus_address_get_stream() for the asynchronous version. | |
| 99 | 94 | func DbusAddressGetStreamSync(AddressVar string, OutGuidVar *string, CancellableVar *Cancellable) (*IOStream, error) { | |
| 100 | - | core.LazyRegister(&xDbusAddressGetStreamSync, "GIO", "g_dbus_address_get_stream_sync", false) | |
| 101 | 95 | var cls *IOStream | |
| 102 | 96 | var cerr *glib.Error | |
| 103 | 97 | ||
| @@ -123,8 +117,6 @@ var xDbusIsAddress func(string) bool | |||
| 123 | 117 | // or #GDBusConnection - use g_dbus_is_supported_address() to do more | |
| 124 | 118 | // checks. | |
| 125 | 119 | func DbusIsAddress(StringVar string) bool { | |
| 126 | - | core.LazyRegister(&xDbusIsAddress, "GIO", "g_dbus_is_address", false) | |
| 127 | - | ||
| 128 | 120 | cret := xDbusIsAddress(StringVar) | |
| 129 | 121 | return cret | |
| 130 | 122 | } | |
| @@ -136,7 +128,6 @@ var xDbusIsSupportedAddress func(string, **glib.Error) bool | |||
| 136 | 128 | // are valid. See the specification of the | |
| 137 | 129 | // [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses). | |
| 138 | 130 | func DbusIsSupportedAddress(StringVar string) (bool, error) { | |
| 139 | - | core.LazyRegister(&xDbusIsSupportedAddress, "GIO", "g_dbus_is_supported_address", false) | |
| 140 | 131 | var cerr *glib.Error | |
| 141 | 132 | ||
| 142 | 133 | cret := xDbusIsSupportedAddress(StringVar, &cerr) | |
| @@ -149,4 +140,20 @@ func DbusIsSupportedAddress(StringVar string) (bool, error) { | |||
| 149 | 140 | func init() { | |
| 150 | 141 | core.SetPackageName("GIO", "gio-2.0") | |
| 151 | 142 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 143 | + | var libs []uintptr | |
| 144 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 145 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 146 | + | if err != nil { | |
| 147 | + | panic(err) | |
| 148 | + | } | |
| 149 | + | libs = append(libs, lib) | |
| 150 | + | } | |
| 151 | + | ||
| 152 | + | core.PuregoSafeRegister(&xDbusAddressEscapeValue, libs, "g_dbus_address_escape_value") | |
| 153 | + | core.PuregoSafeRegister(&xDbusAddressGetForBusSync, libs, "g_dbus_address_get_for_bus_sync") | |
| 154 | + | core.PuregoSafeRegister(&xDbusAddressGetStream, libs, "g_dbus_address_get_stream") | |
| 155 | + | core.PuregoSafeRegister(&xDbusAddressGetStreamFinish, libs, "g_dbus_address_get_stream_finish") | |
| 156 | + | core.PuregoSafeRegister(&xDbusAddressGetStreamSync, libs, "g_dbus_address_get_stream_sync") | |
| 157 | + | core.PuregoSafeRegister(&xDbusIsAddress, libs, "g_dbus_is_address") | |
| 158 | + | core.PuregoSafeRegister(&xDbusIsSupportedAddress, libs, "g_dbus_is_supported_address") | |
| 152 | 159 | } | |
| @@ -2,6 +2,7 @@ | |||||
| 2 | package gio | 2 | package gio | ||
| 3 | 3 | ||||
| 4 | import ( | 4 | import ( | ||
| 5 | + | "github.com/bnema/purego" | |||
| 5 | "github.com/bnema/puregotk/pkg/core" | 6 | "github.com/bnema/puregotk/pkg/core" | ||
| 6 | "github.com/bnema/puregotk/v4/glib" | 7 | "github.com/bnema/puregotk/v4/glib" | ||
| 7 | ) | 8 | ) | ||
| @@ -16,8 +17,6 @@ var xDbusAddressEscapeValue func(string) string | |||||
| 16 | // which could be used in a D-Bus address like | 17 | // which could be used in a D-Bus address like | ||
| 17 | // `unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0`. | 18 | // `unix:nonce-tcp:host=127.0.0.1,port=42,noncefile=/run/bus-for-%3A0`. | ||
| 18 | func DbusAddressEscapeValue(StringVar string) string { | 19 | func DbusAddressEscapeValue(StringVar string) string { | ||
| 19 | - | core.LazyRegister(&xDbusAddressEscapeValue, "GIO", "g_dbus_address_escape_value", false) | |||
| 20 | - | ||||
| 21 | cret := xDbusAddressEscapeValue(StringVar) | 20 | cret := xDbusAddressEscapeValue(StringVar) | ||
| 22 | return cret | 21 | return cret | ||
| 23 | } | 22 | } | ||
| @@ -31,7 +30,6 @@ var xDbusAddressGetForBusSync func(BusType, uintptr, **glib.Error) string | |||||
| 31 | // The returned address will be in the | 30 | // The returned address will be in the | ||
| 32 | // [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses). | 31 | // [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses). | ||
| 33 | func DbusAddressGetForBusSync(BusTypeVar BusType, CancellableVar *Cancellable) (string, error) { | 32 | func DbusAddressGetForBusSync(BusTypeVar BusType, CancellableVar *Cancellable) (string, error) { | ||
| 34 | - | core.LazyRegister(&xDbusAddressGetForBusSync, "GIO", "g_dbus_address_get_for_bus_sync", false) | |||
| 35 | var cerr *glib.Error | 33 | var cerr *glib.Error | ||
| 36 | 34 | ||||
| 37 | cret := xDbusAddressGetForBusSync(BusTypeVar, CancellableVar.GoPointer(), &cerr) | 35 | cret := xDbusAddressGetForBusSync(BusTypeVar, CancellableVar.GoPointer(), &cerr) | ||
| @@ -55,8 +53,6 @@ var xDbusAddressGetStream func(string, uintptr, uintptr, uintptr) | |||||
| 55 | // This is an asynchronous failable function. See | 53 | // This is an asynchronous failable function. See | ||
| 56 | // g_dbus_address_get_stream_sync() for the synchronous version. | 54 | // g_dbus_address_get_stream_sync() for the synchronous version. | ||
| 57 | func DbusAddressGetStream(AddressVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | 55 | func DbusAddressGetStream(AddressVar string, CancellableVar *Cancellable, CallbackVar *AsyncReadyCallback, UserDataVar uintptr) { | ||
| 58 | - | core.LazyRegister(&xDbusAddressGetStream, "GIO", "g_dbus_address_get_stream", false) | |||
| 59 | - | ||||
| 60 | xDbusAddressGetStream(AddressVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | 56 | xDbusAddressGetStream(AddressVar, CancellableVar.GoPointer(), glib.NewCallbackNullable(CallbackVar), UserDataVar) | ||
| 61 | } | 57 | } | ||
| 62 | 58 | ||||
| @@ -67,7 +63,6 @@ var xDbusAddressGetStreamFinish func(uintptr, *string, **glib.Error) uintptr | |||||
| 67 | // A server is not required to set a GUID, so @out_guid may be set to %NULL | 63 | // A server is not required to set a GUID, so @out_guid may be set to %NULL | ||
| 68 | // even on success. | 64 | // even on success. | ||
| 69 | func DbusAddressGetStreamFinish(ResVar AsyncResult, OutGuidVar *string) (*IOStream, error) { | 65 | func DbusAddressGetStreamFinish(ResVar AsyncResult, OutGuidVar *string) (*IOStream, error) { | ||
| 70 | - | core.LazyRegister(&xDbusAddressGetStreamFinish, "GIO", "g_dbus_address_get_stream_finish", false) | |||
| 71 | var cls *IOStream | 66 | var cls *IOStream | ||
| 72 | var cerr *glib.Error | 67 | var cerr *glib.Error | ||
| 73 | 68 | ||||
| @@ -97,7 +92,6 @@ var xDbusAddressGetStreamSync func(string, *string, uintptr, **glib.Error) uintp | |||||
| 97 | // This is a synchronous failable function. See | 92 | // This is a synchronous failable function. See | ||
| 98 | // g_dbus_address_get_stream() for the asynchronous version. | 93 | // g_dbus_address_get_stream() for the asynchronous version. | ||
| 99 | func DbusAddressGetStreamSync(AddressVar string, OutGuidVar *string, CancellableVar *Cancellable) (*IOStream, error) { | 94 | func DbusAddressGetStreamSync(AddressVar string, OutGuidVar *string, CancellableVar *Cancellable) (*IOStream, error) { | ||
| 100 | - | core.LazyRegister(&xDbusAddressGetStreamSync, "GIO", "g_dbus_address_get_stream_sync", false) | |||
| 101 | var cls *IOStream | 95 | var cls *IOStream | ||
| 102 | var cerr *glib.Error | 96 | var cerr *glib.Error | ||
| 103 | 97 | ||||
| @@ -123,8 +117,6 @@ var xDbusIsAddress func(string) bool | |||||
| 123 | // or #GDBusConnection - use g_dbus_is_supported_address() to do more | 117 | // or #GDBusConnection - use g_dbus_is_supported_address() to do more | ||
| 124 | // checks. | 118 | // checks. | ||
| 125 | func DbusIsAddress(StringVar string) bool { | 119 | func DbusIsAddress(StringVar string) bool { | ||
| 126 | - | core.LazyRegister(&xDbusIsAddress, "GIO", "g_dbus_is_address", false) | |||
| 127 | - | ||||
| 128 | cret := xDbusIsAddress(StringVar) | 120 | cret := xDbusIsAddress(StringVar) | ||
| 129 | return cret | 121 | return cret | ||
| 130 | } | 122 | } | ||
| @@ -136,7 +128,6 @@ var xDbusIsSupportedAddress func(string, **glib.Error) bool | |||||
| 136 | // are valid. See the specification of the | 128 | // are valid. See the specification of the | ||
| 137 | // [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses). | 129 | // [D-Bus address format](https://dbus.freedesktop.org/doc/dbus-specification.html#addresses). | ||
| 138 | func DbusIsSupportedAddress(StringVar string) (bool, error) { | 130 | func DbusIsSupportedAddress(StringVar string) (bool, error) { | ||
| 139 | - | core.LazyRegister(&xDbusIsSupportedAddress, "GIO", "g_dbus_is_supported_address", false) | |||
| 140 | var cerr *glib.Error | 131 | var cerr *glib.Error | ||
| 141 | 132 | ||||
| 142 | cret := xDbusIsSupportedAddress(StringVar, &cerr) | 133 | cret := xDbusIsSupportedAddress(StringVar, &cerr) | ||
| @@ -149,4 +140,20 @@ func DbusIsSupportedAddress(StringVar string) (bool, error) { | |||||
| 149 | func init() { | 140 | func init() { | ||
| 150 | core.SetPackageName("GIO", "gio-2.0") | 141 | core.SetPackageName("GIO", "gio-2.0") | ||
| 151 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 142 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 143 | + | var libs []uintptr | |||
| 144 | + | for _, libPath := range core.GetPaths("GIO") { | |||
| 145 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 146 | + | if err != nil { | |||
| 147 | + | panic(err) | |||
| 148 | + | } | |||
| 149 | + | libs = append(libs, lib) | |||
| 150 | + | } | |||
| 151 | + | ||||
| 152 | + | core.PuregoSafeRegister(&xDbusAddressEscapeValue, libs, "g_dbus_address_escape_value") | |||
| 153 | + | core.PuregoSafeRegister(&xDbusAddressGetForBusSync, libs, "g_dbus_address_get_for_bus_sync") | |||
| 154 | + | core.PuregoSafeRegister(&xDbusAddressGetStream, libs, "g_dbus_address_get_stream") | |||
| 155 | + | core.PuregoSafeRegister(&xDbusAddressGetStreamFinish, libs, "g_dbus_address_get_stream_finish") | |||
| 156 | + | core.PuregoSafeRegister(&xDbusAddressGetStreamSync, libs, "g_dbus_address_get_stream_sync") | |||
| 157 | + | core.PuregoSafeRegister(&xDbusIsAddress, libs, "g_dbus_is_address") | |||
| 158 | + | core.PuregoSafeRegister(&xDbusIsSupportedAddress, libs, "g_dbus_is_supported_address") | |||
| 152 | } | 159 | } | ||