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 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusauthobserver.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusconnection.go +66 -77 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbuserror.go +18 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterface.go +19 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusinterfaceskeleton.go +24 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusintrospection.go +56 -54 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmenumodel.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmessage.go +64 -88 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusmethodinvocation.go +30 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnameowning.go +15 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusnamewatching.go +15 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobject.go +17 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanager.go +19 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerclient.go +23 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectmanagerserver.go +20 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectproxy.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusobjectskeleton.go +18 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusproxy.go +38 -42 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusserver.go +20 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdbusutils.go +22 -24 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontroller.go +16 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdebugcontrollerdbus.go +14 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdrive.go +82 -214 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsclientconnection.go +24 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsconnection.go +80 -207 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gdtlsserverconnection.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblem.go +17 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gemblemedicon.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfile.go +450 -1148 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileattribute.go +19 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileenumerator.go +35 -34 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileicon.go +15 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinfo.go +84 -138 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileinputstream.go +23 -17 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileiostream.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilemonitor.go +15 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilenamecompleter.go +16 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfileoutputstream.go +27 -23 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilterinputstream.go +14 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gfilteroutputstream.go +14 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gicon.go +25 -32 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddress.go +34 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetaddressmask.go +21 -14 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginetsocketaddress.go +19 -10 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginitable.go +18 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/ginputstream.go +48 -52 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioenums.go +1 -90 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioerror.go +13 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giomodule.go +29 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gioscheduler.go +12 -4 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giostream.go +29 -25 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giotypes.go +60 -70 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/giptosmessage.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gipv6tclassmessage.go +16 -6 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/glistmodel.go +21 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gliststore.go +24 -22 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gloadableicon.go +23 -27 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryinputstream.go +17 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemorymonitor.go +12 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmemoryoutputstream.go +19 -13 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenu.go +50 -62 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmenumodel.go +33 -31 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmount.go +86 -215 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gmountoperation.go +32 -40 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativesocketaddress.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnativevolumemonitor.go +0 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkaddress.go +21 -11 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworking.go +14 -3 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkmonitor.go +31 -49 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnetworkservice.go +19 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gnotification.go +26 -26 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/goutputstream.go +72 -86 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpermission.go +33 -33 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableinputstream.go +22 -30 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableoutputstream.go +27 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpollableutils.go +15 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpowerprofilemonitor.go +16 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gpropertyaction.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxy.go +27 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddress.go +21 -16 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyaddressenumerator.go +0 -7 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gproxyresolver.go +27 -35 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gremoteactiongroup.go +15 -12 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresolver.go +67 -75 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gresource.go +23 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gseekable.go +27 -41 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettings.go +67 -99 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsbackend.go +24 -19 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsettingsschema.go +43 -48 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleaction.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleactiongroup.go +18 -9 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleasyncresult.go +40 -46 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleiostream.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimplepermission.go +13 -2 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsimpleproxyresolver.go +16 -8 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocket.go +72 -87 generated file: collapsed
M vendor/github.com/bnema/puregotk/v4/gio/gsocketaddress.go +19 -11
| @@ -87,7 +87,7 @@ func (x *SocketAddressClass) OverrideToNative(cb func(*SocketAddress, uintptr, u | |||
| 87 | 87 | if cb == nil { | |
| 88 | 88 | x.xToNative = 0 | |
| 89 | 89 | } else { | |
| 90 | - | x.xToNative = purego.NewCallback(func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint, cerrp **glib.Error) bool { | |
| 90 | + | x.xToNative = purego.NewCallback(func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint) bool { | |
| 91 | 91 | return cb(SocketAddressNewFromInternalPtr(AddressVarp), DestVarp, DestlenVarp) | |
| 92 | 92 | }) | |
| 93 | 93 | } | |
| @@ -98,11 +98,10 @@ func (x *SocketAddressClass) GetToNative() func(*SocketAddress, uintptr, uint) b | |||
| 98 | 98 | if x.xToNative == 0 { | |
| 99 | 99 | return nil | |
| 100 | 100 | } | |
| 101 | - | var rawCallback func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint, cerrp **glib.Error) bool | |
| 101 | + | var rawCallback func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint) bool | |
| 102 | 102 | purego.RegisterFunc(&rawCallback, x.xToNative) | |
| 103 | 103 | return func(AddressVar *SocketAddress, DestVar uintptr, DestlenVar uint) bool { | |
| 104 | - | var cerr *glib.Error | |
| 105 | - | return rawCallback(AddressVar.GoPointer(), DestVar, DestlenVar, &cerr) | |
| 104 | + | return rawCallback(AddressVar.GoPointer(), DestVar, DestlenVar) | |
| 106 | 105 | } | |
| 107 | 106 | } | |
| 108 | 107 | ||
| @@ -117,7 +116,6 @@ type SocketAddress struct { | |||
| 117 | 116 | var xSocketAddressGLibType func() types.GType | |
| 118 | 117 | ||
| 119 | 118 | func SocketAddressGLibType() types.GType { | |
| 120 | - | core.LazyRegister(&xSocketAddressGLibType, "GIO", "g_socket_address_get_type", false) | |
| 121 | 119 | return xSocketAddressGLibType() | |
| 122 | 120 | } | |
| 123 | 121 | ||
| @@ -132,7 +130,6 @@ var xNewSocketAddressFromNative func(uintptr, uint) uintptr | |||
| 132 | 130 | // Creates a #GSocketAddress subclass corresponding to the native | |
| 133 | 131 | // struct sockaddr @native. | |
| 134 | 132 | func NewSocketAddressFromNative(NativeVar uintptr, LenVar uint) *SocketAddress { | |
| 135 | - | core.LazyRegister(&xNewSocketAddressFromNative, "GIO", "g_socket_address_new_from_native", false) | |
| 136 | 133 | var cls *SocketAddress | |
| 137 | 134 | ||
| 138 | 135 | cret := xNewSocketAddressFromNative(NativeVar, LenVar) | |
| @@ -149,8 +146,6 @@ var xSocketAddressGetFamily func(uintptr) SocketFamily | |||
| 149 | 146 | ||
| 150 | 147 | // Gets the socket family type of @address. | |
| 151 | 148 | func (x *SocketAddress) GetFamily() SocketFamily { | |
| 152 | - | core.LazyRegister(&xSocketAddressGetFamily, "GIO", "g_socket_address_get_family", false) | |
| 153 | - | ||
| 154 | 149 | cret := xSocketAddressGetFamily(x.GoPointer()) | |
| 155 | 150 | return cret | |
| 156 | 151 | } | |
| @@ -161,8 +156,6 @@ var xSocketAddressGetNativeSize func(uintptr) int | |||
| 161 | 156 | // You can use this to allocate memory to pass to | |
| 162 | 157 | // g_socket_address_to_native(). | |
| 163 | 158 | func (x *SocketAddress) GetNativeSize() int { | |
| 164 | - | core.LazyRegister(&xSocketAddressGetNativeSize, "GIO", "g_socket_address_get_native_size", false) | |
| 165 | - | ||
| 166 | 159 | cret := xSocketAddressGetNativeSize(x.GoPointer()) | |
| 167 | 160 | return cret | |
| 168 | 161 | } | |
| @@ -176,7 +169,6 @@ var xSocketAddressToNative func(uintptr, uintptr, uint, **glib.Error) bool | |||
| 176 | 169 | // is returned. If the address type is not known on the system | |
| 177 | 170 | // then a %G_IO_ERROR_NOT_SUPPORTED error is returned. | |
| 178 | 171 | func (x *SocketAddress) ToNative(DestVar uintptr, DestlenVar uint) (bool, error) { | |
| 179 | - | core.LazyRegister(&xSocketAddressToNative, "GIO", "g_socket_address_to_native", false) | |
| 180 | 172 | var cerr *glib.Error | |
| 181 | 173 | ||
| 182 | 174 | cret := xSocketAddressToNative(x.GoPointer(), DestVar, DestlenVar, &cerr) | |
| @@ -246,4 +238,20 @@ func (x *SocketAddress) ToString() string { | |||
| 246 | 238 | func init() { | |
| 247 | 239 | core.SetPackageName("GIO", "gio-2.0") | |
| 248 | 240 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | |
| 241 | + | var libs []uintptr | |
| 242 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 243 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 244 | + | if err != nil { | |
| 245 | + | panic(err) | |
| 246 | + | } | |
| 247 | + | libs = append(libs, lib) | |
| 248 | + | } | |
| 249 | + | ||
| 250 | + | core.PuregoSafeRegister(&xSocketAddressGLibType, libs, "g_socket_address_get_type") | |
| 251 | + | ||
| 252 | + | core.PuregoSafeRegister(&xNewSocketAddressFromNative, libs, "g_socket_address_new_from_native") | |
| 253 | + | ||
| 254 | + | core.PuregoSafeRegister(&xSocketAddressGetFamily, libs, "g_socket_address_get_family") | |
| 255 | + | core.PuregoSafeRegister(&xSocketAddressGetNativeSize, libs, "g_socket_address_get_native_size") | |
| 256 | + | core.PuregoSafeRegister(&xSocketAddressToNative, libs, "g_socket_address_to_native") | |
| 249 | 257 | } | |
| @@ -87,7 +87,7 @@ func (x *SocketAddressClass) OverrideToNative(cb func(*SocketAddress, uintptr, u | |||||
| 87 | if cb == nil { | 87 | if cb == nil { | ||
| 88 | x.xToNative = 0 | 88 | x.xToNative = 0 | ||
| 89 | } else { | 89 | } else { | ||
| 90 | - | x.xToNative = purego.NewCallback(func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint, cerrp **glib.Error) bool { | 90 | + | x.xToNative = purego.NewCallback(func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint) bool { |
| 91 | return cb(SocketAddressNewFromInternalPtr(AddressVarp), DestVarp, DestlenVarp) | 91 | return cb(SocketAddressNewFromInternalPtr(AddressVarp), DestVarp, DestlenVarp) | ||
| 92 | }) | 92 | }) | ||
| 93 | } | 93 | } | ||
| @@ -98,11 +98,10 @@ func (x *SocketAddressClass) GetToNative() func(*SocketAddress, uintptr, uint) b | |||||
| 98 | if x.xToNative == 0 { | 98 | if x.xToNative == 0 { | ||
| 99 | return nil | 99 | return nil | ||
| 100 | } | 100 | } | ||
| 101 | - | var rawCallback func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint, cerrp **glib.Error) bool | 101 | + | var rawCallback func(AddressVarp uintptr, DestVarp uintptr, DestlenVarp uint) bool |
| 102 | purego.RegisterFunc(&rawCallback, x.xToNative) | 102 | purego.RegisterFunc(&rawCallback, x.xToNative) | ||
| 103 | return func(AddressVar *SocketAddress, DestVar uintptr, DestlenVar uint) bool { | 103 | return func(AddressVar *SocketAddress, DestVar uintptr, DestlenVar uint) bool { | ||
| 104 | - | var cerr *glib.Error | 104 | + | return rawCallback(AddressVar.GoPointer(), DestVar, DestlenVar) |
| 105 | - | return rawCallback(AddressVar.GoPointer(), DestVar, DestlenVar, &cerr) | |||
| 106 | } | 105 | } | ||
| 107 | } | 106 | } | ||
| 108 | 107 | ||||
| @@ -117,7 +116,6 @@ type SocketAddress struct { | |||||
| 117 | var xSocketAddressGLibType func() types.GType | 116 | var xSocketAddressGLibType func() types.GType | ||
| 118 | 117 | ||||
| 119 | func SocketAddressGLibType() types.GType { | 118 | func SocketAddressGLibType() types.GType { | ||
| 120 | - | core.LazyRegister(&xSocketAddressGLibType, "GIO", "g_socket_address_get_type", false) | |||
| 121 | return xSocketAddressGLibType() | 119 | return xSocketAddressGLibType() | ||
| 122 | } | 120 | } | ||
| 123 | 121 | ||||
| @@ -132,7 +130,6 @@ var xNewSocketAddressFromNative func(uintptr, uint) uintptr | |||||
| 132 | // Creates a #GSocketAddress subclass corresponding to the native | 130 | // Creates a #GSocketAddress subclass corresponding to the native | ||
| 133 | // struct sockaddr @native. | 131 | // struct sockaddr @native. | ||
| 134 | func NewSocketAddressFromNative(NativeVar uintptr, LenVar uint) *SocketAddress { | 132 | func NewSocketAddressFromNative(NativeVar uintptr, LenVar uint) *SocketAddress { | ||
| 135 | - | core.LazyRegister(&xNewSocketAddressFromNative, "GIO", "g_socket_address_new_from_native", false) | |||
| 136 | var cls *SocketAddress | 133 | var cls *SocketAddress | ||
| 137 | 134 | ||||
| 138 | cret := xNewSocketAddressFromNative(NativeVar, LenVar) | 135 | cret := xNewSocketAddressFromNative(NativeVar, LenVar) | ||
| @@ -149,8 +146,6 @@ var xSocketAddressGetFamily func(uintptr) SocketFamily | |||||
| 149 | 146 | ||||
| 150 | // Gets the socket family type of @address. | 147 | // Gets the socket family type of @address. | ||
| 151 | func (x *SocketAddress) GetFamily() SocketFamily { | 148 | func (x *SocketAddress) GetFamily() SocketFamily { | ||
| 152 | - | core.LazyRegister(&xSocketAddressGetFamily, "GIO", "g_socket_address_get_family", false) | |||
| 153 | - | ||||
| 154 | cret := xSocketAddressGetFamily(x.GoPointer()) | 149 | cret := xSocketAddressGetFamily(x.GoPointer()) | ||
| 155 | return cret | 150 | return cret | ||
| 156 | } | 151 | } | ||
| @@ -161,8 +156,6 @@ var xSocketAddressGetNativeSize func(uintptr) int | |||||
| 161 | // You can use this to allocate memory to pass to | 156 | // You can use this to allocate memory to pass to | ||
| 162 | // g_socket_address_to_native(). | 157 | // g_socket_address_to_native(). | ||
| 163 | func (x *SocketAddress) GetNativeSize() int { | 158 | func (x *SocketAddress) GetNativeSize() int { | ||
| 164 | - | core.LazyRegister(&xSocketAddressGetNativeSize, "GIO", "g_socket_address_get_native_size", false) | |||
| 165 | - | ||||
| 166 | cret := xSocketAddressGetNativeSize(x.GoPointer()) | 159 | cret := xSocketAddressGetNativeSize(x.GoPointer()) | ||
| 167 | return cret | 160 | return cret | ||
| 168 | } | 161 | } | ||
| @@ -176,7 +169,6 @@ var xSocketAddressToNative func(uintptr, uintptr, uint, **glib.Error) bool | |||||
| 176 | // is returned. If the address type is not known on the system | 169 | // is returned. If the address type is not known on the system | ||
| 177 | // then a %G_IO_ERROR_NOT_SUPPORTED error is returned. | 170 | // then a %G_IO_ERROR_NOT_SUPPORTED error is returned. | ||
| 178 | func (x *SocketAddress) ToNative(DestVar uintptr, DestlenVar uint) (bool, error) { | 171 | func (x *SocketAddress) ToNative(DestVar uintptr, DestlenVar uint) (bool, error) { | ||
| 179 | - | core.LazyRegister(&xSocketAddressToNative, "GIO", "g_socket_address_to_native", false) | |||
| 180 | var cerr *glib.Error | 172 | var cerr *glib.Error | ||
| 181 | 173 | ||||
| 182 | cret := xSocketAddressToNative(x.GoPointer(), DestVar, DestlenVar, &cerr) | 174 | cret := xSocketAddressToNative(x.GoPointer(), DestVar, DestlenVar, &cerr) | ||
| @@ -246,4 +238,20 @@ func (x *SocketAddress) ToString() string { | |||||
| 246 | func init() { | 238 | func init() { | ||
| 247 | core.SetPackageName("GIO", "gio-2.0") | 239 | core.SetPackageName("GIO", "gio-2.0") | ||
| 248 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | 240 | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0", "libgio-2.0.0.dylib"}) | ||
| 241 | + | var libs []uintptr | |||
| 242 | + | for _, libPath := range core.GetPaths("GIO") { | |||
| 243 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 244 | + | if err != nil { | |||
| 245 | + | panic(err) | |||
| 246 | + | } | |||
| 247 | + | libs = append(libs, lib) | |||
| 248 | + | } | |||
| 249 | + | ||||
| 250 | + | core.PuregoSafeRegister(&xSocketAddressGLibType, libs, "g_socket_address_get_type") | |||
| 251 | + | ||||
| 252 | + | core.PuregoSafeRegister(&xNewSocketAddressFromNative, libs, "g_socket_address_new_from_native") | |||
| 253 | + | ||||
| 254 | + | core.PuregoSafeRegister(&xSocketAddressGetFamily, libs, "g_socket_address_get_family") | |||
| 255 | + | core.PuregoSafeRegister(&xSocketAddressGetNativeSize, libs, "g_socket_address_get_native_size") | |||
| 256 | + | core.PuregoSafeRegister(&xSocketAddressToNative, libs, "g_socket_address_to_native") | |||
| 249 | } | 257 | } | ||