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
| @@ -5,6 +5,7 @@ import ( | |||
| 5 | 5 | "structs" | |
| 6 | 6 | "unsafe" | |
| 7 | 7 | ||
| 8 | + | "github.com/bnema/purego" | |
| 8 | 9 | "github.com/bnema/puregotk/pkg/core" | |
| 9 | 10 | "github.com/bnema/puregotk/v4/gobject" | |
| 10 | 11 | "github.com/bnema/puregotk/v4/gobject/types" | |
| @@ -60,7 +61,6 @@ type PreferencesDialog struct { | |||
| 60 | 61 | var xPreferencesDialogGLibType func() types.GType | |
| 61 | 62 | ||
| 62 | 63 | func PreferencesDialogGLibType() types.GType { | |
| 63 | - | core.LazyRegister(&xPreferencesDialogGLibType, "ADW", "adw_preferences_dialog_get_type", false) | |
| 64 | 64 | return xPreferencesDialogGLibType() | |
| 65 | 65 | } | |
| 66 | 66 | ||
| @@ -74,7 +74,6 @@ var xNewPreferencesDialog func() uintptr | |||
| 74 | 74 | ||
| 75 | 75 | // Creates a new `AdwPreferencesDialog`. | |
| 76 | 76 | func NewPreferencesDialog() *PreferencesDialog { | |
| 77 | - | core.LazyRegister(&xNewPreferencesDialog, "ADW", "adw_preferences_dialog_new", false) | |
| 78 | 77 | var cls *PreferencesDialog | |
| 79 | 78 | ||
| 80 | 79 | cret := xNewPreferencesDialog() | |
| @@ -92,8 +91,6 @@ var xPreferencesDialogAdd func(uintptr, uintptr) | |||
| 92 | 91 | ||
| 93 | 92 | // Adds a preferences page to @self. | |
| 94 | 93 | func (x *PreferencesDialog) Add(PageVar *PreferencesPage) { | |
| 95 | - | core.LazyRegister(&xPreferencesDialogAdd, "ADW", "adw_preferences_dialog_add", false) | |
| 96 | - | ||
| 97 | 94 | xPreferencesDialogAdd(x.GoPointer(), PageVar.GoPointer()) | |
| 98 | 95 | } | |
| 99 | 96 | ||
| @@ -103,8 +100,6 @@ var xPreferencesDialogAddToast func(uintptr, uintptr) | |||
| 103 | 100 | // | |
| 104 | 101 | // See [method@ToastOverlay.add_toast]. | |
| 105 | 102 | func (x *PreferencesDialog) AddToast(ToastVar *Toast) { | |
| 106 | - | core.LazyRegister(&xPreferencesDialogAddToast, "ADW", "adw_preferences_dialog_add_toast", false) | |
| 107 | - | ||
| 108 | 103 | xPreferencesDialogAddToast(x.GoPointer(), ToastVar.GoPointer()) | |
| 109 | 104 | } | |
| 110 | 105 | ||
| @@ -112,8 +107,6 @@ var xPreferencesDialogGetSearchEnabled func(uintptr) bool | |||
| 112 | 107 | ||
| 113 | 108 | // Gets whether search is enabled for @self. | |
| 114 | 109 | func (x *PreferencesDialog) GetSearchEnabled() bool { | |
| 115 | - | core.LazyRegister(&xPreferencesDialogGetSearchEnabled, "ADW", "adw_preferences_dialog_get_search_enabled", false) | |
| 116 | - | ||
| 117 | 110 | cret := xPreferencesDialogGetSearchEnabled(x.GoPointer()) | |
| 118 | 111 | return cret | |
| 119 | 112 | } | |
| @@ -122,7 +115,6 @@ var xPreferencesDialogGetVisiblePage func(uintptr) uintptr | |||
| 122 | 115 | ||
| 123 | 116 | // Gets the currently visible page of @self. | |
| 124 | 117 | func (x *PreferencesDialog) GetVisiblePage() *PreferencesPage { | |
| 125 | - | core.LazyRegister(&xPreferencesDialogGetVisiblePage, "ADW", "adw_preferences_dialog_get_visible_page", false) | |
| 126 | 118 | var cls *PreferencesPage | |
| 127 | 119 | ||
| 128 | 120 | cret := xPreferencesDialogGetVisiblePage(x.GoPointer()) | |
| @@ -140,8 +132,6 @@ var xPreferencesDialogGetVisiblePageName func(uintptr) string | |||
| 140 | 132 | ||
| 141 | 133 | // Gets the name of currently visible page of @self. | |
| 142 | 134 | func (x *PreferencesDialog) GetVisiblePageName() string { | |
| 143 | - | core.LazyRegister(&xPreferencesDialogGetVisiblePageName, "ADW", "adw_preferences_dialog_get_visible_page_name", false) | |
| 144 | - | ||
| 145 | 135 | cret := xPreferencesDialogGetVisiblePageName(x.GoPointer()) | |
| 146 | 136 | return cret | |
| 147 | 137 | } | |
| @@ -150,8 +140,6 @@ var xPreferencesDialogPopSubpage func(uintptr) bool | |||
| 150 | 140 | ||
| 151 | 141 | // Pop the visible page from the subpage stack of @self. | |
| 152 | 142 | func (x *PreferencesDialog) PopSubpage() bool { | |
| 153 | - | core.LazyRegister(&xPreferencesDialogPopSubpage, "ADW", "adw_preferences_dialog_pop_subpage", false) | |
| 154 | - | ||
| 155 | 143 | cret := xPreferencesDialogPopSubpage(x.GoPointer()) | |
| 156 | 144 | return cret | |
| 157 | 145 | } | |
| @@ -162,8 +150,6 @@ var xPreferencesDialogPushSubpage func(uintptr, uintptr) | |||
| 162 | 150 | // | |
| 163 | 151 | // The page will be automatically removed when popped. | |
| 164 | 152 | func (x *PreferencesDialog) PushSubpage(PageVar *NavigationPage) { | |
| 165 | - | core.LazyRegister(&xPreferencesDialogPushSubpage, "ADW", "adw_preferences_dialog_push_subpage", false) | |
| 166 | - | ||
| 167 | 153 | xPreferencesDialogPushSubpage(x.GoPointer(), PageVar.GoPointer()) | |
| 168 | 154 | } | |
| 169 | 155 | ||
| @@ -171,8 +157,6 @@ var xPreferencesDialogRemove func(uintptr, uintptr) | |||
| 171 | 157 | ||
| 172 | 158 | // Removes a page from @self. | |
| 173 | 159 | func (x *PreferencesDialog) Remove(PageVar *PreferencesPage) { | |
| 174 | - | core.LazyRegister(&xPreferencesDialogRemove, "ADW", "adw_preferences_dialog_remove", false) | |
| 175 | - | ||
| 176 | 160 | xPreferencesDialogRemove(x.GoPointer(), PageVar.GoPointer()) | |
| 177 | 161 | } | |
| 178 | 162 | ||
| @@ -180,8 +164,6 @@ var xPreferencesDialogSetSearchEnabled func(uintptr, bool) | |||
| 180 | 164 | ||
| 181 | 165 | // Sets whether search is enabled for @self. | |
| 182 | 166 | func (x *PreferencesDialog) SetSearchEnabled(SearchEnabledVar bool) { | |
| 183 | - | core.LazyRegister(&xPreferencesDialogSetSearchEnabled, "ADW", "adw_preferences_dialog_set_search_enabled", false) | |
| 184 | - | ||
| 185 | 167 | xPreferencesDialogSetSearchEnabled(x.GoPointer(), SearchEnabledVar) | |
| 186 | 168 | } | |
| 187 | 169 | ||
| @@ -189,8 +171,6 @@ var xPreferencesDialogSetVisiblePage func(uintptr, uintptr) | |||
| 189 | 171 | ||
| 190 | 172 | // Makes @page the visible page of @self. | |
| 191 | 173 | func (x *PreferencesDialog) SetVisiblePage(PageVar *PreferencesPage) { | |
| 192 | - | core.LazyRegister(&xPreferencesDialogSetVisiblePage, "ADW", "adw_preferences_dialog_set_visible_page", false) | |
| 193 | - | ||
| 194 | 174 | xPreferencesDialogSetVisiblePage(x.GoPointer(), PageVar.GoPointer()) | |
| 195 | 175 | } | |
| 196 | 176 | ||
| @@ -200,8 +180,6 @@ var xPreferencesDialogSetVisiblePageName func(uintptr, string) | |||
| 200 | 180 | // | |
| 201 | 181 | // See [property@PreferencesDialog:visible-page]. | |
| 202 | 182 | func (x *PreferencesDialog) SetVisiblePageName(NameVar string) { | |
| 203 | - | core.LazyRegister(&xPreferencesDialogSetVisiblePageName, "ADW", "adw_preferences_dialog_set_visible_page_name", false) | |
| 204 | - | ||
| 205 | 183 | xPreferencesDialogSetVisiblePageName(x.GoPointer(), NameVar) | |
| 206 | 184 | } | |
| 207 | 185 | ||
| @@ -517,4 +495,28 @@ func (x *PreferencesDialog) GetBuildableId() string { | |||
| 517 | 495 | func init() { | |
| 518 | 496 | core.SetPackageName("ADW", "libadwaita-1") | |
| 519 | 497 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | |
| 498 | + | var libs []uintptr | |
| 499 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 500 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 501 | + | if err != nil { | |
| 502 | + | panic(err) | |
| 503 | + | } | |
| 504 | + | libs = append(libs, lib) | |
| 505 | + | } | |
| 506 | + | ||
| 507 | + | core.PuregoSafeRegister(&xPreferencesDialogGLibType, libs, "adw_preferences_dialog_get_type") | |
| 508 | + | ||
| 509 | + | core.PuregoSafeRegister(&xNewPreferencesDialog, libs, "adw_preferences_dialog_new") | |
| 510 | + | ||
| 511 | + | core.PuregoSafeRegister(&xPreferencesDialogAdd, libs, "adw_preferences_dialog_add") | |
| 512 | + | core.PuregoSafeRegister(&xPreferencesDialogAddToast, libs, "adw_preferences_dialog_add_toast") | |
| 513 | + | core.PuregoSafeRegister(&xPreferencesDialogGetSearchEnabled, libs, "adw_preferences_dialog_get_search_enabled") | |
| 514 | + | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePage, libs, "adw_preferences_dialog_get_visible_page") | |
| 515 | + | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePageName, libs, "adw_preferences_dialog_get_visible_page_name") | |
| 516 | + | core.PuregoSafeRegister(&xPreferencesDialogPopSubpage, libs, "adw_preferences_dialog_pop_subpage") | |
| 517 | + | core.PuregoSafeRegister(&xPreferencesDialogPushSubpage, libs, "adw_preferences_dialog_push_subpage") | |
| 518 | + | core.PuregoSafeRegister(&xPreferencesDialogRemove, libs, "adw_preferences_dialog_remove") | |
| 519 | + | core.PuregoSafeRegister(&xPreferencesDialogSetSearchEnabled, libs, "adw_preferences_dialog_set_search_enabled") | |
| 520 | + | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePage, libs, "adw_preferences_dialog_set_visible_page") | |
| 521 | + | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePageName, libs, "adw_preferences_dialog_set_visible_page_name") | |
| 520 | 522 | } | |
| @@ -5,6 +5,7 @@ import ( | |||||
| 5 | "structs" | 5 | "structs" | ||
| 6 | "unsafe" | 6 | "unsafe" | ||
| 7 | 7 | ||||
| 8 | + | "github.com/bnema/purego" | |||
| 8 | "github.com/bnema/puregotk/pkg/core" | 9 | "github.com/bnema/puregotk/pkg/core" | ||
| 9 | "github.com/bnema/puregotk/v4/gobject" | 10 | "github.com/bnema/puregotk/v4/gobject" | ||
| 10 | "github.com/bnema/puregotk/v4/gobject/types" | 11 | "github.com/bnema/puregotk/v4/gobject/types" | ||
| @@ -60,7 +61,6 @@ type PreferencesDialog struct { | |||||
| 60 | var xPreferencesDialogGLibType func() types.GType | 61 | var xPreferencesDialogGLibType func() types.GType | ||
| 61 | 62 | ||||
| 62 | func PreferencesDialogGLibType() types.GType { | 63 | func PreferencesDialogGLibType() types.GType { | ||
| 63 | - | core.LazyRegister(&xPreferencesDialogGLibType, "ADW", "adw_preferences_dialog_get_type", false) | |||
| 64 | return xPreferencesDialogGLibType() | 64 | return xPreferencesDialogGLibType() | ||
| 65 | } | 65 | } | ||
| 66 | 66 | ||||
| @@ -74,7 +74,6 @@ var xNewPreferencesDialog func() uintptr | |||||
| 74 | 74 | ||||
| 75 | // Creates a new `AdwPreferencesDialog`. | 75 | // Creates a new `AdwPreferencesDialog`. | ||
| 76 | func NewPreferencesDialog() *PreferencesDialog { | 76 | func NewPreferencesDialog() *PreferencesDialog { | ||
| 77 | - | core.LazyRegister(&xNewPreferencesDialog, "ADW", "adw_preferences_dialog_new", false) | |||
| 78 | var cls *PreferencesDialog | 77 | var cls *PreferencesDialog | ||
| 79 | 78 | ||||
| 80 | cret := xNewPreferencesDialog() | 79 | cret := xNewPreferencesDialog() | ||
| @@ -92,8 +91,6 @@ var xPreferencesDialogAdd func(uintptr, uintptr) | |||||
| 92 | 91 | ||||
| 93 | // Adds a preferences page to @self. | 92 | // Adds a preferences page to @self. | ||
| 94 | func (x *PreferencesDialog) Add(PageVar *PreferencesPage) { | 93 | func (x *PreferencesDialog) Add(PageVar *PreferencesPage) { | ||
| 95 | - | core.LazyRegister(&xPreferencesDialogAdd, "ADW", "adw_preferences_dialog_add", false) | |||
| 96 | - | ||||
| 97 | xPreferencesDialogAdd(x.GoPointer(), PageVar.GoPointer()) | 94 | xPreferencesDialogAdd(x.GoPointer(), PageVar.GoPointer()) | ||
| 98 | } | 95 | } | ||
| 99 | 96 | ||||
| @@ -103,8 +100,6 @@ var xPreferencesDialogAddToast func(uintptr, uintptr) | |||||
| 103 | // | 100 | // | ||
| 104 | // See [method@ToastOverlay.add_toast]. | 101 | // See [method@ToastOverlay.add_toast]. | ||
| 105 | func (x *PreferencesDialog) AddToast(ToastVar *Toast) { | 102 | func (x *PreferencesDialog) AddToast(ToastVar *Toast) { | ||
| 106 | - | core.LazyRegister(&xPreferencesDialogAddToast, "ADW", "adw_preferences_dialog_add_toast", false) | |||
| 107 | - | ||||
| 108 | xPreferencesDialogAddToast(x.GoPointer(), ToastVar.GoPointer()) | 103 | xPreferencesDialogAddToast(x.GoPointer(), ToastVar.GoPointer()) | ||
| 109 | } | 104 | } | ||
| 110 | 105 | ||||
| @@ -112,8 +107,6 @@ var xPreferencesDialogGetSearchEnabled func(uintptr) bool | |||||
| 112 | 107 | ||||
| 113 | // Gets whether search is enabled for @self. | 108 | // Gets whether search is enabled for @self. | ||
| 114 | func (x *PreferencesDialog) GetSearchEnabled() bool { | 109 | func (x *PreferencesDialog) GetSearchEnabled() bool { | ||
| 115 | - | core.LazyRegister(&xPreferencesDialogGetSearchEnabled, "ADW", "adw_preferences_dialog_get_search_enabled", false) | |||
| 116 | - | ||||
| 117 | cret := xPreferencesDialogGetSearchEnabled(x.GoPointer()) | 110 | cret := xPreferencesDialogGetSearchEnabled(x.GoPointer()) | ||
| 118 | return cret | 111 | return cret | ||
| 119 | } | 112 | } | ||
| @@ -122,7 +115,6 @@ var xPreferencesDialogGetVisiblePage func(uintptr) uintptr | |||||
| 122 | 115 | ||||
| 123 | // Gets the currently visible page of @self. | 116 | // Gets the currently visible page of @self. | ||
| 124 | func (x *PreferencesDialog) GetVisiblePage() *PreferencesPage { | 117 | func (x *PreferencesDialog) GetVisiblePage() *PreferencesPage { | ||
| 125 | - | core.LazyRegister(&xPreferencesDialogGetVisiblePage, "ADW", "adw_preferences_dialog_get_visible_page", false) | |||
| 126 | var cls *PreferencesPage | 118 | var cls *PreferencesPage | ||
| 127 | 119 | ||||
| 128 | cret := xPreferencesDialogGetVisiblePage(x.GoPointer()) | 120 | cret := xPreferencesDialogGetVisiblePage(x.GoPointer()) | ||
| @@ -140,8 +132,6 @@ var xPreferencesDialogGetVisiblePageName func(uintptr) string | |||||
| 140 | 132 | ||||
| 141 | // Gets the name of currently visible page of @self. | 133 | // Gets the name of currently visible page of @self. | ||
| 142 | func (x *PreferencesDialog) GetVisiblePageName() string { | 134 | func (x *PreferencesDialog) GetVisiblePageName() string { | ||
| 143 | - | core.LazyRegister(&xPreferencesDialogGetVisiblePageName, "ADW", "adw_preferences_dialog_get_visible_page_name", false) | |||
| 144 | - | ||||
| 145 | cret := xPreferencesDialogGetVisiblePageName(x.GoPointer()) | 135 | cret := xPreferencesDialogGetVisiblePageName(x.GoPointer()) | ||
| 146 | return cret | 136 | return cret | ||
| 147 | } | 137 | } | ||
| @@ -150,8 +140,6 @@ var xPreferencesDialogPopSubpage func(uintptr) bool | |||||
| 150 | 140 | ||||
| 151 | // Pop the visible page from the subpage stack of @self. | 141 | // Pop the visible page from the subpage stack of @self. | ||
| 152 | func (x *PreferencesDialog) PopSubpage() bool { | 142 | func (x *PreferencesDialog) PopSubpage() bool { | ||
| 153 | - | core.LazyRegister(&xPreferencesDialogPopSubpage, "ADW", "adw_preferences_dialog_pop_subpage", false) | |||
| 154 | - | ||||
| 155 | cret := xPreferencesDialogPopSubpage(x.GoPointer()) | 143 | cret := xPreferencesDialogPopSubpage(x.GoPointer()) | ||
| 156 | return cret | 144 | return cret | ||
| 157 | } | 145 | } | ||
| @@ -162,8 +150,6 @@ var xPreferencesDialogPushSubpage func(uintptr, uintptr) | |||||
| 162 | // | 150 | // | ||
| 163 | // The page will be automatically removed when popped. | 151 | // The page will be automatically removed when popped. | ||
| 164 | func (x *PreferencesDialog) PushSubpage(PageVar *NavigationPage) { | 152 | func (x *PreferencesDialog) PushSubpage(PageVar *NavigationPage) { | ||
| 165 | - | core.LazyRegister(&xPreferencesDialogPushSubpage, "ADW", "adw_preferences_dialog_push_subpage", false) | |||
| 166 | - | ||||
| 167 | xPreferencesDialogPushSubpage(x.GoPointer(), PageVar.GoPointer()) | 153 | xPreferencesDialogPushSubpage(x.GoPointer(), PageVar.GoPointer()) | ||
| 168 | } | 154 | } | ||
| 169 | 155 | ||||
| @@ -171,8 +157,6 @@ var xPreferencesDialogRemove func(uintptr, uintptr) | |||||
| 171 | 157 | ||||
| 172 | // Removes a page from @self. | 158 | // Removes a page from @self. | ||
| 173 | func (x *PreferencesDialog) Remove(PageVar *PreferencesPage) { | 159 | func (x *PreferencesDialog) Remove(PageVar *PreferencesPage) { | ||
| 174 | - | core.LazyRegister(&xPreferencesDialogRemove, "ADW", "adw_preferences_dialog_remove", false) | |||
| 175 | - | ||||
| 176 | xPreferencesDialogRemove(x.GoPointer(), PageVar.GoPointer()) | 160 | xPreferencesDialogRemove(x.GoPointer(), PageVar.GoPointer()) | ||
| 177 | } | 161 | } | ||
| 178 | 162 | ||||
| @@ -180,8 +164,6 @@ var xPreferencesDialogSetSearchEnabled func(uintptr, bool) | |||||
| 180 | 164 | ||||
| 181 | // Sets whether search is enabled for @self. | 165 | // Sets whether search is enabled for @self. | ||
| 182 | func (x *PreferencesDialog) SetSearchEnabled(SearchEnabledVar bool) { | 166 | func (x *PreferencesDialog) SetSearchEnabled(SearchEnabledVar bool) { | ||
| 183 | - | core.LazyRegister(&xPreferencesDialogSetSearchEnabled, "ADW", "adw_preferences_dialog_set_search_enabled", false) | |||
| 184 | - | ||||
| 185 | xPreferencesDialogSetSearchEnabled(x.GoPointer(), SearchEnabledVar) | 167 | xPreferencesDialogSetSearchEnabled(x.GoPointer(), SearchEnabledVar) | ||
| 186 | } | 168 | } | ||
| 187 | 169 | ||||
| @@ -189,8 +171,6 @@ var xPreferencesDialogSetVisiblePage func(uintptr, uintptr) | |||||
| 189 | 171 | ||||
| 190 | // Makes @page the visible page of @self. | 172 | // Makes @page the visible page of @self. | ||
| 191 | func (x *PreferencesDialog) SetVisiblePage(PageVar *PreferencesPage) { | 173 | func (x *PreferencesDialog) SetVisiblePage(PageVar *PreferencesPage) { | ||
| 192 | - | core.LazyRegister(&xPreferencesDialogSetVisiblePage, "ADW", "adw_preferences_dialog_set_visible_page", false) | |||
| 193 | - | ||||
| 194 | xPreferencesDialogSetVisiblePage(x.GoPointer(), PageVar.GoPointer()) | 174 | xPreferencesDialogSetVisiblePage(x.GoPointer(), PageVar.GoPointer()) | ||
| 195 | } | 175 | } | ||
| 196 | 176 | ||||
| @@ -200,8 +180,6 @@ var xPreferencesDialogSetVisiblePageName func(uintptr, string) | |||||
| 200 | // | 180 | // | ||
| 201 | // See [property@PreferencesDialog:visible-page]. | 181 | // See [property@PreferencesDialog:visible-page]. | ||
| 202 | func (x *PreferencesDialog) SetVisiblePageName(NameVar string) { | 182 | func (x *PreferencesDialog) SetVisiblePageName(NameVar string) { | ||
| 203 | - | core.LazyRegister(&xPreferencesDialogSetVisiblePageName, "ADW", "adw_preferences_dialog_set_visible_page_name", false) | |||
| 204 | - | ||||
| 205 | xPreferencesDialogSetVisiblePageName(x.GoPointer(), NameVar) | 183 | xPreferencesDialogSetVisiblePageName(x.GoPointer(), NameVar) | ||
| 206 | } | 184 | } | ||
| 207 | 185 | ||||
| @@ -517,4 +495,28 @@ func (x *PreferencesDialog) GetBuildableId() string { | |||||
| 517 | func init() { | 495 | func init() { | ||
| 518 | core.SetPackageName("ADW", "libadwaita-1") | 496 | core.SetPackageName("ADW", "libadwaita-1") | ||
| 519 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | 497 | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0", "libadwaita-1.0.dylib"}) | ||
| 498 | + | var libs []uintptr | |||
| 499 | + | for _, libPath := range core.GetPaths("ADW") { | |||
| 500 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |||
| 501 | + | if err != nil { | |||
| 502 | + | panic(err) | |||
| 503 | + | } | |||
| 504 | + | libs = append(libs, lib) | |||
| 505 | + | } | |||
| 506 | + | ||||
| 507 | + | core.PuregoSafeRegister(&xPreferencesDialogGLibType, libs, "adw_preferences_dialog_get_type") | |||
| 508 | + | ||||
| 509 | + | core.PuregoSafeRegister(&xNewPreferencesDialog, libs, "adw_preferences_dialog_new") | |||
| 510 | + | ||||
| 511 | + | core.PuregoSafeRegister(&xPreferencesDialogAdd, libs, "adw_preferences_dialog_add") | |||
| 512 | + | core.PuregoSafeRegister(&xPreferencesDialogAddToast, libs, "adw_preferences_dialog_add_toast") | |||
| 513 | + | core.PuregoSafeRegister(&xPreferencesDialogGetSearchEnabled, libs, "adw_preferences_dialog_get_search_enabled") | |||
| 514 | + | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePage, libs, "adw_preferences_dialog_get_visible_page") | |||
| 515 | + | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePageName, libs, "adw_preferences_dialog_get_visible_page_name") | |||
| 516 | + | core.PuregoSafeRegister(&xPreferencesDialogPopSubpage, libs, "adw_preferences_dialog_pop_subpage") | |||
| 517 | + | core.PuregoSafeRegister(&xPreferencesDialogPushSubpage, libs, "adw_preferences_dialog_push_subpage") | |||
| 518 | + | core.PuregoSafeRegister(&xPreferencesDialogRemove, libs, "adw_preferences_dialog_remove") | |||
| 519 | + | core.PuregoSafeRegister(&xPreferencesDialogSetSearchEnabled, libs, "adw_preferences_dialog_set_search_enabled") | |||
| 520 | + | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePage, libs, "adw_preferences_dialog_set_visible_page") | |||
| 521 | + | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePageName, libs, "adw_preferences_dialog_set_visible_page_name") | |||
| 520 | } | 522 | } | ||