Gen: Re-run script
- commit
- 3e78d93472d3227c72ca80903feadb1bbbbfc89a
- author
- Jeroen Wijenbergh · · 2025-10-22 07:47 UTC
- parent
- e282e1c
- signature
- SSH Unverified
SHA256:8N5EoON8reSTMm461SyWlzRhib6IymBjUHb1p62kwywThe key is unknown
718 files · +18277 -15405
M v4/adw/adw-about-dialog.go +61 -57
| @@ -1298,64 +1298,68 @@ func (x *AboutDialog) GetBuildableId() string { | |||
| 1298 | 1298 | ||
| 1299 | 1299 | func init() { | |
| 1300 | 1300 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1301 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1302 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1303 | - | if err != nil { | |
| 1304 | - | panic(err) | |
| 1301 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1302 | + | var libs []uintptr | |
| 1303 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1304 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1305 | + | if err != nil { | |
| 1306 | + | panic(err) | |
| 1307 | + | } | |
| 1308 | + | libs = append(libs, lib) | |
| 1305 | 1309 | } | |
| 1306 | 1310 | ||
| 1307 | - | core.PuregoSafeRegister(&xShowAboutDialog, lib, "adw_show_about_dialog") | |
| 1308 | - | core.PuregoSafeRegister(&xShowAboutDialogFromAppdata, lib, "adw_show_about_dialog_from_appdata") | |
| 1309 | - | ||
| 1310 | - | core.PuregoSafeRegister(&xAboutDialogGLibType, lib, "adw_about_dialog_get_type") | |
| 1311 | - | ||
| 1312 | - | core.PuregoSafeRegister(&xNewAboutDialog, lib, "adw_about_dialog_new") | |
| 1313 | - | core.PuregoSafeRegister(&xNewAboutDialogFromAppdata, lib, "adw_about_dialog_new_from_appdata") | |
| 1314 | - | ||
| 1315 | - | core.PuregoSafeRegister(&xAboutDialogAddAcknowledgementSection, lib, "adw_about_dialog_add_acknowledgement_section") | |
| 1316 | - | core.PuregoSafeRegister(&xAboutDialogAddCreditSection, lib, "adw_about_dialog_add_credit_section") | |
| 1317 | - | core.PuregoSafeRegister(&xAboutDialogAddLegalSection, lib, "adw_about_dialog_add_legal_section") | |
| 1318 | - | core.PuregoSafeRegister(&xAboutDialogAddLink, lib, "adw_about_dialog_add_link") | |
| 1319 | - | core.PuregoSafeRegister(&xAboutDialogAddOtherApp, lib, "adw_about_dialog_add_other_app") | |
| 1320 | - | core.PuregoSafeRegister(&xAboutDialogGetApplicationIcon, lib, "adw_about_dialog_get_application_icon") | |
| 1321 | - | core.PuregoSafeRegister(&xAboutDialogGetApplicationName, lib, "adw_about_dialog_get_application_name") | |
| 1322 | - | core.PuregoSafeRegister(&xAboutDialogGetArtists, lib, "adw_about_dialog_get_artists") | |
| 1323 | - | core.PuregoSafeRegister(&xAboutDialogGetComments, lib, "adw_about_dialog_get_comments") | |
| 1324 | - | core.PuregoSafeRegister(&xAboutDialogGetCopyright, lib, "adw_about_dialog_get_copyright") | |
| 1325 | - | core.PuregoSafeRegister(&xAboutDialogGetDebugInfo, lib, "adw_about_dialog_get_debug_info") | |
| 1326 | - | core.PuregoSafeRegister(&xAboutDialogGetDebugInfoFilename, lib, "adw_about_dialog_get_debug_info_filename") | |
| 1327 | - | core.PuregoSafeRegister(&xAboutDialogGetDesigners, lib, "adw_about_dialog_get_designers") | |
| 1328 | - | core.PuregoSafeRegister(&xAboutDialogGetDeveloperName, lib, "adw_about_dialog_get_developer_name") | |
| 1329 | - | core.PuregoSafeRegister(&xAboutDialogGetDevelopers, lib, "adw_about_dialog_get_developers") | |
| 1330 | - | core.PuregoSafeRegister(&xAboutDialogGetDocumenters, lib, "adw_about_dialog_get_documenters") | |
| 1331 | - | core.PuregoSafeRegister(&xAboutDialogGetIssueUrl, lib, "adw_about_dialog_get_issue_url") | |
| 1332 | - | core.PuregoSafeRegister(&xAboutDialogGetLicense, lib, "adw_about_dialog_get_license") | |
| 1333 | - | core.PuregoSafeRegister(&xAboutDialogGetLicenseType, lib, "adw_about_dialog_get_license_type") | |
| 1334 | - | core.PuregoSafeRegister(&xAboutDialogGetReleaseNotes, lib, "adw_about_dialog_get_release_notes") | |
| 1335 | - | core.PuregoSafeRegister(&xAboutDialogGetReleaseNotesVersion, lib, "adw_about_dialog_get_release_notes_version") | |
| 1336 | - | core.PuregoSafeRegister(&xAboutDialogGetSupportUrl, lib, "adw_about_dialog_get_support_url") | |
| 1337 | - | core.PuregoSafeRegister(&xAboutDialogGetTranslatorCredits, lib, "adw_about_dialog_get_translator_credits") | |
| 1338 | - | core.PuregoSafeRegister(&xAboutDialogGetVersion, lib, "adw_about_dialog_get_version") | |
| 1339 | - | core.PuregoSafeRegister(&xAboutDialogGetWebsite, lib, "adw_about_dialog_get_website") | |
| 1340 | - | core.PuregoSafeRegister(&xAboutDialogSetApplicationIcon, lib, "adw_about_dialog_set_application_icon") | |
| 1341 | - | core.PuregoSafeRegister(&xAboutDialogSetApplicationName, lib, "adw_about_dialog_set_application_name") | |
| 1342 | - | core.PuregoSafeRegister(&xAboutDialogSetArtists, lib, "adw_about_dialog_set_artists") | |
| 1343 | - | core.PuregoSafeRegister(&xAboutDialogSetComments, lib, "adw_about_dialog_set_comments") | |
| 1344 | - | core.PuregoSafeRegister(&xAboutDialogSetCopyright, lib, "adw_about_dialog_set_copyright") | |
| 1345 | - | core.PuregoSafeRegister(&xAboutDialogSetDebugInfo, lib, "adw_about_dialog_set_debug_info") | |
| 1346 | - | core.PuregoSafeRegister(&xAboutDialogSetDebugInfoFilename, lib, "adw_about_dialog_set_debug_info_filename") | |
| 1347 | - | core.PuregoSafeRegister(&xAboutDialogSetDesigners, lib, "adw_about_dialog_set_designers") | |
| 1348 | - | core.PuregoSafeRegister(&xAboutDialogSetDeveloperName, lib, "adw_about_dialog_set_developer_name") | |
| 1349 | - | core.PuregoSafeRegister(&xAboutDialogSetDevelopers, lib, "adw_about_dialog_set_developers") | |
| 1350 | - | core.PuregoSafeRegister(&xAboutDialogSetDocumenters, lib, "adw_about_dialog_set_documenters") | |
| 1351 | - | core.PuregoSafeRegister(&xAboutDialogSetIssueUrl, lib, "adw_about_dialog_set_issue_url") | |
| 1352 | - | core.PuregoSafeRegister(&xAboutDialogSetLicense, lib, "adw_about_dialog_set_license") | |
| 1353 | - | core.PuregoSafeRegister(&xAboutDialogSetLicenseType, lib, "adw_about_dialog_set_license_type") | |
| 1354 | - | core.PuregoSafeRegister(&xAboutDialogSetReleaseNotes, lib, "adw_about_dialog_set_release_notes") | |
| 1355 | - | core.PuregoSafeRegister(&xAboutDialogSetReleaseNotesVersion, lib, "adw_about_dialog_set_release_notes_version") | |
| 1356 | - | core.PuregoSafeRegister(&xAboutDialogSetSupportUrl, lib, "adw_about_dialog_set_support_url") | |
| 1357 | - | core.PuregoSafeRegister(&xAboutDialogSetTranslatorCredits, lib, "adw_about_dialog_set_translator_credits") | |
| 1358 | - | core.PuregoSafeRegister(&xAboutDialogSetVersion, lib, "adw_about_dialog_set_version") | |
| 1359 | - | core.PuregoSafeRegister(&xAboutDialogSetWebsite, lib, "adw_about_dialog_set_website") | |
| 1311 | + | core.PuregoSafeRegister(&xShowAboutDialog, libs, "adw_show_about_dialog") | |
| 1312 | + | core.PuregoSafeRegister(&xShowAboutDialogFromAppdata, libs, "adw_show_about_dialog_from_appdata") | |
| 1313 | + | ||
| 1314 | + | core.PuregoSafeRegister(&xAboutDialogGLibType, libs, "adw_about_dialog_get_type") | |
| 1315 | + | ||
| 1316 | + | core.PuregoSafeRegister(&xNewAboutDialog, libs, "adw_about_dialog_new") | |
| 1317 | + | core.PuregoSafeRegister(&xNewAboutDialogFromAppdata, libs, "adw_about_dialog_new_from_appdata") | |
| 1318 | + | ||
| 1319 | + | core.PuregoSafeRegister(&xAboutDialogAddAcknowledgementSection, libs, "adw_about_dialog_add_acknowledgement_section") | |
| 1320 | + | core.PuregoSafeRegister(&xAboutDialogAddCreditSection, libs, "adw_about_dialog_add_credit_section") | |
| 1321 | + | core.PuregoSafeRegister(&xAboutDialogAddLegalSection, libs, "adw_about_dialog_add_legal_section") | |
| 1322 | + | core.PuregoSafeRegister(&xAboutDialogAddLink, libs, "adw_about_dialog_add_link") | |
| 1323 | + | core.PuregoSafeRegister(&xAboutDialogAddOtherApp, libs, "adw_about_dialog_add_other_app") | |
| 1324 | + | core.PuregoSafeRegister(&xAboutDialogGetApplicationIcon, libs, "adw_about_dialog_get_application_icon") | |
| 1325 | + | core.PuregoSafeRegister(&xAboutDialogGetApplicationName, libs, "adw_about_dialog_get_application_name") | |
| 1326 | + | core.PuregoSafeRegister(&xAboutDialogGetArtists, libs, "adw_about_dialog_get_artists") | |
| 1327 | + | core.PuregoSafeRegister(&xAboutDialogGetComments, libs, "adw_about_dialog_get_comments") | |
| 1328 | + | core.PuregoSafeRegister(&xAboutDialogGetCopyright, libs, "adw_about_dialog_get_copyright") | |
| 1329 | + | core.PuregoSafeRegister(&xAboutDialogGetDebugInfo, libs, "adw_about_dialog_get_debug_info") | |
| 1330 | + | core.PuregoSafeRegister(&xAboutDialogGetDebugInfoFilename, libs, "adw_about_dialog_get_debug_info_filename") | |
| 1331 | + | core.PuregoSafeRegister(&xAboutDialogGetDesigners, libs, "adw_about_dialog_get_designers") | |
| 1332 | + | core.PuregoSafeRegister(&xAboutDialogGetDeveloperName, libs, "adw_about_dialog_get_developer_name") | |
| 1333 | + | core.PuregoSafeRegister(&xAboutDialogGetDevelopers, libs, "adw_about_dialog_get_developers") | |
| 1334 | + | core.PuregoSafeRegister(&xAboutDialogGetDocumenters, libs, "adw_about_dialog_get_documenters") | |
| 1335 | + | core.PuregoSafeRegister(&xAboutDialogGetIssueUrl, libs, "adw_about_dialog_get_issue_url") | |
| 1336 | + | core.PuregoSafeRegister(&xAboutDialogGetLicense, libs, "adw_about_dialog_get_license") | |
| 1337 | + | core.PuregoSafeRegister(&xAboutDialogGetLicenseType, libs, "adw_about_dialog_get_license_type") | |
| 1338 | + | core.PuregoSafeRegister(&xAboutDialogGetReleaseNotes, libs, "adw_about_dialog_get_release_notes") | |
| 1339 | + | core.PuregoSafeRegister(&xAboutDialogGetReleaseNotesVersion, libs, "adw_about_dialog_get_release_notes_version") | |
| 1340 | + | core.PuregoSafeRegister(&xAboutDialogGetSupportUrl, libs, "adw_about_dialog_get_support_url") | |
| 1341 | + | core.PuregoSafeRegister(&xAboutDialogGetTranslatorCredits, libs, "adw_about_dialog_get_translator_credits") | |
| 1342 | + | core.PuregoSafeRegister(&xAboutDialogGetVersion, libs, "adw_about_dialog_get_version") | |
| 1343 | + | core.PuregoSafeRegister(&xAboutDialogGetWebsite, libs, "adw_about_dialog_get_website") | |
| 1344 | + | core.PuregoSafeRegister(&xAboutDialogSetApplicationIcon, libs, "adw_about_dialog_set_application_icon") | |
| 1345 | + | core.PuregoSafeRegister(&xAboutDialogSetApplicationName, libs, "adw_about_dialog_set_application_name") | |
| 1346 | + | core.PuregoSafeRegister(&xAboutDialogSetArtists, libs, "adw_about_dialog_set_artists") | |
| 1347 | + | core.PuregoSafeRegister(&xAboutDialogSetComments, libs, "adw_about_dialog_set_comments") | |
| 1348 | + | core.PuregoSafeRegister(&xAboutDialogSetCopyright, libs, "adw_about_dialog_set_copyright") | |
| 1349 | + | core.PuregoSafeRegister(&xAboutDialogSetDebugInfo, libs, "adw_about_dialog_set_debug_info") | |
| 1350 | + | core.PuregoSafeRegister(&xAboutDialogSetDebugInfoFilename, libs, "adw_about_dialog_set_debug_info_filename") | |
| 1351 | + | core.PuregoSafeRegister(&xAboutDialogSetDesigners, libs, "adw_about_dialog_set_designers") | |
| 1352 | + | core.PuregoSafeRegister(&xAboutDialogSetDeveloperName, libs, "adw_about_dialog_set_developer_name") | |
| 1353 | + | core.PuregoSafeRegister(&xAboutDialogSetDevelopers, libs, "adw_about_dialog_set_developers") | |
| 1354 | + | core.PuregoSafeRegister(&xAboutDialogSetDocumenters, libs, "adw_about_dialog_set_documenters") | |
| 1355 | + | core.PuregoSafeRegister(&xAboutDialogSetIssueUrl, libs, "adw_about_dialog_set_issue_url") | |
| 1356 | + | core.PuregoSafeRegister(&xAboutDialogSetLicense, libs, "adw_about_dialog_set_license") | |
| 1357 | + | core.PuregoSafeRegister(&xAboutDialogSetLicenseType, libs, "adw_about_dialog_set_license_type") | |
| 1358 | + | core.PuregoSafeRegister(&xAboutDialogSetReleaseNotes, libs, "adw_about_dialog_set_release_notes") | |
| 1359 | + | core.PuregoSafeRegister(&xAboutDialogSetReleaseNotesVersion, libs, "adw_about_dialog_set_release_notes_version") | |
| 1360 | + | core.PuregoSafeRegister(&xAboutDialogSetSupportUrl, libs, "adw_about_dialog_set_support_url") | |
| 1361 | + | core.PuregoSafeRegister(&xAboutDialogSetTranslatorCredits, libs, "adw_about_dialog_set_translator_credits") | |
| 1362 | + | core.PuregoSafeRegister(&xAboutDialogSetVersion, libs, "adw_about_dialog_set_version") | |
| 1363 | + | core.PuregoSafeRegister(&xAboutDialogSetWebsite, libs, "adw_about_dialog_set_website") | |
| 1360 | 1364 | ||
| 1361 | 1365 | } | |
M v4/adw/adw-about-window.go +60 -56
| @@ -1375,63 +1375,67 @@ func (x *AboutWindow) SetFocus(FocusVar *gtk.Widget) { | |||
| 1375 | 1375 | ||
| 1376 | 1376 | func init() { | |
| 1377 | 1377 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1378 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1379 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1380 | - | if err != nil { | |
| 1381 | - | panic(err) | |
| 1378 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1379 | + | var libs []uintptr | |
| 1380 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1381 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1382 | + | if err != nil { | |
| 1383 | + | panic(err) | |
| 1384 | + | } | |
| 1385 | + | libs = append(libs, lib) | |
| 1382 | 1386 | } | |
| 1383 | 1387 | ||
| 1384 | - | core.PuregoSafeRegister(&xShowAboutWindow, lib, "adw_show_about_window") | |
| 1385 | - | core.PuregoSafeRegister(&xShowAboutWindowFromAppdata, lib, "adw_show_about_window_from_appdata") | |
| 1386 | - | ||
| 1387 | - | core.PuregoSafeRegister(&xAboutWindowGLibType, lib, "adw_about_window_get_type") | |
| 1388 | - | ||
| 1389 | - | core.PuregoSafeRegister(&xNewAboutWindow, lib, "adw_about_window_new") | |
| 1390 | - | core.PuregoSafeRegister(&xNewAboutWindowFromAppdata, lib, "adw_about_window_new_from_appdata") | |
| 1391 | - | ||
| 1392 | - | core.PuregoSafeRegister(&xAboutWindowAddAcknowledgementSection, lib, "adw_about_window_add_acknowledgement_section") | |
| 1393 | - | core.PuregoSafeRegister(&xAboutWindowAddCreditSection, lib, "adw_about_window_add_credit_section") | |
| 1394 | - | core.PuregoSafeRegister(&xAboutWindowAddLegalSection, lib, "adw_about_window_add_legal_section") | |
| 1395 | - | core.PuregoSafeRegister(&xAboutWindowAddLink, lib, "adw_about_window_add_link") | |
| 1396 | - | core.PuregoSafeRegister(&xAboutWindowGetApplicationIcon, lib, "adw_about_window_get_application_icon") | |
| 1397 | - | core.PuregoSafeRegister(&xAboutWindowGetApplicationName, lib, "adw_about_window_get_application_name") | |
| 1398 | - | core.PuregoSafeRegister(&xAboutWindowGetArtists, lib, "adw_about_window_get_artists") | |
| 1399 | - | core.PuregoSafeRegister(&xAboutWindowGetComments, lib, "adw_about_window_get_comments") | |
| 1400 | - | core.PuregoSafeRegister(&xAboutWindowGetCopyright, lib, "adw_about_window_get_copyright") | |
| 1401 | - | core.PuregoSafeRegister(&xAboutWindowGetDebugInfo, lib, "adw_about_window_get_debug_info") | |
| 1402 | - | core.PuregoSafeRegister(&xAboutWindowGetDebugInfoFilename, lib, "adw_about_window_get_debug_info_filename") | |
| 1403 | - | core.PuregoSafeRegister(&xAboutWindowGetDesigners, lib, "adw_about_window_get_designers") | |
| 1404 | - | core.PuregoSafeRegister(&xAboutWindowGetDeveloperName, lib, "adw_about_window_get_developer_name") | |
| 1405 | - | core.PuregoSafeRegister(&xAboutWindowGetDevelopers, lib, "adw_about_window_get_developers") | |
| 1406 | - | core.PuregoSafeRegister(&xAboutWindowGetDocumenters, lib, "adw_about_window_get_documenters") | |
| 1407 | - | core.PuregoSafeRegister(&xAboutWindowGetIssueUrl, lib, "adw_about_window_get_issue_url") | |
| 1408 | - | core.PuregoSafeRegister(&xAboutWindowGetLicense, lib, "adw_about_window_get_license") | |
| 1409 | - | core.PuregoSafeRegister(&xAboutWindowGetLicenseType, lib, "adw_about_window_get_license_type") | |
| 1410 | - | core.PuregoSafeRegister(&xAboutWindowGetReleaseNotes, lib, "adw_about_window_get_release_notes") | |
| 1411 | - | core.PuregoSafeRegister(&xAboutWindowGetReleaseNotesVersion, lib, "adw_about_window_get_release_notes_version") | |
| 1412 | - | core.PuregoSafeRegister(&xAboutWindowGetSupportUrl, lib, "adw_about_window_get_support_url") | |
| 1413 | - | core.PuregoSafeRegister(&xAboutWindowGetTranslatorCredits, lib, "adw_about_window_get_translator_credits") | |
| 1414 | - | core.PuregoSafeRegister(&xAboutWindowGetVersion, lib, "adw_about_window_get_version") | |
| 1415 | - | core.PuregoSafeRegister(&xAboutWindowGetWebsite, lib, "adw_about_window_get_website") | |
| 1416 | - | core.PuregoSafeRegister(&xAboutWindowSetApplicationIcon, lib, "adw_about_window_set_application_icon") | |
| 1417 | - | core.PuregoSafeRegister(&xAboutWindowSetApplicationName, lib, "adw_about_window_set_application_name") | |
| 1418 | - | core.PuregoSafeRegister(&xAboutWindowSetArtists, lib, "adw_about_window_set_artists") | |
| 1419 | - | core.PuregoSafeRegister(&xAboutWindowSetComments, lib, "adw_about_window_set_comments") | |
| 1420 | - | core.PuregoSafeRegister(&xAboutWindowSetCopyright, lib, "adw_about_window_set_copyright") | |
| 1421 | - | core.PuregoSafeRegister(&xAboutWindowSetDebugInfo, lib, "adw_about_window_set_debug_info") | |
| 1422 | - | core.PuregoSafeRegister(&xAboutWindowSetDebugInfoFilename, lib, "adw_about_window_set_debug_info_filename") | |
| 1423 | - | core.PuregoSafeRegister(&xAboutWindowSetDesigners, lib, "adw_about_window_set_designers") | |
| 1424 | - | core.PuregoSafeRegister(&xAboutWindowSetDeveloperName, lib, "adw_about_window_set_developer_name") | |
| 1425 | - | core.PuregoSafeRegister(&xAboutWindowSetDevelopers, lib, "adw_about_window_set_developers") | |
| 1426 | - | core.PuregoSafeRegister(&xAboutWindowSetDocumenters, lib, "adw_about_window_set_documenters") | |
| 1427 | - | core.PuregoSafeRegister(&xAboutWindowSetIssueUrl, lib, "adw_about_window_set_issue_url") | |
| 1428 | - | core.PuregoSafeRegister(&xAboutWindowSetLicense, lib, "adw_about_window_set_license") | |
| 1429 | - | core.PuregoSafeRegister(&xAboutWindowSetLicenseType, lib, "adw_about_window_set_license_type") | |
| 1430 | - | core.PuregoSafeRegister(&xAboutWindowSetReleaseNotes, lib, "adw_about_window_set_release_notes") | |
| 1431 | - | core.PuregoSafeRegister(&xAboutWindowSetReleaseNotesVersion, lib, "adw_about_window_set_release_notes_version") | |
| 1432 | - | core.PuregoSafeRegister(&xAboutWindowSetSupportUrl, lib, "adw_about_window_set_support_url") | |
| 1433 | - | core.PuregoSafeRegister(&xAboutWindowSetTranslatorCredits, lib, "adw_about_window_set_translator_credits") | |
| 1434 | - | core.PuregoSafeRegister(&xAboutWindowSetVersion, lib, "adw_about_window_set_version") | |
| 1435 | - | core.PuregoSafeRegister(&xAboutWindowSetWebsite, lib, "adw_about_window_set_website") | |
| 1388 | + | core.PuregoSafeRegister(&xShowAboutWindow, libs, "adw_show_about_window") | |
| 1389 | + | core.PuregoSafeRegister(&xShowAboutWindowFromAppdata, libs, "adw_show_about_window_from_appdata") | |
| 1390 | + | ||
| 1391 | + | core.PuregoSafeRegister(&xAboutWindowGLibType, libs, "adw_about_window_get_type") | |
| 1392 | + | ||
| 1393 | + | core.PuregoSafeRegister(&xNewAboutWindow, libs, "adw_about_window_new") | |
| 1394 | + | core.PuregoSafeRegister(&xNewAboutWindowFromAppdata, libs, "adw_about_window_new_from_appdata") | |
| 1395 | + | ||
| 1396 | + | core.PuregoSafeRegister(&xAboutWindowAddAcknowledgementSection, libs, "adw_about_window_add_acknowledgement_section") | |
| 1397 | + | core.PuregoSafeRegister(&xAboutWindowAddCreditSection, libs, "adw_about_window_add_credit_section") | |
| 1398 | + | core.PuregoSafeRegister(&xAboutWindowAddLegalSection, libs, "adw_about_window_add_legal_section") | |
| 1399 | + | core.PuregoSafeRegister(&xAboutWindowAddLink, libs, "adw_about_window_add_link") | |
| 1400 | + | core.PuregoSafeRegister(&xAboutWindowGetApplicationIcon, libs, "adw_about_window_get_application_icon") | |
| 1401 | + | core.PuregoSafeRegister(&xAboutWindowGetApplicationName, libs, "adw_about_window_get_application_name") | |
| 1402 | + | core.PuregoSafeRegister(&xAboutWindowGetArtists, libs, "adw_about_window_get_artists") | |
| 1403 | + | core.PuregoSafeRegister(&xAboutWindowGetComments, libs, "adw_about_window_get_comments") | |
| 1404 | + | core.PuregoSafeRegister(&xAboutWindowGetCopyright, libs, "adw_about_window_get_copyright") | |
| 1405 | + | core.PuregoSafeRegister(&xAboutWindowGetDebugInfo, libs, "adw_about_window_get_debug_info") | |
| 1406 | + | core.PuregoSafeRegister(&xAboutWindowGetDebugInfoFilename, libs, "adw_about_window_get_debug_info_filename") | |
| 1407 | + | core.PuregoSafeRegister(&xAboutWindowGetDesigners, libs, "adw_about_window_get_designers") | |
| 1408 | + | core.PuregoSafeRegister(&xAboutWindowGetDeveloperName, libs, "adw_about_window_get_developer_name") | |
| 1409 | + | core.PuregoSafeRegister(&xAboutWindowGetDevelopers, libs, "adw_about_window_get_developers") | |
| 1410 | + | core.PuregoSafeRegister(&xAboutWindowGetDocumenters, libs, "adw_about_window_get_documenters") | |
| 1411 | + | core.PuregoSafeRegister(&xAboutWindowGetIssueUrl, libs, "adw_about_window_get_issue_url") | |
| 1412 | + | core.PuregoSafeRegister(&xAboutWindowGetLicense, libs, "adw_about_window_get_license") | |
| 1413 | + | core.PuregoSafeRegister(&xAboutWindowGetLicenseType, libs, "adw_about_window_get_license_type") | |
| 1414 | + | core.PuregoSafeRegister(&xAboutWindowGetReleaseNotes, libs, "adw_about_window_get_release_notes") | |
| 1415 | + | core.PuregoSafeRegister(&xAboutWindowGetReleaseNotesVersion, libs, "adw_about_window_get_release_notes_version") | |
| 1416 | + | core.PuregoSafeRegister(&xAboutWindowGetSupportUrl, libs, "adw_about_window_get_support_url") | |
| 1417 | + | core.PuregoSafeRegister(&xAboutWindowGetTranslatorCredits, libs, "adw_about_window_get_translator_credits") | |
| 1418 | + | core.PuregoSafeRegister(&xAboutWindowGetVersion, libs, "adw_about_window_get_version") | |
| 1419 | + | core.PuregoSafeRegister(&xAboutWindowGetWebsite, libs, "adw_about_window_get_website") | |
| 1420 | + | core.PuregoSafeRegister(&xAboutWindowSetApplicationIcon, libs, "adw_about_window_set_application_icon") | |
| 1421 | + | core.PuregoSafeRegister(&xAboutWindowSetApplicationName, libs, "adw_about_window_set_application_name") | |
| 1422 | + | core.PuregoSafeRegister(&xAboutWindowSetArtists, libs, "adw_about_window_set_artists") | |
| 1423 | + | core.PuregoSafeRegister(&xAboutWindowSetComments, libs, "adw_about_window_set_comments") | |
| 1424 | + | core.PuregoSafeRegister(&xAboutWindowSetCopyright, libs, "adw_about_window_set_copyright") | |
| 1425 | + | core.PuregoSafeRegister(&xAboutWindowSetDebugInfo, libs, "adw_about_window_set_debug_info") | |
| 1426 | + | core.PuregoSafeRegister(&xAboutWindowSetDebugInfoFilename, libs, "adw_about_window_set_debug_info_filename") | |
| 1427 | + | core.PuregoSafeRegister(&xAboutWindowSetDesigners, libs, "adw_about_window_set_designers") | |
| 1428 | + | core.PuregoSafeRegister(&xAboutWindowSetDeveloperName, libs, "adw_about_window_set_developer_name") | |
| 1429 | + | core.PuregoSafeRegister(&xAboutWindowSetDevelopers, libs, "adw_about_window_set_developers") | |
| 1430 | + | core.PuregoSafeRegister(&xAboutWindowSetDocumenters, libs, "adw_about_window_set_documenters") | |
| 1431 | + | core.PuregoSafeRegister(&xAboutWindowSetIssueUrl, libs, "adw_about_window_set_issue_url") | |
| 1432 | + | core.PuregoSafeRegister(&xAboutWindowSetLicense, libs, "adw_about_window_set_license") | |
| 1433 | + | core.PuregoSafeRegister(&xAboutWindowSetLicenseType, libs, "adw_about_window_set_license_type") | |
| 1434 | + | core.PuregoSafeRegister(&xAboutWindowSetReleaseNotes, libs, "adw_about_window_set_release_notes") | |
| 1435 | + | core.PuregoSafeRegister(&xAboutWindowSetReleaseNotesVersion, libs, "adw_about_window_set_release_notes_version") | |
| 1436 | + | core.PuregoSafeRegister(&xAboutWindowSetSupportUrl, libs, "adw_about_window_set_support_url") | |
| 1437 | + | core.PuregoSafeRegister(&xAboutWindowSetTranslatorCredits, libs, "adw_about_window_set_translator_credits") | |
| 1438 | + | core.PuregoSafeRegister(&xAboutWindowSetVersion, libs, "adw_about_window_set_version") | |
| 1439 | + | core.PuregoSafeRegister(&xAboutWindowSetWebsite, libs, "adw_about_window_set_website") | |
| 1436 | 1440 | ||
| 1437 | 1441 | } | |
M v4/adw/adw-accent-color.go +12 -8
| @@ -76,16 +76,20 @@ func RgbaToStandalone(RgbaVar *gdk.RGBA, DarkVar bool, StandaloneRgbaVar *gdk.RG | |||
| 76 | 76 | ||
| 77 | 77 | func init() { | |
| 78 | 78 | core.SetPackageName("ADW", "libadwaita-1") | |
| 79 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 80 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 81 | - | if err != nil { | |
| 82 | - | panic(err) | |
| 79 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 80 | + | var libs []uintptr | |
| 81 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 82 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 83 | + | if err != nil { | |
| 84 | + | panic(err) | |
| 85 | + | } | |
| 86 | + | libs = append(libs, lib) | |
| 83 | 87 | } | |
| 84 | 88 | ||
| 85 | - | core.PuregoSafeRegister(&xAccentColorGLibType, lib, "adw_accent_color_get_type") | |
| 89 | + | core.PuregoSafeRegister(&xAccentColorGLibType, libs, "adw_accent_color_get_type") | |
| 86 | 90 | ||
| 87 | - | core.PuregoSafeRegister(&xAccentColorToRgba, lib, "adw_accent_color_to_rgba") | |
| 88 | - | core.PuregoSafeRegister(&xAccentColorToStandaloneRgba, lib, "adw_accent_color_to_standalone_rgba") | |
| 89 | - | core.PuregoSafeRegister(&xRgbaToStandalone, lib, "adw_rgba_to_standalone") | |
| 91 | + | core.PuregoSafeRegister(&xAccentColorToRgba, libs, "adw_accent_color_to_rgba") | |
| 92 | + | core.PuregoSafeRegister(&xAccentColorToStandaloneRgba, libs, "adw_accent_color_to_standalone_rgba") | |
| 93 | + | core.PuregoSafeRegister(&xRgbaToStandalone, libs, "adw_rgba_to_standalone") | |
| 90 | 94 | ||
| 91 | 95 | } | |
M v4/adw/adw-action-row.go +28 -24
| @@ -703,31 +703,35 @@ func (x *ActionRow) GetBuildableId() string { | |||
| 703 | 703 | ||
| 704 | 704 | func init() { | |
| 705 | 705 | core.SetPackageName("ADW", "libadwaita-1") | |
| 706 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 707 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 708 | - | if err != nil { | |
| 709 | - | panic(err) | |
| 706 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 707 | + | var libs []uintptr | |
| 708 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 709 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 710 | + | if err != nil { | |
| 711 | + | panic(err) | |
| 712 | + | } | |
| 713 | + | libs = append(libs, lib) | |
| 710 | 714 | } | |
| 711 | 715 | ||
| 712 | - | core.PuregoSafeRegister(&xActionRowGLibType, lib, "adw_action_row_get_type") | |
| 713 | - | ||
| 714 | - | core.PuregoSafeRegister(&xNewActionRow, lib, "adw_action_row_new") | |
| 715 | - | ||
| 716 | - | core.PuregoSafeRegister(&xActionRowActivate, lib, "adw_action_row_activate") | |
| 717 | - | core.PuregoSafeRegister(&xActionRowAddPrefix, lib, "adw_action_row_add_prefix") | |
| 718 | - | core.PuregoSafeRegister(&xActionRowAddSuffix, lib, "adw_action_row_add_suffix") | |
| 719 | - | core.PuregoSafeRegister(&xActionRowGetActivatableWidget, lib, "adw_action_row_get_activatable_widget") | |
| 720 | - | core.PuregoSafeRegister(&xActionRowGetIconName, lib, "adw_action_row_get_icon_name") | |
| 721 | - | core.PuregoSafeRegister(&xActionRowGetSubtitle, lib, "adw_action_row_get_subtitle") | |
| 722 | - | core.PuregoSafeRegister(&xActionRowGetSubtitleLines, lib, "adw_action_row_get_subtitle_lines") | |
| 723 | - | core.PuregoSafeRegister(&xActionRowGetSubtitleSelectable, lib, "adw_action_row_get_subtitle_selectable") | |
| 724 | - | core.PuregoSafeRegister(&xActionRowGetTitleLines, lib, "adw_action_row_get_title_lines") | |
| 725 | - | core.PuregoSafeRegister(&xActionRowRemove, lib, "adw_action_row_remove") | |
| 726 | - | core.PuregoSafeRegister(&xActionRowSetActivatableWidget, lib, "adw_action_row_set_activatable_widget") | |
| 727 | - | core.PuregoSafeRegister(&xActionRowSetIconName, lib, "adw_action_row_set_icon_name") | |
| 728 | - | core.PuregoSafeRegister(&xActionRowSetSubtitle, lib, "adw_action_row_set_subtitle") | |
| 729 | - | core.PuregoSafeRegister(&xActionRowSetSubtitleLines, lib, "adw_action_row_set_subtitle_lines") | |
| 730 | - | core.PuregoSafeRegister(&xActionRowSetSubtitleSelectable, lib, "adw_action_row_set_subtitle_selectable") | |
| 731 | - | core.PuregoSafeRegister(&xActionRowSetTitleLines, lib, "adw_action_row_set_title_lines") | |
| 716 | + | core.PuregoSafeRegister(&xActionRowGLibType, libs, "adw_action_row_get_type") | |
| 717 | + | ||
| 718 | + | core.PuregoSafeRegister(&xNewActionRow, libs, "adw_action_row_new") | |
| 719 | + | ||
| 720 | + | core.PuregoSafeRegister(&xActionRowActivate, libs, "adw_action_row_activate") | |
| 721 | + | core.PuregoSafeRegister(&xActionRowAddPrefix, libs, "adw_action_row_add_prefix") | |
| 722 | + | core.PuregoSafeRegister(&xActionRowAddSuffix, libs, "adw_action_row_add_suffix") | |
| 723 | + | core.PuregoSafeRegister(&xActionRowGetActivatableWidget, libs, "adw_action_row_get_activatable_widget") | |
| 724 | + | core.PuregoSafeRegister(&xActionRowGetIconName, libs, "adw_action_row_get_icon_name") | |
| 725 | + | core.PuregoSafeRegister(&xActionRowGetSubtitle, libs, "adw_action_row_get_subtitle") | |
| 726 | + | core.PuregoSafeRegister(&xActionRowGetSubtitleLines, libs, "adw_action_row_get_subtitle_lines") | |
| 727 | + | core.PuregoSafeRegister(&xActionRowGetSubtitleSelectable, libs, "adw_action_row_get_subtitle_selectable") | |
| 728 | + | core.PuregoSafeRegister(&xActionRowGetTitleLines, libs, "adw_action_row_get_title_lines") | |
| 729 | + | core.PuregoSafeRegister(&xActionRowRemove, libs, "adw_action_row_remove") | |
| 730 | + | core.PuregoSafeRegister(&xActionRowSetActivatableWidget, libs, "adw_action_row_set_activatable_widget") | |
| 731 | + | core.PuregoSafeRegister(&xActionRowSetIconName, libs, "adw_action_row_set_icon_name") | |
| 732 | + | core.PuregoSafeRegister(&xActionRowSetSubtitle, libs, "adw_action_row_set_subtitle") | |
| 733 | + | core.PuregoSafeRegister(&xActionRowSetSubtitleLines, libs, "adw_action_row_set_subtitle_lines") | |
| 734 | + | core.PuregoSafeRegister(&xActionRowSetSubtitleSelectable, libs, "adw_action_row_set_subtitle_selectable") | |
| 735 | + | core.PuregoSafeRegister(&xActionRowSetTitleLines, libs, "adw_action_row_set_title_lines") | |
| 732 | 736 | ||
| 733 | 737 | } | |
M v4/adw/adw-alert-dialog.go +46 -42
| @@ -992,49 +992,53 @@ func (x *AlertDialog) GetBuildableId() string { | |||
| 992 | 992 | ||
| 993 | 993 | func init() { | |
| 994 | 994 | core.SetPackageName("ADW", "libadwaita-1") | |
| 995 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 996 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 997 | - | if err != nil { | |
| 998 | - | panic(err) | |
| 995 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 996 | + | var libs []uintptr | |
| 997 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 998 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 999 | + | if err != nil { | |
| 1000 | + | panic(err) | |
| 1001 | + | } | |
| 1002 | + | libs = append(libs, lib) | |
| 999 | 1003 | } | |
| 1000 | 1004 | ||
| 1001 | - | core.PuregoSafeRegister(&xResponseAppearanceGLibType, lib, "adw_response_appearance_get_type") | |
| 1002 | - | ||
| 1003 | - | core.PuregoSafeRegister(&xAlertDialogGLibType, lib, "adw_alert_dialog_get_type") | |
| 1004 | - | ||
| 1005 | - | core.PuregoSafeRegister(&xNewAlertDialog, lib, "adw_alert_dialog_new") | |
| 1006 | - | ||
| 1007 | - | core.PuregoSafeRegister(&xAlertDialogAddResponse, lib, "adw_alert_dialog_add_response") | |
| 1008 | - | core.PuregoSafeRegister(&xAlertDialogAddResponses, lib, "adw_alert_dialog_add_responses") | |
| 1009 | - | core.PuregoSafeRegister(&xAlertDialogChoose, lib, "adw_alert_dialog_choose") | |
| 1010 | - | core.PuregoSafeRegister(&xAlertDialogChooseFinish, lib, "adw_alert_dialog_choose_finish") | |
| 1011 | - | core.PuregoSafeRegister(&xAlertDialogFormatBody, lib, "adw_alert_dialog_format_body") | |
| 1012 | - | core.PuregoSafeRegister(&xAlertDialogFormatBodyMarkup, lib, "adw_alert_dialog_format_body_markup") | |
| 1013 | - | core.PuregoSafeRegister(&xAlertDialogFormatHeading, lib, "adw_alert_dialog_format_heading") | |
| 1014 | - | core.PuregoSafeRegister(&xAlertDialogFormatHeadingMarkup, lib, "adw_alert_dialog_format_heading_markup") | |
| 1015 | - | core.PuregoSafeRegister(&xAlertDialogGetBody, lib, "adw_alert_dialog_get_body") | |
| 1016 | - | core.PuregoSafeRegister(&xAlertDialogGetBodyUseMarkup, lib, "adw_alert_dialog_get_body_use_markup") | |
| 1017 | - | core.PuregoSafeRegister(&xAlertDialogGetCloseResponse, lib, "adw_alert_dialog_get_close_response") | |
| 1018 | - | core.PuregoSafeRegister(&xAlertDialogGetDefaultResponse, lib, "adw_alert_dialog_get_default_response") | |
| 1019 | - | core.PuregoSafeRegister(&xAlertDialogGetExtraChild, lib, "adw_alert_dialog_get_extra_child") | |
| 1020 | - | core.PuregoSafeRegister(&xAlertDialogGetHeading, lib, "adw_alert_dialog_get_heading") | |
| 1021 | - | core.PuregoSafeRegister(&xAlertDialogGetHeadingUseMarkup, lib, "adw_alert_dialog_get_heading_use_markup") | |
| 1022 | - | core.PuregoSafeRegister(&xAlertDialogGetPreferWideLayout, lib, "adw_alert_dialog_get_prefer_wide_layout") | |
| 1023 | - | core.PuregoSafeRegister(&xAlertDialogGetResponseAppearance, lib, "adw_alert_dialog_get_response_appearance") | |
| 1024 | - | core.PuregoSafeRegister(&xAlertDialogGetResponseEnabled, lib, "adw_alert_dialog_get_response_enabled") | |
| 1025 | - | core.PuregoSafeRegister(&xAlertDialogGetResponseLabel, lib, "adw_alert_dialog_get_response_label") | |
| 1026 | - | core.PuregoSafeRegister(&xAlertDialogHasResponse, lib, "adw_alert_dialog_has_response") | |
| 1027 | - | core.PuregoSafeRegister(&xAlertDialogRemoveResponse, lib, "adw_alert_dialog_remove_response") | |
| 1028 | - | core.PuregoSafeRegister(&xAlertDialogSetBody, lib, "adw_alert_dialog_set_body") | |
| 1029 | - | core.PuregoSafeRegister(&xAlertDialogSetBodyUseMarkup, lib, "adw_alert_dialog_set_body_use_markup") | |
| 1030 | - | core.PuregoSafeRegister(&xAlertDialogSetCloseResponse, lib, "adw_alert_dialog_set_close_response") | |
| 1031 | - | core.PuregoSafeRegister(&xAlertDialogSetDefaultResponse, lib, "adw_alert_dialog_set_default_response") | |
| 1032 | - | core.PuregoSafeRegister(&xAlertDialogSetExtraChild, lib, "adw_alert_dialog_set_extra_child") | |
| 1033 | - | core.PuregoSafeRegister(&xAlertDialogSetHeading, lib, "adw_alert_dialog_set_heading") | |
| 1034 | - | core.PuregoSafeRegister(&xAlertDialogSetHeadingUseMarkup, lib, "adw_alert_dialog_set_heading_use_markup") | |
| 1035 | - | core.PuregoSafeRegister(&xAlertDialogSetPreferWideLayout, lib, "adw_alert_dialog_set_prefer_wide_layout") | |
| 1036 | - | core.PuregoSafeRegister(&xAlertDialogSetResponseAppearance, lib, "adw_alert_dialog_set_response_appearance") | |
| 1037 | - | core.PuregoSafeRegister(&xAlertDialogSetResponseEnabled, lib, "adw_alert_dialog_set_response_enabled") | |
| 1038 | - | core.PuregoSafeRegister(&xAlertDialogSetResponseLabel, lib, "adw_alert_dialog_set_response_label") | |
| 1005 | + | core.PuregoSafeRegister(&xResponseAppearanceGLibType, libs, "adw_response_appearance_get_type") | |
| 1006 | + | ||
| 1007 | + | core.PuregoSafeRegister(&xAlertDialogGLibType, libs, "adw_alert_dialog_get_type") | |
| 1008 | + | ||
| 1009 | + | core.PuregoSafeRegister(&xNewAlertDialog, libs, "adw_alert_dialog_new") | |
| 1010 | + | ||
| 1011 | + | core.PuregoSafeRegister(&xAlertDialogAddResponse, libs, "adw_alert_dialog_add_response") | |
| 1012 | + | core.PuregoSafeRegister(&xAlertDialogAddResponses, libs, "adw_alert_dialog_add_responses") | |
| 1013 | + | core.PuregoSafeRegister(&xAlertDialogChoose, libs, "adw_alert_dialog_choose") | |
| 1014 | + | core.PuregoSafeRegister(&xAlertDialogChooseFinish, libs, "adw_alert_dialog_choose_finish") | |
| 1015 | + | core.PuregoSafeRegister(&xAlertDialogFormatBody, libs, "adw_alert_dialog_format_body") | |
| 1016 | + | core.PuregoSafeRegister(&xAlertDialogFormatBodyMarkup, libs, "adw_alert_dialog_format_body_markup") | |
| 1017 | + | core.PuregoSafeRegister(&xAlertDialogFormatHeading, libs, "adw_alert_dialog_format_heading") | |
| 1018 | + | core.PuregoSafeRegister(&xAlertDialogFormatHeadingMarkup, libs, "adw_alert_dialog_format_heading_markup") | |
| 1019 | + | core.PuregoSafeRegister(&xAlertDialogGetBody, libs, "adw_alert_dialog_get_body") | |
| 1020 | + | core.PuregoSafeRegister(&xAlertDialogGetBodyUseMarkup, libs, "adw_alert_dialog_get_body_use_markup") | |
| 1021 | + | core.PuregoSafeRegister(&xAlertDialogGetCloseResponse, libs, "adw_alert_dialog_get_close_response") | |
| 1022 | + | core.PuregoSafeRegister(&xAlertDialogGetDefaultResponse, libs, "adw_alert_dialog_get_default_response") | |
| 1023 | + | core.PuregoSafeRegister(&xAlertDialogGetExtraChild, libs, "adw_alert_dialog_get_extra_child") | |
| 1024 | + | core.PuregoSafeRegister(&xAlertDialogGetHeading, libs, "adw_alert_dialog_get_heading") | |
| 1025 | + | core.PuregoSafeRegister(&xAlertDialogGetHeadingUseMarkup, libs, "adw_alert_dialog_get_heading_use_markup") | |
| 1026 | + | core.PuregoSafeRegister(&xAlertDialogGetPreferWideLayout, libs, "adw_alert_dialog_get_prefer_wide_layout") | |
| 1027 | + | core.PuregoSafeRegister(&xAlertDialogGetResponseAppearance, libs, "adw_alert_dialog_get_response_appearance") | |
| 1028 | + | core.PuregoSafeRegister(&xAlertDialogGetResponseEnabled, libs, "adw_alert_dialog_get_response_enabled") | |
| 1029 | + | core.PuregoSafeRegister(&xAlertDialogGetResponseLabel, libs, "adw_alert_dialog_get_response_label") | |
| 1030 | + | core.PuregoSafeRegister(&xAlertDialogHasResponse, libs, "adw_alert_dialog_has_response") | |
| 1031 | + | core.PuregoSafeRegister(&xAlertDialogRemoveResponse, libs, "adw_alert_dialog_remove_response") | |
| 1032 | + | core.PuregoSafeRegister(&xAlertDialogSetBody, libs, "adw_alert_dialog_set_body") | |
| 1033 | + | core.PuregoSafeRegister(&xAlertDialogSetBodyUseMarkup, libs, "adw_alert_dialog_set_body_use_markup") | |
| 1034 | + | core.PuregoSafeRegister(&xAlertDialogSetCloseResponse, libs, "adw_alert_dialog_set_close_response") | |
| 1035 | + | core.PuregoSafeRegister(&xAlertDialogSetDefaultResponse, libs, "adw_alert_dialog_set_default_response") | |
| 1036 | + | core.PuregoSafeRegister(&xAlertDialogSetExtraChild, libs, "adw_alert_dialog_set_extra_child") | |
| 1037 | + | core.PuregoSafeRegister(&xAlertDialogSetHeading, libs, "adw_alert_dialog_set_heading") | |
| 1038 | + | core.PuregoSafeRegister(&xAlertDialogSetHeadingUseMarkup, libs, "adw_alert_dialog_set_heading_use_markup") | |
| 1039 | + | core.PuregoSafeRegister(&xAlertDialogSetPreferWideLayout, libs, "adw_alert_dialog_set_prefer_wide_layout") | |
| 1040 | + | core.PuregoSafeRegister(&xAlertDialogSetResponseAppearance, libs, "adw_alert_dialog_set_response_appearance") | |
| 1041 | + | core.PuregoSafeRegister(&xAlertDialogSetResponseEnabled, libs, "adw_alert_dialog_set_response_enabled") | |
| 1042 | + | core.PuregoSafeRegister(&xAlertDialogSetResponseLabel, libs, "adw_alert_dialog_set_response_label") | |
| 1039 | 1043 | ||
| 1040 | 1044 | } | |
M v4/adw/adw-animation-target.go +16 -12
| @@ -216,24 +216,28 @@ func (c *PropertyAnimationTarget) SetGoPointer(ptr uintptr) { | |||
| 216 | 216 | ||
| 217 | 217 | func init() { | |
| 218 | 218 | core.SetPackageName("ADW", "libadwaita-1") | |
| 219 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 220 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 221 | - | if err != nil { | |
| 222 | - | panic(err) | |
| 219 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 220 | + | var libs []uintptr | |
| 221 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 222 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 223 | + | if err != nil { | |
| 224 | + | panic(err) | |
| 225 | + | } | |
| 226 | + | libs = append(libs, lib) | |
| 223 | 227 | } | |
| 224 | 228 | ||
| 225 | - | core.PuregoSafeRegister(&xAnimationTargetGLibType, lib, "adw_animation_target_get_type") | |
| 229 | + | core.PuregoSafeRegister(&xAnimationTargetGLibType, libs, "adw_animation_target_get_type") | |
| 226 | 230 | ||
| 227 | - | core.PuregoSafeRegister(&xCallbackAnimationTargetGLibType, lib, "adw_callback_animation_target_get_type") | |
| 231 | + | core.PuregoSafeRegister(&xCallbackAnimationTargetGLibType, libs, "adw_callback_animation_target_get_type") | |
| 228 | 232 | ||
| 229 | - | core.PuregoSafeRegister(&xNewCallbackAnimationTarget, lib, "adw_callback_animation_target_new") | |
| 233 | + | core.PuregoSafeRegister(&xNewCallbackAnimationTarget, libs, "adw_callback_animation_target_new") | |
| 230 | 234 | ||
| 231 | - | core.PuregoSafeRegister(&xPropertyAnimationTargetGLibType, lib, "adw_property_animation_target_get_type") | |
| 235 | + | core.PuregoSafeRegister(&xPropertyAnimationTargetGLibType, libs, "adw_property_animation_target_get_type") | |
| 232 | 236 | ||
| 233 | - | core.PuregoSafeRegister(&xNewPropertyAnimationTarget, lib, "adw_property_animation_target_new") | |
| 234 | - | core.PuregoSafeRegister(&xNewPropertyAnimationTargetForPspec, lib, "adw_property_animation_target_new_for_pspec") | |
| 237 | + | core.PuregoSafeRegister(&xNewPropertyAnimationTarget, libs, "adw_property_animation_target_new") | |
| 238 | + | core.PuregoSafeRegister(&xNewPropertyAnimationTargetForPspec, libs, "adw_property_animation_target_new_for_pspec") | |
| 235 | 239 | ||
| 236 | - | core.PuregoSafeRegister(&xPropertyAnimationTargetGetObject, lib, "adw_property_animation_target_get_object") | |
| 237 | - | core.PuregoSafeRegister(&xPropertyAnimationTargetGetPspec, lib, "adw_property_animation_target_get_pspec") | |
| 240 | + | core.PuregoSafeRegister(&xPropertyAnimationTargetGetObject, libs, "adw_property_animation_target_get_object") | |
| 241 | + | core.PuregoSafeRegister(&xPropertyAnimationTargetGetPspec, libs, "adw_property_animation_target_get_pspec") | |
| 238 | 242 | ||
| 239 | 243 | } | |
M v4/adw/adw-animation-util.go +10 -6
| @@ -30,13 +30,17 @@ func Lerp(AVar float64, BVar float64, TVar float64) float64 { | |||
| 30 | 30 | ||
| 31 | 31 | func init() { | |
| 32 | 32 | core.SetPackageName("ADW", "libadwaita-1") | |
| 33 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 34 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 35 | - | if err != nil { | |
| 36 | - | panic(err) | |
| 33 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 34 | + | var libs []uintptr | |
| 35 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 36 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 37 | + | if err != nil { | |
| 38 | + | panic(err) | |
| 39 | + | } | |
| 40 | + | libs = append(libs, lib) | |
| 37 | 41 | } | |
| 38 | 42 | ||
| 39 | - | core.PuregoSafeRegister(&xGetEnableAnimations, lib, "adw_get_enable_animations") | |
| 40 | - | core.PuregoSafeRegister(&xLerp, lib, "adw_lerp") | |
| 43 | + | core.PuregoSafeRegister(&xGetEnableAnimations, libs, "adw_get_enable_animations") | |
| 44 | + | core.PuregoSafeRegister(&xLerp, libs, "adw_lerp") | |
| 41 | 45 | ||
| 42 | 46 | } | |
M v4/adw/adw-animation.go +24 -20
| @@ -325,27 +325,31 @@ func (x *Animation) ConnectDone(cb *func(Animation)) uint32 { | |||
| 325 | 325 | ||
| 326 | 326 | func init() { | |
| 327 | 327 | core.SetPackageName("ADW", "libadwaita-1") | |
| 328 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 329 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 330 | - | if err != nil { | |
| 331 | - | panic(err) | |
| 328 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 329 | + | var libs []uintptr | |
| 330 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 331 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 332 | + | if err != nil { | |
| 333 | + | panic(err) | |
| 334 | + | } | |
| 335 | + | libs = append(libs, lib) | |
| 332 | 336 | } | |
| 333 | 337 | ||
| 334 | - | core.PuregoSafeRegister(&xAnimationStateGLibType, lib, "adw_animation_state_get_type") | |
| 335 | - | ||
| 336 | - | core.PuregoSafeRegister(&xAnimationGLibType, lib, "adw_animation_get_type") | |
| 337 | - | ||
| 338 | - | core.PuregoSafeRegister(&xAnimationGetFollowEnableAnimationsSetting, lib, "adw_animation_get_follow_enable_animations_setting") | |
| 339 | - | core.PuregoSafeRegister(&xAnimationGetState, lib, "adw_animation_get_state") | |
| 340 | - | core.PuregoSafeRegister(&xAnimationGetTarget, lib, "adw_animation_get_target") | |
| 341 | - | core.PuregoSafeRegister(&xAnimationGetValue, lib, "adw_animation_get_value") | |
| 342 | - | core.PuregoSafeRegister(&xAnimationGetWidget, lib, "adw_animation_get_widget") | |
| 343 | - | core.PuregoSafeRegister(&xAnimationPause, lib, "adw_animation_pause") | |
| 344 | - | core.PuregoSafeRegister(&xAnimationPlay, lib, "adw_animation_play") | |
| 345 | - | core.PuregoSafeRegister(&xAnimationReset, lib, "adw_animation_reset") | |
| 346 | - | core.PuregoSafeRegister(&xAnimationResume, lib, "adw_animation_resume") | |
| 347 | - | core.PuregoSafeRegister(&xAnimationSetFollowEnableAnimationsSetting, lib, "adw_animation_set_follow_enable_animations_setting") | |
| 348 | - | core.PuregoSafeRegister(&xAnimationSetTarget, lib, "adw_animation_set_target") | |
| 349 | - | core.PuregoSafeRegister(&xAnimationSkip, lib, "adw_animation_skip") | |
| 338 | + | core.PuregoSafeRegister(&xAnimationStateGLibType, libs, "adw_animation_state_get_type") | |
| 339 | + | ||
| 340 | + | core.PuregoSafeRegister(&xAnimationGLibType, libs, "adw_animation_get_type") | |
| 341 | + | ||
| 342 | + | core.PuregoSafeRegister(&xAnimationGetFollowEnableAnimationsSetting, libs, "adw_animation_get_follow_enable_animations_setting") | |
| 343 | + | core.PuregoSafeRegister(&xAnimationGetState, libs, "adw_animation_get_state") | |
| 344 | + | core.PuregoSafeRegister(&xAnimationGetTarget, libs, "adw_animation_get_target") | |
| 345 | + | core.PuregoSafeRegister(&xAnimationGetValue, libs, "adw_animation_get_value") | |
| 346 | + | core.PuregoSafeRegister(&xAnimationGetWidget, libs, "adw_animation_get_widget") | |
| 347 | + | core.PuregoSafeRegister(&xAnimationPause, libs, "adw_animation_pause") | |
| 348 | + | core.PuregoSafeRegister(&xAnimationPlay, libs, "adw_animation_play") | |
| 349 | + | core.PuregoSafeRegister(&xAnimationReset, libs, "adw_animation_reset") | |
| 350 | + | core.PuregoSafeRegister(&xAnimationResume, libs, "adw_animation_resume") | |
| 351 | + | core.PuregoSafeRegister(&xAnimationSetFollowEnableAnimationsSetting, libs, "adw_animation_set_follow_enable_animations_setting") | |
| 352 | + | core.PuregoSafeRegister(&xAnimationSetTarget, libs, "adw_animation_set_target") | |
| 353 | + | core.PuregoSafeRegister(&xAnimationSkip, libs, "adw_animation_skip") | |
| 350 | 354 | ||
| 351 | 355 | } | |
M v4/adw/adw-application-window.go +18 -14
| @@ -960,23 +960,27 @@ func (x *ApplicationWindow) SetFocus(FocusVar *gtk.Widget) { | |||
| 960 | 960 | ||
| 961 | 961 | func init() { | |
| 962 | 962 | core.SetPackageName("ADW", "libadwaita-1") | |
| 963 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 964 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 965 | - | if err != nil { | |
| 966 | - | panic(err) | |
| 963 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 964 | + | var libs []uintptr | |
| 965 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 966 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 967 | + | if err != nil { | |
| 968 | + | panic(err) | |
| 969 | + | } | |
| 970 | + | libs = append(libs, lib) | |
| 967 | 971 | } | |
| 968 | 972 | ||
| 969 | - | core.PuregoSafeRegister(&xApplicationWindowGLibType, lib, "adw_application_window_get_type") | |
| 973 | + | core.PuregoSafeRegister(&xApplicationWindowGLibType, libs, "adw_application_window_get_type") | |
| 970 | 974 | ||
| 971 | - | core.PuregoSafeRegister(&xNewApplicationWindow, lib, "adw_application_window_new") | |
| 975 | + | core.PuregoSafeRegister(&xNewApplicationWindow, libs, "adw_application_window_new") | |
| 972 | 976 | ||
| 973 | - | core.PuregoSafeRegister(&xApplicationWindowAddBreakpoint, lib, "adw_application_window_add_breakpoint") | |
| 974 | - | core.PuregoSafeRegister(&xApplicationWindowGetAdaptivePreview, lib, "adw_application_window_get_adaptive_preview") | |
| 975 | - | core.PuregoSafeRegister(&xApplicationWindowGetContent, lib, "adw_application_window_get_content") | |
| 976 | - | core.PuregoSafeRegister(&xApplicationWindowGetCurrentBreakpoint, lib, "adw_application_window_get_current_breakpoint") | |
| 977 | - | core.PuregoSafeRegister(&xApplicationWindowGetDialogs, lib, "adw_application_window_get_dialogs") | |
| 978 | - | core.PuregoSafeRegister(&xApplicationWindowGetVisibleDialog, lib, "adw_application_window_get_visible_dialog") | |
| 979 | - | core.PuregoSafeRegister(&xApplicationWindowSetAdaptivePreview, lib, "adw_application_window_set_adaptive_preview") | |
| 980 | - | core.PuregoSafeRegister(&xApplicationWindowSetContent, lib, "adw_application_window_set_content") | |
| 977 | + | core.PuregoSafeRegister(&xApplicationWindowAddBreakpoint, libs, "adw_application_window_add_breakpoint") | |
| 978 | + | core.PuregoSafeRegister(&xApplicationWindowGetAdaptivePreview, libs, "adw_application_window_get_adaptive_preview") | |
| 979 | + | core.PuregoSafeRegister(&xApplicationWindowGetContent, libs, "adw_application_window_get_content") | |
| 980 | + | core.PuregoSafeRegister(&xApplicationWindowGetCurrentBreakpoint, libs, "adw_application_window_get_current_breakpoint") | |
| 981 | + | core.PuregoSafeRegister(&xApplicationWindowGetDialogs, libs, "adw_application_window_get_dialogs") | |
| 982 | + | core.PuregoSafeRegister(&xApplicationWindowGetVisibleDialog, libs, "adw_application_window_get_visible_dialog") | |
| 983 | + | core.PuregoSafeRegister(&xApplicationWindowSetAdaptivePreview, libs, "adw_application_window_set_adaptive_preview") | |
| 984 | + | core.PuregoSafeRegister(&xApplicationWindowSetContent, libs, "adw_application_window_set_content") | |
| 981 | 985 | ||
| 982 | 986 | } | |
M v4/adw/adw-application.go +11 -7
| @@ -472,16 +472,20 @@ func (x *Application) RemoveActionEntries(EntriesVar []gio.ActionEntry, NEntries | |||
| 472 | 472 | ||
| 473 | 473 | func init() { | |
| 474 | 474 | core.SetPackageName("ADW", "libadwaita-1") | |
| 475 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 476 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 477 | - | if err != nil { | |
| 478 | - | panic(err) | |
| 475 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 476 | + | var libs []uintptr | |
| 477 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 478 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 479 | + | if err != nil { | |
| 480 | + | panic(err) | |
| 481 | + | } | |
| 482 | + | libs = append(libs, lib) | |
| 479 | 483 | } | |
| 480 | 484 | ||
| 481 | - | core.PuregoSafeRegister(&xApplicationGLibType, lib, "adw_application_get_type") | |
| 485 | + | core.PuregoSafeRegister(&xApplicationGLibType, libs, "adw_application_get_type") | |
| 482 | 486 | ||
| 483 | - | core.PuregoSafeRegister(&xNewApplication, lib, "adw_application_new") | |
| 487 | + | core.PuregoSafeRegister(&xNewApplication, libs, "adw_application_new") | |
| 484 | 488 | ||
| 485 | - | core.PuregoSafeRegister(&xApplicationGetStyleManager, lib, "adw_application_get_style_manager") | |
| 489 | + | core.PuregoSafeRegister(&xApplicationGetStyleManager, libs, "adw_application_get_style_manager") | |
| 486 | 490 | ||
| 487 | 491 | } | |
M v4/adw/adw-avatar.go +23 -19
| @@ -501,26 +501,30 @@ func (x *Avatar) GetBuildableId() string { | |||
| 501 | 501 | ||
| 502 | 502 | func init() { | |
| 503 | 503 | core.SetPackageName("ADW", "libadwaita-1") | |
| 504 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 505 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 506 | - | if err != nil { | |
| 507 | - | panic(err) | |
| 504 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 505 | + | var libs []uintptr | |
| 506 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 507 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 508 | + | if err != nil { | |
| 509 | + | panic(err) | |
| 510 | + | } | |
| 511 | + | libs = append(libs, lib) | |
| 508 | 512 | } | |
| 509 | 513 | ||
| 510 | - | core.PuregoSafeRegister(&xAvatarGLibType, lib, "adw_avatar_get_type") | |
| 511 | - | ||
| 512 | - | core.PuregoSafeRegister(&xNewAvatar, lib, "adw_avatar_new") | |
| 513 | - | ||
| 514 | - | core.PuregoSafeRegister(&xAvatarDrawToTexture, lib, "adw_avatar_draw_to_texture") | |
| 515 | - | core.PuregoSafeRegister(&xAvatarGetCustomImage, lib, "adw_avatar_get_custom_image") | |
| 516 | - | core.PuregoSafeRegister(&xAvatarGetIconName, lib, "adw_avatar_get_icon_name") | |
| 517 | - | core.PuregoSafeRegister(&xAvatarGetShowInitials, lib, "adw_avatar_get_show_initials") | |
| 518 | - | core.PuregoSafeRegister(&xAvatarGetSize, lib, "adw_avatar_get_size") | |
| 519 | - | core.PuregoSafeRegister(&xAvatarGetText, lib, "adw_avatar_get_text") | |
| 520 | - | core.PuregoSafeRegister(&xAvatarSetCustomImage, lib, "adw_avatar_set_custom_image") | |
| 521 | - | core.PuregoSafeRegister(&xAvatarSetIconName, lib, "adw_avatar_set_icon_name") | |
| 522 | - | core.PuregoSafeRegister(&xAvatarSetShowInitials, lib, "adw_avatar_set_show_initials") | |
| 523 | - | core.PuregoSafeRegister(&xAvatarSetSize, lib, "adw_avatar_set_size") | |
| 524 | - | core.PuregoSafeRegister(&xAvatarSetText, lib, "adw_avatar_set_text") | |
| 514 | + | core.PuregoSafeRegister(&xAvatarGLibType, libs, "adw_avatar_get_type") | |
| 515 | + | ||
| 516 | + | core.PuregoSafeRegister(&xNewAvatar, libs, "adw_avatar_new") | |
| 517 | + | ||
| 518 | + | core.PuregoSafeRegister(&xAvatarDrawToTexture, libs, "adw_avatar_draw_to_texture") | |
| 519 | + | core.PuregoSafeRegister(&xAvatarGetCustomImage, libs, "adw_avatar_get_custom_image") | |
| 520 | + | core.PuregoSafeRegister(&xAvatarGetIconName, libs, "adw_avatar_get_icon_name") | |
| 521 | + | core.PuregoSafeRegister(&xAvatarGetShowInitials, libs, "adw_avatar_get_show_initials") | |
| 522 | + | core.PuregoSafeRegister(&xAvatarGetSize, libs, "adw_avatar_get_size") | |
| 523 | + | core.PuregoSafeRegister(&xAvatarGetText, libs, "adw_avatar_get_text") | |
| 524 | + | core.PuregoSafeRegister(&xAvatarSetCustomImage, libs, "adw_avatar_set_custom_image") | |
| 525 | + | core.PuregoSafeRegister(&xAvatarSetIconName, libs, "adw_avatar_set_icon_name") | |
| 526 | + | core.PuregoSafeRegister(&xAvatarSetShowInitials, libs, "adw_avatar_set_show_initials") | |
| 527 | + | core.PuregoSafeRegister(&xAvatarSetSize, libs, "adw_avatar_set_size") | |
| 528 | + | core.PuregoSafeRegister(&xAvatarSetText, libs, "adw_avatar_set_text") | |
| 525 | 529 | ||
| 526 | 530 | } | |
M v4/adw/adw-banner.go +21 -17
| @@ -614,27 +614,31 @@ func (x *Banner) GetBuildableId() string { | |||
| 614 | 614 | ||
| 615 | 615 | func init() { | |
| 616 | 616 | core.SetPackageName("ADW", "libadwaita-1") | |
| 617 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 618 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 619 | - | if err != nil { | |
| 620 | - | panic(err) | |
| 617 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 618 | + | var libs []uintptr | |
| 619 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 620 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 621 | + | if err != nil { | |
| 622 | + | panic(err) | |
| 623 | + | } | |
| 624 | + | libs = append(libs, lib) | |
| 621 | 625 | } | |
| 622 | 626 | ||
| 623 | - | core.PuregoSafeRegister(&xBannerButtonStyleGLibType, lib, "adw_banner_button_style_get_type") | |
| 627 | + | core.PuregoSafeRegister(&xBannerButtonStyleGLibType, libs, "adw_banner_button_style_get_type") | |
| 624 | 628 | ||
| 625 | - | core.PuregoSafeRegister(&xBannerGLibType, lib, "adw_banner_get_type") | |
| 629 | + | core.PuregoSafeRegister(&xBannerGLibType, libs, "adw_banner_get_type") | |
| 626 | 630 | ||
| 627 | - | core.PuregoSafeRegister(&xNewBanner, lib, "adw_banner_new") | |
| 631 | + | core.PuregoSafeRegister(&xNewBanner, libs, "adw_banner_new") | |
| 628 | 632 | ||
| 629 | - | core.PuregoSafeRegister(&xBannerGetButtonLabel, lib, "adw_banner_get_button_label") | |
| 630 | - | core.PuregoSafeRegister(&xBannerGetButtonStyle, lib, "adw_banner_get_button_style") | |
| 631 | - | core.PuregoSafeRegister(&xBannerGetRevealed, lib, "adw_banner_get_revealed") | |
| 632 | - | core.PuregoSafeRegister(&xBannerGetTitle, lib, "adw_banner_get_title") | |
| 633 | - | core.PuregoSafeRegister(&xBannerGetUseMarkup, lib, "adw_banner_get_use_markup") | |
| 634 | - | core.PuregoSafeRegister(&xBannerSetButtonLabel, lib, "adw_banner_set_button_label") | |
| 635 | - | core.PuregoSafeRegister(&xBannerSetButtonStyle, lib, "adw_banner_set_button_style") | |
| 636 | - | core.PuregoSafeRegister(&xBannerSetRevealed, lib, "adw_banner_set_revealed") | |
| 637 | - | core.PuregoSafeRegister(&xBannerSetTitle, lib, "adw_banner_set_title") | |
| 638 | - | core.PuregoSafeRegister(&xBannerSetUseMarkup, lib, "adw_banner_set_use_markup") | |
| 633 | + | core.PuregoSafeRegister(&xBannerGetButtonLabel, libs, "adw_banner_get_button_label") | |
| 634 | + | core.PuregoSafeRegister(&xBannerGetButtonStyle, libs, "adw_banner_get_button_style") | |
| 635 | + | core.PuregoSafeRegister(&xBannerGetRevealed, libs, "adw_banner_get_revealed") | |
| 636 | + | core.PuregoSafeRegister(&xBannerGetTitle, libs, "adw_banner_get_title") | |
| 637 | + | core.PuregoSafeRegister(&xBannerGetUseMarkup, libs, "adw_banner_get_use_markup") | |
| 638 | + | core.PuregoSafeRegister(&xBannerSetButtonLabel, libs, "adw_banner_set_button_label") | |
| 639 | + | core.PuregoSafeRegister(&xBannerSetButtonStyle, libs, "adw_banner_set_button_style") | |
| 640 | + | core.PuregoSafeRegister(&xBannerSetRevealed, libs, "adw_banner_set_revealed") | |
| 641 | + | core.PuregoSafeRegister(&xBannerSetTitle, libs, "adw_banner_set_title") | |
| 642 | + | core.PuregoSafeRegister(&xBannerSetUseMarkup, libs, "adw_banner_set_use_markup") | |
| 639 | 643 | ||
| 640 | 644 | } | |
M v4/adw/adw-bin.go +12 -8
| @@ -386,17 +386,21 @@ func (x *Bin) GetBuildableId() string { | |||
| 386 | 386 | ||
| 387 | 387 | func init() { | |
| 388 | 388 | core.SetPackageName("ADW", "libadwaita-1") | |
| 389 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 390 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 391 | - | if err != nil { | |
| 392 | - | panic(err) | |
| 389 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 390 | + | var libs []uintptr | |
| 391 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 392 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 393 | + | if err != nil { | |
| 394 | + | panic(err) | |
| 395 | + | } | |
| 396 | + | libs = append(libs, lib) | |
| 393 | 397 | } | |
| 394 | 398 | ||
| 395 | - | core.PuregoSafeRegister(&xBinGLibType, lib, "adw_bin_get_type") | |
| 399 | + | core.PuregoSafeRegister(&xBinGLibType, libs, "adw_bin_get_type") | |
| 396 | 400 | ||
| 397 | - | core.PuregoSafeRegister(&xNewBin, lib, "adw_bin_new") | |
| 401 | + | core.PuregoSafeRegister(&xNewBin, libs, "adw_bin_new") | |
| 398 | 402 | ||
| 399 | - | core.PuregoSafeRegister(&xBinGetChild, lib, "adw_bin_get_child") | |
| 400 | - | core.PuregoSafeRegister(&xBinSetChild, lib, "adw_bin_set_child") | |
| 403 | + | core.PuregoSafeRegister(&xBinGetChild, libs, "adw_bin_get_child") | |
| 404 | + | core.PuregoSafeRegister(&xBinSetChild, libs, "adw_bin_set_child") | |
| 401 | 405 | ||
| 402 | 406 | } | |
M v4/adw/adw-bottom-sheet.go +36 -32
| @@ -783,39 +783,43 @@ func (x *BottomSheet) GetBuildableId() string { | |||
| 783 | 783 | ||
| 784 | 784 | func init() { | |
| 785 | 785 | core.SetPackageName("ADW", "libadwaita-1") | |
| 786 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 787 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 788 | - | if err != nil { | |
| 789 | - | panic(err) | |
| 786 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 787 | + | var libs []uintptr | |
| 788 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 789 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 790 | + | if err != nil { | |
| 791 | + | panic(err) | |
| 792 | + | } | |
| 793 | + | libs = append(libs, lib) | |
| 790 | 794 | } | |
| 791 | 795 | ||
| 792 | - | core.PuregoSafeRegister(&xBottomSheetGLibType, lib, "adw_bottom_sheet_get_type") | |
| 793 | - | ||
| 794 | - | core.PuregoSafeRegister(&xNewBottomSheet, lib, "adw_bottom_sheet_new") | |
| 795 | - | ||
| 796 | - | core.PuregoSafeRegister(&xBottomSheetGetAlign, lib, "adw_bottom_sheet_get_align") | |
| 797 | - | core.PuregoSafeRegister(&xBottomSheetGetBottomBar, lib, "adw_bottom_sheet_get_bottom_bar") | |
| 798 | - | core.PuregoSafeRegister(&xBottomSheetGetBottomBarHeight, lib, "adw_bottom_sheet_get_bottom_bar_height") | |
| 799 | - | core.PuregoSafeRegister(&xBottomSheetGetCanClose, lib, "adw_bottom_sheet_get_can_close") | |
| 800 | - | core.PuregoSafeRegister(&xBottomSheetGetCanOpen, lib, "adw_bottom_sheet_get_can_open") | |
| 801 | - | core.PuregoSafeRegister(&xBottomSheetGetContent, lib, "adw_bottom_sheet_get_content") | |
| 802 | - | core.PuregoSafeRegister(&xBottomSheetGetFullWidth, lib, "adw_bottom_sheet_get_full_width") | |
| 803 | - | core.PuregoSafeRegister(&xBottomSheetGetModal, lib, "adw_bottom_sheet_get_modal") | |
| 804 | - | core.PuregoSafeRegister(&xBottomSheetGetOpen, lib, "adw_bottom_sheet_get_open") | |
| 805 | - | core.PuregoSafeRegister(&xBottomSheetGetRevealBottomBar, lib, "adw_bottom_sheet_get_reveal_bottom_bar") | |
| 806 | - | core.PuregoSafeRegister(&xBottomSheetGetSheet, lib, "adw_bottom_sheet_get_sheet") | |
| 807 | - | core.PuregoSafeRegister(&xBottomSheetGetSheetHeight, lib, "adw_bottom_sheet_get_sheet_height") | |
| 808 | - | core.PuregoSafeRegister(&xBottomSheetGetShowDragHandle, lib, "adw_bottom_sheet_get_show_drag_handle") | |
| 809 | - | core.PuregoSafeRegister(&xBottomSheetSetAlign, lib, "adw_bottom_sheet_set_align") | |
| 810 | - | core.PuregoSafeRegister(&xBottomSheetSetBottomBar, lib, "adw_bottom_sheet_set_bottom_bar") | |
| 811 | - | core.PuregoSafeRegister(&xBottomSheetSetCanClose, lib, "adw_bottom_sheet_set_can_close") | |
| 812 | - | core.PuregoSafeRegister(&xBottomSheetSetCanOpen, lib, "adw_bottom_sheet_set_can_open") | |
| 813 | - | core.PuregoSafeRegister(&xBottomSheetSetContent, lib, "adw_bottom_sheet_set_content") | |
| 814 | - | core.PuregoSafeRegister(&xBottomSheetSetFullWidth, lib, "adw_bottom_sheet_set_full_width") | |
| 815 | - | core.PuregoSafeRegister(&xBottomSheetSetModal, lib, "adw_bottom_sheet_set_modal") | |
| 816 | - | core.PuregoSafeRegister(&xBottomSheetSetOpen, lib, "adw_bottom_sheet_set_open") | |
| 817 | - | core.PuregoSafeRegister(&xBottomSheetSetRevealBottomBar, lib, "adw_bottom_sheet_set_reveal_bottom_bar") | |
| 818 | - | core.PuregoSafeRegister(&xBottomSheetSetSheet, lib, "adw_bottom_sheet_set_sheet") | |
| 819 | - | core.PuregoSafeRegister(&xBottomSheetSetShowDragHandle, lib, "adw_bottom_sheet_set_show_drag_handle") | |
| 796 | + | core.PuregoSafeRegister(&xBottomSheetGLibType, libs, "adw_bottom_sheet_get_type") | |
| 797 | + | ||
| 798 | + | core.PuregoSafeRegister(&xNewBottomSheet, libs, "adw_bottom_sheet_new") | |
| 799 | + | ||
| 800 | + | core.PuregoSafeRegister(&xBottomSheetGetAlign, libs, "adw_bottom_sheet_get_align") | |
| 801 | + | core.PuregoSafeRegister(&xBottomSheetGetBottomBar, libs, "adw_bottom_sheet_get_bottom_bar") | |
| 802 | + | core.PuregoSafeRegister(&xBottomSheetGetBottomBarHeight, libs, "adw_bottom_sheet_get_bottom_bar_height") | |
| 803 | + | core.PuregoSafeRegister(&xBottomSheetGetCanClose, libs, "adw_bottom_sheet_get_can_close") | |
| 804 | + | core.PuregoSafeRegister(&xBottomSheetGetCanOpen, libs, "adw_bottom_sheet_get_can_open") | |
| 805 | + | core.PuregoSafeRegister(&xBottomSheetGetContent, libs, "adw_bottom_sheet_get_content") | |
| 806 | + | core.PuregoSafeRegister(&xBottomSheetGetFullWidth, libs, "adw_bottom_sheet_get_full_width") | |
| 807 | + | core.PuregoSafeRegister(&xBottomSheetGetModal, libs, "adw_bottom_sheet_get_modal") | |
| 808 | + | core.PuregoSafeRegister(&xBottomSheetGetOpen, libs, "adw_bottom_sheet_get_open") | |
| 809 | + | core.PuregoSafeRegister(&xBottomSheetGetRevealBottomBar, libs, "adw_bottom_sheet_get_reveal_bottom_bar") | |
| 810 | + | core.PuregoSafeRegister(&xBottomSheetGetSheet, libs, "adw_bottom_sheet_get_sheet") | |
| 811 | + | core.PuregoSafeRegister(&xBottomSheetGetSheetHeight, libs, "adw_bottom_sheet_get_sheet_height") | |
| 812 | + | core.PuregoSafeRegister(&xBottomSheetGetShowDragHandle, libs, "adw_bottom_sheet_get_show_drag_handle") | |
| 813 | + | core.PuregoSafeRegister(&xBottomSheetSetAlign, libs, "adw_bottom_sheet_set_align") | |
| 814 | + | core.PuregoSafeRegister(&xBottomSheetSetBottomBar, libs, "adw_bottom_sheet_set_bottom_bar") | |
| 815 | + | core.PuregoSafeRegister(&xBottomSheetSetCanClose, libs, "adw_bottom_sheet_set_can_close") | |
| 816 | + | core.PuregoSafeRegister(&xBottomSheetSetCanOpen, libs, "adw_bottom_sheet_set_can_open") | |
| 817 | + | core.PuregoSafeRegister(&xBottomSheetSetContent, libs, "adw_bottom_sheet_set_content") | |
| 818 | + | core.PuregoSafeRegister(&xBottomSheetSetFullWidth, libs, "adw_bottom_sheet_set_full_width") | |
| 819 | + | core.PuregoSafeRegister(&xBottomSheetSetModal, libs, "adw_bottom_sheet_set_modal") | |
| 820 | + | core.PuregoSafeRegister(&xBottomSheetSetOpen, libs, "adw_bottom_sheet_set_open") | |
| 821 | + | core.PuregoSafeRegister(&xBottomSheetSetRevealBottomBar, libs, "adw_bottom_sheet_set_reveal_bottom_bar") | |
| 822 | + | core.PuregoSafeRegister(&xBottomSheetSetSheet, libs, "adw_bottom_sheet_set_sheet") | |
| 823 | + | core.PuregoSafeRegister(&xBottomSheetSetShowDragHandle, libs, "adw_bottom_sheet_set_show_drag_handle") | |
| 820 | 824 | ||
| 821 | 825 | } | |
M v4/adw/adw-breakpoint-bin.go +15 -11
| @@ -526,20 +526,24 @@ func (x *BreakpointBin) GetBuildableId() string { | |||
| 526 | 526 | ||
| 527 | 527 | func init() { | |
| 528 | 528 | core.SetPackageName("ADW", "libadwaita-1") | |
| 529 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 530 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 531 | - | if err != nil { | |
| 532 | - | panic(err) | |
| 529 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 530 | + | var libs []uintptr | |
| 531 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 532 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 533 | + | if err != nil { | |
| 534 | + | panic(err) | |
| 535 | + | } | |
| 536 | + | libs = append(libs, lib) | |
| 533 | 537 | } | |
| 534 | 538 | ||
| 535 | - | core.PuregoSafeRegister(&xBreakpointBinGLibType, lib, "adw_breakpoint_bin_get_type") | |
| 539 | + | core.PuregoSafeRegister(&xBreakpointBinGLibType, libs, "adw_breakpoint_bin_get_type") | |
| 536 | 540 | ||
| 537 | - | core.PuregoSafeRegister(&xNewBreakpointBin, lib, "adw_breakpoint_bin_new") | |
| 541 | + | core.PuregoSafeRegister(&xNewBreakpointBin, libs, "adw_breakpoint_bin_new") | |
| 538 | 542 | ||
| 539 | - | core.PuregoSafeRegister(&xBreakpointBinAddBreakpoint, lib, "adw_breakpoint_bin_add_breakpoint") | |
| 540 | - | core.PuregoSafeRegister(&xBreakpointBinGetChild, lib, "adw_breakpoint_bin_get_child") | |
| 541 | - | core.PuregoSafeRegister(&xBreakpointBinGetCurrentBreakpoint, lib, "adw_breakpoint_bin_get_current_breakpoint") | |
| 542 | - | core.PuregoSafeRegister(&xBreakpointBinRemoveBreakpoint, lib, "adw_breakpoint_bin_remove_breakpoint") | |
| 543 | - | core.PuregoSafeRegister(&xBreakpointBinSetChild, lib, "adw_breakpoint_bin_set_child") | |
| 543 | + | core.PuregoSafeRegister(&xBreakpointBinAddBreakpoint, libs, "adw_breakpoint_bin_add_breakpoint") | |
| 544 | + | core.PuregoSafeRegister(&xBreakpointBinGetChild, libs, "adw_breakpoint_bin_get_child") | |
| 545 | + | core.PuregoSafeRegister(&xBreakpointBinGetCurrentBreakpoint, libs, "adw_breakpoint_bin_get_current_breakpoint") | |
| 546 | + | core.PuregoSafeRegister(&xBreakpointBinRemoveBreakpoint, libs, "adw_breakpoint_bin_remove_breakpoint") | |
| 547 | + | core.PuregoSafeRegister(&xBreakpointBinSetChild, libs, "adw_breakpoint_bin_set_child") | |
| 544 | 548 | ||
| 545 | 549 | } | |
M v4/adw/adw-breakpoint.go +27 -23
| @@ -487,38 +487,42 @@ func (x *Breakpoint) GetBuildableId() string { | |||
| 487 | 487 | ||
| 488 | 488 | func init() { | |
| 489 | 489 | core.SetPackageName("ADW", "libadwaita-1") | |
| 490 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 491 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 492 | - | if err != nil { | |
| 493 | - | panic(err) | |
| 490 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 491 | + | var libs []uintptr | |
| 492 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 493 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 494 | + | if err != nil { | |
| 495 | + | panic(err) | |
| 496 | + | } | |
| 497 | + | libs = append(libs, lib) | |
| 494 | 498 | } | |
| 495 | 499 | ||
| 496 | - | core.PuregoSafeRegister(&xBreakpointConditionLengthTypeGLibType, lib, "adw_breakpoint_condition_length_type_get_type") | |
| 500 | + | core.PuregoSafeRegister(&xBreakpointConditionLengthTypeGLibType, libs, "adw_breakpoint_condition_length_type_get_type") | |
| 497 | 501 | ||
| 498 | - | core.PuregoSafeRegister(&xBreakpointConditionRatioTypeGLibType, lib, "adw_breakpoint_condition_ratio_type_get_type") | |
| 502 | + | core.PuregoSafeRegister(&xBreakpointConditionRatioTypeGLibType, libs, "adw_breakpoint_condition_ratio_type_get_type") | |
| 499 | 503 | ||
| 500 | - | core.PuregoSafeRegister(&xBreakpointConditionParse, lib, "adw_breakpoint_condition_parse") | |
| 504 | + | core.PuregoSafeRegister(&xBreakpointConditionParse, libs, "adw_breakpoint_condition_parse") | |
| 501 | 505 | ||
| 502 | - | core.PuregoSafeRegister(&xBreakpointConditionGLibType, lib, "adw_breakpoint_condition_get_type") | |
| 506 | + | core.PuregoSafeRegister(&xBreakpointConditionGLibType, libs, "adw_breakpoint_condition_get_type") | |
| 503 | 507 | ||
| 504 | - | core.PuregoSafeRegister(&xNewBreakpointConditionAnd, lib, "adw_breakpoint_condition_new_and") | |
| 505 | - | core.PuregoSafeRegister(&xNewBreakpointConditionLength, lib, "adw_breakpoint_condition_new_length") | |
| 506 | - | core.PuregoSafeRegister(&xNewBreakpointConditionOr, lib, "adw_breakpoint_condition_new_or") | |
| 507 | - | core.PuregoSafeRegister(&xNewBreakpointConditionRatio, lib, "adw_breakpoint_condition_new_ratio") | |
| 508 | + | core.PuregoSafeRegister(&xNewBreakpointConditionAnd, libs, "adw_breakpoint_condition_new_and") | |
| 509 | + | core.PuregoSafeRegister(&xNewBreakpointConditionLength, libs, "adw_breakpoint_condition_new_length") | |
| 510 | + | core.PuregoSafeRegister(&xNewBreakpointConditionOr, libs, "adw_breakpoint_condition_new_or") | |
| 511 | + | core.PuregoSafeRegister(&xNewBreakpointConditionRatio, libs, "adw_breakpoint_condition_new_ratio") | |
| 508 | 512 | ||
| 509 | - | core.PuregoSafeRegister(&xBreakpointConditionCopy, lib, "adw_breakpoint_condition_copy") | |
| 510 | - | core.PuregoSafeRegister(&xBreakpointConditionFree, lib, "adw_breakpoint_condition_free") | |
| 511 | - | core.PuregoSafeRegister(&xBreakpointConditionToString, lib, "adw_breakpoint_condition_to_string") | |
| 513 | + | core.PuregoSafeRegister(&xBreakpointConditionCopy, libs, "adw_breakpoint_condition_copy") | |
| 514 | + | core.PuregoSafeRegister(&xBreakpointConditionFree, libs, "adw_breakpoint_condition_free") | |
| 515 | + | core.PuregoSafeRegister(&xBreakpointConditionToString, libs, "adw_breakpoint_condition_to_string") | |
| 512 | 516 | ||
| 513 | - | core.PuregoSafeRegister(&xBreakpointGLibType, lib, "adw_breakpoint_get_type") | |
| 517 | + | core.PuregoSafeRegister(&xBreakpointGLibType, libs, "adw_breakpoint_get_type") | |
| 514 | 518 | ||
| 515 | - | core.PuregoSafeRegister(&xNewBreakpoint, lib, "adw_breakpoint_new") | |
| 519 | + | core.PuregoSafeRegister(&xNewBreakpoint, libs, "adw_breakpoint_new") | |
| 516 | 520 | ||
| 517 | - | core.PuregoSafeRegister(&xBreakpointAddSetter, lib, "adw_breakpoint_add_setter") | |
| 518 | - | core.PuregoSafeRegister(&xBreakpointAddSetters, lib, "adw_breakpoint_add_setters") | |
| 519 | - | core.PuregoSafeRegister(&xBreakpointAddSettersValist, lib, "adw_breakpoint_add_setters_valist") | |
| 520 | - | core.PuregoSafeRegister(&xBreakpointAddSettersv, lib, "adw_breakpoint_add_settersv") | |
| 521 | - | core.PuregoSafeRegister(&xBreakpointGetCondition, lib, "adw_breakpoint_get_condition") | |
| 522 | - | core.PuregoSafeRegister(&xBreakpointSetCondition, lib, "adw_breakpoint_set_condition") | |
| 521 | + | core.PuregoSafeRegister(&xBreakpointAddSetter, libs, "adw_breakpoint_add_setter") | |
| 522 | + | core.PuregoSafeRegister(&xBreakpointAddSetters, libs, "adw_breakpoint_add_setters") | |
| 523 | + | core.PuregoSafeRegister(&xBreakpointAddSettersValist, libs, "adw_breakpoint_add_setters_valist") | |
| 524 | + | core.PuregoSafeRegister(&xBreakpointAddSettersv, libs, "adw_breakpoint_add_settersv") | |
| 525 | + | core.PuregoSafeRegister(&xBreakpointGetCondition, libs, "adw_breakpoint_get_condition") | |
| 526 | + | core.PuregoSafeRegister(&xBreakpointSetCondition, libs, "adw_breakpoint_set_condition") | |
| 523 | 527 | ||
| 524 | 528 | } | |
M v4/adw/adw-button-content.go +18 -14
| @@ -481,23 +481,27 @@ func (x *ButtonContent) GetBuildableId() string { | |||
| 481 | 481 | ||
| 482 | 482 | func init() { | |
| 483 | 483 | core.SetPackageName("ADW", "libadwaita-1") | |
| 484 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 485 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 486 | - | if err != nil { | |
| 487 | - | panic(err) | |
| 484 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 485 | + | var libs []uintptr | |
| 486 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 487 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 488 | + | if err != nil { | |
| 489 | + | panic(err) | |
| 490 | + | } | |
| 491 | + | libs = append(libs, lib) | |
| 488 | 492 | } | |
| 489 | 493 | ||
| 490 | - | core.PuregoSafeRegister(&xButtonContentGLibType, lib, "adw_button_content_get_type") | |
| 494 | + | core.PuregoSafeRegister(&xButtonContentGLibType, libs, "adw_button_content_get_type") | |
| 491 | 495 | ||
| 492 | - | core.PuregoSafeRegister(&xNewButtonContent, lib, "adw_button_content_new") | |
| 496 | + | core.PuregoSafeRegister(&xNewButtonContent, libs, "adw_button_content_new") | |
| 493 | 497 | ||
| 494 | - | core.PuregoSafeRegister(&xButtonContentGetCanShrink, lib, "adw_button_content_get_can_shrink") | |
| 495 | - | core.PuregoSafeRegister(&xButtonContentGetIconName, lib, "adw_button_content_get_icon_name") | |
| 496 | - | core.PuregoSafeRegister(&xButtonContentGetLabel, lib, "adw_button_content_get_label") | |
| 497 | - | core.PuregoSafeRegister(&xButtonContentGetUseUnderline, lib, "adw_button_content_get_use_underline") | |
| 498 | - | core.PuregoSafeRegister(&xButtonContentSetCanShrink, lib, "adw_button_content_set_can_shrink") | |
| 499 | - | core.PuregoSafeRegister(&xButtonContentSetIconName, lib, "adw_button_content_set_icon_name") | |
| 500 | - | core.PuregoSafeRegister(&xButtonContentSetLabel, lib, "adw_button_content_set_label") | |
| 501 | - | core.PuregoSafeRegister(&xButtonContentSetUseUnderline, lib, "adw_button_content_set_use_underline") | |
| 498 | + | core.PuregoSafeRegister(&xButtonContentGetCanShrink, libs, "adw_button_content_get_can_shrink") | |
| 499 | + | core.PuregoSafeRegister(&xButtonContentGetIconName, libs, "adw_button_content_get_icon_name") | |
| 500 | + | core.PuregoSafeRegister(&xButtonContentGetLabel, libs, "adw_button_content_get_label") | |
| 501 | + | core.PuregoSafeRegister(&xButtonContentGetUseUnderline, libs, "adw_button_content_get_use_underline") | |
| 502 | + | core.PuregoSafeRegister(&xButtonContentSetCanShrink, libs, "adw_button_content_set_can_shrink") | |
| 503 | + | core.PuregoSafeRegister(&xButtonContentSetIconName, libs, "adw_button_content_set_icon_name") | |
| 504 | + | core.PuregoSafeRegister(&xButtonContentSetLabel, libs, "adw_button_content_set_label") | |
| 505 | + | core.PuregoSafeRegister(&xButtonContentSetUseUnderline, libs, "adw_button_content_set_use_underline") | |
| 502 | 506 | ||
| 503 | 507 | } | |
M v4/adw/adw-button-row.go +14 -10
| @@ -536,19 +536,23 @@ func (x *ButtonRow) GetBuildableId() string { | |||
| 536 | 536 | ||
| 537 | 537 | func init() { | |
| 538 | 538 | core.SetPackageName("ADW", "libadwaita-1") | |
| 539 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 540 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 541 | - | if err != nil { | |
| 542 | - | panic(err) | |
| 539 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 540 | + | var libs []uintptr | |
| 541 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 542 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 543 | + | if err != nil { | |
| 544 | + | panic(err) | |
| 545 | + | } | |
| 546 | + | libs = append(libs, lib) | |
| 543 | 547 | } | |
| 544 | 548 | ||
| 545 | - | core.PuregoSafeRegister(&xButtonRowGLibType, lib, "adw_button_row_get_type") | |
| 549 | + | core.PuregoSafeRegister(&xButtonRowGLibType, libs, "adw_button_row_get_type") | |
| 546 | 550 | ||
| 547 | - | core.PuregoSafeRegister(&xNewButtonRow, lib, "adw_button_row_new") | |
| 551 | + | core.PuregoSafeRegister(&xNewButtonRow, libs, "adw_button_row_new") | |
| 548 | 552 | ||
| 549 | - | core.PuregoSafeRegister(&xButtonRowGetEndIconName, lib, "adw_button_row_get_end_icon_name") | |
| 550 | - | core.PuregoSafeRegister(&xButtonRowGetStartIconName, lib, "adw_button_row_get_start_icon_name") | |
| 551 | - | core.PuregoSafeRegister(&xButtonRowSetEndIconName, lib, "adw_button_row_set_end_icon_name") | |
| 552 | - | core.PuregoSafeRegister(&xButtonRowSetStartIconName, lib, "adw_button_row_set_start_icon_name") | |
| 553 | + | core.PuregoSafeRegister(&xButtonRowGetEndIconName, libs, "adw_button_row_get_end_icon_name") | |
| 554 | + | core.PuregoSafeRegister(&xButtonRowGetStartIconName, libs, "adw_button_row_get_start_icon_name") | |
| 555 | + | core.PuregoSafeRegister(&xButtonRowSetEndIconName, libs, "adw_button_row_set_end_icon_name") | |
| 556 | + | core.PuregoSafeRegister(&xButtonRowSetStartIconName, libs, "adw_button_row_set_start_icon_name") | |
| 553 | 557 | ||
| 554 | 558 | } | |
M v4/adw/adw-carousel-indicator-dots.go +12 -8
| @@ -406,17 +406,21 @@ func (x *CarouselIndicatorDots) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 406 | 406 | ||
| 407 | 407 | func init() { | |
| 408 | 408 | core.SetPackageName("ADW", "libadwaita-1") | |
| 409 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 410 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 411 | - | if err != nil { | |
| 412 | - | panic(err) | |
| 409 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 410 | + | var libs []uintptr | |
| 411 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 412 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 413 | + | if err != nil { | |
| 414 | + | panic(err) | |
| 415 | + | } | |
| 416 | + | libs = append(libs, lib) | |
| 413 | 417 | } | |
| 414 | 418 | ||
| 415 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsGLibType, lib, "adw_carousel_indicator_dots_get_type") | |
| 419 | + | core.PuregoSafeRegister(&xCarouselIndicatorDotsGLibType, libs, "adw_carousel_indicator_dots_get_type") | |
| 416 | 420 | ||
| 417 | - | core.PuregoSafeRegister(&xNewCarouselIndicatorDots, lib, "adw_carousel_indicator_dots_new") | |
| 421 | + | core.PuregoSafeRegister(&xNewCarouselIndicatorDots, libs, "adw_carousel_indicator_dots_new") | |
| 418 | 422 | ||
| 419 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsGetCarousel, lib, "adw_carousel_indicator_dots_get_carousel") | |
| 420 | - | core.PuregoSafeRegister(&xCarouselIndicatorDotsSetCarousel, lib, "adw_carousel_indicator_dots_set_carousel") | |
| 423 | + | core.PuregoSafeRegister(&xCarouselIndicatorDotsGetCarousel, libs, "adw_carousel_indicator_dots_get_carousel") | |
| 424 | + | core.PuregoSafeRegister(&xCarouselIndicatorDotsSetCarousel, libs, "adw_carousel_indicator_dots_set_carousel") | |
| 421 | 425 | ||
| 422 | 426 | } | |
M v4/adw/adw-carousel-indicator-lines.go +12 -8
| @@ -405,17 +405,21 @@ func (x *CarouselIndicatorLines) SetOrientation(OrientationVar gtk.Orientation) | |||
| 405 | 405 | ||
| 406 | 406 | func init() { | |
| 407 | 407 | core.SetPackageName("ADW", "libadwaita-1") | |
| 408 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 409 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 410 | - | if err != nil { | |
| 411 | - | panic(err) | |
| 408 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 409 | + | var libs []uintptr | |
| 410 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 411 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 412 | + | if err != nil { | |
| 413 | + | panic(err) | |
| 414 | + | } | |
| 415 | + | libs = append(libs, lib) | |
| 412 | 416 | } | |
| 413 | 417 | ||
| 414 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesGLibType, lib, "adw_carousel_indicator_lines_get_type") | |
| 418 | + | core.PuregoSafeRegister(&xCarouselIndicatorLinesGLibType, libs, "adw_carousel_indicator_lines_get_type") | |
| 415 | 419 | ||
| 416 | - | core.PuregoSafeRegister(&xNewCarouselIndicatorLines, lib, "adw_carousel_indicator_lines_new") | |
| 420 | + | core.PuregoSafeRegister(&xNewCarouselIndicatorLines, libs, "adw_carousel_indicator_lines_new") | |
| 417 | 421 | ||
| 418 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesGetCarousel, lib, "adw_carousel_indicator_lines_get_carousel") | |
| 419 | - | core.PuregoSafeRegister(&xCarouselIndicatorLinesSetCarousel, lib, "adw_carousel_indicator_lines_set_carousel") | |
| 422 | + | core.PuregoSafeRegister(&xCarouselIndicatorLinesGetCarousel, libs, "adw_carousel_indicator_lines_get_carousel") | |
| 423 | + | core.PuregoSafeRegister(&xCarouselIndicatorLinesSetCarousel, libs, "adw_carousel_indicator_lines_set_carousel") | |
| 420 | 424 | ||
| 421 | 425 | } | |
M v4/adw/adw-carousel.go +35 -31
| @@ -698,38 +698,42 @@ func (x *Carousel) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 698 | 698 | ||
| 699 | 699 | func init() { | |
| 700 | 700 | core.SetPackageName("ADW", "libadwaita-1") | |
| 701 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 702 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 703 | - | if err != nil { | |
| 704 | - | panic(err) | |
| 701 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 702 | + | var libs []uintptr | |
| 703 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 704 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 705 | + | if err != nil { | |
| 706 | + | panic(err) | |
| 707 | + | } | |
| 708 | + | libs = append(libs, lib) | |
| 705 | 709 | } | |
| 706 | 710 | ||
| 707 | - | core.PuregoSafeRegister(&xCarouselGLibType, lib, "adw_carousel_get_type") | |
| 708 | - | ||
| 709 | - | core.PuregoSafeRegister(&xNewCarousel, lib, "adw_carousel_new") | |
| 710 | - | ||
| 711 | - | core.PuregoSafeRegister(&xCarouselAppend, lib, "adw_carousel_append") | |
| 712 | - | core.PuregoSafeRegister(&xCarouselGetAllowLongSwipes, lib, "adw_carousel_get_allow_long_swipes") | |
| 713 | - | core.PuregoSafeRegister(&xCarouselGetAllowMouseDrag, lib, "adw_carousel_get_allow_mouse_drag") | |
| 714 | - | core.PuregoSafeRegister(&xCarouselGetAllowScrollWheel, lib, "adw_carousel_get_allow_scroll_wheel") | |
| 715 | - | core.PuregoSafeRegister(&xCarouselGetInteractive, lib, "adw_carousel_get_interactive") | |
| 716 | - | core.PuregoSafeRegister(&xCarouselGetNPages, lib, "adw_carousel_get_n_pages") | |
| 717 | - | core.PuregoSafeRegister(&xCarouselGetNthPage, lib, "adw_carousel_get_nth_page") | |
| 718 | - | core.PuregoSafeRegister(&xCarouselGetPosition, lib, "adw_carousel_get_position") | |
| 719 | - | core.PuregoSafeRegister(&xCarouselGetRevealDuration, lib, "adw_carousel_get_reveal_duration") | |
| 720 | - | core.PuregoSafeRegister(&xCarouselGetScrollParams, lib, "adw_carousel_get_scroll_params") | |
| 721 | - | core.PuregoSafeRegister(&xCarouselGetSpacing, lib, "adw_carousel_get_spacing") | |
| 722 | - | core.PuregoSafeRegister(&xCarouselInsert, lib, "adw_carousel_insert") | |
| 723 | - | core.PuregoSafeRegister(&xCarouselPrepend, lib, "adw_carousel_prepend") | |
| 724 | - | core.PuregoSafeRegister(&xCarouselRemove, lib, "adw_carousel_remove") | |
| 725 | - | core.PuregoSafeRegister(&xCarouselReorder, lib, "adw_carousel_reorder") | |
| 726 | - | core.PuregoSafeRegister(&xCarouselScrollTo, lib, "adw_carousel_scroll_to") | |
| 727 | - | core.PuregoSafeRegister(&xCarouselSetAllowLongSwipes, lib, "adw_carousel_set_allow_long_swipes") | |
| 728 | - | core.PuregoSafeRegister(&xCarouselSetAllowMouseDrag, lib, "adw_carousel_set_allow_mouse_drag") | |
| 729 | - | core.PuregoSafeRegister(&xCarouselSetAllowScrollWheel, lib, "adw_carousel_set_allow_scroll_wheel") | |
| 730 | - | core.PuregoSafeRegister(&xCarouselSetInteractive, lib, "adw_carousel_set_interactive") | |
| 731 | - | core.PuregoSafeRegister(&xCarouselSetRevealDuration, lib, "adw_carousel_set_reveal_duration") | |
| 732 | - | core.PuregoSafeRegister(&xCarouselSetScrollParams, lib, "adw_carousel_set_scroll_params") | |
| 733 | - | core.PuregoSafeRegister(&xCarouselSetSpacing, lib, "adw_carousel_set_spacing") | |
| 711 | + | core.PuregoSafeRegister(&xCarouselGLibType, libs, "adw_carousel_get_type") | |
| 712 | + | ||
| 713 | + | core.PuregoSafeRegister(&xNewCarousel, libs, "adw_carousel_new") | |
| 714 | + | ||
| 715 | + | core.PuregoSafeRegister(&xCarouselAppend, libs, "adw_carousel_append") | |
| 716 | + | core.PuregoSafeRegister(&xCarouselGetAllowLongSwipes, libs, "adw_carousel_get_allow_long_swipes") | |
| 717 | + | core.PuregoSafeRegister(&xCarouselGetAllowMouseDrag, libs, "adw_carousel_get_allow_mouse_drag") | |
| 718 | + | core.PuregoSafeRegister(&xCarouselGetAllowScrollWheel, libs, "adw_carousel_get_allow_scroll_wheel") | |
| 719 | + | core.PuregoSafeRegister(&xCarouselGetInteractive, libs, "adw_carousel_get_interactive") | |
| 720 | + | core.PuregoSafeRegister(&xCarouselGetNPages, libs, "adw_carousel_get_n_pages") | |
| 721 | + | core.PuregoSafeRegister(&xCarouselGetNthPage, libs, "adw_carousel_get_nth_page") | |
| 722 | + | core.PuregoSafeRegister(&xCarouselGetPosition, libs, "adw_carousel_get_position") | |
| 723 | + | core.PuregoSafeRegister(&xCarouselGetRevealDuration, libs, "adw_carousel_get_reveal_duration") | |
| 724 | + | core.PuregoSafeRegister(&xCarouselGetScrollParams, libs, "adw_carousel_get_scroll_params") | |
| 725 | + | core.PuregoSafeRegister(&xCarouselGetSpacing, libs, "adw_carousel_get_spacing") | |
| 726 | + | core.PuregoSafeRegister(&xCarouselInsert, libs, "adw_carousel_insert") | |
| 727 | + | core.PuregoSafeRegister(&xCarouselPrepend, libs, "adw_carousel_prepend") | |
| 728 | + | core.PuregoSafeRegister(&xCarouselRemove, libs, "adw_carousel_remove") | |
| 729 | + | core.PuregoSafeRegister(&xCarouselReorder, libs, "adw_carousel_reorder") | |
| 730 | + | core.PuregoSafeRegister(&xCarouselScrollTo, libs, "adw_carousel_scroll_to") | |
| 731 | + | core.PuregoSafeRegister(&xCarouselSetAllowLongSwipes, libs, "adw_carousel_set_allow_long_swipes") | |
| 732 | + | core.PuregoSafeRegister(&xCarouselSetAllowMouseDrag, libs, "adw_carousel_set_allow_mouse_drag") | |
| 733 | + | core.PuregoSafeRegister(&xCarouselSetAllowScrollWheel, libs, "adw_carousel_set_allow_scroll_wheel") | |
| 734 | + | core.PuregoSafeRegister(&xCarouselSetInteractive, libs, "adw_carousel_set_interactive") | |
| 735 | + | core.PuregoSafeRegister(&xCarouselSetRevealDuration, libs, "adw_carousel_set_reveal_duration") | |
| 736 | + | core.PuregoSafeRegister(&xCarouselSetScrollParams, libs, "adw_carousel_set_scroll_params") | |
| 737 | + | core.PuregoSafeRegister(&xCarouselSetSpacing, libs, "adw_carousel_set_spacing") | |
| 734 | 738 | ||
| 735 | 739 | } | |
M v4/adw/adw-clamp-layout.go +16 -12
| @@ -178,21 +178,25 @@ func (x *ClampLayout) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 178 | 178 | ||
| 179 | 179 | func init() { | |
| 180 | 180 | core.SetPackageName("ADW", "libadwaita-1") | |
| 181 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 182 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 183 | - | if err != nil { | |
| 184 | - | panic(err) | |
| 181 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 182 | + | var libs []uintptr | |
| 183 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 184 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 185 | + | if err != nil { | |
| 186 | + | panic(err) | |
| 187 | + | } | |
| 188 | + | libs = append(libs, lib) | |
| 185 | 189 | } | |
| 186 | 190 | ||
| 187 | - | core.PuregoSafeRegister(&xClampLayoutGLibType, lib, "adw_clamp_layout_get_type") | |
| 191 | + | core.PuregoSafeRegister(&xClampLayoutGLibType, libs, "adw_clamp_layout_get_type") | |
| 188 | 192 | ||
| 189 | - | core.PuregoSafeRegister(&xNewClampLayout, lib, "adw_clamp_layout_new") | |
| 193 | + | core.PuregoSafeRegister(&xNewClampLayout, libs, "adw_clamp_layout_new") | |
| 190 | 194 | ||
| 191 | - | core.PuregoSafeRegister(&xClampLayoutGetMaximumSize, lib, "adw_clamp_layout_get_maximum_size") | |
| 192 | - | core.PuregoSafeRegister(&xClampLayoutGetTighteningThreshold, lib, "adw_clamp_layout_get_tightening_threshold") | |
| 193 | - | core.PuregoSafeRegister(&xClampLayoutGetUnit, lib, "adw_clamp_layout_get_unit") | |
| 194 | - | core.PuregoSafeRegister(&xClampLayoutSetMaximumSize, lib, "adw_clamp_layout_set_maximum_size") | |
| 195 | - | core.PuregoSafeRegister(&xClampLayoutSetTighteningThreshold, lib, "adw_clamp_layout_set_tightening_threshold") | |
| 196 | - | core.PuregoSafeRegister(&xClampLayoutSetUnit, lib, "adw_clamp_layout_set_unit") | |
| 195 | + | core.PuregoSafeRegister(&xClampLayoutGetMaximumSize, libs, "adw_clamp_layout_get_maximum_size") | |
| 196 | + | core.PuregoSafeRegister(&xClampLayoutGetTighteningThreshold, libs, "adw_clamp_layout_get_tightening_threshold") | |
| 197 | + | core.PuregoSafeRegister(&xClampLayoutGetUnit, libs, "adw_clamp_layout_get_unit") | |
| 198 | + | core.PuregoSafeRegister(&xClampLayoutSetMaximumSize, libs, "adw_clamp_layout_set_maximum_size") | |
| 199 | + | core.PuregoSafeRegister(&xClampLayoutSetTighteningThreshold, libs, "adw_clamp_layout_set_tightening_threshold") | |
| 200 | + | core.PuregoSafeRegister(&xClampLayoutSetUnit, libs, "adw_clamp_layout_set_unit") | |
| 197 | 201 | ||
| 198 | 202 | } | |
M v4/adw/adw-clamp-scrollable.go +18 -14
| @@ -556,23 +556,27 @@ func (x *ClampScrollable) SetVscrollPolicy(PolicyVar gtk.ScrollablePolicy) { | |||
| 556 | 556 | ||
| 557 | 557 | func init() { | |
| 558 | 558 | core.SetPackageName("ADW", "libadwaita-1") | |
| 559 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 560 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 561 | - | if err != nil { | |
| 562 | - | panic(err) | |
| 559 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 560 | + | var libs []uintptr | |
| 561 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 562 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 563 | + | if err != nil { | |
| 564 | + | panic(err) | |
| 565 | + | } | |
| 566 | + | libs = append(libs, lib) | |
| 563 | 567 | } | |
| 564 | 568 | ||
| 565 | - | core.PuregoSafeRegister(&xClampScrollableGLibType, lib, "adw_clamp_scrollable_get_type") | |
| 569 | + | core.PuregoSafeRegister(&xClampScrollableGLibType, libs, "adw_clamp_scrollable_get_type") | |
| 566 | 570 | ||
| 567 | - | core.PuregoSafeRegister(&xNewClampScrollable, lib, "adw_clamp_scrollable_new") | |
| 571 | + | core.PuregoSafeRegister(&xNewClampScrollable, libs, "adw_clamp_scrollable_new") | |
| 568 | 572 | ||
| 569 | - | core.PuregoSafeRegister(&xClampScrollableGetChild, lib, "adw_clamp_scrollable_get_child") | |
| 570 | - | core.PuregoSafeRegister(&xClampScrollableGetMaximumSize, lib, "adw_clamp_scrollable_get_maximum_size") | |
| 571 | - | core.PuregoSafeRegister(&xClampScrollableGetTighteningThreshold, lib, "adw_clamp_scrollable_get_tightening_threshold") | |
| 572 | - | core.PuregoSafeRegister(&xClampScrollableGetUnit, lib, "adw_clamp_scrollable_get_unit") | |
| 573 | - | core.PuregoSafeRegister(&xClampScrollableSetChild, lib, "adw_clamp_scrollable_set_child") | |
| 574 | - | core.PuregoSafeRegister(&xClampScrollableSetMaximumSize, lib, "adw_clamp_scrollable_set_maximum_size") | |
| 575 | - | core.PuregoSafeRegister(&xClampScrollableSetTighteningThreshold, lib, "adw_clamp_scrollable_set_tightening_threshold") | |
| 576 | - | core.PuregoSafeRegister(&xClampScrollableSetUnit, lib, "adw_clamp_scrollable_set_unit") | |
| 573 | + | core.PuregoSafeRegister(&xClampScrollableGetChild, libs, "adw_clamp_scrollable_get_child") | |
| 574 | + | core.PuregoSafeRegister(&xClampScrollableGetMaximumSize, libs, "adw_clamp_scrollable_get_maximum_size") | |
| 575 | + | core.PuregoSafeRegister(&xClampScrollableGetTighteningThreshold, libs, "adw_clamp_scrollable_get_tightening_threshold") | |
| 576 | + | core.PuregoSafeRegister(&xClampScrollableGetUnit, libs, "adw_clamp_scrollable_get_unit") | |
| 577 | + | core.PuregoSafeRegister(&xClampScrollableSetChild, libs, "adw_clamp_scrollable_set_child") | |
| 578 | + | core.PuregoSafeRegister(&xClampScrollableSetMaximumSize, libs, "adw_clamp_scrollable_set_maximum_size") | |
| 579 | + | core.PuregoSafeRegister(&xClampScrollableSetTighteningThreshold, libs, "adw_clamp_scrollable_set_tightening_threshold") | |
| 580 | + | core.PuregoSafeRegister(&xClampScrollableSetUnit, libs, "adw_clamp_scrollable_set_unit") | |
| 577 | 581 | ||
| 578 | 582 | } | |
M v4/adw/adw-clamp.go +18 -14
| @@ -488,23 +488,27 @@ func (x *Clamp) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 488 | 488 | ||
| 489 | 489 | func init() { | |
| 490 | 490 | core.SetPackageName("ADW", "libadwaita-1") | |
| 491 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 492 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 493 | - | if err != nil { | |
| 494 | - | panic(err) | |
| 491 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 492 | + | var libs []uintptr | |
| 493 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 494 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 495 | + | if err != nil { | |
| 496 | + | panic(err) | |
| 497 | + | } | |
| 498 | + | libs = append(libs, lib) | |
| 495 | 499 | } | |
| 496 | 500 | ||
| 497 | - | core.PuregoSafeRegister(&xClampGLibType, lib, "adw_clamp_get_type") | |
| 501 | + | core.PuregoSafeRegister(&xClampGLibType, libs, "adw_clamp_get_type") | |
| 498 | 502 | ||
| 499 | - | core.PuregoSafeRegister(&xNewClamp, lib, "adw_clamp_new") | |
| 503 | + | core.PuregoSafeRegister(&xNewClamp, libs, "adw_clamp_new") | |
| 500 | 504 | ||
| 501 | - | core.PuregoSafeRegister(&xClampGetChild, lib, "adw_clamp_get_child") | |
| 502 | - | core.PuregoSafeRegister(&xClampGetMaximumSize, lib, "adw_clamp_get_maximum_size") | |
| 503 | - | core.PuregoSafeRegister(&xClampGetTighteningThreshold, lib, "adw_clamp_get_tightening_threshold") | |
| 504 | - | core.PuregoSafeRegister(&xClampGetUnit, lib, "adw_clamp_get_unit") | |
| 505 | - | core.PuregoSafeRegister(&xClampSetChild, lib, "adw_clamp_set_child") | |
| 506 | - | core.PuregoSafeRegister(&xClampSetMaximumSize, lib, "adw_clamp_set_maximum_size") | |
| 507 | - | core.PuregoSafeRegister(&xClampSetTighteningThreshold, lib, "adw_clamp_set_tightening_threshold") | |
| 508 | - | core.PuregoSafeRegister(&xClampSetUnit, lib, "adw_clamp_set_unit") | |
| 505 | + | core.PuregoSafeRegister(&xClampGetChild, libs, "adw_clamp_get_child") | |
| 506 | + | core.PuregoSafeRegister(&xClampGetMaximumSize, libs, "adw_clamp_get_maximum_size") | |
| 507 | + | core.PuregoSafeRegister(&xClampGetTighteningThreshold, libs, "adw_clamp_get_tightening_threshold") | |
| 508 | + | core.PuregoSafeRegister(&xClampGetUnit, libs, "adw_clamp_get_unit") | |
| 509 | + | core.PuregoSafeRegister(&xClampSetChild, libs, "adw_clamp_set_child") | |
| 510 | + | core.PuregoSafeRegister(&xClampSetMaximumSize, libs, "adw_clamp_set_maximum_size") | |
| 511 | + | core.PuregoSafeRegister(&xClampSetTighteningThreshold, libs, "adw_clamp_set_tightening_threshold") | |
| 512 | + | core.PuregoSafeRegister(&xClampSetUnit, libs, "adw_clamp_set_unit") | |
| 509 | 513 | ||
| 510 | 514 | } | |
M v4/adw/adw-combo-row.go +31 -27
| @@ -732,34 +732,38 @@ func (x *ComboRow) GetBuildableId() string { | |||
| 732 | 732 | ||
| 733 | 733 | func init() { | |
| 734 | 734 | core.SetPackageName("ADW", "libadwaita-1") | |
| 735 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 736 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 737 | - | if err != nil { | |
| 738 | - | panic(err) | |
| 735 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 736 | + | var libs []uintptr | |
| 737 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 738 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 739 | + | if err != nil { | |
| 740 | + | panic(err) | |
| 741 | + | } | |
| 742 | + | libs = append(libs, lib) | |
| 739 | 743 | } | |
| 740 | 744 | ||
| 741 | - | core.PuregoSafeRegister(&xComboRowGLibType, lib, "adw_combo_row_get_type") | |
| 742 | - | ||
| 743 | - | core.PuregoSafeRegister(&xNewComboRow, lib, "adw_combo_row_new") | |
| 744 | - | ||
| 745 | - | core.PuregoSafeRegister(&xComboRowGetEnableSearch, lib, "adw_combo_row_get_enable_search") | |
| 746 | - | core.PuregoSafeRegister(&xComboRowGetExpression, lib, "adw_combo_row_get_expression") | |
| 747 | - | core.PuregoSafeRegister(&xComboRowGetFactory, lib, "adw_combo_row_get_factory") | |
| 748 | - | core.PuregoSafeRegister(&xComboRowGetHeaderFactory, lib, "adw_combo_row_get_header_factory") | |
| 749 | - | core.PuregoSafeRegister(&xComboRowGetListFactory, lib, "adw_combo_row_get_list_factory") | |
| 750 | - | core.PuregoSafeRegister(&xComboRowGetModel, lib, "adw_combo_row_get_model") | |
| 751 | - | core.PuregoSafeRegister(&xComboRowGetSearchMatchMode, lib, "adw_combo_row_get_search_match_mode") | |
| 752 | - | core.PuregoSafeRegister(&xComboRowGetSelected, lib, "adw_combo_row_get_selected") | |
| 753 | - | core.PuregoSafeRegister(&xComboRowGetSelectedItem, lib, "adw_combo_row_get_selected_item") | |
| 754 | - | core.PuregoSafeRegister(&xComboRowGetUseSubtitle, lib, "adw_combo_row_get_use_subtitle") | |
| 755 | - | core.PuregoSafeRegister(&xComboRowSetEnableSearch, lib, "adw_combo_row_set_enable_search") | |
| 756 | - | core.PuregoSafeRegister(&xComboRowSetExpression, lib, "adw_combo_row_set_expression") | |
| 757 | - | core.PuregoSafeRegister(&xComboRowSetFactory, lib, "adw_combo_row_set_factory") | |
| 758 | - | core.PuregoSafeRegister(&xComboRowSetHeaderFactory, lib, "adw_combo_row_set_header_factory") | |
| 759 | - | core.PuregoSafeRegister(&xComboRowSetListFactory, lib, "adw_combo_row_set_list_factory") | |
| 760 | - | core.PuregoSafeRegister(&xComboRowSetModel, lib, "adw_combo_row_set_model") | |
| 761 | - | core.PuregoSafeRegister(&xComboRowSetSearchMatchMode, lib, "adw_combo_row_set_search_match_mode") | |
| 762 | - | core.PuregoSafeRegister(&xComboRowSetSelected, lib, "adw_combo_row_set_selected") | |
| 763 | - | core.PuregoSafeRegister(&xComboRowSetUseSubtitle, lib, "adw_combo_row_set_use_subtitle") | |
| 745 | + | core.PuregoSafeRegister(&xComboRowGLibType, libs, "adw_combo_row_get_type") | |
| 746 | + | ||
| 747 | + | core.PuregoSafeRegister(&xNewComboRow, libs, "adw_combo_row_new") | |
| 748 | + | ||
| 749 | + | core.PuregoSafeRegister(&xComboRowGetEnableSearch, libs, "adw_combo_row_get_enable_search") | |
| 750 | + | core.PuregoSafeRegister(&xComboRowGetExpression, libs, "adw_combo_row_get_expression") | |
| 751 | + | core.PuregoSafeRegister(&xComboRowGetFactory, libs, "adw_combo_row_get_factory") | |
| 752 | + | core.PuregoSafeRegister(&xComboRowGetHeaderFactory, libs, "adw_combo_row_get_header_factory") | |
| 753 | + | core.PuregoSafeRegister(&xComboRowGetListFactory, libs, "adw_combo_row_get_list_factory") | |
| 754 | + | core.PuregoSafeRegister(&xComboRowGetModel, libs, "adw_combo_row_get_model") | |
| 755 | + | core.PuregoSafeRegister(&xComboRowGetSearchMatchMode, libs, "adw_combo_row_get_search_match_mode") | |
| 756 | + | core.PuregoSafeRegister(&xComboRowGetSelected, libs, "adw_combo_row_get_selected") | |
| 757 | + | core.PuregoSafeRegister(&xComboRowGetSelectedItem, libs, "adw_combo_row_get_selected_item") | |
| 758 | + | core.PuregoSafeRegister(&xComboRowGetUseSubtitle, libs, "adw_combo_row_get_use_subtitle") | |
| 759 | + | core.PuregoSafeRegister(&xComboRowSetEnableSearch, libs, "adw_combo_row_set_enable_search") | |
| 760 | + | core.PuregoSafeRegister(&xComboRowSetExpression, libs, "adw_combo_row_set_expression") | |
| 761 | + | core.PuregoSafeRegister(&xComboRowSetFactory, libs, "adw_combo_row_set_factory") | |
| 762 | + | core.PuregoSafeRegister(&xComboRowSetHeaderFactory, libs, "adw_combo_row_set_header_factory") | |
| 763 | + | core.PuregoSafeRegister(&xComboRowSetListFactory, libs, "adw_combo_row_set_list_factory") | |
| 764 | + | core.PuregoSafeRegister(&xComboRowSetModel, libs, "adw_combo_row_set_model") | |
| 765 | + | core.PuregoSafeRegister(&xComboRowSetSearchMatchMode, libs, "adw_combo_row_set_search_match_mode") | |
| 766 | + | core.PuregoSafeRegister(&xComboRowSetSelected, libs, "adw_combo_row_set_selected") | |
| 767 | + | core.PuregoSafeRegister(&xComboRowSetUseSubtitle, libs, "adw_combo_row_set_use_subtitle") | |
| 764 | 768 | ||
| 765 | 769 | } | |
M v4/adw/adw-dialog.go +37 -33
| @@ -816,40 +816,44 @@ func (x *Dialog) GetBuildableId() string { | |||
| 816 | 816 | ||
| 817 | 817 | func init() { | |
| 818 | 818 | core.SetPackageName("ADW", "libadwaita-1") | |
| 819 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 820 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 821 | - | if err != nil { | |
| 822 | - | panic(err) | |
| 819 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 820 | + | var libs []uintptr | |
| 821 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 822 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 823 | + | if err != nil { | |
| 824 | + | panic(err) | |
| 825 | + | } | |
| 826 | + | libs = append(libs, lib) | |
| 823 | 827 | } | |
| 824 | 828 | ||
| 825 | - | core.PuregoSafeRegister(&xDialogPresentationModeGLibType, lib, "adw_dialog_presentation_mode_get_type") | |
| 826 | - | ||
| 827 | - | core.PuregoSafeRegister(&xDialogGLibType, lib, "adw_dialog_get_type") | |
| 828 | - | ||
| 829 | - | core.PuregoSafeRegister(&xNewDialog, lib, "adw_dialog_new") | |
| 830 | - | ||
| 831 | - | core.PuregoSafeRegister(&xDialogAddBreakpoint, lib, "adw_dialog_add_breakpoint") | |
| 832 | - | core.PuregoSafeRegister(&xDialogClose, lib, "adw_dialog_close") | |
| 833 | - | core.PuregoSafeRegister(&xDialogForceClose, lib, "adw_dialog_force_close") | |
| 834 | - | core.PuregoSafeRegister(&xDialogGetCanClose, lib, "adw_dialog_get_can_close") | |
| 835 | - | core.PuregoSafeRegister(&xDialogGetChild, lib, "adw_dialog_get_child") | |
| 836 | - | core.PuregoSafeRegister(&xDialogGetContentHeight, lib, "adw_dialog_get_content_height") | |
| 837 | - | core.PuregoSafeRegister(&xDialogGetContentWidth, lib, "adw_dialog_get_content_width") | |
| 838 | - | core.PuregoSafeRegister(&xDialogGetCurrentBreakpoint, lib, "adw_dialog_get_current_breakpoint") | |
| 839 | - | core.PuregoSafeRegister(&xDialogGetDefaultWidget, lib, "adw_dialog_get_default_widget") | |
| 840 | - | core.PuregoSafeRegister(&xDialogGetFocus, lib, "adw_dialog_get_focus") | |
| 841 | - | core.PuregoSafeRegister(&xDialogGetFollowsContentSize, lib, "adw_dialog_get_follows_content_size") | |
| 842 | - | core.PuregoSafeRegister(&xDialogGetPresentationMode, lib, "adw_dialog_get_presentation_mode") | |
| 843 | - | core.PuregoSafeRegister(&xDialogGetTitle, lib, "adw_dialog_get_title") | |
| 844 | - | core.PuregoSafeRegister(&xDialogPresent, lib, "adw_dialog_present") | |
| 845 | - | core.PuregoSafeRegister(&xDialogSetCanClose, lib, "adw_dialog_set_can_close") | |
| 846 | - | core.PuregoSafeRegister(&xDialogSetChild, lib, "adw_dialog_set_child") | |
| 847 | - | core.PuregoSafeRegister(&xDialogSetContentHeight, lib, "adw_dialog_set_content_height") | |
| 848 | - | core.PuregoSafeRegister(&xDialogSetContentWidth, lib, "adw_dialog_set_content_width") | |
| 849 | - | core.PuregoSafeRegister(&xDialogSetDefaultWidget, lib, "adw_dialog_set_default_widget") | |
| 850 | - | core.PuregoSafeRegister(&xDialogSetFocus, lib, "adw_dialog_set_focus") | |
| 851 | - | core.PuregoSafeRegister(&xDialogSetFollowsContentSize, lib, "adw_dialog_set_follows_content_size") | |
| 852 | - | core.PuregoSafeRegister(&xDialogSetPresentationMode, lib, "adw_dialog_set_presentation_mode") | |
| 853 | - | core.PuregoSafeRegister(&xDialogSetTitle, lib, "adw_dialog_set_title") | |
| 829 | + | core.PuregoSafeRegister(&xDialogPresentationModeGLibType, libs, "adw_dialog_presentation_mode_get_type") | |
| 830 | + | ||
| 831 | + | core.PuregoSafeRegister(&xDialogGLibType, libs, "adw_dialog_get_type") | |
| 832 | + | ||
| 833 | + | core.PuregoSafeRegister(&xNewDialog, libs, "adw_dialog_new") | |
| 834 | + | ||
| 835 | + | core.PuregoSafeRegister(&xDialogAddBreakpoint, libs, "adw_dialog_add_breakpoint") | |
| 836 | + | core.PuregoSafeRegister(&xDialogClose, libs, "adw_dialog_close") | |
| 837 | + | core.PuregoSafeRegister(&xDialogForceClose, libs, "adw_dialog_force_close") | |
| 838 | + | core.PuregoSafeRegister(&xDialogGetCanClose, libs, "adw_dialog_get_can_close") | |
| 839 | + | core.PuregoSafeRegister(&xDialogGetChild, libs, "adw_dialog_get_child") | |
| 840 | + | core.PuregoSafeRegister(&xDialogGetContentHeight, libs, "adw_dialog_get_content_height") | |
| 841 | + | core.PuregoSafeRegister(&xDialogGetContentWidth, libs, "adw_dialog_get_content_width") | |
| 842 | + | core.PuregoSafeRegister(&xDialogGetCurrentBreakpoint, libs, "adw_dialog_get_current_breakpoint") | |
| 843 | + | core.PuregoSafeRegister(&xDialogGetDefaultWidget, libs, "adw_dialog_get_default_widget") | |
| 844 | + | core.PuregoSafeRegister(&xDialogGetFocus, libs, "adw_dialog_get_focus") | |
| 845 | + | core.PuregoSafeRegister(&xDialogGetFollowsContentSize, libs, "adw_dialog_get_follows_content_size") | |
| 846 | + | core.PuregoSafeRegister(&xDialogGetPresentationMode, libs, "adw_dialog_get_presentation_mode") | |
| 847 | + | core.PuregoSafeRegister(&xDialogGetTitle, libs, "adw_dialog_get_title") | |
| 848 | + | core.PuregoSafeRegister(&xDialogPresent, libs, "adw_dialog_present") | |
| 849 | + | core.PuregoSafeRegister(&xDialogSetCanClose, libs, "adw_dialog_set_can_close") | |
| 850 | + | core.PuregoSafeRegister(&xDialogSetChild, libs, "adw_dialog_set_child") | |
| 851 | + | core.PuregoSafeRegister(&xDialogSetContentHeight, libs, "adw_dialog_set_content_height") | |
| 852 | + | core.PuregoSafeRegister(&xDialogSetContentWidth, libs, "adw_dialog_set_content_width") | |
| 853 | + | core.PuregoSafeRegister(&xDialogSetDefaultWidget, libs, "adw_dialog_set_default_widget") | |
| 854 | + | core.PuregoSafeRegister(&xDialogSetFocus, libs, "adw_dialog_set_focus") | |
| 855 | + | core.PuregoSafeRegister(&xDialogSetFollowsContentSize, libs, "adw_dialog_set_follows_content_size") | |
| 856 | + | core.PuregoSafeRegister(&xDialogSetPresentationMode, libs, "adw_dialog_set_presentation_mode") | |
| 857 | + | core.PuregoSafeRegister(&xDialogSetTitle, libs, "adw_dialog_set_title") | |
| 854 | 858 | ||
| 855 | 859 | } | |
M v4/adw/adw-easing.go +10 -6
| @@ -130,14 +130,18 @@ func EasingEase(SelfVar Easing, ValueVar float64) float64 { | |||
| 130 | 130 | ||
| 131 | 131 | func init() { | |
| 132 | 132 | core.SetPackageName("ADW", "libadwaita-1") | |
| 133 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 134 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 135 | - | if err != nil { | |
| 136 | - | panic(err) | |
| 133 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 134 | + | var libs []uintptr | |
| 135 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 136 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 137 | + | if err != nil { | |
| 138 | + | panic(err) | |
| 139 | + | } | |
| 140 | + | libs = append(libs, lib) | |
| 137 | 141 | } | |
| 138 | 142 | ||
| 139 | - | core.PuregoSafeRegister(&xEasingGLibType, lib, "adw_easing_get_type") | |
| 143 | + | core.PuregoSafeRegister(&xEasingGLibType, libs, "adw_easing_get_type") | |
| 140 | 144 | ||
| 141 | - | core.PuregoSafeRegister(&xEasingEase, lib, "adw_easing_ease") | |
| 145 | + | core.PuregoSafeRegister(&xEasingEase, libs, "adw_easing_ease") | |
| 142 | 146 | ||
| 143 | 147 | } | |
M v4/adw/adw-entry-row.go +31 -27
| @@ -985,34 +985,38 @@ func (x *EntryRow) SetWidthChars(NCharsVar int) { | |||
| 985 | 985 | ||
| 986 | 986 | func init() { | |
| 987 | 987 | core.SetPackageName("ADW", "libadwaita-1") | |
| 988 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 989 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 990 | - | if err != nil { | |
| 991 | - | panic(err) | |
| 988 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 989 | + | var libs []uintptr | |
| 990 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 991 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 992 | + | if err != nil { | |
| 993 | + | panic(err) | |
| 994 | + | } | |
| 995 | + | libs = append(libs, lib) | |
| 992 | 996 | } | |
| 993 | 997 | ||
| 994 | - | core.PuregoSafeRegister(&xEntryRowGLibType, lib, "adw_entry_row_get_type") | |
| 995 | - | ||
| 996 | - | core.PuregoSafeRegister(&xNewEntryRow, lib, "adw_entry_row_new") | |
| 997 | - | ||
| 998 | - | core.PuregoSafeRegister(&xEntryRowAddPrefix, lib, "adw_entry_row_add_prefix") | |
| 999 | - | core.PuregoSafeRegister(&xEntryRowAddSuffix, lib, "adw_entry_row_add_suffix") | |
| 1000 | - | core.PuregoSafeRegister(&xEntryRowGetActivatesDefault, lib, "adw_entry_row_get_activates_default") | |
| 1001 | - | core.PuregoSafeRegister(&xEntryRowGetAttributes, lib, "adw_entry_row_get_attributes") | |
| 1002 | - | core.PuregoSafeRegister(&xEntryRowGetEnableEmojiCompletion, lib, "adw_entry_row_get_enable_emoji_completion") | |
| 1003 | - | core.PuregoSafeRegister(&xEntryRowGetInputHints, lib, "adw_entry_row_get_input_hints") | |
| 1004 | - | core.PuregoSafeRegister(&xEntryRowGetInputPurpose, lib, "adw_entry_row_get_input_purpose") | |
| 1005 | - | core.PuregoSafeRegister(&xEntryRowGetMaxLength, lib, "adw_entry_row_get_max_length") | |
| 1006 | - | core.PuregoSafeRegister(&xEntryRowGetShowApplyButton, lib, "adw_entry_row_get_show_apply_button") | |
| 1007 | - | core.PuregoSafeRegister(&xEntryRowGetTextLength, lib, "adw_entry_row_get_text_length") | |
| 1008 | - | core.PuregoSafeRegister(&xEntryRowGrabFocusWithoutSelecting, lib, "adw_entry_row_grab_focus_without_selecting") | |
| 1009 | - | core.PuregoSafeRegister(&xEntryRowRemove, lib, "adw_entry_row_remove") | |
| 1010 | - | core.PuregoSafeRegister(&xEntryRowSetActivatesDefault, lib, "adw_entry_row_set_activates_default") | |
| 1011 | - | core.PuregoSafeRegister(&xEntryRowSetAttributes, lib, "adw_entry_row_set_attributes") | |
| 1012 | - | core.PuregoSafeRegister(&xEntryRowSetEnableEmojiCompletion, lib, "adw_entry_row_set_enable_emoji_completion") | |
| 1013 | - | core.PuregoSafeRegister(&xEntryRowSetInputHints, lib, "adw_entry_row_set_input_hints") | |
| 1014 | - | core.PuregoSafeRegister(&xEntryRowSetInputPurpose, lib, "adw_entry_row_set_input_purpose") | |
| 1015 | - | core.PuregoSafeRegister(&xEntryRowSetMaxLength, lib, "adw_entry_row_set_max_length") | |
| 1016 | - | core.PuregoSafeRegister(&xEntryRowSetShowApplyButton, lib, "adw_entry_row_set_show_apply_button") | |
| 998 | + | core.PuregoSafeRegister(&xEntryRowGLibType, libs, "adw_entry_row_get_type") | |
| 999 | + | ||
| 1000 | + | core.PuregoSafeRegister(&xNewEntryRow, libs, "adw_entry_row_new") | |
| 1001 | + | ||
| 1002 | + | core.PuregoSafeRegister(&xEntryRowAddPrefix, libs, "adw_entry_row_add_prefix") | |
| 1003 | + | core.PuregoSafeRegister(&xEntryRowAddSuffix, libs, "adw_entry_row_add_suffix") | |
| 1004 | + | core.PuregoSafeRegister(&xEntryRowGetActivatesDefault, libs, "adw_entry_row_get_activates_default") | |
| 1005 | + | core.PuregoSafeRegister(&xEntryRowGetAttributes, libs, "adw_entry_row_get_attributes") | |
| 1006 | + | core.PuregoSafeRegister(&xEntryRowGetEnableEmojiCompletion, libs, "adw_entry_row_get_enable_emoji_completion") | |
| 1007 | + | core.PuregoSafeRegister(&xEntryRowGetInputHints, libs, "adw_entry_row_get_input_hints") | |
| 1008 | + | core.PuregoSafeRegister(&xEntryRowGetInputPurpose, libs, "adw_entry_row_get_input_purpose") | |
| 1009 | + | core.PuregoSafeRegister(&xEntryRowGetMaxLength, libs, "adw_entry_row_get_max_length") | |
| 1010 | + | core.PuregoSafeRegister(&xEntryRowGetShowApplyButton, libs, "adw_entry_row_get_show_apply_button") | |
| 1011 | + | core.PuregoSafeRegister(&xEntryRowGetTextLength, libs, "adw_entry_row_get_text_length") | |
| 1012 | + | core.PuregoSafeRegister(&xEntryRowGrabFocusWithoutSelecting, libs, "adw_entry_row_grab_focus_without_selecting") | |
| 1013 | + | core.PuregoSafeRegister(&xEntryRowRemove, libs, "adw_entry_row_remove") | |
| 1014 | + | core.PuregoSafeRegister(&xEntryRowSetActivatesDefault, libs, "adw_entry_row_set_activates_default") | |
| 1015 | + | core.PuregoSafeRegister(&xEntryRowSetAttributes, libs, "adw_entry_row_set_attributes") | |
| 1016 | + | core.PuregoSafeRegister(&xEntryRowSetEnableEmojiCompletion, libs, "adw_entry_row_set_enable_emoji_completion") | |
| 1017 | + | core.PuregoSafeRegister(&xEntryRowSetInputHints, libs, "adw_entry_row_set_input_hints") | |
| 1018 | + | core.PuregoSafeRegister(&xEntryRowSetInputPurpose, libs, "adw_entry_row_set_input_purpose") | |
| 1019 | + | core.PuregoSafeRegister(&xEntryRowSetMaxLength, libs, "adw_entry_row_set_max_length") | |
| 1020 | + | core.PuregoSafeRegister(&xEntryRowSetShowApplyButton, libs, "adw_entry_row_set_show_apply_button") | |
| 1017 | 1021 | ||
| 1018 | 1022 | } | |
M v4/adw/adw-enum-list-model.go +16 -12
| @@ -246,23 +246,27 @@ func (x *EnumListModel) ItemsChanged(PositionVar uint, RemovedVar uint, AddedVar | |||
| 246 | 246 | ||
| 247 | 247 | func init() { | |
| 248 | 248 | core.SetPackageName("ADW", "libadwaita-1") | |
| 249 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 250 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 251 | - | if err != nil { | |
| 252 | - | panic(err) | |
| 249 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 250 | + | var libs []uintptr | |
| 251 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 252 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 253 | + | if err != nil { | |
| 254 | + | panic(err) | |
| 255 | + | } | |
| 256 | + | libs = append(libs, lib) | |
| 253 | 257 | } | |
| 254 | 258 | ||
| 255 | - | core.PuregoSafeRegister(&xEnumListItemGLibType, lib, "adw_enum_list_item_get_type") | |
| 259 | + | core.PuregoSafeRegister(&xEnumListItemGLibType, libs, "adw_enum_list_item_get_type") | |
| 256 | 260 | ||
| 257 | - | core.PuregoSafeRegister(&xEnumListItemGetName, lib, "adw_enum_list_item_get_name") | |
| 258 | - | core.PuregoSafeRegister(&xEnumListItemGetNick, lib, "adw_enum_list_item_get_nick") | |
| 259 | - | core.PuregoSafeRegister(&xEnumListItemGetValue, lib, "adw_enum_list_item_get_value") | |
| 261 | + | core.PuregoSafeRegister(&xEnumListItemGetName, libs, "adw_enum_list_item_get_name") | |
| 262 | + | core.PuregoSafeRegister(&xEnumListItemGetNick, libs, "adw_enum_list_item_get_nick") | |
| 263 | + | core.PuregoSafeRegister(&xEnumListItemGetValue, libs, "adw_enum_list_item_get_value") | |
| 260 | 264 | ||
| 261 | - | core.PuregoSafeRegister(&xEnumListModelGLibType, lib, "adw_enum_list_model_get_type") | |
| 265 | + | core.PuregoSafeRegister(&xEnumListModelGLibType, libs, "adw_enum_list_model_get_type") | |
| 262 | 266 | ||
| 263 | - | core.PuregoSafeRegister(&xNewEnumListModel, lib, "adw_enum_list_model_new") | |
| 267 | + | core.PuregoSafeRegister(&xNewEnumListModel, libs, "adw_enum_list_model_new") | |
| 264 | 268 | ||
| 265 | - | core.PuregoSafeRegister(&xEnumListModelFindPosition, lib, "adw_enum_list_model_find_position") | |
| 266 | - | core.PuregoSafeRegister(&xEnumListModelGetEnumType, lib, "adw_enum_list_model_get_enum_type") | |
| 269 | + | core.PuregoSafeRegister(&xEnumListModelFindPosition, libs, "adw_enum_list_model_find_position") | |
| 270 | + | core.PuregoSafeRegister(&xEnumListModelGetEnumType, libs, "adw_enum_list_model_get_enum_type") | |
| 267 | 271 | ||
| 268 | 272 | } | |
M v4/adw/adw-expander-row.go +31 -27
| @@ -655,34 +655,38 @@ func (x *ExpanderRow) GetBuildableId() string { | |||
| 655 | 655 | ||
| 656 | 656 | func init() { | |
| 657 | 657 | core.SetPackageName("ADW", "libadwaita-1") | |
| 658 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 659 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 660 | - | if err != nil { | |
| 661 | - | panic(err) | |
| 658 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 659 | + | var libs []uintptr | |
| 660 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 661 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 662 | + | if err != nil { | |
| 663 | + | panic(err) | |
| 664 | + | } | |
| 665 | + | libs = append(libs, lib) | |
| 662 | 666 | } | |
| 663 | 667 | ||
| 664 | - | core.PuregoSafeRegister(&xExpanderRowGLibType, lib, "adw_expander_row_get_type") | |
| 665 | - | ||
| 666 | - | core.PuregoSafeRegister(&xNewExpanderRow, lib, "adw_expander_row_new") | |
| 667 | - | ||
| 668 | - | core.PuregoSafeRegister(&xExpanderRowAddAction, lib, "adw_expander_row_add_action") | |
| 669 | - | core.PuregoSafeRegister(&xExpanderRowAddPrefix, lib, "adw_expander_row_add_prefix") | |
| 670 | - | core.PuregoSafeRegister(&xExpanderRowAddRow, lib, "adw_expander_row_add_row") | |
| 671 | - | core.PuregoSafeRegister(&xExpanderRowAddSuffix, lib, "adw_expander_row_add_suffix") | |
| 672 | - | core.PuregoSafeRegister(&xExpanderRowGetEnableExpansion, lib, "adw_expander_row_get_enable_expansion") | |
| 673 | - | core.PuregoSafeRegister(&xExpanderRowGetExpanded, lib, "adw_expander_row_get_expanded") | |
| 674 | - | core.PuregoSafeRegister(&xExpanderRowGetIconName, lib, "adw_expander_row_get_icon_name") | |
| 675 | - | core.PuregoSafeRegister(&xExpanderRowGetShowEnableSwitch, lib, "adw_expander_row_get_show_enable_switch") | |
| 676 | - | core.PuregoSafeRegister(&xExpanderRowGetSubtitle, lib, "adw_expander_row_get_subtitle") | |
| 677 | - | core.PuregoSafeRegister(&xExpanderRowGetSubtitleLines, lib, "adw_expander_row_get_subtitle_lines") | |
| 678 | - | core.PuregoSafeRegister(&xExpanderRowGetTitleLines, lib, "adw_expander_row_get_title_lines") | |
| 679 | - | core.PuregoSafeRegister(&xExpanderRowRemove, lib, "adw_expander_row_remove") | |
| 680 | - | core.PuregoSafeRegister(&xExpanderRowSetEnableExpansion, lib, "adw_expander_row_set_enable_expansion") | |
| 681 | - | core.PuregoSafeRegister(&xExpanderRowSetExpanded, lib, "adw_expander_row_set_expanded") | |
| 682 | - | core.PuregoSafeRegister(&xExpanderRowSetIconName, lib, "adw_expander_row_set_icon_name") | |
| 683 | - | core.PuregoSafeRegister(&xExpanderRowSetShowEnableSwitch, lib, "adw_expander_row_set_show_enable_switch") | |
| 684 | - | core.PuregoSafeRegister(&xExpanderRowSetSubtitle, lib, "adw_expander_row_set_subtitle") | |
| 685 | - | core.PuregoSafeRegister(&xExpanderRowSetSubtitleLines, lib, "adw_expander_row_set_subtitle_lines") | |
| 686 | - | core.PuregoSafeRegister(&xExpanderRowSetTitleLines, lib, "adw_expander_row_set_title_lines") | |
| 668 | + | core.PuregoSafeRegister(&xExpanderRowGLibType, libs, "adw_expander_row_get_type") | |
| 669 | + | ||
| 670 | + | core.PuregoSafeRegister(&xNewExpanderRow, libs, "adw_expander_row_new") | |
| 671 | + | ||
| 672 | + | core.PuregoSafeRegister(&xExpanderRowAddAction, libs, "adw_expander_row_add_action") | |
| 673 | + | core.PuregoSafeRegister(&xExpanderRowAddPrefix, libs, "adw_expander_row_add_prefix") | |
| 674 | + | core.PuregoSafeRegister(&xExpanderRowAddRow, libs, "adw_expander_row_add_row") | |
| 675 | + | core.PuregoSafeRegister(&xExpanderRowAddSuffix, libs, "adw_expander_row_add_suffix") | |
| 676 | + | core.PuregoSafeRegister(&xExpanderRowGetEnableExpansion, libs, "adw_expander_row_get_enable_expansion") | |
| 677 | + | core.PuregoSafeRegister(&xExpanderRowGetExpanded, libs, "adw_expander_row_get_expanded") | |
| 678 | + | core.PuregoSafeRegister(&xExpanderRowGetIconName, libs, "adw_expander_row_get_icon_name") | |
| 679 | + | core.PuregoSafeRegister(&xExpanderRowGetShowEnableSwitch, libs, "adw_expander_row_get_show_enable_switch") | |
| 680 | + | core.PuregoSafeRegister(&xExpanderRowGetSubtitle, libs, "adw_expander_row_get_subtitle") | |
| 681 | + | core.PuregoSafeRegister(&xExpanderRowGetSubtitleLines, libs, "adw_expander_row_get_subtitle_lines") | |
| 682 | + | core.PuregoSafeRegister(&xExpanderRowGetTitleLines, libs, "adw_expander_row_get_title_lines") | |
| 683 | + | core.PuregoSafeRegister(&xExpanderRowRemove, libs, "adw_expander_row_remove") | |
| 684 | + | core.PuregoSafeRegister(&xExpanderRowSetEnableExpansion, libs, "adw_expander_row_set_enable_expansion") | |
| 685 | + | core.PuregoSafeRegister(&xExpanderRowSetExpanded, libs, "adw_expander_row_set_expanded") | |
| 686 | + | core.PuregoSafeRegister(&xExpanderRowSetIconName, libs, "adw_expander_row_set_icon_name") | |
| 687 | + | core.PuregoSafeRegister(&xExpanderRowSetShowEnableSwitch, libs, "adw_expander_row_set_show_enable_switch") | |
| 688 | + | core.PuregoSafeRegister(&xExpanderRowSetSubtitle, libs, "adw_expander_row_set_subtitle") | |
| 689 | + | core.PuregoSafeRegister(&xExpanderRowSetSubtitleLines, libs, "adw_expander_row_set_subtitle_lines") | |
| 690 | + | core.PuregoSafeRegister(&xExpanderRowSetTitleLines, libs, "adw_expander_row_set_title_lines") | |
| 687 | 691 | ||
| 688 | 692 | } | |
M v4/adw/adw-flap.go +46 -42
| @@ -861,49 +861,53 @@ func (x *Flap) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 861 | 861 | ||
| 862 | 862 | func init() { | |
| 863 | 863 | core.SetPackageName("ADW", "libadwaita-1") | |
| 864 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 865 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 866 | - | if err != nil { | |
| 867 | - | panic(err) | |
| 864 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 865 | + | var libs []uintptr | |
| 866 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 867 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 868 | + | if err != nil { | |
| 869 | + | panic(err) | |
| 870 | + | } | |
| 871 | + | libs = append(libs, lib) | |
| 868 | 872 | } | |
| 869 | 873 | ||
| 870 | - | core.PuregoSafeRegister(&xFlapFoldPolicyGLibType, lib, "adw_flap_fold_policy_get_type") | |
| 871 | - | ||
| 872 | - | core.PuregoSafeRegister(&xFlapTransitionTypeGLibType, lib, "adw_flap_transition_type_get_type") | |
| 873 | - | ||
| 874 | - | core.PuregoSafeRegister(&xFlapGLibType, lib, "adw_flap_get_type") | |
| 875 | - | ||
| 876 | - | core.PuregoSafeRegister(&xNewFlap, lib, "adw_flap_new") | |
| 877 | - | ||
| 878 | - | core.PuregoSafeRegister(&xFlapGetContent, lib, "adw_flap_get_content") | |
| 879 | - | core.PuregoSafeRegister(&xFlapGetFlap, lib, "adw_flap_get_flap") | |
| 880 | - | core.PuregoSafeRegister(&xFlapGetFlapPosition, lib, "adw_flap_get_flap_position") | |
| 881 | - | core.PuregoSafeRegister(&xFlapGetFoldDuration, lib, "adw_flap_get_fold_duration") | |
| 882 | - | core.PuregoSafeRegister(&xFlapGetFoldPolicy, lib, "adw_flap_get_fold_policy") | |
| 883 | - | core.PuregoSafeRegister(&xFlapGetFoldThresholdPolicy, lib, "adw_flap_get_fold_threshold_policy") | |
| 884 | - | core.PuregoSafeRegister(&xFlapGetFolded, lib, "adw_flap_get_folded") | |
| 885 | - | core.PuregoSafeRegister(&xFlapGetLocked, lib, "adw_flap_get_locked") | |
| 886 | - | core.PuregoSafeRegister(&xFlapGetModal, lib, "adw_flap_get_modal") | |
| 887 | - | core.PuregoSafeRegister(&xFlapGetRevealFlap, lib, "adw_flap_get_reveal_flap") | |
| 888 | - | core.PuregoSafeRegister(&xFlapGetRevealParams, lib, "adw_flap_get_reveal_params") | |
| 889 | - | core.PuregoSafeRegister(&xFlapGetRevealProgress, lib, "adw_flap_get_reveal_progress") | |
| 890 | - | core.PuregoSafeRegister(&xFlapGetSeparator, lib, "adw_flap_get_separator") | |
| 891 | - | core.PuregoSafeRegister(&xFlapGetSwipeToClose, lib, "adw_flap_get_swipe_to_close") | |
| 892 | - | core.PuregoSafeRegister(&xFlapGetSwipeToOpen, lib, "adw_flap_get_swipe_to_open") | |
| 893 | - | core.PuregoSafeRegister(&xFlapGetTransitionType, lib, "adw_flap_get_transition_type") | |
| 894 | - | core.PuregoSafeRegister(&xFlapSetContent, lib, "adw_flap_set_content") | |
| 895 | - | core.PuregoSafeRegister(&xFlapSetFlap, lib, "adw_flap_set_flap") | |
| 896 | - | core.PuregoSafeRegister(&xFlapSetFlapPosition, lib, "adw_flap_set_flap_position") | |
| 897 | - | core.PuregoSafeRegister(&xFlapSetFoldDuration, lib, "adw_flap_set_fold_duration") | |
| 898 | - | core.PuregoSafeRegister(&xFlapSetFoldPolicy, lib, "adw_flap_set_fold_policy") | |
| 899 | - | core.PuregoSafeRegister(&xFlapSetFoldThresholdPolicy, lib, "adw_flap_set_fold_threshold_policy") | |
| 900 | - | core.PuregoSafeRegister(&xFlapSetLocked, lib, "adw_flap_set_locked") | |
| 901 | - | core.PuregoSafeRegister(&xFlapSetModal, lib, "adw_flap_set_modal") | |
| 902 | - | core.PuregoSafeRegister(&xFlapSetRevealFlap, lib, "adw_flap_set_reveal_flap") | |
| 903 | - | core.PuregoSafeRegister(&xFlapSetRevealParams, lib, "adw_flap_set_reveal_params") | |
| 904 | - | core.PuregoSafeRegister(&xFlapSetSeparator, lib, "adw_flap_set_separator") | |
| 905 | - | core.PuregoSafeRegister(&xFlapSetSwipeToClose, lib, "adw_flap_set_swipe_to_close") | |
| 906 | - | core.PuregoSafeRegister(&xFlapSetSwipeToOpen, lib, "adw_flap_set_swipe_to_open") | |
| 907 | - | core.PuregoSafeRegister(&xFlapSetTransitionType, lib, "adw_flap_set_transition_type") | |
| 874 | + | core.PuregoSafeRegister(&xFlapFoldPolicyGLibType, libs, "adw_flap_fold_policy_get_type") | |
| 875 | + | ||
| 876 | + | core.PuregoSafeRegister(&xFlapTransitionTypeGLibType, libs, "adw_flap_transition_type_get_type") | |
| 877 | + | ||
| 878 | + | core.PuregoSafeRegister(&xFlapGLibType, libs, "adw_flap_get_type") | |
| 879 | + | ||
| 880 | + | core.PuregoSafeRegister(&xNewFlap, libs, "adw_flap_new") | |
| 881 | + | ||
| 882 | + | core.PuregoSafeRegister(&xFlapGetContent, libs, "adw_flap_get_content") | |
| 883 | + | core.PuregoSafeRegister(&xFlapGetFlap, libs, "adw_flap_get_flap") | |
| 884 | + | core.PuregoSafeRegister(&xFlapGetFlapPosition, libs, "adw_flap_get_flap_position") | |
| 885 | + | core.PuregoSafeRegister(&xFlapGetFoldDuration, libs, "adw_flap_get_fold_duration") | |
| 886 | + | core.PuregoSafeRegister(&xFlapGetFoldPolicy, libs, "adw_flap_get_fold_policy") | |
| 887 | + | core.PuregoSafeRegister(&xFlapGetFoldThresholdPolicy, libs, "adw_flap_get_fold_threshold_policy") | |
| 888 | + | core.PuregoSafeRegister(&xFlapGetFolded, libs, "adw_flap_get_folded") | |
| 889 | + | core.PuregoSafeRegister(&xFlapGetLocked, libs, "adw_flap_get_locked") | |
| 890 | + | core.PuregoSafeRegister(&xFlapGetModal, libs, "adw_flap_get_modal") | |
| 891 | + | core.PuregoSafeRegister(&xFlapGetRevealFlap, libs, "adw_flap_get_reveal_flap") | |
| 892 | + | core.PuregoSafeRegister(&xFlapGetRevealParams, libs, "adw_flap_get_reveal_params") | |
| 893 | + | core.PuregoSafeRegister(&xFlapGetRevealProgress, libs, "adw_flap_get_reveal_progress") | |
| 894 | + | core.PuregoSafeRegister(&xFlapGetSeparator, libs, "adw_flap_get_separator") | |
| 895 | + | core.PuregoSafeRegister(&xFlapGetSwipeToClose, libs, "adw_flap_get_swipe_to_close") | |
| 896 | + | core.PuregoSafeRegister(&xFlapGetSwipeToOpen, libs, "adw_flap_get_swipe_to_open") | |
| 897 | + | core.PuregoSafeRegister(&xFlapGetTransitionType, libs, "adw_flap_get_transition_type") | |
| 898 | + | core.PuregoSafeRegister(&xFlapSetContent, libs, "adw_flap_set_content") | |
| 899 | + | core.PuregoSafeRegister(&xFlapSetFlap, libs, "adw_flap_set_flap") | |
| 900 | + | core.PuregoSafeRegister(&xFlapSetFlapPosition, libs, "adw_flap_set_flap_position") | |
| 901 | + | core.PuregoSafeRegister(&xFlapSetFoldDuration, libs, "adw_flap_set_fold_duration") | |
| 902 | + | core.PuregoSafeRegister(&xFlapSetFoldPolicy, libs, "adw_flap_set_fold_policy") | |
| 903 | + | core.PuregoSafeRegister(&xFlapSetFoldThresholdPolicy, libs, "adw_flap_set_fold_threshold_policy") | |
| 904 | + | core.PuregoSafeRegister(&xFlapSetLocked, libs, "adw_flap_set_locked") | |
| 905 | + | core.PuregoSafeRegister(&xFlapSetModal, libs, "adw_flap_set_modal") | |
| 906 | + | core.PuregoSafeRegister(&xFlapSetRevealFlap, libs, "adw_flap_set_reveal_flap") | |
| 907 | + | core.PuregoSafeRegister(&xFlapSetRevealParams, libs, "adw_flap_set_reveal_params") | |
| 908 | + | core.PuregoSafeRegister(&xFlapSetSeparator, libs, "adw_flap_set_separator") | |
| 909 | + | core.PuregoSafeRegister(&xFlapSetSwipeToClose, libs, "adw_flap_set_swipe_to_close") | |
| 910 | + | core.PuregoSafeRegister(&xFlapSetSwipeToOpen, libs, "adw_flap_set_swipe_to_open") | |
| 911 | + | core.PuregoSafeRegister(&xFlapSetTransitionType, libs, "adw_flap_set_transition_type") | |
| 908 | 912 | ||
| 909 | 913 | } | |
M v4/adw/adw-header-bar.go +31 -27
| @@ -668,34 +668,38 @@ func (x *HeaderBar) GetBuildableId() string { | |||
| 668 | 668 | ||
| 669 | 669 | func init() { | |
| 670 | 670 | core.SetPackageName("ADW", "libadwaita-1") | |
| 671 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 672 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 673 | - | if err != nil { | |
| 674 | - | panic(err) | |
| 671 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 672 | + | var libs []uintptr | |
| 673 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 674 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 675 | + | if err != nil { | |
| 676 | + | panic(err) | |
| 677 | + | } | |
| 678 | + | libs = append(libs, lib) | |
| 675 | 679 | } | |
| 676 | 680 | ||
| 677 | - | core.PuregoSafeRegister(&xCenteringPolicyGLibType, lib, "adw_centering_policy_get_type") | |
| 678 | - | ||
| 679 | - | core.PuregoSafeRegister(&xHeaderBarGLibType, lib, "adw_header_bar_get_type") | |
| 680 | - | ||
| 681 | - | core.PuregoSafeRegister(&xNewHeaderBar, lib, "adw_header_bar_new") | |
| 682 | - | ||
| 683 | - | core.PuregoSafeRegister(&xHeaderBarGetCenteringPolicy, lib, "adw_header_bar_get_centering_policy") | |
| 684 | - | core.PuregoSafeRegister(&xHeaderBarGetDecorationLayout, lib, "adw_header_bar_get_decoration_layout") | |
| 685 | - | core.PuregoSafeRegister(&xHeaderBarGetShowBackButton, lib, "adw_header_bar_get_show_back_button") | |
| 686 | - | core.PuregoSafeRegister(&xHeaderBarGetShowEndTitleButtons, lib, "adw_header_bar_get_show_end_title_buttons") | |
| 687 | - | core.PuregoSafeRegister(&xHeaderBarGetShowStartTitleButtons, lib, "adw_header_bar_get_show_start_title_buttons") | |
| 688 | - | core.PuregoSafeRegister(&xHeaderBarGetShowTitle, lib, "adw_header_bar_get_show_title") | |
| 689 | - | core.PuregoSafeRegister(&xHeaderBarGetTitleWidget, lib, "adw_header_bar_get_title_widget") | |
| 690 | - | core.PuregoSafeRegister(&xHeaderBarPackEnd, lib, "adw_header_bar_pack_end") | |
| 691 | - | core.PuregoSafeRegister(&xHeaderBarPackStart, lib, "adw_header_bar_pack_start") | |
| 692 | - | core.PuregoSafeRegister(&xHeaderBarRemove, lib, "adw_header_bar_remove") | |
| 693 | - | core.PuregoSafeRegister(&xHeaderBarSetCenteringPolicy, lib, "adw_header_bar_set_centering_policy") | |
| 694 | - | core.PuregoSafeRegister(&xHeaderBarSetDecorationLayout, lib, "adw_header_bar_set_decoration_layout") | |
| 695 | - | core.PuregoSafeRegister(&xHeaderBarSetShowBackButton, lib, "adw_header_bar_set_show_back_button") | |
| 696 | - | core.PuregoSafeRegister(&xHeaderBarSetShowEndTitleButtons, lib, "adw_header_bar_set_show_end_title_buttons") | |
| 697 | - | core.PuregoSafeRegister(&xHeaderBarSetShowStartTitleButtons, lib, "adw_header_bar_set_show_start_title_buttons") | |
| 698 | - | core.PuregoSafeRegister(&xHeaderBarSetShowTitle, lib, "adw_header_bar_set_show_title") | |
| 699 | - | core.PuregoSafeRegister(&xHeaderBarSetTitleWidget, lib, "adw_header_bar_set_title_widget") | |
| 681 | + | core.PuregoSafeRegister(&xCenteringPolicyGLibType, libs, "adw_centering_policy_get_type") | |
| 682 | + | ||
| 683 | + | core.PuregoSafeRegister(&xHeaderBarGLibType, libs, "adw_header_bar_get_type") | |
| 684 | + | ||
| 685 | + | core.PuregoSafeRegister(&xNewHeaderBar, libs, "adw_header_bar_new") | |
| 686 | + | ||
| 687 | + | core.PuregoSafeRegister(&xHeaderBarGetCenteringPolicy, libs, "adw_header_bar_get_centering_policy") | |
| 688 | + | core.PuregoSafeRegister(&xHeaderBarGetDecorationLayout, libs, "adw_header_bar_get_decoration_layout") | |
| 689 | + | core.PuregoSafeRegister(&xHeaderBarGetShowBackButton, libs, "adw_header_bar_get_show_back_button") | |
| 690 | + | core.PuregoSafeRegister(&xHeaderBarGetShowEndTitleButtons, libs, "adw_header_bar_get_show_end_title_buttons") | |
| 691 | + | core.PuregoSafeRegister(&xHeaderBarGetShowStartTitleButtons, libs, "adw_header_bar_get_show_start_title_buttons") | |
| 692 | + | core.PuregoSafeRegister(&xHeaderBarGetShowTitle, libs, "adw_header_bar_get_show_title") | |
| 693 | + | core.PuregoSafeRegister(&xHeaderBarGetTitleWidget, libs, "adw_header_bar_get_title_widget") | |
| 694 | + | core.PuregoSafeRegister(&xHeaderBarPackEnd, libs, "adw_header_bar_pack_end") | |
| 695 | + | core.PuregoSafeRegister(&xHeaderBarPackStart, libs, "adw_header_bar_pack_start") | |
| 696 | + | core.PuregoSafeRegister(&xHeaderBarRemove, libs, "adw_header_bar_remove") | |
| 697 | + | core.PuregoSafeRegister(&xHeaderBarSetCenteringPolicy, libs, "adw_header_bar_set_centering_policy") | |
| 698 | + | core.PuregoSafeRegister(&xHeaderBarSetDecorationLayout, libs, "adw_header_bar_set_decoration_layout") | |
| 699 | + | core.PuregoSafeRegister(&xHeaderBarSetShowBackButton, libs, "adw_header_bar_set_show_back_button") | |
| 700 | + | core.PuregoSafeRegister(&xHeaderBarSetShowEndTitleButtons, libs, "adw_header_bar_set_show_end_title_buttons") | |
| 701 | + | core.PuregoSafeRegister(&xHeaderBarSetShowStartTitleButtons, libs, "adw_header_bar_set_show_start_title_buttons") | |
| 702 | + | core.PuregoSafeRegister(&xHeaderBarSetShowTitle, libs, "adw_header_bar_set_show_title") | |
| 703 | + | core.PuregoSafeRegister(&xHeaderBarSetTitleWidget, libs, "adw_header_bar_set_title_widget") | |
| 700 | 704 | ||
| 701 | 705 | } | |
M v4/adw/adw-inline-view-switcher.go +19 -15
| @@ -524,25 +524,29 @@ func (x *InlineViewSwitcher) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 524 | 524 | ||
| 525 | 525 | func init() { | |
| 526 | 526 | core.SetPackageName("ADW", "libadwaita-1") | |
| 527 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 528 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 529 | - | if err != nil { | |
| 530 | - | panic(err) | |
| 527 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 528 | + | var libs []uintptr | |
| 529 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 530 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 531 | + | if err != nil { | |
| 532 | + | panic(err) | |
| 533 | + | } | |
| 534 | + | libs = append(libs, lib) | |
| 531 | 535 | } | |
| 532 | 536 | ||
| 533 | - | core.PuregoSafeRegister(&xInlineViewSwitcherDisplayModeGLibType, lib, "adw_inline_view_switcher_display_mode_get_type") | |
| 537 | + | core.PuregoSafeRegister(&xInlineViewSwitcherDisplayModeGLibType, libs, "adw_inline_view_switcher_display_mode_get_type") | |
| 534 | 538 | ||
| 535 | - | core.PuregoSafeRegister(&xInlineViewSwitcherGLibType, lib, "adw_inline_view_switcher_get_type") | |
| 539 | + | core.PuregoSafeRegister(&xInlineViewSwitcherGLibType, libs, "adw_inline_view_switcher_get_type") | |
| 536 | 540 | ||
| 537 | - | core.PuregoSafeRegister(&xNewInlineViewSwitcher, lib, "adw_inline_view_switcher_new") | |
| 541 | + | core.PuregoSafeRegister(&xNewInlineViewSwitcher, libs, "adw_inline_view_switcher_new") | |
| 538 | 542 | ||
| 539 | - | core.PuregoSafeRegister(&xInlineViewSwitcherGetCanShrink, lib, "adw_inline_view_switcher_get_can_shrink") | |
| 540 | - | core.PuregoSafeRegister(&xInlineViewSwitcherGetDisplayMode, lib, "adw_inline_view_switcher_get_display_mode") | |
| 541 | - | core.PuregoSafeRegister(&xInlineViewSwitcherGetHomogeneous, lib, "adw_inline_view_switcher_get_homogeneous") | |
| 542 | - | core.PuregoSafeRegister(&xInlineViewSwitcherGetStack, lib, "adw_inline_view_switcher_get_stack") | |
| 543 | - | core.PuregoSafeRegister(&xInlineViewSwitcherSetCanShrink, lib, "adw_inline_view_switcher_set_can_shrink") | |
| 544 | - | core.PuregoSafeRegister(&xInlineViewSwitcherSetDisplayMode, lib, "adw_inline_view_switcher_set_display_mode") | |
| 545 | - | core.PuregoSafeRegister(&xInlineViewSwitcherSetHomogeneous, lib, "adw_inline_view_switcher_set_homogeneous") | |
| 546 | - | core.PuregoSafeRegister(&xInlineViewSwitcherSetStack, lib, "adw_inline_view_switcher_set_stack") | |
| 543 | + | core.PuregoSafeRegister(&xInlineViewSwitcherGetCanShrink, libs, "adw_inline_view_switcher_get_can_shrink") | |
| 544 | + | core.PuregoSafeRegister(&xInlineViewSwitcherGetDisplayMode, libs, "adw_inline_view_switcher_get_display_mode") | |
| 545 | + | core.PuregoSafeRegister(&xInlineViewSwitcherGetHomogeneous, libs, "adw_inline_view_switcher_get_homogeneous") | |
| 546 | + | core.PuregoSafeRegister(&xInlineViewSwitcherGetStack, libs, "adw_inline_view_switcher_get_stack") | |
| 547 | + | core.PuregoSafeRegister(&xInlineViewSwitcherSetCanShrink, libs, "adw_inline_view_switcher_set_can_shrink") | |
| 548 | + | core.PuregoSafeRegister(&xInlineViewSwitcherSetDisplayMode, libs, "adw_inline_view_switcher_set_display_mode") | |
| 549 | + | core.PuregoSafeRegister(&xInlineViewSwitcherSetHomogeneous, libs, "adw_inline_view_switcher_set_homogeneous") | |
| 550 | + | core.PuregoSafeRegister(&xInlineViewSwitcherSetStack, libs, "adw_inline_view_switcher_set_stack") | |
| 547 | 551 | ||
| 548 | 552 | } | |
M v4/adw/adw-layout-slot.go +11 -7
| @@ -361,16 +361,20 @@ func (x *LayoutSlot) GetBuildableId() string { | |||
| 361 | 361 | ||
| 362 | 362 | func init() { | |
| 363 | 363 | core.SetPackageName("ADW", "libadwaita-1") | |
| 364 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 365 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 366 | - | if err != nil { | |
| 367 | - | panic(err) | |
| 364 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 365 | + | var libs []uintptr | |
| 366 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 367 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 368 | + | if err != nil { | |
| 369 | + | panic(err) | |
| 370 | + | } | |
| 371 | + | libs = append(libs, lib) | |
| 368 | 372 | } | |
| 369 | 373 | ||
| 370 | - | core.PuregoSafeRegister(&xLayoutSlotGLibType, lib, "adw_layout_slot_get_type") | |
| 374 | + | core.PuregoSafeRegister(&xLayoutSlotGLibType, libs, "adw_layout_slot_get_type") | |
| 371 | 375 | ||
| 372 | - | core.PuregoSafeRegister(&xNewLayoutSlot, lib, "adw_layout_slot_new") | |
| 376 | + | core.PuregoSafeRegister(&xNewLayoutSlot, libs, "adw_layout_slot_new") | |
| 373 | 377 | ||
| 374 | - | core.PuregoSafeRegister(&xLayoutSlotGetSlotId, lib, "adw_layout_slot_get_slot_id") | |
| 378 | + | core.PuregoSafeRegister(&xLayoutSlotGetSlotId, libs, "adw_layout_slot_get_slot_id") | |
| 375 | 379 | ||
| 376 | 380 | } | |
M v4/adw/adw-layout.go +13 -9
| @@ -113,18 +113,22 @@ func (x *Layout) GetBuildableId() string { | |||
| 113 | 113 | ||
| 114 | 114 | func init() { | |
| 115 | 115 | core.SetPackageName("ADW", "libadwaita-1") | |
| 116 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 117 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 118 | - | if err != nil { | |
| 119 | - | panic(err) | |
| 116 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 117 | + | var libs []uintptr | |
| 118 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 119 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 120 | + | if err != nil { | |
| 121 | + | panic(err) | |
| 122 | + | } | |
| 123 | + | libs = append(libs, lib) | |
| 120 | 124 | } | |
| 121 | 125 | ||
| 122 | - | core.PuregoSafeRegister(&xLayoutGLibType, lib, "adw_layout_get_type") | |
| 126 | + | core.PuregoSafeRegister(&xLayoutGLibType, libs, "adw_layout_get_type") | |
| 123 | 127 | ||
| 124 | - | core.PuregoSafeRegister(&xNewLayout, lib, "adw_layout_new") | |
| 128 | + | core.PuregoSafeRegister(&xNewLayout, libs, "adw_layout_new") | |
| 125 | 129 | ||
| 126 | - | core.PuregoSafeRegister(&xLayoutGetContent, lib, "adw_layout_get_content") | |
| 127 | - | core.PuregoSafeRegister(&xLayoutGetName, lib, "adw_layout_get_name") | |
| 128 | - | core.PuregoSafeRegister(&xLayoutSetName, lib, "adw_layout_set_name") | |
| 130 | + | core.PuregoSafeRegister(&xLayoutGetContent, libs, "adw_layout_get_content") | |
| 131 | + | core.PuregoSafeRegister(&xLayoutGetName, libs, "adw_layout_get_name") | |
| 132 | + | core.PuregoSafeRegister(&xLayoutSetName, libs, "adw_layout_set_name") | |
| 129 | 133 | ||
| 130 | 134 | } | |
M v4/adw/adw-leaflet.go +54 -50
| @@ -1000,57 +1000,61 @@ func (c *LeafletPage) SetGoPointer(ptr uintptr) { | |||
| 1000 | 1000 | ||
| 1001 | 1001 | func init() { | |
| 1002 | 1002 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1003 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1004 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1005 | - | if err != nil { | |
| 1006 | - | panic(err) | |
| 1003 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1004 | + | var libs []uintptr | |
| 1005 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1006 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1007 | + | if err != nil { | |
| 1008 | + | panic(err) | |
| 1009 | + | } | |
| 1010 | + | libs = append(libs, lib) | |
| 1007 | 1011 | } | |
| 1008 | 1012 | ||
| 1009 | - | core.PuregoSafeRegister(&xLeafletTransitionTypeGLibType, lib, "adw_leaflet_transition_type_get_type") | |
| 1010 | - | ||
| 1011 | - | core.PuregoSafeRegister(&xLeafletGLibType, lib, "adw_leaflet_get_type") | |
| 1012 | - | ||
| 1013 | - | core.PuregoSafeRegister(&xNewLeaflet, lib, "adw_leaflet_new") | |
| 1014 | - | ||
| 1015 | - | core.PuregoSafeRegister(&xLeafletAppend, lib, "adw_leaflet_append") | |
| 1016 | - | core.PuregoSafeRegister(&xLeafletGetAdjacentChild, lib, "adw_leaflet_get_adjacent_child") | |
| 1017 | - | core.PuregoSafeRegister(&xLeafletGetCanNavigateBack, lib, "adw_leaflet_get_can_navigate_back") | |
| 1018 | - | core.PuregoSafeRegister(&xLeafletGetCanNavigateForward, lib, "adw_leaflet_get_can_navigate_forward") | |
| 1019 | - | core.PuregoSafeRegister(&xLeafletGetCanUnfold, lib, "adw_leaflet_get_can_unfold") | |
| 1020 | - | core.PuregoSafeRegister(&xLeafletGetChildByName, lib, "adw_leaflet_get_child_by_name") | |
| 1021 | - | core.PuregoSafeRegister(&xLeafletGetChildTransitionParams, lib, "adw_leaflet_get_child_transition_params") | |
| 1022 | - | core.PuregoSafeRegister(&xLeafletGetChildTransitionRunning, lib, "adw_leaflet_get_child_transition_running") | |
| 1023 | - | core.PuregoSafeRegister(&xLeafletGetFoldThresholdPolicy, lib, "adw_leaflet_get_fold_threshold_policy") | |
| 1024 | - | core.PuregoSafeRegister(&xLeafletGetFolded, lib, "adw_leaflet_get_folded") | |
| 1025 | - | core.PuregoSafeRegister(&xLeafletGetHomogeneous, lib, "adw_leaflet_get_homogeneous") | |
| 1026 | - | core.PuregoSafeRegister(&xLeafletGetModeTransitionDuration, lib, "adw_leaflet_get_mode_transition_duration") | |
| 1027 | - | core.PuregoSafeRegister(&xLeafletGetPage, lib, "adw_leaflet_get_page") | |
| 1028 | - | core.PuregoSafeRegister(&xLeafletGetPages, lib, "adw_leaflet_get_pages") | |
| 1029 | - | core.PuregoSafeRegister(&xLeafletGetTransitionType, lib, "adw_leaflet_get_transition_type") | |
| 1030 | - | core.PuregoSafeRegister(&xLeafletGetVisibleChild, lib, "adw_leaflet_get_visible_child") | |
| 1031 | - | core.PuregoSafeRegister(&xLeafletGetVisibleChildName, lib, "adw_leaflet_get_visible_child_name") | |
| 1032 | - | core.PuregoSafeRegister(&xLeafletInsertChildAfter, lib, "adw_leaflet_insert_child_after") | |
| 1033 | - | core.PuregoSafeRegister(&xLeafletNavigate, lib, "adw_leaflet_navigate") | |
| 1034 | - | core.PuregoSafeRegister(&xLeafletPrepend, lib, "adw_leaflet_prepend") | |
| 1035 | - | core.PuregoSafeRegister(&xLeafletRemove, lib, "adw_leaflet_remove") | |
| 1036 | - | core.PuregoSafeRegister(&xLeafletReorderChildAfter, lib, "adw_leaflet_reorder_child_after") | |
| 1037 | - | core.PuregoSafeRegister(&xLeafletSetCanNavigateBack, lib, "adw_leaflet_set_can_navigate_back") | |
| 1038 | - | core.PuregoSafeRegister(&xLeafletSetCanNavigateForward, lib, "adw_leaflet_set_can_navigate_forward") | |
| 1039 | - | core.PuregoSafeRegister(&xLeafletSetCanUnfold, lib, "adw_leaflet_set_can_unfold") | |
| 1040 | - | core.PuregoSafeRegister(&xLeafletSetChildTransitionParams, lib, "adw_leaflet_set_child_transition_params") | |
| 1041 | - | core.PuregoSafeRegister(&xLeafletSetFoldThresholdPolicy, lib, "adw_leaflet_set_fold_threshold_policy") | |
| 1042 | - | core.PuregoSafeRegister(&xLeafletSetHomogeneous, lib, "adw_leaflet_set_homogeneous") | |
| 1043 | - | core.PuregoSafeRegister(&xLeafletSetModeTransitionDuration, lib, "adw_leaflet_set_mode_transition_duration") | |
| 1044 | - | core.PuregoSafeRegister(&xLeafletSetTransitionType, lib, "adw_leaflet_set_transition_type") | |
| 1045 | - | core.PuregoSafeRegister(&xLeafletSetVisibleChild, lib, "adw_leaflet_set_visible_child") | |
| 1046 | - | core.PuregoSafeRegister(&xLeafletSetVisibleChildName, lib, "adw_leaflet_set_visible_child_name") | |
| 1047 | - | ||
| 1048 | - | core.PuregoSafeRegister(&xLeafletPageGLibType, lib, "adw_leaflet_page_get_type") | |
| 1049 | - | ||
| 1050 | - | core.PuregoSafeRegister(&xLeafletPageGetChild, lib, "adw_leaflet_page_get_child") | |
| 1051 | - | core.PuregoSafeRegister(&xLeafletPageGetName, lib, "adw_leaflet_page_get_name") | |
| 1052 | - | core.PuregoSafeRegister(&xLeafletPageGetNavigatable, lib, "adw_leaflet_page_get_navigatable") | |
| 1053 | - | core.PuregoSafeRegister(&xLeafletPageSetName, lib, "adw_leaflet_page_set_name") | |
| 1054 | - | core.PuregoSafeRegister(&xLeafletPageSetNavigatable, lib, "adw_leaflet_page_set_navigatable") | |
| 1013 | + | core.PuregoSafeRegister(&xLeafletTransitionTypeGLibType, libs, "adw_leaflet_transition_type_get_type") | |
| 1014 | + | ||
| 1015 | + | core.PuregoSafeRegister(&xLeafletGLibType, libs, "adw_leaflet_get_type") | |
| 1016 | + | ||
| 1017 | + | core.PuregoSafeRegister(&xNewLeaflet, libs, "adw_leaflet_new") | |
| 1018 | + | ||
| 1019 | + | core.PuregoSafeRegister(&xLeafletAppend, libs, "adw_leaflet_append") | |
| 1020 | + | core.PuregoSafeRegister(&xLeafletGetAdjacentChild, libs, "adw_leaflet_get_adjacent_child") | |
| 1021 | + | core.PuregoSafeRegister(&xLeafletGetCanNavigateBack, libs, "adw_leaflet_get_can_navigate_back") | |
| 1022 | + | core.PuregoSafeRegister(&xLeafletGetCanNavigateForward, libs, "adw_leaflet_get_can_navigate_forward") | |
| 1023 | + | core.PuregoSafeRegister(&xLeafletGetCanUnfold, libs, "adw_leaflet_get_can_unfold") | |
| 1024 | + | core.PuregoSafeRegister(&xLeafletGetChildByName, libs, "adw_leaflet_get_child_by_name") | |
| 1025 | + | core.PuregoSafeRegister(&xLeafletGetChildTransitionParams, libs, "adw_leaflet_get_child_transition_params") | |
| 1026 | + | core.PuregoSafeRegister(&xLeafletGetChildTransitionRunning, libs, "adw_leaflet_get_child_transition_running") | |
| 1027 | + | core.PuregoSafeRegister(&xLeafletGetFoldThresholdPolicy, libs, "adw_leaflet_get_fold_threshold_policy") | |
| 1028 | + | core.PuregoSafeRegister(&xLeafletGetFolded, libs, "adw_leaflet_get_folded") | |
| 1029 | + | core.PuregoSafeRegister(&xLeafletGetHomogeneous, libs, "adw_leaflet_get_homogeneous") | |
| 1030 | + | core.PuregoSafeRegister(&xLeafletGetModeTransitionDuration, libs, "adw_leaflet_get_mode_transition_duration") | |
| 1031 | + | core.PuregoSafeRegister(&xLeafletGetPage, libs, "adw_leaflet_get_page") | |
| 1032 | + | core.PuregoSafeRegister(&xLeafletGetPages, libs, "adw_leaflet_get_pages") | |
| 1033 | + | core.PuregoSafeRegister(&xLeafletGetTransitionType, libs, "adw_leaflet_get_transition_type") | |
| 1034 | + | core.PuregoSafeRegister(&xLeafletGetVisibleChild, libs, "adw_leaflet_get_visible_child") | |
| 1035 | + | core.PuregoSafeRegister(&xLeafletGetVisibleChildName, libs, "adw_leaflet_get_visible_child_name") | |
| 1036 | + | core.PuregoSafeRegister(&xLeafletInsertChildAfter, libs, "adw_leaflet_insert_child_after") | |
| 1037 | + | core.PuregoSafeRegister(&xLeafletNavigate, libs, "adw_leaflet_navigate") | |
| 1038 | + | core.PuregoSafeRegister(&xLeafletPrepend, libs, "adw_leaflet_prepend") | |
| 1039 | + | core.PuregoSafeRegister(&xLeafletRemove, libs, "adw_leaflet_remove") | |
| 1040 | + | core.PuregoSafeRegister(&xLeafletReorderChildAfter, libs, "adw_leaflet_reorder_child_after") | |
| 1041 | + | core.PuregoSafeRegister(&xLeafletSetCanNavigateBack, libs, "adw_leaflet_set_can_navigate_back") | |
| 1042 | + | core.PuregoSafeRegister(&xLeafletSetCanNavigateForward, libs, "adw_leaflet_set_can_navigate_forward") | |
| 1043 | + | core.PuregoSafeRegister(&xLeafletSetCanUnfold, libs, "adw_leaflet_set_can_unfold") | |
| 1044 | + | core.PuregoSafeRegister(&xLeafletSetChildTransitionParams, libs, "adw_leaflet_set_child_transition_params") | |
| 1045 | + | core.PuregoSafeRegister(&xLeafletSetFoldThresholdPolicy, libs, "adw_leaflet_set_fold_threshold_policy") | |
| 1046 | + | core.PuregoSafeRegister(&xLeafletSetHomogeneous, libs, "adw_leaflet_set_homogeneous") | |
| 1047 | + | core.PuregoSafeRegister(&xLeafletSetModeTransitionDuration, libs, "adw_leaflet_set_mode_transition_duration") | |
| 1048 | + | core.PuregoSafeRegister(&xLeafletSetTransitionType, libs, "adw_leaflet_set_transition_type") | |
| 1049 | + | core.PuregoSafeRegister(&xLeafletSetVisibleChild, libs, "adw_leaflet_set_visible_child") | |
| 1050 | + | core.PuregoSafeRegister(&xLeafletSetVisibleChildName, libs, "adw_leaflet_set_visible_child_name") | |
| 1051 | + | ||
| 1052 | + | core.PuregoSafeRegister(&xLeafletPageGLibType, libs, "adw_leaflet_page_get_type") | |
| 1053 | + | ||
| 1054 | + | core.PuregoSafeRegister(&xLeafletPageGetChild, libs, "adw_leaflet_page_get_child") | |
| 1055 | + | core.PuregoSafeRegister(&xLeafletPageGetName, libs, "adw_leaflet_page_get_name") | |
| 1056 | + | core.PuregoSafeRegister(&xLeafletPageGetNavigatable, libs, "adw_leaflet_page_get_navigatable") | |
| 1057 | + | core.PuregoSafeRegister(&xLeafletPageSetName, libs, "adw_leaflet_page_set_name") | |
| 1058 | + | core.PuregoSafeRegister(&xLeafletPageSetNavigatable, libs, "adw_leaflet_page_set_navigatable") | |
| 1055 | 1059 | ||
| 1056 | 1060 | } | |
M v4/adw/adw-length-unit.go +11 -7
| @@ -55,15 +55,19 @@ func LengthUnitToPx(UnitVar LengthUnit, ValueVar float64, SettingsVar *gtk.Setti | |||
| 55 | 55 | ||
| 56 | 56 | func init() { | |
| 57 | 57 | core.SetPackageName("ADW", "libadwaita-1") | |
| 58 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 59 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 60 | - | if err != nil { | |
| 61 | - | panic(err) | |
| 58 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 59 | + | var libs []uintptr | |
| 60 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 61 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 62 | + | if err != nil { | |
| 63 | + | panic(err) | |
| 64 | + | } | |
| 65 | + | libs = append(libs, lib) | |
| 62 | 66 | } | |
| 63 | 67 | ||
| 64 | - | core.PuregoSafeRegister(&xLengthUnitGLibType, lib, "adw_length_unit_get_type") | |
| 68 | + | core.PuregoSafeRegister(&xLengthUnitGLibType, libs, "adw_length_unit_get_type") | |
| 65 | 69 | ||
| 66 | - | core.PuregoSafeRegister(&xLengthUnitFromPx, lib, "adw_length_unit_from_px") | |
| 67 | - | core.PuregoSafeRegister(&xLengthUnitToPx, lib, "adw_length_unit_to_px") | |
| 70 | + | core.PuregoSafeRegister(&xLengthUnitFromPx, libs, "adw_length_unit_from_px") | |
| 71 | + | core.PuregoSafeRegister(&xLengthUnitToPx, libs, "adw_length_unit_to_px") | |
| 68 | 72 | ||
| 69 | 73 | } | |
M v4/adw/adw-main.go +10 -6
| @@ -37,13 +37,17 @@ func IsInitialized() bool { | |||
| 37 | 37 | ||
| 38 | 38 | func init() { | |
| 39 | 39 | core.SetPackageName("ADW", "libadwaita-1") | |
| 40 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 41 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 42 | - | if err != nil { | |
| 43 | - | panic(err) | |
| 40 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 41 | + | var libs []uintptr | |
| 42 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 43 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 44 | + | if err != nil { | |
| 45 | + | panic(err) | |
| 46 | + | } | |
| 47 | + | libs = append(libs, lib) | |
| 44 | 48 | } | |
| 45 | 49 | ||
| 46 | - | core.PuregoSafeRegister(&xInit, lib, "adw_init") | |
| 47 | - | core.PuregoSafeRegister(&xIsInitialized, lib, "adw_is_initialized") | |
| 50 | + | core.PuregoSafeRegister(&xInit, libs, "adw_init") | |
| 51 | + | core.PuregoSafeRegister(&xIsInitialized, libs, "adw_is_initialized") | |
| 48 | 52 | ||
| 49 | 53 | } | |
M v4/adw/adw-message-dialog.go +43 -39
| @@ -1062,46 +1062,50 @@ func (x *MessageDialog) SetFocus(FocusVar *gtk.Widget) { | |||
| 1062 | 1062 | ||
| 1063 | 1063 | func init() { | |
| 1064 | 1064 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1065 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1066 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1067 | - | if err != nil { | |
| 1068 | - | panic(err) | |
| 1065 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1066 | + | var libs []uintptr | |
| 1067 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1068 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1069 | + | if err != nil { | |
| 1070 | + | panic(err) | |
| 1071 | + | } | |
| 1072 | + | libs = append(libs, lib) | |
| 1069 | 1073 | } | |
| 1070 | 1074 | ||
| 1071 | - | core.PuregoSafeRegister(&xMessageDialogGLibType, lib, "adw_message_dialog_get_type") | |
| 1072 | - | ||
| 1073 | - | core.PuregoSafeRegister(&xNewMessageDialog, lib, "adw_message_dialog_new") | |
| 1074 | - | ||
| 1075 | - | core.PuregoSafeRegister(&xMessageDialogAddResponse, lib, "adw_message_dialog_add_response") | |
| 1076 | - | core.PuregoSafeRegister(&xMessageDialogAddResponses, lib, "adw_message_dialog_add_responses") | |
| 1077 | - | core.PuregoSafeRegister(&xMessageDialogChoose, lib, "adw_message_dialog_choose") | |
| 1078 | - | core.PuregoSafeRegister(&xMessageDialogChooseFinish, lib, "adw_message_dialog_choose_finish") | |
| 1079 | - | core.PuregoSafeRegister(&xMessageDialogFormatBody, lib, "adw_message_dialog_format_body") | |
| 1080 | - | core.PuregoSafeRegister(&xMessageDialogFormatBodyMarkup, lib, "adw_message_dialog_format_body_markup") | |
| 1081 | - | core.PuregoSafeRegister(&xMessageDialogFormatHeading, lib, "adw_message_dialog_format_heading") | |
| 1082 | - | core.PuregoSafeRegister(&xMessageDialogFormatHeadingMarkup, lib, "adw_message_dialog_format_heading_markup") | |
| 1083 | - | core.PuregoSafeRegister(&xMessageDialogGetBody, lib, "adw_message_dialog_get_body") | |
| 1084 | - | core.PuregoSafeRegister(&xMessageDialogGetBodyUseMarkup, lib, "adw_message_dialog_get_body_use_markup") | |
| 1085 | - | core.PuregoSafeRegister(&xMessageDialogGetCloseResponse, lib, "adw_message_dialog_get_close_response") | |
| 1086 | - | core.PuregoSafeRegister(&xMessageDialogGetDefaultResponse, lib, "adw_message_dialog_get_default_response") | |
| 1087 | - | core.PuregoSafeRegister(&xMessageDialogGetExtraChild, lib, "adw_message_dialog_get_extra_child") | |
| 1088 | - | core.PuregoSafeRegister(&xMessageDialogGetHeading, lib, "adw_message_dialog_get_heading") | |
| 1089 | - | core.PuregoSafeRegister(&xMessageDialogGetHeadingUseMarkup, lib, "adw_message_dialog_get_heading_use_markup") | |
| 1090 | - | core.PuregoSafeRegister(&xMessageDialogGetResponseAppearance, lib, "adw_message_dialog_get_response_appearance") | |
| 1091 | - | core.PuregoSafeRegister(&xMessageDialogGetResponseEnabled, lib, "adw_message_dialog_get_response_enabled") | |
| 1092 | - | core.PuregoSafeRegister(&xMessageDialogGetResponseLabel, lib, "adw_message_dialog_get_response_label") | |
| 1093 | - | core.PuregoSafeRegister(&xMessageDialogHasResponse, lib, "adw_message_dialog_has_response") | |
| 1094 | - | core.PuregoSafeRegister(&xMessageDialogRemoveResponse, lib, "adw_message_dialog_remove_response") | |
| 1095 | - | core.PuregoSafeRegister(&xMessageDialogResponse, lib, "adw_message_dialog_response") | |
| 1096 | - | core.PuregoSafeRegister(&xMessageDialogSetBody, lib, "adw_message_dialog_set_body") | |
| 1097 | - | core.PuregoSafeRegister(&xMessageDialogSetBodyUseMarkup, lib, "adw_message_dialog_set_body_use_markup") | |
| 1098 | - | core.PuregoSafeRegister(&xMessageDialogSetCloseResponse, lib, "adw_message_dialog_set_close_response") | |
| 1099 | - | core.PuregoSafeRegister(&xMessageDialogSetDefaultResponse, lib, "adw_message_dialog_set_default_response") | |
| 1100 | - | core.PuregoSafeRegister(&xMessageDialogSetExtraChild, lib, "adw_message_dialog_set_extra_child") | |
| 1101 | - | core.PuregoSafeRegister(&xMessageDialogSetHeading, lib, "adw_message_dialog_set_heading") | |
| 1102 | - | core.PuregoSafeRegister(&xMessageDialogSetHeadingUseMarkup, lib, "adw_message_dialog_set_heading_use_markup") | |
| 1103 | - | core.PuregoSafeRegister(&xMessageDialogSetResponseAppearance, lib, "adw_message_dialog_set_response_appearance") | |
| 1104 | - | core.PuregoSafeRegister(&xMessageDialogSetResponseEnabled, lib, "adw_message_dialog_set_response_enabled") | |
| 1105 | - | core.PuregoSafeRegister(&xMessageDialogSetResponseLabel, lib, "adw_message_dialog_set_response_label") | |
| 1075 | + | core.PuregoSafeRegister(&xMessageDialogGLibType, libs, "adw_message_dialog_get_type") | |
| 1076 | + | ||
| 1077 | + | core.PuregoSafeRegister(&xNewMessageDialog, libs, "adw_message_dialog_new") | |
| 1078 | + | ||
| 1079 | + | core.PuregoSafeRegister(&xMessageDialogAddResponse, libs, "adw_message_dialog_add_response") | |
| 1080 | + | core.PuregoSafeRegister(&xMessageDialogAddResponses, libs, "adw_message_dialog_add_responses") | |
| 1081 | + | core.PuregoSafeRegister(&xMessageDialogChoose, libs, "adw_message_dialog_choose") | |
| 1082 | + | core.PuregoSafeRegister(&xMessageDialogChooseFinish, libs, "adw_message_dialog_choose_finish") | |
| 1083 | + | core.PuregoSafeRegister(&xMessageDialogFormatBody, libs, "adw_message_dialog_format_body") | |
| 1084 | + | core.PuregoSafeRegister(&xMessageDialogFormatBodyMarkup, libs, "adw_message_dialog_format_body_markup") | |
| 1085 | + | core.PuregoSafeRegister(&xMessageDialogFormatHeading, libs, "adw_message_dialog_format_heading") | |
| 1086 | + | core.PuregoSafeRegister(&xMessageDialogFormatHeadingMarkup, libs, "adw_message_dialog_format_heading_markup") | |
| 1087 | + | core.PuregoSafeRegister(&xMessageDialogGetBody, libs, "adw_message_dialog_get_body") | |
| 1088 | + | core.PuregoSafeRegister(&xMessageDialogGetBodyUseMarkup, libs, "adw_message_dialog_get_body_use_markup") | |
| 1089 | + | core.PuregoSafeRegister(&xMessageDialogGetCloseResponse, libs, "adw_message_dialog_get_close_response") | |
| 1090 | + | core.PuregoSafeRegister(&xMessageDialogGetDefaultResponse, libs, "adw_message_dialog_get_default_response") | |
| 1091 | + | core.PuregoSafeRegister(&xMessageDialogGetExtraChild, libs, "adw_message_dialog_get_extra_child") | |
| 1092 | + | core.PuregoSafeRegister(&xMessageDialogGetHeading, libs, "adw_message_dialog_get_heading") | |
| 1093 | + | core.PuregoSafeRegister(&xMessageDialogGetHeadingUseMarkup, libs, "adw_message_dialog_get_heading_use_markup") | |
| 1094 | + | core.PuregoSafeRegister(&xMessageDialogGetResponseAppearance, libs, "adw_message_dialog_get_response_appearance") | |
| 1095 | + | core.PuregoSafeRegister(&xMessageDialogGetResponseEnabled, libs, "adw_message_dialog_get_response_enabled") | |
| 1096 | + | core.PuregoSafeRegister(&xMessageDialogGetResponseLabel, libs, "adw_message_dialog_get_response_label") | |
| 1097 | + | core.PuregoSafeRegister(&xMessageDialogHasResponse, libs, "adw_message_dialog_has_response") | |
| 1098 | + | core.PuregoSafeRegister(&xMessageDialogRemoveResponse, libs, "adw_message_dialog_remove_response") | |
| 1099 | + | core.PuregoSafeRegister(&xMessageDialogResponse, libs, "adw_message_dialog_response") | |
| 1100 | + | core.PuregoSafeRegister(&xMessageDialogSetBody, libs, "adw_message_dialog_set_body") | |
| 1101 | + | core.PuregoSafeRegister(&xMessageDialogSetBodyUseMarkup, libs, "adw_message_dialog_set_body_use_markup") | |
| 1102 | + | core.PuregoSafeRegister(&xMessageDialogSetCloseResponse, libs, "adw_message_dialog_set_close_response") | |
| 1103 | + | core.PuregoSafeRegister(&xMessageDialogSetDefaultResponse, libs, "adw_message_dialog_set_default_response") | |
| 1104 | + | core.PuregoSafeRegister(&xMessageDialogSetExtraChild, libs, "adw_message_dialog_set_extra_child") | |
| 1105 | + | core.PuregoSafeRegister(&xMessageDialogSetHeading, libs, "adw_message_dialog_set_heading") | |
| 1106 | + | core.PuregoSafeRegister(&xMessageDialogSetHeadingUseMarkup, libs, "adw_message_dialog_set_heading_use_markup") | |
| 1107 | + | core.PuregoSafeRegister(&xMessageDialogSetResponseAppearance, libs, "adw_message_dialog_set_response_appearance") | |
| 1108 | + | core.PuregoSafeRegister(&xMessageDialogSetResponseEnabled, libs, "adw_message_dialog_set_response_enabled") | |
| 1109 | + | core.PuregoSafeRegister(&xMessageDialogSetResponseLabel, libs, "adw_message_dialog_set_response_label") | |
| 1106 | 1110 | ||
| 1107 | 1111 | } | |
M v4/adw/adw-multi-layout-view.go +19 -15
| @@ -539,24 +539,28 @@ func (x *MultiLayoutView) GetBuildableId() string { | |||
| 539 | 539 | ||
| 540 | 540 | func init() { | |
| 541 | 541 | core.SetPackageName("ADW", "libadwaita-1") | |
| 542 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 543 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 544 | - | if err != nil { | |
| 545 | - | panic(err) | |
| 542 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 543 | + | var libs []uintptr | |
| 544 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 545 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 546 | + | if err != nil { | |
| 547 | + | panic(err) | |
| 548 | + | } | |
| 549 | + | libs = append(libs, lib) | |
| 546 | 550 | } | |
| 547 | 551 | ||
| 548 | - | core.PuregoSafeRegister(&xMultiLayoutViewGLibType, lib, "adw_multi_layout_view_get_type") | |
| 552 | + | core.PuregoSafeRegister(&xMultiLayoutViewGLibType, libs, "adw_multi_layout_view_get_type") | |
| 549 | 553 | ||
| 550 | - | core.PuregoSafeRegister(&xNewMultiLayoutView, lib, "adw_multi_layout_view_new") | |
| 554 | + | core.PuregoSafeRegister(&xNewMultiLayoutView, libs, "adw_multi_layout_view_new") | |
| 551 | 555 | ||
| 552 | - | core.PuregoSafeRegister(&xMultiLayoutViewAddLayout, lib, "adw_multi_layout_view_add_layout") | |
| 553 | - | core.PuregoSafeRegister(&xMultiLayoutViewGetChild, lib, "adw_multi_layout_view_get_child") | |
| 554 | - | core.PuregoSafeRegister(&xMultiLayoutViewGetLayout, lib, "adw_multi_layout_view_get_layout") | |
| 555 | - | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutByName, lib, "adw_multi_layout_view_get_layout_by_name") | |
| 556 | - | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutName, lib, "adw_multi_layout_view_get_layout_name") | |
| 557 | - | core.PuregoSafeRegister(&xMultiLayoutViewRemoveLayout, lib, "adw_multi_layout_view_remove_layout") | |
| 558 | - | core.PuregoSafeRegister(&xMultiLayoutViewSetChild, lib, "adw_multi_layout_view_set_child") | |
| 559 | - | core.PuregoSafeRegister(&xMultiLayoutViewSetLayout, lib, "adw_multi_layout_view_set_layout") | |
| 560 | - | core.PuregoSafeRegister(&xMultiLayoutViewSetLayoutName, lib, "adw_multi_layout_view_set_layout_name") | |
| 556 | + | core.PuregoSafeRegister(&xMultiLayoutViewAddLayout, libs, "adw_multi_layout_view_add_layout") | |
| 557 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetChild, libs, "adw_multi_layout_view_get_child") | |
| 558 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayout, libs, "adw_multi_layout_view_get_layout") | |
| 559 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutByName, libs, "adw_multi_layout_view_get_layout_by_name") | |
| 560 | + | core.PuregoSafeRegister(&xMultiLayoutViewGetLayoutName, libs, "adw_multi_layout_view_get_layout_name") | |
| 561 | + | core.PuregoSafeRegister(&xMultiLayoutViewRemoveLayout, libs, "adw_multi_layout_view_remove_layout") | |
| 562 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetChild, libs, "adw_multi_layout_view_set_child") | |
| 563 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetLayout, libs, "adw_multi_layout_view_set_layout") | |
| 564 | + | core.PuregoSafeRegister(&xMultiLayoutViewSetLayoutName, libs, "adw_multi_layout_view_set_layout_name") | |
| 561 | 565 | ||
| 562 | 566 | } | |
M v4/adw/adw-navigation-split-view.go +30 -26
| @@ -708,33 +708,37 @@ func (x *NavigationSplitView) GetBuildableId() string { | |||
| 708 | 708 | ||
| 709 | 709 | func init() { | |
| 710 | 710 | core.SetPackageName("ADW", "libadwaita-1") | |
| 711 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 712 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 713 | - | if err != nil { | |
| 714 | - | panic(err) | |
| 711 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 712 | + | var libs []uintptr | |
| 713 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 714 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 715 | + | if err != nil { | |
| 716 | + | panic(err) | |
| 717 | + | } | |
| 718 | + | libs = append(libs, lib) | |
| 715 | 719 | } | |
| 716 | 720 | ||
| 717 | - | core.PuregoSafeRegister(&xNavigationSplitViewGLibType, lib, "adw_navigation_split_view_get_type") | |
| 718 | - | ||
| 719 | - | core.PuregoSafeRegister(&xNewNavigationSplitView, lib, "adw_navigation_split_view_new") | |
| 720 | - | ||
| 721 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetCollapsed, lib, "adw_navigation_split_view_get_collapsed") | |
| 722 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetContent, lib, "adw_navigation_split_view_get_content") | |
| 723 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetMaxSidebarWidth, lib, "adw_navigation_split_view_get_max_sidebar_width") | |
| 724 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetMinSidebarWidth, lib, "adw_navigation_split_view_get_min_sidebar_width") | |
| 725 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetShowContent, lib, "adw_navigation_split_view_get_show_content") | |
| 726 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebar, lib, "adw_navigation_split_view_get_sidebar") | |
| 727 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebarPosition, lib, "adw_navigation_split_view_get_sidebar_position") | |
| 728 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebarWidthFraction, lib, "adw_navigation_split_view_get_sidebar_width_fraction") | |
| 729 | - | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebarWidthUnit, lib, "adw_navigation_split_view_get_sidebar_width_unit") | |
| 730 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetCollapsed, lib, "adw_navigation_split_view_set_collapsed") | |
| 731 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetContent, lib, "adw_navigation_split_view_set_content") | |
| 732 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetMaxSidebarWidth, lib, "adw_navigation_split_view_set_max_sidebar_width") | |
| 733 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetMinSidebarWidth, lib, "adw_navigation_split_view_set_min_sidebar_width") | |
| 734 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetShowContent, lib, "adw_navigation_split_view_set_show_content") | |
| 735 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebar, lib, "adw_navigation_split_view_set_sidebar") | |
| 736 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebarPosition, lib, "adw_navigation_split_view_set_sidebar_position") | |
| 737 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebarWidthFraction, lib, "adw_navigation_split_view_set_sidebar_width_fraction") | |
| 738 | - | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebarWidthUnit, lib, "adw_navigation_split_view_set_sidebar_width_unit") | |
| 721 | + | core.PuregoSafeRegister(&xNavigationSplitViewGLibType, libs, "adw_navigation_split_view_get_type") | |
| 722 | + | ||
| 723 | + | core.PuregoSafeRegister(&xNewNavigationSplitView, libs, "adw_navigation_split_view_new") | |
| 724 | + | ||
| 725 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetCollapsed, libs, "adw_navigation_split_view_get_collapsed") | |
| 726 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetContent, libs, "adw_navigation_split_view_get_content") | |
| 727 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetMaxSidebarWidth, libs, "adw_navigation_split_view_get_max_sidebar_width") | |
| 728 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetMinSidebarWidth, libs, "adw_navigation_split_view_get_min_sidebar_width") | |
| 729 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetShowContent, libs, "adw_navigation_split_view_get_show_content") | |
| 730 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebar, libs, "adw_navigation_split_view_get_sidebar") | |
| 731 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebarPosition, libs, "adw_navigation_split_view_get_sidebar_position") | |
| 732 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebarWidthFraction, libs, "adw_navigation_split_view_get_sidebar_width_fraction") | |
| 733 | + | core.PuregoSafeRegister(&xNavigationSplitViewGetSidebarWidthUnit, libs, "adw_navigation_split_view_get_sidebar_width_unit") | |
| 734 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetCollapsed, libs, "adw_navigation_split_view_set_collapsed") | |
| 735 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetContent, libs, "adw_navigation_split_view_set_content") | |
| 736 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetMaxSidebarWidth, libs, "adw_navigation_split_view_set_max_sidebar_width") | |
| 737 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetMinSidebarWidth, libs, "adw_navigation_split_view_set_min_sidebar_width") | |
| 738 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetShowContent, libs, "adw_navigation_split_view_set_show_content") | |
| 739 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebar, libs, "adw_navigation_split_view_set_sidebar") | |
| 740 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebarPosition, libs, "adw_navigation_split_view_set_sidebar_position") | |
| 741 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebarWidthFraction, libs, "adw_navigation_split_view_set_sidebar_width_fraction") | |
| 742 | + | core.PuregoSafeRegister(&xNavigationSplitViewSetSidebarWidthUnit, libs, "adw_navigation_split_view_set_sidebar_width_unit") | |
| 739 | 743 | ||
| 740 | 744 | } | |
M v4/adw/adw-navigation-view.go +48 -44
| @@ -1675,51 +1675,55 @@ func (x *NavigationView) GetBuildableId() string { | |||
| 1675 | 1675 | ||
| 1676 | 1676 | func init() { | |
| 1677 | 1677 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1678 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1679 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1680 | - | if err != nil { | |
| 1681 | - | panic(err) | |
| 1678 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1679 | + | var libs []uintptr | |
| 1680 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1681 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1682 | + | if err != nil { | |
| 1683 | + | panic(err) | |
| 1684 | + | } | |
| 1685 | + | libs = append(libs, lib) | |
| 1682 | 1686 | } | |
| 1683 | 1687 | ||
| 1684 | - | core.PuregoSafeRegister(&xNavigationPageGLibType, lib, "adw_navigation_page_get_type") | |
| 1685 | - | ||
| 1686 | - | core.PuregoSafeRegister(&xNewNavigationPage, lib, "adw_navigation_page_new") | |
| 1687 | - | core.PuregoSafeRegister(&xNewNavigationPageWithTag, lib, "adw_navigation_page_new_with_tag") | |
| 1688 | - | ||
| 1689 | - | core.PuregoSafeRegister(&xNavigationPageGetCanPop, lib, "adw_navigation_page_get_can_pop") | |
| 1690 | - | core.PuregoSafeRegister(&xNavigationPageGetChild, lib, "adw_navigation_page_get_child") | |
| 1691 | - | core.PuregoSafeRegister(&xNavigationPageGetTag, lib, "adw_navigation_page_get_tag") | |
| 1692 | - | core.PuregoSafeRegister(&xNavigationPageGetTitle, lib, "adw_navigation_page_get_title") | |
| 1693 | - | core.PuregoSafeRegister(&xNavigationPageSetCanPop, lib, "adw_navigation_page_set_can_pop") | |
| 1694 | - | core.PuregoSafeRegister(&xNavigationPageSetChild, lib, "adw_navigation_page_set_child") | |
| 1695 | - | core.PuregoSafeRegister(&xNavigationPageSetTag, lib, "adw_navigation_page_set_tag") | |
| 1696 | - | core.PuregoSafeRegister(&xNavigationPageSetTitle, lib, "adw_navigation_page_set_title") | |
| 1697 | - | ||
| 1698 | - | core.PuregoSafeRegister(&xNavigationViewGLibType, lib, "adw_navigation_view_get_type") | |
| 1699 | - | ||
| 1700 | - | core.PuregoSafeRegister(&xNewNavigationView, lib, "adw_navigation_view_new") | |
| 1701 | - | ||
| 1702 | - | core.PuregoSafeRegister(&xNavigationViewAdd, lib, "adw_navigation_view_add") | |
| 1703 | - | core.PuregoSafeRegister(&xNavigationViewFindPage, lib, "adw_navigation_view_find_page") | |
| 1704 | - | core.PuregoSafeRegister(&xNavigationViewGetAnimateTransitions, lib, "adw_navigation_view_get_animate_transitions") | |
| 1705 | - | core.PuregoSafeRegister(&xNavigationViewGetHhomogeneous, lib, "adw_navigation_view_get_hhomogeneous") | |
| 1706 | - | core.PuregoSafeRegister(&xNavigationViewGetNavigationStack, lib, "adw_navigation_view_get_navigation_stack") | |
| 1707 | - | core.PuregoSafeRegister(&xNavigationViewGetPopOnEscape, lib, "adw_navigation_view_get_pop_on_escape") | |
| 1708 | - | core.PuregoSafeRegister(&xNavigationViewGetPreviousPage, lib, "adw_navigation_view_get_previous_page") | |
| 1709 | - | core.PuregoSafeRegister(&xNavigationViewGetVhomogeneous, lib, "adw_navigation_view_get_vhomogeneous") | |
| 1710 | - | core.PuregoSafeRegister(&xNavigationViewGetVisiblePage, lib, "adw_navigation_view_get_visible_page") | |
| 1711 | - | core.PuregoSafeRegister(&xNavigationViewGetVisiblePageTag, lib, "adw_navigation_view_get_visible_page_tag") | |
| 1712 | - | core.PuregoSafeRegister(&xNavigationViewPop, lib, "adw_navigation_view_pop") | |
| 1713 | - | core.PuregoSafeRegister(&xNavigationViewPopToPage, lib, "adw_navigation_view_pop_to_page") | |
| 1714 | - | core.PuregoSafeRegister(&xNavigationViewPopToTag, lib, "adw_navigation_view_pop_to_tag") | |
| 1715 | - | core.PuregoSafeRegister(&xNavigationViewPush, lib, "adw_navigation_view_push") | |
| 1716 | - | core.PuregoSafeRegister(&xNavigationViewPushByTag, lib, "adw_navigation_view_push_by_tag") | |
| 1717 | - | core.PuregoSafeRegister(&xNavigationViewRemove, lib, "adw_navigation_view_remove") | |
| 1718 | - | core.PuregoSafeRegister(&xNavigationViewReplace, lib, "adw_navigation_view_replace") | |
| 1719 | - | core.PuregoSafeRegister(&xNavigationViewReplaceWithTags, lib, "adw_navigation_view_replace_with_tags") | |
| 1720 | - | core.PuregoSafeRegister(&xNavigationViewSetAnimateTransitions, lib, "adw_navigation_view_set_animate_transitions") | |
| 1721 | - | core.PuregoSafeRegister(&xNavigationViewSetHhomogeneous, lib, "adw_navigation_view_set_hhomogeneous") | |
| 1722 | - | core.PuregoSafeRegister(&xNavigationViewSetPopOnEscape, lib, "adw_navigation_view_set_pop_on_escape") | |
| 1723 | - | core.PuregoSafeRegister(&xNavigationViewSetVhomogeneous, lib, "adw_navigation_view_set_vhomogeneous") | |
| 1688 | + | core.PuregoSafeRegister(&xNavigationPageGLibType, libs, "adw_navigation_page_get_type") | |
| 1689 | + | ||
| 1690 | + | core.PuregoSafeRegister(&xNewNavigationPage, libs, "adw_navigation_page_new") | |
| 1691 | + | core.PuregoSafeRegister(&xNewNavigationPageWithTag, libs, "adw_navigation_page_new_with_tag") | |
| 1692 | + | ||
| 1693 | + | core.PuregoSafeRegister(&xNavigationPageGetCanPop, libs, "adw_navigation_page_get_can_pop") | |
| 1694 | + | core.PuregoSafeRegister(&xNavigationPageGetChild, libs, "adw_navigation_page_get_child") | |
| 1695 | + | core.PuregoSafeRegister(&xNavigationPageGetTag, libs, "adw_navigation_page_get_tag") | |
| 1696 | + | core.PuregoSafeRegister(&xNavigationPageGetTitle, libs, "adw_navigation_page_get_title") | |
| 1697 | + | core.PuregoSafeRegister(&xNavigationPageSetCanPop, libs, "adw_navigation_page_set_can_pop") | |
| 1698 | + | core.PuregoSafeRegister(&xNavigationPageSetChild, libs, "adw_navigation_page_set_child") | |
| 1699 | + | core.PuregoSafeRegister(&xNavigationPageSetTag, libs, "adw_navigation_page_set_tag") | |
| 1700 | + | core.PuregoSafeRegister(&xNavigationPageSetTitle, libs, "adw_navigation_page_set_title") | |
| 1701 | + | ||
| 1702 | + | core.PuregoSafeRegister(&xNavigationViewGLibType, libs, "adw_navigation_view_get_type") | |
| 1703 | + | ||
| 1704 | + | core.PuregoSafeRegister(&xNewNavigationView, libs, "adw_navigation_view_new") | |
| 1705 | + | ||
| 1706 | + | core.PuregoSafeRegister(&xNavigationViewAdd, libs, "adw_navigation_view_add") | |
| 1707 | + | core.PuregoSafeRegister(&xNavigationViewFindPage, libs, "adw_navigation_view_find_page") | |
| 1708 | + | core.PuregoSafeRegister(&xNavigationViewGetAnimateTransitions, libs, "adw_navigation_view_get_animate_transitions") | |
| 1709 | + | core.PuregoSafeRegister(&xNavigationViewGetHhomogeneous, libs, "adw_navigation_view_get_hhomogeneous") | |
| 1710 | + | core.PuregoSafeRegister(&xNavigationViewGetNavigationStack, libs, "adw_navigation_view_get_navigation_stack") | |
| 1711 | + | core.PuregoSafeRegister(&xNavigationViewGetPopOnEscape, libs, "adw_navigation_view_get_pop_on_escape") | |
| 1712 | + | core.PuregoSafeRegister(&xNavigationViewGetPreviousPage, libs, "adw_navigation_view_get_previous_page") | |
| 1713 | + | core.PuregoSafeRegister(&xNavigationViewGetVhomogeneous, libs, "adw_navigation_view_get_vhomogeneous") | |
| 1714 | + | core.PuregoSafeRegister(&xNavigationViewGetVisiblePage, libs, "adw_navigation_view_get_visible_page") | |
| 1715 | + | core.PuregoSafeRegister(&xNavigationViewGetVisiblePageTag, libs, "adw_navigation_view_get_visible_page_tag") | |
| 1716 | + | core.PuregoSafeRegister(&xNavigationViewPop, libs, "adw_navigation_view_pop") | |
| 1717 | + | core.PuregoSafeRegister(&xNavigationViewPopToPage, libs, "adw_navigation_view_pop_to_page") | |
| 1718 | + | core.PuregoSafeRegister(&xNavigationViewPopToTag, libs, "adw_navigation_view_pop_to_tag") | |
| 1719 | + | core.PuregoSafeRegister(&xNavigationViewPush, libs, "adw_navigation_view_push") | |
| 1720 | + | core.PuregoSafeRegister(&xNavigationViewPushByTag, libs, "adw_navigation_view_push_by_tag") | |
| 1721 | + | core.PuregoSafeRegister(&xNavigationViewRemove, libs, "adw_navigation_view_remove") | |
| 1722 | + | core.PuregoSafeRegister(&xNavigationViewReplace, libs, "adw_navigation_view_replace") | |
| 1723 | + | core.PuregoSafeRegister(&xNavigationViewReplaceWithTags, libs, "adw_navigation_view_replace_with_tags") | |
| 1724 | + | core.PuregoSafeRegister(&xNavigationViewSetAnimateTransitions, libs, "adw_navigation_view_set_animate_transitions") | |
| 1725 | + | core.PuregoSafeRegister(&xNavigationViewSetHhomogeneous, libs, "adw_navigation_view_set_hhomogeneous") | |
| 1726 | + | core.PuregoSafeRegister(&xNavigationViewSetPopOnEscape, libs, "adw_navigation_view_set_pop_on_escape") | |
| 1727 | + | core.PuregoSafeRegister(&xNavigationViewSetVhomogeneous, libs, "adw_navigation_view_set_vhomogeneous") | |
| 1724 | 1728 | ||
| 1725 | 1729 | } | |
M v4/adw/adw-overlay-split-view.go +36 -32
| @@ -802,39 +802,43 @@ func (x *OverlaySplitView) GetBuildableId() string { | |||
| 802 | 802 | ||
| 803 | 803 | func init() { | |
| 804 | 804 | core.SetPackageName("ADW", "libadwaita-1") | |
| 805 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 806 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 807 | - | if err != nil { | |
| 808 | - | panic(err) | |
| 805 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 806 | + | var libs []uintptr | |
| 807 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 808 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 809 | + | if err != nil { | |
| 810 | + | panic(err) | |
| 811 | + | } | |
| 812 | + | libs = append(libs, lib) | |
| 809 | 813 | } | |
| 810 | 814 | ||
| 811 | - | core.PuregoSafeRegister(&xOverlaySplitViewGLibType, lib, "adw_overlay_split_view_get_type") | |
| 812 | - | ||
| 813 | - | core.PuregoSafeRegister(&xNewOverlaySplitView, lib, "adw_overlay_split_view_new") | |
| 814 | - | ||
| 815 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetCollapsed, lib, "adw_overlay_split_view_get_collapsed") | |
| 816 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetContent, lib, "adw_overlay_split_view_get_content") | |
| 817 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetEnableHideGesture, lib, "adw_overlay_split_view_get_enable_hide_gesture") | |
| 818 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetEnableShowGesture, lib, "adw_overlay_split_view_get_enable_show_gesture") | |
| 819 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetMaxSidebarWidth, lib, "adw_overlay_split_view_get_max_sidebar_width") | |
| 820 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetMinSidebarWidth, lib, "adw_overlay_split_view_get_min_sidebar_width") | |
| 821 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetPinSidebar, lib, "adw_overlay_split_view_get_pin_sidebar") | |
| 822 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetShowSidebar, lib, "adw_overlay_split_view_get_show_sidebar") | |
| 823 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebar, lib, "adw_overlay_split_view_get_sidebar") | |
| 824 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebarPosition, lib, "adw_overlay_split_view_get_sidebar_position") | |
| 825 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebarWidthFraction, lib, "adw_overlay_split_view_get_sidebar_width_fraction") | |
| 826 | - | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebarWidthUnit, lib, "adw_overlay_split_view_get_sidebar_width_unit") | |
| 827 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetCollapsed, lib, "adw_overlay_split_view_set_collapsed") | |
| 828 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetContent, lib, "adw_overlay_split_view_set_content") | |
| 829 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetEnableHideGesture, lib, "adw_overlay_split_view_set_enable_hide_gesture") | |
| 830 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetEnableShowGesture, lib, "adw_overlay_split_view_set_enable_show_gesture") | |
| 831 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetMaxSidebarWidth, lib, "adw_overlay_split_view_set_max_sidebar_width") | |
| 832 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetMinSidebarWidth, lib, "adw_overlay_split_view_set_min_sidebar_width") | |
| 833 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetPinSidebar, lib, "adw_overlay_split_view_set_pin_sidebar") | |
| 834 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetShowSidebar, lib, "adw_overlay_split_view_set_show_sidebar") | |
| 835 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebar, lib, "adw_overlay_split_view_set_sidebar") | |
| 836 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebarPosition, lib, "adw_overlay_split_view_set_sidebar_position") | |
| 837 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebarWidthFraction, lib, "adw_overlay_split_view_set_sidebar_width_fraction") | |
| 838 | - | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebarWidthUnit, lib, "adw_overlay_split_view_set_sidebar_width_unit") | |
| 815 | + | core.PuregoSafeRegister(&xOverlaySplitViewGLibType, libs, "adw_overlay_split_view_get_type") | |
| 816 | + | ||
| 817 | + | core.PuregoSafeRegister(&xNewOverlaySplitView, libs, "adw_overlay_split_view_new") | |
| 818 | + | ||
| 819 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetCollapsed, libs, "adw_overlay_split_view_get_collapsed") | |
| 820 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetContent, libs, "adw_overlay_split_view_get_content") | |
| 821 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetEnableHideGesture, libs, "adw_overlay_split_view_get_enable_hide_gesture") | |
| 822 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetEnableShowGesture, libs, "adw_overlay_split_view_get_enable_show_gesture") | |
| 823 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetMaxSidebarWidth, libs, "adw_overlay_split_view_get_max_sidebar_width") | |
| 824 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetMinSidebarWidth, libs, "adw_overlay_split_view_get_min_sidebar_width") | |
| 825 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetPinSidebar, libs, "adw_overlay_split_view_get_pin_sidebar") | |
| 826 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetShowSidebar, libs, "adw_overlay_split_view_get_show_sidebar") | |
| 827 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebar, libs, "adw_overlay_split_view_get_sidebar") | |
| 828 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebarPosition, libs, "adw_overlay_split_view_get_sidebar_position") | |
| 829 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebarWidthFraction, libs, "adw_overlay_split_view_get_sidebar_width_fraction") | |
| 830 | + | core.PuregoSafeRegister(&xOverlaySplitViewGetSidebarWidthUnit, libs, "adw_overlay_split_view_get_sidebar_width_unit") | |
| 831 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetCollapsed, libs, "adw_overlay_split_view_set_collapsed") | |
| 832 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetContent, libs, "adw_overlay_split_view_set_content") | |
| 833 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetEnableHideGesture, libs, "adw_overlay_split_view_set_enable_hide_gesture") | |
| 834 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetEnableShowGesture, libs, "adw_overlay_split_view_set_enable_show_gesture") | |
| 835 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetMaxSidebarWidth, libs, "adw_overlay_split_view_set_max_sidebar_width") | |
| 836 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetMinSidebarWidth, libs, "adw_overlay_split_view_set_min_sidebar_width") | |
| 837 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetPinSidebar, libs, "adw_overlay_split_view_set_pin_sidebar") | |
| 838 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetShowSidebar, libs, "adw_overlay_split_view_set_show_sidebar") | |
| 839 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebar, libs, "adw_overlay_split_view_set_sidebar") | |
| 840 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebarPosition, libs, "adw_overlay_split_view_set_sidebar_position") | |
| 841 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebarWidthFraction, libs, "adw_overlay_split_view_set_sidebar_width_fraction") | |
| 842 | + | core.PuregoSafeRegister(&xOverlaySplitViewSetSidebarWidthUnit, libs, "adw_overlay_split_view_set_sidebar_width_unit") | |
| 839 | 843 | ||
| 840 | 844 | } | |
M v4/adw/adw-password-entry-row.go +10 -6
| @@ -735,14 +735,18 @@ func (x *PasswordEntryRow) SetWidthChars(NCharsVar int) { | |||
| 735 | 735 | ||
| 736 | 736 | func init() { | |
| 737 | 737 | core.SetPackageName("ADW", "libadwaita-1") | |
| 738 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 739 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 740 | - | if err != nil { | |
| 741 | - | panic(err) | |
| 738 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 739 | + | var libs []uintptr | |
| 740 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 741 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 742 | + | if err != nil { | |
| 743 | + | panic(err) | |
| 744 | + | } | |
| 745 | + | libs = append(libs, lib) | |
| 742 | 746 | } | |
| 743 | 747 | ||
| 744 | - | core.PuregoSafeRegister(&xPasswordEntryRowGLibType, lib, "adw_password_entry_row_get_type") | |
| 748 | + | core.PuregoSafeRegister(&xPasswordEntryRowGLibType, libs, "adw_password_entry_row_get_type") | |
| 745 | 749 | ||
| 746 | - | core.PuregoSafeRegister(&xNewPasswordEntryRow, lib, "adw_password_entry_row_new") | |
| 750 | + | core.PuregoSafeRegister(&xNewPasswordEntryRow, libs, "adw_password_entry_row_new") | |
| 747 | 751 | ||
| 748 | 752 | } | |
M v4/adw/adw-preferences-dialog.go +23 -19
| @@ -483,26 +483,30 @@ func (x *PreferencesDialog) GetBuildableId() string { | |||
| 483 | 483 | ||
| 484 | 484 | func init() { | |
| 485 | 485 | core.SetPackageName("ADW", "libadwaita-1") | |
| 486 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 487 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 488 | - | if err != nil { | |
| 489 | - | panic(err) | |
| 486 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 487 | + | var libs []uintptr | |
| 488 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 489 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 490 | + | if err != nil { | |
| 491 | + | panic(err) | |
| 492 | + | } | |
| 493 | + | libs = append(libs, lib) | |
| 490 | 494 | } | |
| 491 | 495 | ||
| 492 | - | core.PuregoSafeRegister(&xPreferencesDialogGLibType, lib, "adw_preferences_dialog_get_type") | |
| 493 | - | ||
| 494 | - | core.PuregoSafeRegister(&xNewPreferencesDialog, lib, "adw_preferences_dialog_new") | |
| 495 | - | ||
| 496 | - | core.PuregoSafeRegister(&xPreferencesDialogAdd, lib, "adw_preferences_dialog_add") | |
| 497 | - | core.PuregoSafeRegister(&xPreferencesDialogAddToast, lib, "adw_preferences_dialog_add_toast") | |
| 498 | - | core.PuregoSafeRegister(&xPreferencesDialogGetSearchEnabled, lib, "adw_preferences_dialog_get_search_enabled") | |
| 499 | - | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePage, lib, "adw_preferences_dialog_get_visible_page") | |
| 500 | - | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePageName, lib, "adw_preferences_dialog_get_visible_page_name") | |
| 501 | - | core.PuregoSafeRegister(&xPreferencesDialogPopSubpage, lib, "adw_preferences_dialog_pop_subpage") | |
| 502 | - | core.PuregoSafeRegister(&xPreferencesDialogPushSubpage, lib, "adw_preferences_dialog_push_subpage") | |
| 503 | - | core.PuregoSafeRegister(&xPreferencesDialogRemove, lib, "adw_preferences_dialog_remove") | |
| 504 | - | core.PuregoSafeRegister(&xPreferencesDialogSetSearchEnabled, lib, "adw_preferences_dialog_set_search_enabled") | |
| 505 | - | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePage, lib, "adw_preferences_dialog_set_visible_page") | |
| 506 | - | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePageName, lib, "adw_preferences_dialog_set_visible_page_name") | |
| 496 | + | core.PuregoSafeRegister(&xPreferencesDialogGLibType, libs, "adw_preferences_dialog_get_type") | |
| 497 | + | ||
| 498 | + | core.PuregoSafeRegister(&xNewPreferencesDialog, libs, "adw_preferences_dialog_new") | |
| 499 | + | ||
| 500 | + | core.PuregoSafeRegister(&xPreferencesDialogAdd, libs, "adw_preferences_dialog_add") | |
| 501 | + | core.PuregoSafeRegister(&xPreferencesDialogAddToast, libs, "adw_preferences_dialog_add_toast") | |
| 502 | + | core.PuregoSafeRegister(&xPreferencesDialogGetSearchEnabled, libs, "adw_preferences_dialog_get_search_enabled") | |
| 503 | + | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePage, libs, "adw_preferences_dialog_get_visible_page") | |
| 504 | + | core.PuregoSafeRegister(&xPreferencesDialogGetVisiblePageName, libs, "adw_preferences_dialog_get_visible_page_name") | |
| 505 | + | core.PuregoSafeRegister(&xPreferencesDialogPopSubpage, libs, "adw_preferences_dialog_pop_subpage") | |
| 506 | + | core.PuregoSafeRegister(&xPreferencesDialogPushSubpage, libs, "adw_preferences_dialog_push_subpage") | |
| 507 | + | core.PuregoSafeRegister(&xPreferencesDialogRemove, libs, "adw_preferences_dialog_remove") | |
| 508 | + | core.PuregoSafeRegister(&xPreferencesDialogSetSearchEnabled, libs, "adw_preferences_dialog_set_search_enabled") | |
| 509 | + | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePage, libs, "adw_preferences_dialog_set_visible_page") | |
| 510 | + | core.PuregoSafeRegister(&xPreferencesDialogSetVisiblePageName, libs, "adw_preferences_dialog_set_visible_page_name") | |
| 507 | 511 | ||
| 508 | 512 | } | |
M v4/adw/adw-preferences-group.go +20 -16
| @@ -492,25 +492,29 @@ func (x *PreferencesGroup) GetBuildableId() string { | |||
| 492 | 492 | ||
| 493 | 493 | func init() { | |
| 494 | 494 | core.SetPackageName("ADW", "libadwaita-1") | |
| 495 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 496 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 497 | - | if err != nil { | |
| 498 | - | panic(err) | |
| 495 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 496 | + | var libs []uintptr | |
| 497 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 498 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 499 | + | if err != nil { | |
| 500 | + | panic(err) | |
| 501 | + | } | |
| 502 | + | libs = append(libs, lib) | |
| 499 | 503 | } | |
| 500 | 504 | ||
| 501 | - | core.PuregoSafeRegister(&xPreferencesGroupGLibType, lib, "adw_preferences_group_get_type") | |
| 505 | + | core.PuregoSafeRegister(&xPreferencesGroupGLibType, libs, "adw_preferences_group_get_type") | |
| 502 | 506 | ||
| 503 | - | core.PuregoSafeRegister(&xNewPreferencesGroup, lib, "adw_preferences_group_new") | |
| 507 | + | core.PuregoSafeRegister(&xNewPreferencesGroup, libs, "adw_preferences_group_new") | |
| 504 | 508 | ||
| 505 | - | core.PuregoSafeRegister(&xPreferencesGroupAdd, lib, "adw_preferences_group_add") | |
| 506 | - | core.PuregoSafeRegister(&xPreferencesGroupGetDescription, lib, "adw_preferences_group_get_description") | |
| 507 | - | core.PuregoSafeRegister(&xPreferencesGroupGetHeaderSuffix, lib, "adw_preferences_group_get_header_suffix") | |
| 508 | - | core.PuregoSafeRegister(&xPreferencesGroupGetSeparateRows, lib, "adw_preferences_group_get_separate_rows") | |
| 509 | - | core.PuregoSafeRegister(&xPreferencesGroupGetTitle, lib, "adw_preferences_group_get_title") | |
| 510 | - | core.PuregoSafeRegister(&xPreferencesGroupRemove, lib, "adw_preferences_group_remove") | |
| 511 | - | core.PuregoSafeRegister(&xPreferencesGroupSetDescription, lib, "adw_preferences_group_set_description") | |
| 512 | - | core.PuregoSafeRegister(&xPreferencesGroupSetHeaderSuffix, lib, "adw_preferences_group_set_header_suffix") | |
| 513 | - | core.PuregoSafeRegister(&xPreferencesGroupSetSeparateRows, lib, "adw_preferences_group_set_separate_rows") | |
| 514 | - | core.PuregoSafeRegister(&xPreferencesGroupSetTitle, lib, "adw_preferences_group_set_title") | |
| 509 | + | core.PuregoSafeRegister(&xPreferencesGroupAdd, libs, "adw_preferences_group_add") | |
| 510 | + | core.PuregoSafeRegister(&xPreferencesGroupGetDescription, libs, "adw_preferences_group_get_description") | |
| 511 | + | core.PuregoSafeRegister(&xPreferencesGroupGetHeaderSuffix, libs, "adw_preferences_group_get_header_suffix") | |
| 512 | + | core.PuregoSafeRegister(&xPreferencesGroupGetSeparateRows, libs, "adw_preferences_group_get_separate_rows") | |
| 513 | + | core.PuregoSafeRegister(&xPreferencesGroupGetTitle, libs, "adw_preferences_group_get_title") | |
| 514 | + | core.PuregoSafeRegister(&xPreferencesGroupRemove, libs, "adw_preferences_group_remove") | |
| 515 | + | core.PuregoSafeRegister(&xPreferencesGroupSetDescription, libs, "adw_preferences_group_set_description") | |
| 516 | + | core.PuregoSafeRegister(&xPreferencesGroupSetHeaderSuffix, libs, "adw_preferences_group_set_header_suffix") | |
| 517 | + | core.PuregoSafeRegister(&xPreferencesGroupSetSeparateRows, libs, "adw_preferences_group_set_separate_rows") | |
| 518 | + | core.PuregoSafeRegister(&xPreferencesGroupSetTitle, libs, "adw_preferences_group_set_title") | |
| 515 | 519 | ||
| 516 | 520 | } | |
M v4/adw/adw-preferences-page.go +29 -25
| @@ -530,32 +530,36 @@ func (x *PreferencesPage) GetBuildableId() string { | |||
| 530 | 530 | ||
| 531 | 531 | func init() { | |
| 532 | 532 | core.SetPackageName("ADW", "libadwaita-1") | |
| 533 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 534 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 535 | - | if err != nil { | |
| 536 | - | panic(err) | |
| 533 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 534 | + | var libs []uintptr | |
| 535 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 536 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 537 | + | if err != nil { | |
| 538 | + | panic(err) | |
| 539 | + | } | |
| 540 | + | libs = append(libs, lib) | |
| 537 | 541 | } | |
| 538 | 542 | ||
| 539 | - | core.PuregoSafeRegister(&xPreferencesPageGLibType, lib, "adw_preferences_page_get_type") | |
| 540 | - | ||
| 541 | - | core.PuregoSafeRegister(&xNewPreferencesPage, lib, "adw_preferences_page_new") | |
| 542 | - | ||
| 543 | - | core.PuregoSafeRegister(&xPreferencesPageAdd, lib, "adw_preferences_page_add") | |
| 544 | - | core.PuregoSafeRegister(&xPreferencesPageGetBanner, lib, "adw_preferences_page_get_banner") | |
| 545 | - | core.PuregoSafeRegister(&xPreferencesPageGetDescription, lib, "adw_preferences_page_get_description") | |
| 546 | - | core.PuregoSafeRegister(&xPreferencesPageGetDescriptionCentered, lib, "adw_preferences_page_get_description_centered") | |
| 547 | - | core.PuregoSafeRegister(&xPreferencesPageGetIconName, lib, "adw_preferences_page_get_icon_name") | |
| 548 | - | core.PuregoSafeRegister(&xPreferencesPageGetName, lib, "adw_preferences_page_get_name") | |
| 549 | - | core.PuregoSafeRegister(&xPreferencesPageGetTitle, lib, "adw_preferences_page_get_title") | |
| 550 | - | core.PuregoSafeRegister(&xPreferencesPageGetUseUnderline, lib, "adw_preferences_page_get_use_underline") | |
| 551 | - | core.PuregoSafeRegister(&xPreferencesPageRemove, lib, "adw_preferences_page_remove") | |
| 552 | - | core.PuregoSafeRegister(&xPreferencesPageScrollToTop, lib, "adw_preferences_page_scroll_to_top") | |
| 553 | - | core.PuregoSafeRegister(&xPreferencesPageSetBanner, lib, "adw_preferences_page_set_banner") | |
| 554 | - | core.PuregoSafeRegister(&xPreferencesPageSetDescription, lib, "adw_preferences_page_set_description") | |
| 555 | - | core.PuregoSafeRegister(&xPreferencesPageSetDescriptionCentered, lib, "adw_preferences_page_set_description_centered") | |
| 556 | - | core.PuregoSafeRegister(&xPreferencesPageSetIconName, lib, "adw_preferences_page_set_icon_name") | |
| 557 | - | core.PuregoSafeRegister(&xPreferencesPageSetName, lib, "adw_preferences_page_set_name") | |
| 558 | - | core.PuregoSafeRegister(&xPreferencesPageSetTitle, lib, "adw_preferences_page_set_title") | |
| 559 | - | core.PuregoSafeRegister(&xPreferencesPageSetUseUnderline, lib, "adw_preferences_page_set_use_underline") | |
| 543 | + | core.PuregoSafeRegister(&xPreferencesPageGLibType, libs, "adw_preferences_page_get_type") | |
| 544 | + | ||
| 545 | + | core.PuregoSafeRegister(&xNewPreferencesPage, libs, "adw_preferences_page_new") | |
| 546 | + | ||
| 547 | + | core.PuregoSafeRegister(&xPreferencesPageAdd, libs, "adw_preferences_page_add") | |
| 548 | + | core.PuregoSafeRegister(&xPreferencesPageGetBanner, libs, "adw_preferences_page_get_banner") | |
| 549 | + | core.PuregoSafeRegister(&xPreferencesPageGetDescription, libs, "adw_preferences_page_get_description") | |
| 550 | + | core.PuregoSafeRegister(&xPreferencesPageGetDescriptionCentered, libs, "adw_preferences_page_get_description_centered") | |
| 551 | + | core.PuregoSafeRegister(&xPreferencesPageGetIconName, libs, "adw_preferences_page_get_icon_name") | |
| 552 | + | core.PuregoSafeRegister(&xPreferencesPageGetName, libs, "adw_preferences_page_get_name") | |
| 553 | + | core.PuregoSafeRegister(&xPreferencesPageGetTitle, libs, "adw_preferences_page_get_title") | |
| 554 | + | core.PuregoSafeRegister(&xPreferencesPageGetUseUnderline, libs, "adw_preferences_page_get_use_underline") | |
| 555 | + | core.PuregoSafeRegister(&xPreferencesPageRemove, libs, "adw_preferences_page_remove") | |
| 556 | + | core.PuregoSafeRegister(&xPreferencesPageScrollToTop, libs, "adw_preferences_page_scroll_to_top") | |
| 557 | + | core.PuregoSafeRegister(&xPreferencesPageSetBanner, libs, "adw_preferences_page_set_banner") | |
| 558 | + | core.PuregoSafeRegister(&xPreferencesPageSetDescription, libs, "adw_preferences_page_set_description") | |
| 559 | + | core.PuregoSafeRegister(&xPreferencesPageSetDescriptionCentered, libs, "adw_preferences_page_set_description_centered") | |
| 560 | + | core.PuregoSafeRegister(&xPreferencesPageSetIconName, libs, "adw_preferences_page_set_icon_name") | |
| 561 | + | core.PuregoSafeRegister(&xPreferencesPageSetName, libs, "adw_preferences_page_set_name") | |
| 562 | + | core.PuregoSafeRegister(&xPreferencesPageSetTitle, libs, "adw_preferences_page_set_title") | |
| 563 | + | core.PuregoSafeRegister(&xPreferencesPageSetUseUnderline, libs, "adw_preferences_page_set_use_underline") | |
| 560 | 564 | ||
| 561 | 565 | } | |
M v4/adw/adw-preferences-row.go +18 -14
| @@ -522,23 +522,27 @@ func (x *PreferencesRow) GetBuildableId() string { | |||
| 522 | 522 | ||
| 523 | 523 | func init() { | |
| 524 | 524 | core.SetPackageName("ADW", "libadwaita-1") | |
| 525 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 526 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 527 | - | if err != nil { | |
| 528 | - | panic(err) | |
| 525 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 526 | + | var libs []uintptr | |
| 527 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 528 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 529 | + | if err != nil { | |
| 530 | + | panic(err) | |
| 531 | + | } | |
| 532 | + | libs = append(libs, lib) | |
| 529 | 533 | } | |
| 530 | 534 | ||
| 531 | - | core.PuregoSafeRegister(&xPreferencesRowGLibType, lib, "adw_preferences_row_get_type") | |
| 535 | + | core.PuregoSafeRegister(&xPreferencesRowGLibType, libs, "adw_preferences_row_get_type") | |
| 532 | 536 | ||
| 533 | - | core.PuregoSafeRegister(&xNewPreferencesRow, lib, "adw_preferences_row_new") | |
| 537 | + | core.PuregoSafeRegister(&xNewPreferencesRow, libs, "adw_preferences_row_new") | |
| 534 | 538 | ||
| 535 | - | core.PuregoSafeRegister(&xPreferencesRowGetTitle, lib, "adw_preferences_row_get_title") | |
| 536 | - | core.PuregoSafeRegister(&xPreferencesRowGetTitleSelectable, lib, "adw_preferences_row_get_title_selectable") | |
| 537 | - | core.PuregoSafeRegister(&xPreferencesRowGetUseMarkup, lib, "adw_preferences_row_get_use_markup") | |
| 538 | - | core.PuregoSafeRegister(&xPreferencesRowGetUseUnderline, lib, "adw_preferences_row_get_use_underline") | |
| 539 | - | core.PuregoSafeRegister(&xPreferencesRowSetTitle, lib, "adw_preferences_row_set_title") | |
| 540 | - | core.PuregoSafeRegister(&xPreferencesRowSetTitleSelectable, lib, "adw_preferences_row_set_title_selectable") | |
| 541 | - | core.PuregoSafeRegister(&xPreferencesRowSetUseMarkup, lib, "adw_preferences_row_set_use_markup") | |
| 542 | - | core.PuregoSafeRegister(&xPreferencesRowSetUseUnderline, lib, "adw_preferences_row_set_use_underline") | |
| 539 | + | core.PuregoSafeRegister(&xPreferencesRowGetTitle, libs, "adw_preferences_row_get_title") | |
| 540 | + | core.PuregoSafeRegister(&xPreferencesRowGetTitleSelectable, libs, "adw_preferences_row_get_title_selectable") | |
| 541 | + | core.PuregoSafeRegister(&xPreferencesRowGetUseMarkup, libs, "adw_preferences_row_get_use_markup") | |
| 542 | + | core.PuregoSafeRegister(&xPreferencesRowGetUseUnderline, libs, "adw_preferences_row_get_use_underline") | |
| 543 | + | core.PuregoSafeRegister(&xPreferencesRowSetTitle, libs, "adw_preferences_row_set_title") | |
| 544 | + | core.PuregoSafeRegister(&xPreferencesRowSetTitleSelectable, libs, "adw_preferences_row_set_title_selectable") | |
| 545 | + | core.PuregoSafeRegister(&xPreferencesRowSetUseMarkup, libs, "adw_preferences_row_set_use_markup") | |
| 546 | + | core.PuregoSafeRegister(&xPreferencesRowSetUseUnderline, libs, "adw_preferences_row_set_use_underline") | |
| 543 | 547 | ||
| 544 | 548 | } | |
M v4/adw/adw-preferences-window.go +27 -23
| @@ -640,30 +640,34 @@ func (x *PreferencesWindow) SetFocus(FocusVar *gtk.Widget) { | |||
| 640 | 640 | ||
| 641 | 641 | func init() { | |
| 642 | 642 | core.SetPackageName("ADW", "libadwaita-1") | |
| 643 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 644 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 645 | - | if err != nil { | |
| 646 | - | panic(err) | |
| 643 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 644 | + | var libs []uintptr | |
| 645 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 646 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 647 | + | if err != nil { | |
| 648 | + | panic(err) | |
| 649 | + | } | |
| 650 | + | libs = append(libs, lib) | |
| 647 | 651 | } | |
| 648 | 652 | ||
| 649 | - | core.PuregoSafeRegister(&xPreferencesWindowGLibType, lib, "adw_preferences_window_get_type") | |
| 650 | - | ||
| 651 | - | core.PuregoSafeRegister(&xNewPreferencesWindow, lib, "adw_preferences_window_new") | |
| 652 | - | ||
| 653 | - | core.PuregoSafeRegister(&xPreferencesWindowAdd, lib, "adw_preferences_window_add") | |
| 654 | - | core.PuregoSafeRegister(&xPreferencesWindowAddToast, lib, "adw_preferences_window_add_toast") | |
| 655 | - | core.PuregoSafeRegister(&xPreferencesWindowCloseSubpage, lib, "adw_preferences_window_close_subpage") | |
| 656 | - | core.PuregoSafeRegister(&xPreferencesWindowGetCanNavigateBack, lib, "adw_preferences_window_get_can_navigate_back") | |
| 657 | - | core.PuregoSafeRegister(&xPreferencesWindowGetSearchEnabled, lib, "adw_preferences_window_get_search_enabled") | |
| 658 | - | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePage, lib, "adw_preferences_window_get_visible_page") | |
| 659 | - | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePageName, lib, "adw_preferences_window_get_visible_page_name") | |
| 660 | - | core.PuregoSafeRegister(&xPreferencesWindowPopSubpage, lib, "adw_preferences_window_pop_subpage") | |
| 661 | - | core.PuregoSafeRegister(&xPreferencesWindowPresentSubpage, lib, "adw_preferences_window_present_subpage") | |
| 662 | - | core.PuregoSafeRegister(&xPreferencesWindowPushSubpage, lib, "adw_preferences_window_push_subpage") | |
| 663 | - | core.PuregoSafeRegister(&xPreferencesWindowRemove, lib, "adw_preferences_window_remove") | |
| 664 | - | core.PuregoSafeRegister(&xPreferencesWindowSetCanNavigateBack, lib, "adw_preferences_window_set_can_navigate_back") | |
| 665 | - | core.PuregoSafeRegister(&xPreferencesWindowSetSearchEnabled, lib, "adw_preferences_window_set_search_enabled") | |
| 666 | - | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePage, lib, "adw_preferences_window_set_visible_page") | |
| 667 | - | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePageName, lib, "adw_preferences_window_set_visible_page_name") | |
| 653 | + | core.PuregoSafeRegister(&xPreferencesWindowGLibType, libs, "adw_preferences_window_get_type") | |
| 654 | + | ||
| 655 | + | core.PuregoSafeRegister(&xNewPreferencesWindow, libs, "adw_preferences_window_new") | |
| 656 | + | ||
| 657 | + | core.PuregoSafeRegister(&xPreferencesWindowAdd, libs, "adw_preferences_window_add") | |
| 658 | + | core.PuregoSafeRegister(&xPreferencesWindowAddToast, libs, "adw_preferences_window_add_toast") | |
| 659 | + | core.PuregoSafeRegister(&xPreferencesWindowCloseSubpage, libs, "adw_preferences_window_close_subpage") | |
| 660 | + | core.PuregoSafeRegister(&xPreferencesWindowGetCanNavigateBack, libs, "adw_preferences_window_get_can_navigate_back") | |
| 661 | + | core.PuregoSafeRegister(&xPreferencesWindowGetSearchEnabled, libs, "adw_preferences_window_get_search_enabled") | |
| 662 | + | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePage, libs, "adw_preferences_window_get_visible_page") | |
| 663 | + | core.PuregoSafeRegister(&xPreferencesWindowGetVisiblePageName, libs, "adw_preferences_window_get_visible_page_name") | |
| 664 | + | core.PuregoSafeRegister(&xPreferencesWindowPopSubpage, libs, "adw_preferences_window_pop_subpage") | |
| 665 | + | core.PuregoSafeRegister(&xPreferencesWindowPresentSubpage, libs, "adw_preferences_window_present_subpage") | |
| 666 | + | core.PuregoSafeRegister(&xPreferencesWindowPushSubpage, libs, "adw_preferences_window_push_subpage") | |
| 667 | + | core.PuregoSafeRegister(&xPreferencesWindowRemove, libs, "adw_preferences_window_remove") | |
| 668 | + | core.PuregoSafeRegister(&xPreferencesWindowSetCanNavigateBack, libs, "adw_preferences_window_set_can_navigate_back") | |
| 669 | + | core.PuregoSafeRegister(&xPreferencesWindowSetSearchEnabled, libs, "adw_preferences_window_set_search_enabled") | |
| 670 | + | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePage, libs, "adw_preferences_window_set_visible_page") | |
| 671 | + | core.PuregoSafeRegister(&xPreferencesWindowSetVisiblePageName, libs, "adw_preferences_window_set_visible_page_name") | |
| 668 | 672 | ||
| 669 | 673 | } | |
M v4/adw/adw-spin-row.go +32 -28
| @@ -1039,35 +1039,39 @@ func (x *SpinRow) SetWidthChars(NCharsVar int) { | |||
| 1039 | 1039 | ||
| 1040 | 1040 | func init() { | |
| 1041 | 1041 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1042 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1043 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1044 | - | if err != nil { | |
| 1045 | - | panic(err) | |
| 1042 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1043 | + | var libs []uintptr | |
| 1044 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1045 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1046 | + | if err != nil { | |
| 1047 | + | panic(err) | |
| 1048 | + | } | |
| 1049 | + | libs = append(libs, lib) | |
| 1046 | 1050 | } | |
| 1047 | 1051 | ||
| 1048 | - | core.PuregoSafeRegister(&xSpinRowGLibType, lib, "adw_spin_row_get_type") | |
| 1049 | - | ||
| 1050 | - | core.PuregoSafeRegister(&xNewSpinRow, lib, "adw_spin_row_new") | |
| 1051 | - | core.PuregoSafeRegister(&xNewSpinRowWithRange, lib, "adw_spin_row_new_with_range") | |
| 1052 | - | ||
| 1053 | - | core.PuregoSafeRegister(&xSpinRowConfigure, lib, "adw_spin_row_configure") | |
| 1054 | - | core.PuregoSafeRegister(&xSpinRowGetAdjustment, lib, "adw_spin_row_get_adjustment") | |
| 1055 | - | core.PuregoSafeRegister(&xSpinRowGetClimbRate, lib, "adw_spin_row_get_climb_rate") | |
| 1056 | - | core.PuregoSafeRegister(&xSpinRowGetDigits, lib, "adw_spin_row_get_digits") | |
| 1057 | - | core.PuregoSafeRegister(&xSpinRowGetNumeric, lib, "adw_spin_row_get_numeric") | |
| 1058 | - | core.PuregoSafeRegister(&xSpinRowGetSnapToTicks, lib, "adw_spin_row_get_snap_to_ticks") | |
| 1059 | - | core.PuregoSafeRegister(&xSpinRowGetUpdatePolicy, lib, "adw_spin_row_get_update_policy") | |
| 1060 | - | core.PuregoSafeRegister(&xSpinRowGetValue, lib, "adw_spin_row_get_value") | |
| 1061 | - | core.PuregoSafeRegister(&xSpinRowGetWrap, lib, "adw_spin_row_get_wrap") | |
| 1062 | - | core.PuregoSafeRegister(&xSpinRowSetAdjustment, lib, "adw_spin_row_set_adjustment") | |
| 1063 | - | core.PuregoSafeRegister(&xSpinRowSetClimbRate, lib, "adw_spin_row_set_climb_rate") | |
| 1064 | - | core.PuregoSafeRegister(&xSpinRowSetDigits, lib, "adw_spin_row_set_digits") | |
| 1065 | - | core.PuregoSafeRegister(&xSpinRowSetNumeric, lib, "adw_spin_row_set_numeric") | |
| 1066 | - | core.PuregoSafeRegister(&xSpinRowSetRange, lib, "adw_spin_row_set_range") | |
| 1067 | - | core.PuregoSafeRegister(&xSpinRowSetSnapToTicks, lib, "adw_spin_row_set_snap_to_ticks") | |
| 1068 | - | core.PuregoSafeRegister(&xSpinRowSetUpdatePolicy, lib, "adw_spin_row_set_update_policy") | |
| 1069 | - | core.PuregoSafeRegister(&xSpinRowSetValue, lib, "adw_spin_row_set_value") | |
| 1070 | - | core.PuregoSafeRegister(&xSpinRowSetWrap, lib, "adw_spin_row_set_wrap") | |
| 1071 | - | core.PuregoSafeRegister(&xSpinRowUpdate, lib, "adw_spin_row_update") | |
| 1052 | + | core.PuregoSafeRegister(&xSpinRowGLibType, libs, "adw_spin_row_get_type") | |
| 1053 | + | ||
| 1054 | + | core.PuregoSafeRegister(&xNewSpinRow, libs, "adw_spin_row_new") | |
| 1055 | + | core.PuregoSafeRegister(&xNewSpinRowWithRange, libs, "adw_spin_row_new_with_range") | |
| 1056 | + | ||
| 1057 | + | core.PuregoSafeRegister(&xSpinRowConfigure, libs, "adw_spin_row_configure") | |
| 1058 | + | core.PuregoSafeRegister(&xSpinRowGetAdjustment, libs, "adw_spin_row_get_adjustment") | |
| 1059 | + | core.PuregoSafeRegister(&xSpinRowGetClimbRate, libs, "adw_spin_row_get_climb_rate") | |
| 1060 | + | core.PuregoSafeRegister(&xSpinRowGetDigits, libs, "adw_spin_row_get_digits") | |
| 1061 | + | core.PuregoSafeRegister(&xSpinRowGetNumeric, libs, "adw_spin_row_get_numeric") | |
| 1062 | + | core.PuregoSafeRegister(&xSpinRowGetSnapToTicks, libs, "adw_spin_row_get_snap_to_ticks") | |
| 1063 | + | core.PuregoSafeRegister(&xSpinRowGetUpdatePolicy, libs, "adw_spin_row_get_update_policy") | |
| 1064 | + | core.PuregoSafeRegister(&xSpinRowGetValue, libs, "adw_spin_row_get_value") | |
| 1065 | + | core.PuregoSafeRegister(&xSpinRowGetWrap, libs, "adw_spin_row_get_wrap") | |
| 1066 | + | core.PuregoSafeRegister(&xSpinRowSetAdjustment, libs, "adw_spin_row_set_adjustment") | |
| 1067 | + | core.PuregoSafeRegister(&xSpinRowSetClimbRate, libs, "adw_spin_row_set_climb_rate") | |
| 1068 | + | core.PuregoSafeRegister(&xSpinRowSetDigits, libs, "adw_spin_row_set_digits") | |
| 1069 | + | core.PuregoSafeRegister(&xSpinRowSetNumeric, libs, "adw_spin_row_set_numeric") | |
| 1070 | + | core.PuregoSafeRegister(&xSpinRowSetRange, libs, "adw_spin_row_set_range") | |
| 1071 | + | core.PuregoSafeRegister(&xSpinRowSetSnapToTicks, libs, "adw_spin_row_set_snap_to_ticks") | |
| 1072 | + | core.PuregoSafeRegister(&xSpinRowSetUpdatePolicy, libs, "adw_spin_row_set_update_policy") | |
| 1073 | + | core.PuregoSafeRegister(&xSpinRowSetValue, libs, "adw_spin_row_set_value") | |
| 1074 | + | core.PuregoSafeRegister(&xSpinRowSetWrap, libs, "adw_spin_row_set_wrap") | |
| 1075 | + | core.PuregoSafeRegister(&xSpinRowUpdate, libs, "adw_spin_row_update") | |
| 1072 | 1076 | ||
| 1073 | 1077 | } | |
M v4/adw/adw-spinner-paintable.go +12 -8
| @@ -281,17 +281,21 @@ func (x *SpinnerPaintable) SnapshotSymbolic(SnapshotVar *gdk.Snapshot, WidthVar | |||
| 281 | 281 | ||
| 282 | 282 | func init() { | |
| 283 | 283 | core.SetPackageName("ADW", "libadwaita-1") | |
| 284 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 285 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 286 | - | if err != nil { | |
| 287 | - | panic(err) | |
| 284 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 285 | + | var libs []uintptr | |
| 286 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 287 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 288 | + | if err != nil { | |
| 289 | + | panic(err) | |
| 290 | + | } | |
| 291 | + | libs = append(libs, lib) | |
| 288 | 292 | } | |
| 289 | 293 | ||
| 290 | - | core.PuregoSafeRegister(&xSpinnerPaintableGLibType, lib, "adw_spinner_paintable_get_type") | |
| 294 | + | core.PuregoSafeRegister(&xSpinnerPaintableGLibType, libs, "adw_spinner_paintable_get_type") | |
| 291 | 295 | ||
| 292 | - | core.PuregoSafeRegister(&xNewSpinnerPaintable, lib, "adw_spinner_paintable_new") | |
| 296 | + | core.PuregoSafeRegister(&xNewSpinnerPaintable, libs, "adw_spinner_paintable_new") | |
| 293 | 297 | ||
| 294 | - | core.PuregoSafeRegister(&xSpinnerPaintableGetWidget, lib, "adw_spinner_paintable_get_widget") | |
| 295 | - | core.PuregoSafeRegister(&xSpinnerPaintableSetWidget, lib, "adw_spinner_paintable_set_widget") | |
| 298 | + | core.PuregoSafeRegister(&xSpinnerPaintableGetWidget, libs, "adw_spinner_paintable_get_widget") | |
| 299 | + | core.PuregoSafeRegister(&xSpinnerPaintableSetWidget, libs, "adw_spinner_paintable_set_widget") | |
| 296 | 300 | ||
| 297 | 301 | } | |
M v4/adw/adw-spinner.go +10 -6
| @@ -386,14 +386,18 @@ func (x *Spinner) GetBuildableId() string { | |||
| 386 | 386 | ||
| 387 | 387 | func init() { | |
| 388 | 388 | core.SetPackageName("ADW", "libadwaita-1") | |
| 389 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 390 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 391 | - | if err != nil { | |
| 392 | - | panic(err) | |
| 389 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 390 | + | var libs []uintptr | |
| 391 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 392 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 393 | + | if err != nil { | |
| 394 | + | panic(err) | |
| 395 | + | } | |
| 396 | + | libs = append(libs, lib) | |
| 393 | 397 | } | |
| 394 | 398 | ||
| 395 | - | core.PuregoSafeRegister(&xSpinnerGLibType, lib, "adw_spinner_get_type") | |
| 399 | + | core.PuregoSafeRegister(&xSpinnerGLibType, libs, "adw_spinner_get_type") | |
| 396 | 400 | ||
| 397 | - | core.PuregoSafeRegister(&xNewSpinner, lib, "adw_spinner_new") | |
| 401 | + | core.PuregoSafeRegister(&xNewSpinner, libs, "adw_spinner_new") | |
| 398 | 402 | ||
| 399 | 403 | } | |
M v4/adw/adw-split-button.go +32 -28
| @@ -768,35 +768,39 @@ func (x *SplitButton) GetBuildableId() string { | |||
| 768 | 768 | ||
| 769 | 769 | func init() { | |
| 770 | 770 | core.SetPackageName("ADW", "libadwaita-1") | |
| 771 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 772 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 773 | - | if err != nil { | |
| 774 | - | panic(err) | |
| 771 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 772 | + | var libs []uintptr | |
| 773 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 774 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 775 | + | if err != nil { | |
| 776 | + | panic(err) | |
| 777 | + | } | |
| 778 | + | libs = append(libs, lib) | |
| 775 | 779 | } | |
| 776 | 780 | ||
| 777 | - | core.PuregoSafeRegister(&xSplitButtonGLibType, lib, "adw_split_button_get_type") | |
| 778 | - | ||
| 779 | - | core.PuregoSafeRegister(&xNewSplitButton, lib, "adw_split_button_new") | |
| 780 | - | ||
| 781 | - | core.PuregoSafeRegister(&xSplitButtonGetCanShrink, lib, "adw_split_button_get_can_shrink") | |
| 782 | - | core.PuregoSafeRegister(&xSplitButtonGetChild, lib, "adw_split_button_get_child") | |
| 783 | - | core.PuregoSafeRegister(&xSplitButtonGetDirection, lib, "adw_split_button_get_direction") | |
| 784 | - | core.PuregoSafeRegister(&xSplitButtonGetDropdownTooltip, lib, "adw_split_button_get_dropdown_tooltip") | |
| 785 | - | core.PuregoSafeRegister(&xSplitButtonGetIconName, lib, "adw_split_button_get_icon_name") | |
| 786 | - | core.PuregoSafeRegister(&xSplitButtonGetLabel, lib, "adw_split_button_get_label") | |
| 787 | - | core.PuregoSafeRegister(&xSplitButtonGetMenuModel, lib, "adw_split_button_get_menu_model") | |
| 788 | - | core.PuregoSafeRegister(&xSplitButtonGetPopover, lib, "adw_split_button_get_popover") | |
| 789 | - | core.PuregoSafeRegister(&xSplitButtonGetUseUnderline, lib, "adw_split_button_get_use_underline") | |
| 790 | - | core.PuregoSafeRegister(&xSplitButtonPopdown, lib, "adw_split_button_popdown") | |
| 791 | - | core.PuregoSafeRegister(&xSplitButtonPopup, lib, "adw_split_button_popup") | |
| 792 | - | core.PuregoSafeRegister(&xSplitButtonSetCanShrink, lib, "adw_split_button_set_can_shrink") | |
| 793 | - | core.PuregoSafeRegister(&xSplitButtonSetChild, lib, "adw_split_button_set_child") | |
| 794 | - | core.PuregoSafeRegister(&xSplitButtonSetDirection, lib, "adw_split_button_set_direction") | |
| 795 | - | core.PuregoSafeRegister(&xSplitButtonSetDropdownTooltip, lib, "adw_split_button_set_dropdown_tooltip") | |
| 796 | - | core.PuregoSafeRegister(&xSplitButtonSetIconName, lib, "adw_split_button_set_icon_name") | |
| 797 | - | core.PuregoSafeRegister(&xSplitButtonSetLabel, lib, "adw_split_button_set_label") | |
| 798 | - | core.PuregoSafeRegister(&xSplitButtonSetMenuModel, lib, "adw_split_button_set_menu_model") | |
| 799 | - | core.PuregoSafeRegister(&xSplitButtonSetPopover, lib, "adw_split_button_set_popover") | |
| 800 | - | core.PuregoSafeRegister(&xSplitButtonSetUseUnderline, lib, "adw_split_button_set_use_underline") | |
| 781 | + | core.PuregoSafeRegister(&xSplitButtonGLibType, libs, "adw_split_button_get_type") | |
| 782 | + | ||
| 783 | + | core.PuregoSafeRegister(&xNewSplitButton, libs, "adw_split_button_new") | |
| 784 | + | ||
| 785 | + | core.PuregoSafeRegister(&xSplitButtonGetCanShrink, libs, "adw_split_button_get_can_shrink") | |
| 786 | + | core.PuregoSafeRegister(&xSplitButtonGetChild, libs, "adw_split_button_get_child") | |
| 787 | + | core.PuregoSafeRegister(&xSplitButtonGetDirection, libs, "adw_split_button_get_direction") | |
| 788 | + | core.PuregoSafeRegister(&xSplitButtonGetDropdownTooltip, libs, "adw_split_button_get_dropdown_tooltip") | |
| 789 | + | core.PuregoSafeRegister(&xSplitButtonGetIconName, libs, "adw_split_button_get_icon_name") | |
| 790 | + | core.PuregoSafeRegister(&xSplitButtonGetLabel, libs, "adw_split_button_get_label") | |
| 791 | + | core.PuregoSafeRegister(&xSplitButtonGetMenuModel, libs, "adw_split_button_get_menu_model") | |
| 792 | + | core.PuregoSafeRegister(&xSplitButtonGetPopover, libs, "adw_split_button_get_popover") | |
| 793 | + | core.PuregoSafeRegister(&xSplitButtonGetUseUnderline, libs, "adw_split_button_get_use_underline") | |
| 794 | + | core.PuregoSafeRegister(&xSplitButtonPopdown, libs, "adw_split_button_popdown") | |
| 795 | + | core.PuregoSafeRegister(&xSplitButtonPopup, libs, "adw_split_button_popup") | |
| 796 | + | core.PuregoSafeRegister(&xSplitButtonSetCanShrink, libs, "adw_split_button_set_can_shrink") | |
| 797 | + | core.PuregoSafeRegister(&xSplitButtonSetChild, libs, "adw_split_button_set_child") | |
| 798 | + | core.PuregoSafeRegister(&xSplitButtonSetDirection, libs, "adw_split_button_set_direction") | |
| 799 | + | core.PuregoSafeRegister(&xSplitButtonSetDropdownTooltip, libs, "adw_split_button_set_dropdown_tooltip") | |
| 800 | + | core.PuregoSafeRegister(&xSplitButtonSetIconName, libs, "adw_split_button_set_icon_name") | |
| 801 | + | core.PuregoSafeRegister(&xSplitButtonSetLabel, libs, "adw_split_button_set_label") | |
| 802 | + | core.PuregoSafeRegister(&xSplitButtonSetMenuModel, libs, "adw_split_button_set_menu_model") | |
| 803 | + | core.PuregoSafeRegister(&xSplitButtonSetPopover, libs, "adw_split_button_set_popover") | |
| 804 | + | core.PuregoSafeRegister(&xSplitButtonSetUseUnderline, libs, "adw_split_button_set_use_underline") | |
| 801 | 805 | ||
| 802 | 806 | } | |
M v4/adw/adw-spring-animation.go +28 -24
| @@ -281,31 +281,35 @@ func (c *SpringAnimation) SetGoPointer(ptr uintptr) { | |||
| 281 | 281 | ||
| 282 | 282 | func init() { | |
| 283 | 283 | core.SetPackageName("ADW", "libadwaita-1") | |
| 284 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 285 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 286 | - | if err != nil { | |
| 287 | - | panic(err) | |
| 284 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 285 | + | var libs []uintptr | |
| 286 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 287 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 288 | + | if err != nil { | |
| 289 | + | panic(err) | |
| 290 | + | } | |
| 291 | + | libs = append(libs, lib) | |
| 288 | 292 | } | |
| 289 | 293 | ||
| 290 | - | core.PuregoSafeRegister(&xSpringAnimationGLibType, lib, "adw_spring_animation_get_type") | |
| 291 | - | ||
| 292 | - | core.PuregoSafeRegister(&xNewSpringAnimation, lib, "adw_spring_animation_new") | |
| 293 | - | ||
| 294 | - | core.PuregoSafeRegister(&xSpringAnimationCalculateValue, lib, "adw_spring_animation_calculate_value") | |
| 295 | - | core.PuregoSafeRegister(&xSpringAnimationCalculateVelocity, lib, "adw_spring_animation_calculate_velocity") | |
| 296 | - | core.PuregoSafeRegister(&xSpringAnimationGetClamp, lib, "adw_spring_animation_get_clamp") | |
| 297 | - | core.PuregoSafeRegister(&xSpringAnimationGetEpsilon, lib, "adw_spring_animation_get_epsilon") | |
| 298 | - | core.PuregoSafeRegister(&xSpringAnimationGetEstimatedDuration, lib, "adw_spring_animation_get_estimated_duration") | |
| 299 | - | core.PuregoSafeRegister(&xSpringAnimationGetInitialVelocity, lib, "adw_spring_animation_get_initial_velocity") | |
| 300 | - | core.PuregoSafeRegister(&xSpringAnimationGetSpringParams, lib, "adw_spring_animation_get_spring_params") | |
| 301 | - | core.PuregoSafeRegister(&xSpringAnimationGetValueFrom, lib, "adw_spring_animation_get_value_from") | |
| 302 | - | core.PuregoSafeRegister(&xSpringAnimationGetValueTo, lib, "adw_spring_animation_get_value_to") | |
| 303 | - | core.PuregoSafeRegister(&xSpringAnimationGetVelocity, lib, "adw_spring_animation_get_velocity") | |
| 304 | - | core.PuregoSafeRegister(&xSpringAnimationSetClamp, lib, "adw_spring_animation_set_clamp") | |
| 305 | - | core.PuregoSafeRegister(&xSpringAnimationSetEpsilon, lib, "adw_spring_animation_set_epsilon") | |
| 306 | - | core.PuregoSafeRegister(&xSpringAnimationSetInitialVelocity, lib, "adw_spring_animation_set_initial_velocity") | |
| 307 | - | core.PuregoSafeRegister(&xSpringAnimationSetSpringParams, lib, "adw_spring_animation_set_spring_params") | |
| 308 | - | core.PuregoSafeRegister(&xSpringAnimationSetValueFrom, lib, "adw_spring_animation_set_value_from") | |
| 309 | - | core.PuregoSafeRegister(&xSpringAnimationSetValueTo, lib, "adw_spring_animation_set_value_to") | |
| 294 | + | core.PuregoSafeRegister(&xSpringAnimationGLibType, libs, "adw_spring_animation_get_type") | |
| 295 | + | ||
| 296 | + | core.PuregoSafeRegister(&xNewSpringAnimation, libs, "adw_spring_animation_new") | |
| 297 | + | ||
| 298 | + | core.PuregoSafeRegister(&xSpringAnimationCalculateValue, libs, "adw_spring_animation_calculate_value") | |
| 299 | + | core.PuregoSafeRegister(&xSpringAnimationCalculateVelocity, libs, "adw_spring_animation_calculate_velocity") | |
| 300 | + | core.PuregoSafeRegister(&xSpringAnimationGetClamp, libs, "adw_spring_animation_get_clamp") | |
| 301 | + | core.PuregoSafeRegister(&xSpringAnimationGetEpsilon, libs, "adw_spring_animation_get_epsilon") | |
| 302 | + | core.PuregoSafeRegister(&xSpringAnimationGetEstimatedDuration, libs, "adw_spring_animation_get_estimated_duration") | |
| 303 | + | core.PuregoSafeRegister(&xSpringAnimationGetInitialVelocity, libs, "adw_spring_animation_get_initial_velocity") | |
| 304 | + | core.PuregoSafeRegister(&xSpringAnimationGetSpringParams, libs, "adw_spring_animation_get_spring_params") | |
| 305 | + | core.PuregoSafeRegister(&xSpringAnimationGetValueFrom, libs, "adw_spring_animation_get_value_from") | |
| 306 | + | core.PuregoSafeRegister(&xSpringAnimationGetValueTo, libs, "adw_spring_animation_get_value_to") | |
| 307 | + | core.PuregoSafeRegister(&xSpringAnimationGetVelocity, libs, "adw_spring_animation_get_velocity") | |
| 308 | + | core.PuregoSafeRegister(&xSpringAnimationSetClamp, libs, "adw_spring_animation_set_clamp") | |
| 309 | + | core.PuregoSafeRegister(&xSpringAnimationSetEpsilon, libs, "adw_spring_animation_set_epsilon") | |
| 310 | + | core.PuregoSafeRegister(&xSpringAnimationSetInitialVelocity, libs, "adw_spring_animation_set_initial_velocity") | |
| 311 | + | core.PuregoSafeRegister(&xSpringAnimationSetSpringParams, libs, "adw_spring_animation_set_spring_params") | |
| 312 | + | core.PuregoSafeRegister(&xSpringAnimationSetValueFrom, libs, "adw_spring_animation_set_value_from") | |
| 313 | + | core.PuregoSafeRegister(&xSpringAnimationSetValueTo, libs, "adw_spring_animation_set_value_to") | |
| 310 | 314 | ||
| 311 | 315 | } | |
M v4/adw/adw-spring-params.go +17 -13
| @@ -147,22 +147,26 @@ func (x *SpringParams) Unref() { | |||
| 147 | 147 | ||
| 148 | 148 | func init() { | |
| 149 | 149 | core.SetPackageName("ADW", "libadwaita-1") | |
| 150 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 151 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 152 | - | if err != nil { | |
| 153 | - | panic(err) | |
| 150 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 151 | + | var libs []uintptr | |
| 152 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 153 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 154 | + | if err != nil { | |
| 155 | + | panic(err) | |
| 156 | + | } | |
| 157 | + | libs = append(libs, lib) | |
| 154 | 158 | } | |
| 155 | 159 | ||
| 156 | - | core.PuregoSafeRegister(&xSpringParamsGLibType, lib, "adw_spring_params_get_type") | |
| 160 | + | core.PuregoSafeRegister(&xSpringParamsGLibType, libs, "adw_spring_params_get_type") | |
| 157 | 161 | ||
| 158 | - | core.PuregoSafeRegister(&xNewSpringParams, lib, "adw_spring_params_new") | |
| 159 | - | core.PuregoSafeRegister(&xNewSpringParamsFull, lib, "adw_spring_params_new_full") | |
| 162 | + | core.PuregoSafeRegister(&xNewSpringParams, libs, "adw_spring_params_new") | |
| 163 | + | core.PuregoSafeRegister(&xNewSpringParamsFull, libs, "adw_spring_params_new_full") | |
| 160 | 164 | ||
| 161 | - | core.PuregoSafeRegister(&xSpringParamsGetDamping, lib, "adw_spring_params_get_damping") | |
| 162 | - | core.PuregoSafeRegister(&xSpringParamsGetDampingRatio, lib, "adw_spring_params_get_damping_ratio") | |
| 163 | - | core.PuregoSafeRegister(&xSpringParamsGetMass, lib, "adw_spring_params_get_mass") | |
| 164 | - | core.PuregoSafeRegister(&xSpringParamsGetStiffness, lib, "adw_spring_params_get_stiffness") | |
| 165 | - | core.PuregoSafeRegister(&xSpringParamsRef, lib, "adw_spring_params_ref") | |
| 166 | - | core.PuregoSafeRegister(&xSpringParamsUnref, lib, "adw_spring_params_unref") | |
| 165 | + | core.PuregoSafeRegister(&xSpringParamsGetDamping, libs, "adw_spring_params_get_damping") | |
| 166 | + | core.PuregoSafeRegister(&xSpringParamsGetDampingRatio, libs, "adw_spring_params_get_damping_ratio") | |
| 167 | + | core.PuregoSafeRegister(&xSpringParamsGetMass, libs, "adw_spring_params_get_mass") | |
| 168 | + | core.PuregoSafeRegister(&xSpringParamsGetStiffness, libs, "adw_spring_params_get_stiffness") | |
| 169 | + | core.PuregoSafeRegister(&xSpringParamsRef, libs, "adw_spring_params_ref") | |
| 170 | + | core.PuregoSafeRegister(&xSpringParamsUnref, libs, "adw_spring_params_unref") | |
| 167 | 171 | ||
| 168 | 172 | } | |
M v4/adw/adw-squeezer.go +42 -38
| @@ -755,45 +755,49 @@ func (c *SqueezerPage) SetGoPointer(ptr uintptr) { | |||
| 755 | 755 | ||
| 756 | 756 | func init() { | |
| 757 | 757 | core.SetPackageName("ADW", "libadwaita-1") | |
| 758 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 759 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 760 | - | if err != nil { | |
| 761 | - | panic(err) | |
| 758 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 759 | + | var libs []uintptr | |
| 760 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 761 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 762 | + | if err != nil { | |
| 763 | + | panic(err) | |
| 764 | + | } | |
| 765 | + | libs = append(libs, lib) | |
| 762 | 766 | } | |
| 763 | 767 | ||
| 764 | - | core.PuregoSafeRegister(&xSqueezerTransitionTypeGLibType, lib, "adw_squeezer_transition_type_get_type") | |
| 765 | - | ||
| 766 | - | core.PuregoSafeRegister(&xSqueezerGLibType, lib, "adw_squeezer_get_type") | |
| 767 | - | ||
| 768 | - | core.PuregoSafeRegister(&xNewSqueezer, lib, "adw_squeezer_new") | |
| 769 | - | ||
| 770 | - | core.PuregoSafeRegister(&xSqueezerAdd, lib, "adw_squeezer_add") | |
| 771 | - | core.PuregoSafeRegister(&xSqueezerGetAllowNone, lib, "adw_squeezer_get_allow_none") | |
| 772 | - | core.PuregoSafeRegister(&xSqueezerGetHomogeneous, lib, "adw_squeezer_get_homogeneous") | |
| 773 | - | core.PuregoSafeRegister(&xSqueezerGetInterpolateSize, lib, "adw_squeezer_get_interpolate_size") | |
| 774 | - | core.PuregoSafeRegister(&xSqueezerGetPage, lib, "adw_squeezer_get_page") | |
| 775 | - | core.PuregoSafeRegister(&xSqueezerGetPages, lib, "adw_squeezer_get_pages") | |
| 776 | - | core.PuregoSafeRegister(&xSqueezerGetSwitchThresholdPolicy, lib, "adw_squeezer_get_switch_threshold_policy") | |
| 777 | - | core.PuregoSafeRegister(&xSqueezerGetTransitionDuration, lib, "adw_squeezer_get_transition_duration") | |
| 778 | - | core.PuregoSafeRegister(&xSqueezerGetTransitionRunning, lib, "adw_squeezer_get_transition_running") | |
| 779 | - | core.PuregoSafeRegister(&xSqueezerGetTransitionType, lib, "adw_squeezer_get_transition_type") | |
| 780 | - | core.PuregoSafeRegister(&xSqueezerGetVisibleChild, lib, "adw_squeezer_get_visible_child") | |
| 781 | - | core.PuregoSafeRegister(&xSqueezerGetXalign, lib, "adw_squeezer_get_xalign") | |
| 782 | - | core.PuregoSafeRegister(&xSqueezerGetYalign, lib, "adw_squeezer_get_yalign") | |
| 783 | - | core.PuregoSafeRegister(&xSqueezerRemove, lib, "adw_squeezer_remove") | |
| 784 | - | core.PuregoSafeRegister(&xSqueezerSetAllowNone, lib, "adw_squeezer_set_allow_none") | |
| 785 | - | core.PuregoSafeRegister(&xSqueezerSetHomogeneous, lib, "adw_squeezer_set_homogeneous") | |
| 786 | - | core.PuregoSafeRegister(&xSqueezerSetInterpolateSize, lib, "adw_squeezer_set_interpolate_size") | |
| 787 | - | core.PuregoSafeRegister(&xSqueezerSetSwitchThresholdPolicy, lib, "adw_squeezer_set_switch_threshold_policy") | |
| 788 | - | core.PuregoSafeRegister(&xSqueezerSetTransitionDuration, lib, "adw_squeezer_set_transition_duration") | |
| 789 | - | core.PuregoSafeRegister(&xSqueezerSetTransitionType, lib, "adw_squeezer_set_transition_type") | |
| 790 | - | core.PuregoSafeRegister(&xSqueezerSetXalign, lib, "adw_squeezer_set_xalign") | |
| 791 | - | core.PuregoSafeRegister(&xSqueezerSetYalign, lib, "adw_squeezer_set_yalign") | |
| 792 | - | ||
| 793 | - | core.PuregoSafeRegister(&xSqueezerPageGLibType, lib, "adw_squeezer_page_get_type") | |
| 794 | - | ||
| 795 | - | core.PuregoSafeRegister(&xSqueezerPageGetChild, lib, "adw_squeezer_page_get_child") | |
| 796 | - | core.PuregoSafeRegister(&xSqueezerPageGetEnabled, lib, "adw_squeezer_page_get_enabled") | |
| 797 | - | core.PuregoSafeRegister(&xSqueezerPageSetEnabled, lib, "adw_squeezer_page_set_enabled") | |
| 768 | + | core.PuregoSafeRegister(&xSqueezerTransitionTypeGLibType, libs, "adw_squeezer_transition_type_get_type") | |
| 769 | + | ||
| 770 | + | core.PuregoSafeRegister(&xSqueezerGLibType, libs, "adw_squeezer_get_type") | |
| 771 | + | ||
| 772 | + | core.PuregoSafeRegister(&xNewSqueezer, libs, "adw_squeezer_new") | |
| 773 | + | ||
| 774 | + | core.PuregoSafeRegister(&xSqueezerAdd, libs, "adw_squeezer_add") | |
| 775 | + | core.PuregoSafeRegister(&xSqueezerGetAllowNone, libs, "adw_squeezer_get_allow_none") | |
| 776 | + | core.PuregoSafeRegister(&xSqueezerGetHomogeneous, libs, "adw_squeezer_get_homogeneous") | |
| 777 | + | core.PuregoSafeRegister(&xSqueezerGetInterpolateSize, libs, "adw_squeezer_get_interpolate_size") | |
| 778 | + | core.PuregoSafeRegister(&xSqueezerGetPage, libs, "adw_squeezer_get_page") | |
| 779 | + | core.PuregoSafeRegister(&xSqueezerGetPages, libs, "adw_squeezer_get_pages") | |
| 780 | + | core.PuregoSafeRegister(&xSqueezerGetSwitchThresholdPolicy, libs, "adw_squeezer_get_switch_threshold_policy") | |
| 781 | + | core.PuregoSafeRegister(&xSqueezerGetTransitionDuration, libs, "adw_squeezer_get_transition_duration") | |
| 782 | + | core.PuregoSafeRegister(&xSqueezerGetTransitionRunning, libs, "adw_squeezer_get_transition_running") | |
| 783 | + | core.PuregoSafeRegister(&xSqueezerGetTransitionType, libs, "adw_squeezer_get_transition_type") | |
| 784 | + | core.PuregoSafeRegister(&xSqueezerGetVisibleChild, libs, "adw_squeezer_get_visible_child") | |
| 785 | + | core.PuregoSafeRegister(&xSqueezerGetXalign, libs, "adw_squeezer_get_xalign") | |
| 786 | + | core.PuregoSafeRegister(&xSqueezerGetYalign, libs, "adw_squeezer_get_yalign") | |
| 787 | + | core.PuregoSafeRegister(&xSqueezerRemove, libs, "adw_squeezer_remove") | |
| 788 | + | core.PuregoSafeRegister(&xSqueezerSetAllowNone, libs, "adw_squeezer_set_allow_none") | |
| 789 | + | core.PuregoSafeRegister(&xSqueezerSetHomogeneous, libs, "adw_squeezer_set_homogeneous") | |
| 790 | + | core.PuregoSafeRegister(&xSqueezerSetInterpolateSize, libs, "adw_squeezer_set_interpolate_size") | |
| 791 | + | core.PuregoSafeRegister(&xSqueezerSetSwitchThresholdPolicy, libs, "adw_squeezer_set_switch_threshold_policy") | |
| 792 | + | core.PuregoSafeRegister(&xSqueezerSetTransitionDuration, libs, "adw_squeezer_set_transition_duration") | |
| 793 | + | core.PuregoSafeRegister(&xSqueezerSetTransitionType, libs, "adw_squeezer_set_transition_type") | |
| 794 | + | core.PuregoSafeRegister(&xSqueezerSetXalign, libs, "adw_squeezer_set_xalign") | |
| 795 | + | core.PuregoSafeRegister(&xSqueezerSetYalign, libs, "adw_squeezer_set_yalign") | |
| 796 | + | ||
| 797 | + | core.PuregoSafeRegister(&xSqueezerPageGLibType, libs, "adw_squeezer_page_get_type") | |
| 798 | + | ||
| 799 | + | core.PuregoSafeRegister(&xSqueezerPageGetChild, libs, "adw_squeezer_page_get_child") | |
| 800 | + | core.PuregoSafeRegister(&xSqueezerPageGetEnabled, libs, "adw_squeezer_page_get_enabled") | |
| 801 | + | core.PuregoSafeRegister(&xSqueezerPageSetEnabled, libs, "adw_squeezer_page_set_enabled") | |
| 798 | 802 | ||
| 799 | 803 | } | |
M v4/adw/adw-status-page.go +20 -16
| @@ -494,25 +494,29 @@ func (x *StatusPage) GetBuildableId() string { | |||
| 494 | 494 | ||
| 495 | 495 | func init() { | |
| 496 | 496 | core.SetPackageName("ADW", "libadwaita-1") | |
| 497 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 498 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 499 | - | if err != nil { | |
| 500 | - | panic(err) | |
| 497 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 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) | |
| 501 | 505 | } | |
| 502 | 506 | ||
| 503 | - | core.PuregoSafeRegister(&xStatusPageGLibType, lib, "adw_status_page_get_type") | |
| 507 | + | core.PuregoSafeRegister(&xStatusPageGLibType, libs, "adw_status_page_get_type") | |
| 504 | 508 | ||
| 505 | - | core.PuregoSafeRegister(&xNewStatusPage, lib, "adw_status_page_new") | |
| 509 | + | core.PuregoSafeRegister(&xNewStatusPage, libs, "adw_status_page_new") | |
| 506 | 510 | ||
| 507 | - | core.PuregoSafeRegister(&xStatusPageGetChild, lib, "adw_status_page_get_child") | |
| 508 | - | core.PuregoSafeRegister(&xStatusPageGetDescription, lib, "adw_status_page_get_description") | |
| 509 | - | core.PuregoSafeRegister(&xStatusPageGetIconName, lib, "adw_status_page_get_icon_name") | |
| 510 | - | core.PuregoSafeRegister(&xStatusPageGetPaintable, lib, "adw_status_page_get_paintable") | |
| 511 | - | core.PuregoSafeRegister(&xStatusPageGetTitle, lib, "adw_status_page_get_title") | |
| 512 | - | core.PuregoSafeRegister(&xStatusPageSetChild, lib, "adw_status_page_set_child") | |
| 513 | - | core.PuregoSafeRegister(&xStatusPageSetDescription, lib, "adw_status_page_set_description") | |
| 514 | - | core.PuregoSafeRegister(&xStatusPageSetIconName, lib, "adw_status_page_set_icon_name") | |
| 515 | - | core.PuregoSafeRegister(&xStatusPageSetPaintable, lib, "adw_status_page_set_paintable") | |
| 516 | - | core.PuregoSafeRegister(&xStatusPageSetTitle, lib, "adw_status_page_set_title") | |
| 511 | + | core.PuregoSafeRegister(&xStatusPageGetChild, libs, "adw_status_page_get_child") | |
| 512 | + | core.PuregoSafeRegister(&xStatusPageGetDescription, libs, "adw_status_page_get_description") | |
| 513 | + | core.PuregoSafeRegister(&xStatusPageGetIconName, libs, "adw_status_page_get_icon_name") | |
| 514 | + | core.PuregoSafeRegister(&xStatusPageGetPaintable, libs, "adw_status_page_get_paintable") | |
| 515 | + | core.PuregoSafeRegister(&xStatusPageGetTitle, libs, "adw_status_page_get_title") | |
| 516 | + | core.PuregoSafeRegister(&xStatusPageSetChild, libs, "adw_status_page_set_child") | |
| 517 | + | core.PuregoSafeRegister(&xStatusPageSetDescription, libs, "adw_status_page_set_description") | |
| 518 | + | core.PuregoSafeRegister(&xStatusPageSetIconName, libs, "adw_status_page_set_icon_name") | |
| 519 | + | core.PuregoSafeRegister(&xStatusPageSetPaintable, libs, "adw_status_page_set_paintable") | |
| 520 | + | core.PuregoSafeRegister(&xStatusPageSetTitle, libs, "adw_status_page_set_title") | |
| 517 | 521 | ||
| 518 | 522 | } | |
M v4/adw/adw-style-manager.go +23 -19
| @@ -304,29 +304,33 @@ func StyleManagerGetForDisplay(DisplayVar *gdk.Display) *StyleManager { | |||
| 304 | 304 | ||
| 305 | 305 | func init() { | |
| 306 | 306 | core.SetPackageName("ADW", "libadwaita-1") | |
| 307 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 308 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 309 | - | if err != nil { | |
| 310 | - | panic(err) | |
| 307 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 308 | + | var libs []uintptr | |
| 309 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 310 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 311 | + | if err != nil { | |
| 312 | + | panic(err) | |
| 313 | + | } | |
| 314 | + | libs = append(libs, lib) | |
| 311 | 315 | } | |
| 312 | 316 | ||
| 313 | - | core.PuregoSafeRegister(&xColorSchemeGLibType, lib, "adw_color_scheme_get_type") | |
| 317 | + | core.PuregoSafeRegister(&xColorSchemeGLibType, libs, "adw_color_scheme_get_type") | |
| 314 | 318 | ||
| 315 | - | core.PuregoSafeRegister(&xStyleManagerGLibType, lib, "adw_style_manager_get_type") | |
| 319 | + | core.PuregoSafeRegister(&xStyleManagerGLibType, libs, "adw_style_manager_get_type") | |
| 316 | 320 | ||
| 317 | - | core.PuregoSafeRegister(&xStyleManagerGetAccentColor, lib, "adw_style_manager_get_accent_color") | |
| 318 | - | core.PuregoSafeRegister(&xStyleManagerGetAccentColorRgba, lib, "adw_style_manager_get_accent_color_rgba") | |
| 319 | - | core.PuregoSafeRegister(&xStyleManagerGetColorScheme, lib, "adw_style_manager_get_color_scheme") | |
| 320 | - | core.PuregoSafeRegister(&xStyleManagerGetDark, lib, "adw_style_manager_get_dark") | |
| 321 | - | core.PuregoSafeRegister(&xStyleManagerGetDisplay, lib, "adw_style_manager_get_display") | |
| 322 | - | core.PuregoSafeRegister(&xStyleManagerGetDocumentFontName, lib, "adw_style_manager_get_document_font_name") | |
| 323 | - | core.PuregoSafeRegister(&xStyleManagerGetHighContrast, lib, "adw_style_manager_get_high_contrast") | |
| 324 | - | core.PuregoSafeRegister(&xStyleManagerGetMonospaceFontName, lib, "adw_style_manager_get_monospace_font_name") | |
| 325 | - | core.PuregoSafeRegister(&xStyleManagerGetSystemSupportsAccentColors, lib, "adw_style_manager_get_system_supports_accent_colors") | |
| 326 | - | core.PuregoSafeRegister(&xStyleManagerGetSystemSupportsColorSchemes, lib, "adw_style_manager_get_system_supports_color_schemes") | |
| 327 | - | core.PuregoSafeRegister(&xStyleManagerSetColorScheme, lib, "adw_style_manager_set_color_scheme") | |
| 321 | + | core.PuregoSafeRegister(&xStyleManagerGetAccentColor, libs, "adw_style_manager_get_accent_color") | |
| 322 | + | core.PuregoSafeRegister(&xStyleManagerGetAccentColorRgba, libs, "adw_style_manager_get_accent_color_rgba") | |
| 323 | + | core.PuregoSafeRegister(&xStyleManagerGetColorScheme, libs, "adw_style_manager_get_color_scheme") | |
| 324 | + | core.PuregoSafeRegister(&xStyleManagerGetDark, libs, "adw_style_manager_get_dark") | |
| 325 | + | core.PuregoSafeRegister(&xStyleManagerGetDisplay, libs, "adw_style_manager_get_display") | |
| 326 | + | core.PuregoSafeRegister(&xStyleManagerGetDocumentFontName, libs, "adw_style_manager_get_document_font_name") | |
| 327 | + | core.PuregoSafeRegister(&xStyleManagerGetHighContrast, libs, "adw_style_manager_get_high_contrast") | |
| 328 | + | core.PuregoSafeRegister(&xStyleManagerGetMonospaceFontName, libs, "adw_style_manager_get_monospace_font_name") | |
| 329 | + | core.PuregoSafeRegister(&xStyleManagerGetSystemSupportsAccentColors, libs, "adw_style_manager_get_system_supports_accent_colors") | |
| 330 | + | core.PuregoSafeRegister(&xStyleManagerGetSystemSupportsColorSchemes, libs, "adw_style_manager_get_system_supports_color_schemes") | |
| 331 | + | core.PuregoSafeRegister(&xStyleManagerSetColorScheme, libs, "adw_style_manager_set_color_scheme") | |
| 328 | 332 | ||
| 329 | - | core.PuregoSafeRegister(&xStyleManagerGetDefault, lib, "adw_style_manager_get_default") | |
| 330 | - | core.PuregoSafeRegister(&xStyleManagerGetForDisplay, lib, "adw_style_manager_get_for_display") | |
| 333 | + | core.PuregoSafeRegister(&xStyleManagerGetDefault, libs, "adw_style_manager_get_default") | |
| 334 | + | core.PuregoSafeRegister(&xStyleManagerGetForDisplay, libs, "adw_style_manager_get_for_display") | |
| 331 | 335 | ||
| 332 | 336 | } | |
M v4/adw/adw-swipe-tracker.go +28 -24
| @@ -348,31 +348,35 @@ func (x *SwipeTracker) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 348 | 348 | ||
| 349 | 349 | func init() { | |
| 350 | 350 | core.SetPackageName("ADW", "libadwaita-1") | |
| 351 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 352 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 353 | - | if err != nil { | |
| 354 | - | panic(err) | |
| 351 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 352 | + | var libs []uintptr | |
| 353 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 354 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 355 | + | if err != nil { | |
| 356 | + | panic(err) | |
| 357 | + | } | |
| 358 | + | libs = append(libs, lib) | |
| 355 | 359 | } | |
| 356 | 360 | ||
| 357 | - | core.PuregoSafeRegister(&xSwipeTrackerGLibType, lib, "adw_swipe_tracker_get_type") | |
| 358 | - | ||
| 359 | - | core.PuregoSafeRegister(&xNewSwipeTracker, lib, "adw_swipe_tracker_new") | |
| 360 | - | ||
| 361 | - | core.PuregoSafeRegister(&xSwipeTrackerGetAllowLongSwipes, lib, "adw_swipe_tracker_get_allow_long_swipes") | |
| 362 | - | core.PuregoSafeRegister(&xSwipeTrackerGetAllowMouseDrag, lib, "adw_swipe_tracker_get_allow_mouse_drag") | |
| 363 | - | core.PuregoSafeRegister(&xSwipeTrackerGetAllowWindowHandle, lib, "adw_swipe_tracker_get_allow_window_handle") | |
| 364 | - | core.PuregoSafeRegister(&xSwipeTrackerGetEnabled, lib, "adw_swipe_tracker_get_enabled") | |
| 365 | - | core.PuregoSafeRegister(&xSwipeTrackerGetLowerOvershoot, lib, "adw_swipe_tracker_get_lower_overshoot") | |
| 366 | - | core.PuregoSafeRegister(&xSwipeTrackerGetReversed, lib, "adw_swipe_tracker_get_reversed") | |
| 367 | - | core.PuregoSafeRegister(&xSwipeTrackerGetSwipeable, lib, "adw_swipe_tracker_get_swipeable") | |
| 368 | - | core.PuregoSafeRegister(&xSwipeTrackerGetUpperOvershoot, lib, "adw_swipe_tracker_get_upper_overshoot") | |
| 369 | - | core.PuregoSafeRegister(&xSwipeTrackerSetAllowLongSwipes, lib, "adw_swipe_tracker_set_allow_long_swipes") | |
| 370 | - | core.PuregoSafeRegister(&xSwipeTrackerSetAllowMouseDrag, lib, "adw_swipe_tracker_set_allow_mouse_drag") | |
| 371 | - | core.PuregoSafeRegister(&xSwipeTrackerSetAllowWindowHandle, lib, "adw_swipe_tracker_set_allow_window_handle") | |
| 372 | - | core.PuregoSafeRegister(&xSwipeTrackerSetEnabled, lib, "adw_swipe_tracker_set_enabled") | |
| 373 | - | core.PuregoSafeRegister(&xSwipeTrackerSetLowerOvershoot, lib, "adw_swipe_tracker_set_lower_overshoot") | |
| 374 | - | core.PuregoSafeRegister(&xSwipeTrackerSetReversed, lib, "adw_swipe_tracker_set_reversed") | |
| 375 | - | core.PuregoSafeRegister(&xSwipeTrackerSetUpperOvershoot, lib, "adw_swipe_tracker_set_upper_overshoot") | |
| 376 | - | core.PuregoSafeRegister(&xSwipeTrackerShiftPosition, lib, "adw_swipe_tracker_shift_position") | |
| 361 | + | core.PuregoSafeRegister(&xSwipeTrackerGLibType, libs, "adw_swipe_tracker_get_type") | |
| 362 | + | ||
| 363 | + | core.PuregoSafeRegister(&xNewSwipeTracker, libs, "adw_swipe_tracker_new") | |
| 364 | + | ||
| 365 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowLongSwipes, libs, "adw_swipe_tracker_get_allow_long_swipes") | |
| 366 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowMouseDrag, libs, "adw_swipe_tracker_get_allow_mouse_drag") | |
| 367 | + | core.PuregoSafeRegister(&xSwipeTrackerGetAllowWindowHandle, libs, "adw_swipe_tracker_get_allow_window_handle") | |
| 368 | + | core.PuregoSafeRegister(&xSwipeTrackerGetEnabled, libs, "adw_swipe_tracker_get_enabled") | |
| 369 | + | core.PuregoSafeRegister(&xSwipeTrackerGetLowerOvershoot, libs, "adw_swipe_tracker_get_lower_overshoot") | |
| 370 | + | core.PuregoSafeRegister(&xSwipeTrackerGetReversed, libs, "adw_swipe_tracker_get_reversed") | |
| 371 | + | core.PuregoSafeRegister(&xSwipeTrackerGetSwipeable, libs, "adw_swipe_tracker_get_swipeable") | |
| 372 | + | core.PuregoSafeRegister(&xSwipeTrackerGetUpperOvershoot, libs, "adw_swipe_tracker_get_upper_overshoot") | |
| 373 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowLongSwipes, libs, "adw_swipe_tracker_set_allow_long_swipes") | |
| 374 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowMouseDrag, libs, "adw_swipe_tracker_set_allow_mouse_drag") | |
| 375 | + | core.PuregoSafeRegister(&xSwipeTrackerSetAllowWindowHandle, libs, "adw_swipe_tracker_set_allow_window_handle") | |
| 376 | + | core.PuregoSafeRegister(&xSwipeTrackerSetEnabled, libs, "adw_swipe_tracker_set_enabled") | |
| 377 | + | core.PuregoSafeRegister(&xSwipeTrackerSetLowerOvershoot, libs, "adw_swipe_tracker_set_lower_overshoot") | |
| 378 | + | core.PuregoSafeRegister(&xSwipeTrackerSetReversed, libs, "adw_swipe_tracker_set_reversed") | |
| 379 | + | core.PuregoSafeRegister(&xSwipeTrackerSetUpperOvershoot, libs, "adw_swipe_tracker_set_upper_overshoot") | |
| 380 | + | core.PuregoSafeRegister(&xSwipeTrackerShiftPosition, libs, "adw_swipe_tracker_shift_position") | |
| 377 | 381 | ||
| 378 | 382 | } | |
M v4/adw/adw-swipeable.go +14 -10
| @@ -251,18 +251,22 @@ var XAdwSwipeableGetSwipeArea func(uintptr, NavigationDirection, bool, *gdk.Rect | |||
| 251 | 251 | ||
| 252 | 252 | func init() { | |
| 253 | 253 | core.SetPackageName("ADW", "libadwaita-1") | |
| 254 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 255 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 256 | - | if err != nil { | |
| 257 | - | panic(err) | |
| 254 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 255 | + | var libs []uintptr | |
| 256 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 257 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 258 | + | if err != nil { | |
| 259 | + | panic(err) | |
| 260 | + | } | |
| 261 | + | libs = append(libs, lib) | |
| 258 | 262 | } | |
| 259 | 263 | ||
| 260 | - | core.PuregoSafeRegister(&xSwipeableGLibType, lib, "adw_swipeable_get_type") | |
| 264 | + | core.PuregoSafeRegister(&xSwipeableGLibType, libs, "adw_swipeable_get_type") | |
| 261 | 265 | ||
| 262 | - | core.PuregoSafeRegister(&XAdwSwipeableGetCancelProgress, lib, "adw_swipeable_get_cancel_progress") | |
| 263 | - | core.PuregoSafeRegister(&XAdwSwipeableGetDistance, lib, "adw_swipeable_get_distance") | |
| 264 | - | core.PuregoSafeRegister(&XAdwSwipeableGetProgress, lib, "adw_swipeable_get_progress") | |
| 265 | - | core.PuregoSafeRegister(&XAdwSwipeableGetSnapPoints, lib, "adw_swipeable_get_snap_points") | |
| 266 | - | core.PuregoSafeRegister(&XAdwSwipeableGetSwipeArea, lib, "adw_swipeable_get_swipe_area") | |
| 266 | + | core.PuregoSafeRegister(&XAdwSwipeableGetCancelProgress, libs, "adw_swipeable_get_cancel_progress") | |
| 267 | + | core.PuregoSafeRegister(&XAdwSwipeableGetDistance, libs, "adw_swipeable_get_distance") | |
| 268 | + | core.PuregoSafeRegister(&XAdwSwipeableGetProgress, libs, "adw_swipeable_get_progress") | |
| 269 | + | core.PuregoSafeRegister(&XAdwSwipeableGetSnapPoints, libs, "adw_swipeable_get_snap_points") | |
| 270 | + | core.PuregoSafeRegister(&XAdwSwipeableGetSwipeArea, libs, "adw_swipeable_get_swipe_area") | |
| 267 | 271 | ||
| 268 | 272 | } | |
M v4/adw/adw-switch-row.go +12 -8
| @@ -482,17 +482,21 @@ func (x *SwitchRow) GetBuildableId() string { | |||
| 482 | 482 | ||
| 483 | 483 | func init() { | |
| 484 | 484 | core.SetPackageName("ADW", "libadwaita-1") | |
| 485 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 486 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 487 | - | if err != nil { | |
| 488 | - | panic(err) | |
| 485 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 486 | + | var libs []uintptr | |
| 487 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 488 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 489 | + | if err != nil { | |
| 490 | + | panic(err) | |
| 491 | + | } | |
| 492 | + | libs = append(libs, lib) | |
| 489 | 493 | } | |
| 490 | 494 | ||
| 491 | - | core.PuregoSafeRegister(&xSwitchRowGLibType, lib, "adw_switch_row_get_type") | |
| 495 | + | core.PuregoSafeRegister(&xSwitchRowGLibType, libs, "adw_switch_row_get_type") | |
| 492 | 496 | ||
| 493 | - | core.PuregoSafeRegister(&xNewSwitchRow, lib, "adw_switch_row_new") | |
| 497 | + | core.PuregoSafeRegister(&xNewSwitchRow, libs, "adw_switch_row_new") | |
| 494 | 498 | ||
| 495 | - | core.PuregoSafeRegister(&xSwitchRowGetActive, lib, "adw_switch_row_get_active") | |
| 496 | - | core.PuregoSafeRegister(&xSwitchRowSetActive, lib, "adw_switch_row_set_active") | |
| 499 | + | core.PuregoSafeRegister(&xSwitchRowGetActive, libs, "adw_switch_row_get_active") | |
| 500 | + | core.PuregoSafeRegister(&xSwitchRowSetActive, libs, "adw_switch_row_set_active") | |
| 497 | 501 | ||
| 498 | 502 | } | |
M v4/adw/adw-tab-bar.go +30 -26
| @@ -650,33 +650,37 @@ func (x *TabBar) GetBuildableId() string { | |||
| 650 | 650 | ||
| 651 | 651 | func init() { | |
| 652 | 652 | core.SetPackageName("ADW", "libadwaita-1") | |
| 653 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 654 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 655 | - | if err != nil { | |
| 656 | - | panic(err) | |
| 653 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 654 | + | var libs []uintptr | |
| 655 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 656 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 657 | + | if err != nil { | |
| 658 | + | panic(err) | |
| 659 | + | } | |
| 660 | + | libs = append(libs, lib) | |
| 657 | 661 | } | |
| 658 | 662 | ||
| 659 | - | core.PuregoSafeRegister(&xTabBarGLibType, lib, "adw_tab_bar_get_type") | |
| 660 | - | ||
| 661 | - | core.PuregoSafeRegister(&xNewTabBar, lib, "adw_tab_bar_new") | |
| 662 | - | ||
| 663 | - | core.PuregoSafeRegister(&xTabBarGetAutohide, lib, "adw_tab_bar_get_autohide") | |
| 664 | - | core.PuregoSafeRegister(&xTabBarGetEndActionWidget, lib, "adw_tab_bar_get_end_action_widget") | |
| 665 | - | core.PuregoSafeRegister(&xTabBarGetExpandTabs, lib, "adw_tab_bar_get_expand_tabs") | |
| 666 | - | core.PuregoSafeRegister(&xTabBarGetExtraDragPreferredAction, lib, "adw_tab_bar_get_extra_drag_preferred_action") | |
| 667 | - | core.PuregoSafeRegister(&xTabBarGetExtraDragPreload, lib, "adw_tab_bar_get_extra_drag_preload") | |
| 668 | - | core.PuregoSafeRegister(&xTabBarGetInverted, lib, "adw_tab_bar_get_inverted") | |
| 669 | - | core.PuregoSafeRegister(&xTabBarGetIsOverflowing, lib, "adw_tab_bar_get_is_overflowing") | |
| 670 | - | core.PuregoSafeRegister(&xTabBarGetStartActionWidget, lib, "adw_tab_bar_get_start_action_widget") | |
| 671 | - | core.PuregoSafeRegister(&xTabBarGetTabsRevealed, lib, "adw_tab_bar_get_tabs_revealed") | |
| 672 | - | core.PuregoSafeRegister(&xTabBarGetView, lib, "adw_tab_bar_get_view") | |
| 673 | - | core.PuregoSafeRegister(&xTabBarSetAutohide, lib, "adw_tab_bar_set_autohide") | |
| 674 | - | core.PuregoSafeRegister(&xTabBarSetEndActionWidget, lib, "adw_tab_bar_set_end_action_widget") | |
| 675 | - | core.PuregoSafeRegister(&xTabBarSetExpandTabs, lib, "adw_tab_bar_set_expand_tabs") | |
| 676 | - | core.PuregoSafeRegister(&xTabBarSetExtraDragPreload, lib, "adw_tab_bar_set_extra_drag_preload") | |
| 677 | - | core.PuregoSafeRegister(&xTabBarSetInverted, lib, "adw_tab_bar_set_inverted") | |
| 678 | - | core.PuregoSafeRegister(&xTabBarSetStartActionWidget, lib, "adw_tab_bar_set_start_action_widget") | |
| 679 | - | core.PuregoSafeRegister(&xTabBarSetView, lib, "adw_tab_bar_set_view") | |
| 680 | - | core.PuregoSafeRegister(&xTabBarSetupExtraDropTarget, lib, "adw_tab_bar_setup_extra_drop_target") | |
| 663 | + | core.PuregoSafeRegister(&xTabBarGLibType, libs, "adw_tab_bar_get_type") | |
| 664 | + | ||
| 665 | + | core.PuregoSafeRegister(&xNewTabBar, libs, "adw_tab_bar_new") | |
| 666 | + | ||
| 667 | + | core.PuregoSafeRegister(&xTabBarGetAutohide, libs, "adw_tab_bar_get_autohide") | |
| 668 | + | core.PuregoSafeRegister(&xTabBarGetEndActionWidget, libs, "adw_tab_bar_get_end_action_widget") | |
| 669 | + | core.PuregoSafeRegister(&xTabBarGetExpandTabs, libs, "adw_tab_bar_get_expand_tabs") | |
| 670 | + | core.PuregoSafeRegister(&xTabBarGetExtraDragPreferredAction, libs, "adw_tab_bar_get_extra_drag_preferred_action") | |
| 671 | + | core.PuregoSafeRegister(&xTabBarGetExtraDragPreload, libs, "adw_tab_bar_get_extra_drag_preload") | |
| 672 | + | core.PuregoSafeRegister(&xTabBarGetInverted, libs, "adw_tab_bar_get_inverted") | |
| 673 | + | core.PuregoSafeRegister(&xTabBarGetIsOverflowing, libs, "adw_tab_bar_get_is_overflowing") | |
| 674 | + | core.PuregoSafeRegister(&xTabBarGetStartActionWidget, libs, "adw_tab_bar_get_start_action_widget") | |
| 675 | + | core.PuregoSafeRegister(&xTabBarGetTabsRevealed, libs, "adw_tab_bar_get_tabs_revealed") | |
| 676 | + | core.PuregoSafeRegister(&xTabBarGetView, libs, "adw_tab_bar_get_view") | |
| 677 | + | core.PuregoSafeRegister(&xTabBarSetAutohide, libs, "adw_tab_bar_set_autohide") | |
| 678 | + | core.PuregoSafeRegister(&xTabBarSetEndActionWidget, libs, "adw_tab_bar_set_end_action_widget") | |
| 679 | + | core.PuregoSafeRegister(&xTabBarSetExpandTabs, libs, "adw_tab_bar_set_expand_tabs") | |
| 680 | + | core.PuregoSafeRegister(&xTabBarSetExtraDragPreload, libs, "adw_tab_bar_set_extra_drag_preload") | |
| 681 | + | core.PuregoSafeRegister(&xTabBarSetInverted, libs, "adw_tab_bar_set_inverted") | |
| 682 | + | core.PuregoSafeRegister(&xTabBarSetStartActionWidget, libs, "adw_tab_bar_set_start_action_widget") | |
| 683 | + | core.PuregoSafeRegister(&xTabBarSetView, libs, "adw_tab_bar_set_view") | |
| 684 | + | core.PuregoSafeRegister(&xTabBarSetupExtraDropTarget, libs, "adw_tab_bar_setup_extra_drop_target") | |
| 681 | 685 | ||
| 682 | 686 | } | |
M v4/adw/adw-tab-button.go +12 -8
| @@ -531,17 +531,21 @@ func (x *TabButton) GetBuildableId() string { | |||
| 531 | 531 | ||
| 532 | 532 | func init() { | |
| 533 | 533 | core.SetPackageName("ADW", "libadwaita-1") | |
| 534 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 535 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 536 | - | if err != nil { | |
| 537 | - | panic(err) | |
| 534 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 535 | + | var libs []uintptr | |
| 536 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 537 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 538 | + | if err != nil { | |
| 539 | + | panic(err) | |
| 540 | + | } | |
| 541 | + | libs = append(libs, lib) | |
| 538 | 542 | } | |
| 539 | 543 | ||
| 540 | - | core.PuregoSafeRegister(&xTabButtonGLibType, lib, "adw_tab_button_get_type") | |
| 544 | + | core.PuregoSafeRegister(&xTabButtonGLibType, libs, "adw_tab_button_get_type") | |
| 541 | 545 | ||
| 542 | - | core.PuregoSafeRegister(&xNewTabButton, lib, "adw_tab_button_new") | |
| 546 | + | core.PuregoSafeRegister(&xNewTabButton, libs, "adw_tab_button_new") | |
| 543 | 547 | ||
| 544 | - | core.PuregoSafeRegister(&xTabButtonGetView, lib, "adw_tab_button_get_view") | |
| 545 | - | core.PuregoSafeRegister(&xTabButtonSetView, lib, "adw_tab_button_set_view") | |
| 548 | + | core.PuregoSafeRegister(&xTabButtonGetView, libs, "adw_tab_button_get_view") | |
| 549 | + | core.PuregoSafeRegister(&xTabButtonSetView, libs, "adw_tab_button_set_view") | |
| 546 | 550 | ||
| 547 | 551 | } | |
M v4/adw/adw-tab-overview.go +35 -31
| @@ -755,38 +755,42 @@ func (x *TabOverview) GetBuildableId() string { | |||
| 755 | 755 | ||
| 756 | 756 | func init() { | |
| 757 | 757 | core.SetPackageName("ADW", "libadwaita-1") | |
| 758 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 759 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 760 | - | if err != nil { | |
| 761 | - | panic(err) | |
| 758 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 759 | + | var libs []uintptr | |
| 760 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 761 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 762 | + | if err != nil { | |
| 763 | + | panic(err) | |
| 764 | + | } | |
| 765 | + | libs = append(libs, lib) | |
| 762 | 766 | } | |
| 763 | 767 | ||
| 764 | - | core.PuregoSafeRegister(&xTabOverviewGLibType, lib, "adw_tab_overview_get_type") | |
| 765 | - | ||
| 766 | - | core.PuregoSafeRegister(&xNewTabOverview, lib, "adw_tab_overview_new") | |
| 767 | - | ||
| 768 | - | core.PuregoSafeRegister(&xTabOverviewGetChild, lib, "adw_tab_overview_get_child") | |
| 769 | - | core.PuregoSafeRegister(&xTabOverviewGetEnableNewTab, lib, "adw_tab_overview_get_enable_new_tab") | |
| 770 | - | core.PuregoSafeRegister(&xTabOverviewGetEnableSearch, lib, "adw_tab_overview_get_enable_search") | |
| 771 | - | core.PuregoSafeRegister(&xTabOverviewGetExtraDragPreferredAction, lib, "adw_tab_overview_get_extra_drag_preferred_action") | |
| 772 | - | core.PuregoSafeRegister(&xTabOverviewGetExtraDragPreload, lib, "adw_tab_overview_get_extra_drag_preload") | |
| 773 | - | core.PuregoSafeRegister(&xTabOverviewGetInverted, lib, "adw_tab_overview_get_inverted") | |
| 774 | - | core.PuregoSafeRegister(&xTabOverviewGetOpen, lib, "adw_tab_overview_get_open") | |
| 775 | - | core.PuregoSafeRegister(&xTabOverviewGetSearchActive, lib, "adw_tab_overview_get_search_active") | |
| 776 | - | core.PuregoSafeRegister(&xTabOverviewGetSecondaryMenu, lib, "adw_tab_overview_get_secondary_menu") | |
| 777 | - | core.PuregoSafeRegister(&xTabOverviewGetShowEndTitleButtons, lib, "adw_tab_overview_get_show_end_title_buttons") | |
| 778 | - | core.PuregoSafeRegister(&xTabOverviewGetShowStartTitleButtons, lib, "adw_tab_overview_get_show_start_title_buttons") | |
| 779 | - | core.PuregoSafeRegister(&xTabOverviewGetView, lib, "adw_tab_overview_get_view") | |
| 780 | - | core.PuregoSafeRegister(&xTabOverviewSetChild, lib, "adw_tab_overview_set_child") | |
| 781 | - | core.PuregoSafeRegister(&xTabOverviewSetEnableNewTab, lib, "adw_tab_overview_set_enable_new_tab") | |
| 782 | - | core.PuregoSafeRegister(&xTabOverviewSetEnableSearch, lib, "adw_tab_overview_set_enable_search") | |
| 783 | - | core.PuregoSafeRegister(&xTabOverviewSetExtraDragPreload, lib, "adw_tab_overview_set_extra_drag_preload") | |
| 784 | - | core.PuregoSafeRegister(&xTabOverviewSetInverted, lib, "adw_tab_overview_set_inverted") | |
| 785 | - | core.PuregoSafeRegister(&xTabOverviewSetOpen, lib, "adw_tab_overview_set_open") | |
| 786 | - | core.PuregoSafeRegister(&xTabOverviewSetSecondaryMenu, lib, "adw_tab_overview_set_secondary_menu") | |
| 787 | - | core.PuregoSafeRegister(&xTabOverviewSetShowEndTitleButtons, lib, "adw_tab_overview_set_show_end_title_buttons") | |
| 788 | - | core.PuregoSafeRegister(&xTabOverviewSetShowStartTitleButtons, lib, "adw_tab_overview_set_show_start_title_buttons") | |
| 789 | - | core.PuregoSafeRegister(&xTabOverviewSetView, lib, "adw_tab_overview_set_view") | |
| 790 | - | core.PuregoSafeRegister(&xTabOverviewSetupExtraDropTarget, lib, "adw_tab_overview_setup_extra_drop_target") | |
| 768 | + | core.PuregoSafeRegister(&xTabOverviewGLibType, libs, "adw_tab_overview_get_type") | |
| 769 | + | ||
| 770 | + | core.PuregoSafeRegister(&xNewTabOverview, libs, "adw_tab_overview_new") | |
| 771 | + | ||
| 772 | + | core.PuregoSafeRegister(&xTabOverviewGetChild, libs, "adw_tab_overview_get_child") | |
| 773 | + | core.PuregoSafeRegister(&xTabOverviewGetEnableNewTab, libs, "adw_tab_overview_get_enable_new_tab") | |
| 774 | + | core.PuregoSafeRegister(&xTabOverviewGetEnableSearch, libs, "adw_tab_overview_get_enable_search") | |
| 775 | + | core.PuregoSafeRegister(&xTabOverviewGetExtraDragPreferredAction, libs, "adw_tab_overview_get_extra_drag_preferred_action") | |
| 776 | + | core.PuregoSafeRegister(&xTabOverviewGetExtraDragPreload, libs, "adw_tab_overview_get_extra_drag_preload") | |
| 777 | + | core.PuregoSafeRegister(&xTabOverviewGetInverted, libs, "adw_tab_overview_get_inverted") | |
| 778 | + | core.PuregoSafeRegister(&xTabOverviewGetOpen, libs, "adw_tab_overview_get_open") | |
| 779 | + | core.PuregoSafeRegister(&xTabOverviewGetSearchActive, libs, "adw_tab_overview_get_search_active") | |
| 780 | + | core.PuregoSafeRegister(&xTabOverviewGetSecondaryMenu, libs, "adw_tab_overview_get_secondary_menu") | |
| 781 | + | core.PuregoSafeRegister(&xTabOverviewGetShowEndTitleButtons, libs, "adw_tab_overview_get_show_end_title_buttons") | |
| 782 | + | core.PuregoSafeRegister(&xTabOverviewGetShowStartTitleButtons, libs, "adw_tab_overview_get_show_start_title_buttons") | |
| 783 | + | core.PuregoSafeRegister(&xTabOverviewGetView, libs, "adw_tab_overview_get_view") | |
| 784 | + | core.PuregoSafeRegister(&xTabOverviewSetChild, libs, "adw_tab_overview_set_child") | |
| 785 | + | core.PuregoSafeRegister(&xTabOverviewSetEnableNewTab, libs, "adw_tab_overview_set_enable_new_tab") | |
| 786 | + | core.PuregoSafeRegister(&xTabOverviewSetEnableSearch, libs, "adw_tab_overview_set_enable_search") | |
| 787 | + | core.PuregoSafeRegister(&xTabOverviewSetExtraDragPreload, libs, "adw_tab_overview_set_extra_drag_preload") | |
| 788 | + | core.PuregoSafeRegister(&xTabOverviewSetInverted, libs, "adw_tab_overview_set_inverted") | |
| 789 | + | core.PuregoSafeRegister(&xTabOverviewSetOpen, libs, "adw_tab_overview_set_open") | |
| 790 | + | core.PuregoSafeRegister(&xTabOverviewSetSecondaryMenu, libs, "adw_tab_overview_set_secondary_menu") | |
| 791 | + | core.PuregoSafeRegister(&xTabOverviewSetShowEndTitleButtons, libs, "adw_tab_overview_set_show_end_title_buttons") | |
| 792 | + | core.PuregoSafeRegister(&xTabOverviewSetShowStartTitleButtons, libs, "adw_tab_overview_set_show_start_title_buttons") | |
| 793 | + | core.PuregoSafeRegister(&xTabOverviewSetView, libs, "adw_tab_overview_set_view") | |
| 794 | + | core.PuregoSafeRegister(&xTabOverviewSetupExtraDropTarget, libs, "adw_tab_overview_setup_extra_drop_target") | |
| 791 | 795 | ||
| 792 | 796 | } | |
M v4/adw/adw-tab-view.go +85 -81
| @@ -1913,88 +1913,92 @@ func (x *TabView) GetBuildableId() string { | |||
| 1913 | 1913 | ||
| 1914 | 1914 | func init() { | |
| 1915 | 1915 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1916 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1917 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1918 | - | if err != nil { | |
| 1919 | - | panic(err) | |
| 1916 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1917 | + | var libs []uintptr | |
| 1918 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1919 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1920 | + | if err != nil { | |
| 1921 | + | panic(err) | |
| 1922 | + | } | |
| 1923 | + | libs = append(libs, lib) | |
| 1920 | 1924 | } | |
| 1921 | 1925 | ||
| 1922 | - | core.PuregoSafeRegister(&xTabViewShortcutsGLibType, lib, "adw_tab_view_shortcuts_get_type") | |
| 1923 | - | ||
| 1924 | - | core.PuregoSafeRegister(&xTabPageGLibType, lib, "adw_tab_page_get_type") | |
| 1925 | - | ||
| 1926 | - | core.PuregoSafeRegister(&xTabPageGetChild, lib, "adw_tab_page_get_child") | |
| 1927 | - | core.PuregoSafeRegister(&xTabPageGetIcon, lib, "adw_tab_page_get_icon") | |
| 1928 | - | core.PuregoSafeRegister(&xTabPageGetIndicatorActivatable, lib, "adw_tab_page_get_indicator_activatable") | |
| 1929 | - | core.PuregoSafeRegister(&xTabPageGetIndicatorIcon, lib, "adw_tab_page_get_indicator_icon") | |
| 1930 | - | core.PuregoSafeRegister(&xTabPageGetIndicatorTooltip, lib, "adw_tab_page_get_indicator_tooltip") | |
| 1931 | - | core.PuregoSafeRegister(&xTabPageGetKeyword, lib, "adw_tab_page_get_keyword") | |
| 1932 | - | core.PuregoSafeRegister(&xTabPageGetLiveThumbnail, lib, "adw_tab_page_get_live_thumbnail") | |
| 1933 | - | core.PuregoSafeRegister(&xTabPageGetLoading, lib, "adw_tab_page_get_loading") | |
| 1934 | - | core.PuregoSafeRegister(&xTabPageGetNeedsAttention, lib, "adw_tab_page_get_needs_attention") | |
| 1935 | - | core.PuregoSafeRegister(&xTabPageGetParent, lib, "adw_tab_page_get_parent") | |
| 1936 | - | core.PuregoSafeRegister(&xTabPageGetPinned, lib, "adw_tab_page_get_pinned") | |
| 1937 | - | core.PuregoSafeRegister(&xTabPageGetSelected, lib, "adw_tab_page_get_selected") | |
| 1938 | - | core.PuregoSafeRegister(&xTabPageGetThumbnailXalign, lib, "adw_tab_page_get_thumbnail_xalign") | |
| 1939 | - | core.PuregoSafeRegister(&xTabPageGetThumbnailYalign, lib, "adw_tab_page_get_thumbnail_yalign") | |
| 1940 | - | core.PuregoSafeRegister(&xTabPageGetTitle, lib, "adw_tab_page_get_title") | |
| 1941 | - | core.PuregoSafeRegister(&xTabPageGetTooltip, lib, "adw_tab_page_get_tooltip") | |
| 1942 | - | core.PuregoSafeRegister(&xTabPageInvalidateThumbnail, lib, "adw_tab_page_invalidate_thumbnail") | |
| 1943 | - | core.PuregoSafeRegister(&xTabPageSetIcon, lib, "adw_tab_page_set_icon") | |
| 1944 | - | core.PuregoSafeRegister(&xTabPageSetIndicatorActivatable, lib, "adw_tab_page_set_indicator_activatable") | |
| 1945 | - | core.PuregoSafeRegister(&xTabPageSetIndicatorIcon, lib, "adw_tab_page_set_indicator_icon") | |
| 1946 | - | core.PuregoSafeRegister(&xTabPageSetIndicatorTooltip, lib, "adw_tab_page_set_indicator_tooltip") | |
| 1947 | - | core.PuregoSafeRegister(&xTabPageSetKeyword, lib, "adw_tab_page_set_keyword") | |
| 1948 | - | core.PuregoSafeRegister(&xTabPageSetLiveThumbnail, lib, "adw_tab_page_set_live_thumbnail") | |
| 1949 | - | core.PuregoSafeRegister(&xTabPageSetLoading, lib, "adw_tab_page_set_loading") | |
| 1950 | - | core.PuregoSafeRegister(&xTabPageSetNeedsAttention, lib, "adw_tab_page_set_needs_attention") | |
| 1951 | - | core.PuregoSafeRegister(&xTabPageSetThumbnailXalign, lib, "adw_tab_page_set_thumbnail_xalign") | |
| 1952 | - | core.PuregoSafeRegister(&xTabPageSetThumbnailYalign, lib, "adw_tab_page_set_thumbnail_yalign") | |
| 1953 | - | core.PuregoSafeRegister(&xTabPageSetTitle, lib, "adw_tab_page_set_title") | |
| 1954 | - | core.PuregoSafeRegister(&xTabPageSetTooltip, lib, "adw_tab_page_set_tooltip") | |
| 1955 | - | ||
| 1956 | - | core.PuregoSafeRegister(&xTabViewGLibType, lib, "adw_tab_view_get_type") | |
| 1957 | - | ||
| 1958 | - | core.PuregoSafeRegister(&xNewTabView, lib, "adw_tab_view_new") | |
| 1959 | - | ||
| 1960 | - | core.PuregoSafeRegister(&xTabViewAddPage, lib, "adw_tab_view_add_page") | |
| 1961 | - | core.PuregoSafeRegister(&xTabViewAddShortcuts, lib, "adw_tab_view_add_shortcuts") | |
| 1962 | - | core.PuregoSafeRegister(&xTabViewAppend, lib, "adw_tab_view_append") | |
| 1963 | - | core.PuregoSafeRegister(&xTabViewAppendPinned, lib, "adw_tab_view_append_pinned") | |
| 1964 | - | core.PuregoSafeRegister(&xTabViewCloseOtherPages, lib, "adw_tab_view_close_other_pages") | |
| 1965 | - | core.PuregoSafeRegister(&xTabViewClosePage, lib, "adw_tab_view_close_page") | |
| 1966 | - | core.PuregoSafeRegister(&xTabViewClosePageFinish, lib, "adw_tab_view_close_page_finish") | |
| 1967 | - | core.PuregoSafeRegister(&xTabViewClosePagesAfter, lib, "adw_tab_view_close_pages_after") | |
| 1968 | - | core.PuregoSafeRegister(&xTabViewClosePagesBefore, lib, "adw_tab_view_close_pages_before") | |
| 1969 | - | core.PuregoSafeRegister(&xTabViewGetDefaultIcon, lib, "adw_tab_view_get_default_icon") | |
| 1970 | - | core.PuregoSafeRegister(&xTabViewGetIsTransferringPage, lib, "adw_tab_view_get_is_transferring_page") | |
| 1971 | - | core.PuregoSafeRegister(&xTabViewGetMenuModel, lib, "adw_tab_view_get_menu_model") | |
| 1972 | - | core.PuregoSafeRegister(&xTabViewGetNPages, lib, "adw_tab_view_get_n_pages") | |
| 1973 | - | core.PuregoSafeRegister(&xTabViewGetNPinnedPages, lib, "adw_tab_view_get_n_pinned_pages") | |
| 1974 | - | core.PuregoSafeRegister(&xTabViewGetNthPage, lib, "adw_tab_view_get_nth_page") | |
| 1975 | - | core.PuregoSafeRegister(&xTabViewGetPage, lib, "adw_tab_view_get_page") | |
| 1976 | - | core.PuregoSafeRegister(&xTabViewGetPagePosition, lib, "adw_tab_view_get_page_position") | |
| 1977 | - | core.PuregoSafeRegister(&xTabViewGetPages, lib, "adw_tab_view_get_pages") | |
| 1978 | - | core.PuregoSafeRegister(&xTabViewGetSelectedPage, lib, "adw_tab_view_get_selected_page") | |
| 1979 | - | core.PuregoSafeRegister(&xTabViewGetShortcuts, lib, "adw_tab_view_get_shortcuts") | |
| 1980 | - | core.PuregoSafeRegister(&xTabViewInsert, lib, "adw_tab_view_insert") | |
| 1981 | - | core.PuregoSafeRegister(&xTabViewInsertPinned, lib, "adw_tab_view_insert_pinned") | |
| 1982 | - | core.PuregoSafeRegister(&xTabViewInvalidateThumbnails, lib, "adw_tab_view_invalidate_thumbnails") | |
| 1983 | - | core.PuregoSafeRegister(&xTabViewPrepend, lib, "adw_tab_view_prepend") | |
| 1984 | - | core.PuregoSafeRegister(&xTabViewPrependPinned, lib, "adw_tab_view_prepend_pinned") | |
| 1985 | - | core.PuregoSafeRegister(&xTabViewRemoveShortcuts, lib, "adw_tab_view_remove_shortcuts") | |
| 1986 | - | core.PuregoSafeRegister(&xTabViewReorderBackward, lib, "adw_tab_view_reorder_backward") | |
| 1987 | - | core.PuregoSafeRegister(&xTabViewReorderFirst, lib, "adw_tab_view_reorder_first") | |
| 1988 | - | core.PuregoSafeRegister(&xTabViewReorderForward, lib, "adw_tab_view_reorder_forward") | |
| 1989 | - | core.PuregoSafeRegister(&xTabViewReorderLast, lib, "adw_tab_view_reorder_last") | |
| 1990 | - | core.PuregoSafeRegister(&xTabViewReorderPage, lib, "adw_tab_view_reorder_page") | |
| 1991 | - | core.PuregoSafeRegister(&xTabViewSelectNextPage, lib, "adw_tab_view_select_next_page") | |
| 1992 | - | core.PuregoSafeRegister(&xTabViewSelectPreviousPage, lib, "adw_tab_view_select_previous_page") | |
| 1993 | - | core.PuregoSafeRegister(&xTabViewSetDefaultIcon, lib, "adw_tab_view_set_default_icon") | |
| 1994 | - | core.PuregoSafeRegister(&xTabViewSetMenuModel, lib, "adw_tab_view_set_menu_model") | |
| 1995 | - | core.PuregoSafeRegister(&xTabViewSetPagePinned, lib, "adw_tab_view_set_page_pinned") | |
| 1996 | - | core.PuregoSafeRegister(&xTabViewSetSelectedPage, lib, "adw_tab_view_set_selected_page") | |
| 1997 | - | core.PuregoSafeRegister(&xTabViewSetShortcuts, lib, "adw_tab_view_set_shortcuts") | |
| 1998 | - | core.PuregoSafeRegister(&xTabViewTransferPage, lib, "adw_tab_view_transfer_page") | |
| 1926 | + | core.PuregoSafeRegister(&xTabViewShortcutsGLibType, libs, "adw_tab_view_shortcuts_get_type") | |
| 1927 | + | ||
| 1928 | + | core.PuregoSafeRegister(&xTabPageGLibType, libs, "adw_tab_page_get_type") | |
| 1929 | + | ||
| 1930 | + | core.PuregoSafeRegister(&xTabPageGetChild, libs, "adw_tab_page_get_child") | |
| 1931 | + | core.PuregoSafeRegister(&xTabPageGetIcon, libs, "adw_tab_page_get_icon") | |
| 1932 | + | core.PuregoSafeRegister(&xTabPageGetIndicatorActivatable, libs, "adw_tab_page_get_indicator_activatable") | |
| 1933 | + | core.PuregoSafeRegister(&xTabPageGetIndicatorIcon, libs, "adw_tab_page_get_indicator_icon") | |
| 1934 | + | core.PuregoSafeRegister(&xTabPageGetIndicatorTooltip, libs, "adw_tab_page_get_indicator_tooltip") | |
| 1935 | + | core.PuregoSafeRegister(&xTabPageGetKeyword, libs, "adw_tab_page_get_keyword") | |
| 1936 | + | core.PuregoSafeRegister(&xTabPageGetLiveThumbnail, libs, "adw_tab_page_get_live_thumbnail") | |
| 1937 | + | core.PuregoSafeRegister(&xTabPageGetLoading, libs, "adw_tab_page_get_loading") | |
| 1938 | + | core.PuregoSafeRegister(&xTabPageGetNeedsAttention, libs, "adw_tab_page_get_needs_attention") | |
| 1939 | + | core.PuregoSafeRegister(&xTabPageGetParent, libs, "adw_tab_page_get_parent") | |
| 1940 | + | core.PuregoSafeRegister(&xTabPageGetPinned, libs, "adw_tab_page_get_pinned") | |
| 1941 | + | core.PuregoSafeRegister(&xTabPageGetSelected, libs, "adw_tab_page_get_selected") | |
| 1942 | + | core.PuregoSafeRegister(&xTabPageGetThumbnailXalign, libs, "adw_tab_page_get_thumbnail_xalign") | |
| 1943 | + | core.PuregoSafeRegister(&xTabPageGetThumbnailYalign, libs, "adw_tab_page_get_thumbnail_yalign") | |
| 1944 | + | core.PuregoSafeRegister(&xTabPageGetTitle, libs, "adw_tab_page_get_title") | |
| 1945 | + | core.PuregoSafeRegister(&xTabPageGetTooltip, libs, "adw_tab_page_get_tooltip") | |
| 1946 | + | core.PuregoSafeRegister(&xTabPageInvalidateThumbnail, libs, "adw_tab_page_invalidate_thumbnail") | |
| 1947 | + | core.PuregoSafeRegister(&xTabPageSetIcon, libs, "adw_tab_page_set_icon") | |
| 1948 | + | core.PuregoSafeRegister(&xTabPageSetIndicatorActivatable, libs, "adw_tab_page_set_indicator_activatable") | |
| 1949 | + | core.PuregoSafeRegister(&xTabPageSetIndicatorIcon, libs, "adw_tab_page_set_indicator_icon") | |
| 1950 | + | core.PuregoSafeRegister(&xTabPageSetIndicatorTooltip, libs, "adw_tab_page_set_indicator_tooltip") | |
| 1951 | + | core.PuregoSafeRegister(&xTabPageSetKeyword, libs, "adw_tab_page_set_keyword") | |
| 1952 | + | core.PuregoSafeRegister(&xTabPageSetLiveThumbnail, libs, "adw_tab_page_set_live_thumbnail") | |
| 1953 | + | core.PuregoSafeRegister(&xTabPageSetLoading, libs, "adw_tab_page_set_loading") | |
| 1954 | + | core.PuregoSafeRegister(&xTabPageSetNeedsAttention, libs, "adw_tab_page_set_needs_attention") | |
| 1955 | + | core.PuregoSafeRegister(&xTabPageSetThumbnailXalign, libs, "adw_tab_page_set_thumbnail_xalign") | |
| 1956 | + | core.PuregoSafeRegister(&xTabPageSetThumbnailYalign, libs, "adw_tab_page_set_thumbnail_yalign") | |
| 1957 | + | core.PuregoSafeRegister(&xTabPageSetTitle, libs, "adw_tab_page_set_title") | |
| 1958 | + | core.PuregoSafeRegister(&xTabPageSetTooltip, libs, "adw_tab_page_set_tooltip") | |
| 1959 | + | ||
| 1960 | + | core.PuregoSafeRegister(&xTabViewGLibType, libs, "adw_tab_view_get_type") | |
| 1961 | + | ||
| 1962 | + | core.PuregoSafeRegister(&xNewTabView, libs, "adw_tab_view_new") | |
| 1963 | + | ||
| 1964 | + | core.PuregoSafeRegister(&xTabViewAddPage, libs, "adw_tab_view_add_page") | |
| 1965 | + | core.PuregoSafeRegister(&xTabViewAddShortcuts, libs, "adw_tab_view_add_shortcuts") | |
| 1966 | + | core.PuregoSafeRegister(&xTabViewAppend, libs, "adw_tab_view_append") | |
| 1967 | + | core.PuregoSafeRegister(&xTabViewAppendPinned, libs, "adw_tab_view_append_pinned") | |
| 1968 | + | core.PuregoSafeRegister(&xTabViewCloseOtherPages, libs, "adw_tab_view_close_other_pages") | |
| 1969 | + | core.PuregoSafeRegister(&xTabViewClosePage, libs, "adw_tab_view_close_page") | |
| 1970 | + | core.PuregoSafeRegister(&xTabViewClosePageFinish, libs, "adw_tab_view_close_page_finish") | |
| 1971 | + | core.PuregoSafeRegister(&xTabViewClosePagesAfter, libs, "adw_tab_view_close_pages_after") | |
| 1972 | + | core.PuregoSafeRegister(&xTabViewClosePagesBefore, libs, "adw_tab_view_close_pages_before") | |
| 1973 | + | core.PuregoSafeRegister(&xTabViewGetDefaultIcon, libs, "adw_tab_view_get_default_icon") | |
| 1974 | + | core.PuregoSafeRegister(&xTabViewGetIsTransferringPage, libs, "adw_tab_view_get_is_transferring_page") | |
| 1975 | + | core.PuregoSafeRegister(&xTabViewGetMenuModel, libs, "adw_tab_view_get_menu_model") | |
| 1976 | + | core.PuregoSafeRegister(&xTabViewGetNPages, libs, "adw_tab_view_get_n_pages") | |
| 1977 | + | core.PuregoSafeRegister(&xTabViewGetNPinnedPages, libs, "adw_tab_view_get_n_pinned_pages") | |
| 1978 | + | core.PuregoSafeRegister(&xTabViewGetNthPage, libs, "adw_tab_view_get_nth_page") | |
| 1979 | + | core.PuregoSafeRegister(&xTabViewGetPage, libs, "adw_tab_view_get_page") | |
| 1980 | + | core.PuregoSafeRegister(&xTabViewGetPagePosition, libs, "adw_tab_view_get_page_position") | |
| 1981 | + | core.PuregoSafeRegister(&xTabViewGetPages, libs, "adw_tab_view_get_pages") | |
| 1982 | + | core.PuregoSafeRegister(&xTabViewGetSelectedPage, libs, "adw_tab_view_get_selected_page") | |
| 1983 | + | core.PuregoSafeRegister(&xTabViewGetShortcuts, libs, "adw_tab_view_get_shortcuts") | |
| 1984 | + | core.PuregoSafeRegister(&xTabViewInsert, libs, "adw_tab_view_insert") | |
| 1985 | + | core.PuregoSafeRegister(&xTabViewInsertPinned, libs, "adw_tab_view_insert_pinned") | |
| 1986 | + | core.PuregoSafeRegister(&xTabViewInvalidateThumbnails, libs, "adw_tab_view_invalidate_thumbnails") | |
| 1987 | + | core.PuregoSafeRegister(&xTabViewPrepend, libs, "adw_tab_view_prepend") | |
| 1988 | + | core.PuregoSafeRegister(&xTabViewPrependPinned, libs, "adw_tab_view_prepend_pinned") | |
| 1989 | + | core.PuregoSafeRegister(&xTabViewRemoveShortcuts, libs, "adw_tab_view_remove_shortcuts") | |
| 1990 | + | core.PuregoSafeRegister(&xTabViewReorderBackward, libs, "adw_tab_view_reorder_backward") | |
| 1991 | + | core.PuregoSafeRegister(&xTabViewReorderFirst, libs, "adw_tab_view_reorder_first") | |
| 1992 | + | core.PuregoSafeRegister(&xTabViewReorderForward, libs, "adw_tab_view_reorder_forward") | |
| 1993 | + | core.PuregoSafeRegister(&xTabViewReorderLast, libs, "adw_tab_view_reorder_last") | |
| 1994 | + | core.PuregoSafeRegister(&xTabViewReorderPage, libs, "adw_tab_view_reorder_page") | |
| 1995 | + | core.PuregoSafeRegister(&xTabViewSelectNextPage, libs, "adw_tab_view_select_next_page") | |
| 1996 | + | core.PuregoSafeRegister(&xTabViewSelectPreviousPage, libs, "adw_tab_view_select_previous_page") | |
| 1997 | + | core.PuregoSafeRegister(&xTabViewSetDefaultIcon, libs, "adw_tab_view_set_default_icon") | |
| 1998 | + | core.PuregoSafeRegister(&xTabViewSetMenuModel, libs, "adw_tab_view_set_menu_model") | |
| 1999 | + | core.PuregoSafeRegister(&xTabViewSetPagePinned, libs, "adw_tab_view_set_page_pinned") | |
| 2000 | + | core.PuregoSafeRegister(&xTabViewSetSelectedPage, libs, "adw_tab_view_set_selected_page") | |
| 2001 | + | core.PuregoSafeRegister(&xTabViewSetShortcuts, libs, "adw_tab_view_set_shortcuts") | |
| 2002 | + | core.PuregoSafeRegister(&xTabViewTransferPage, libs, "adw_tab_view_transfer_page") | |
| 1999 | 2003 | ||
| 2000 | 2004 | } | |
M v4/adw/adw-timed-animation.go +26 -22
| @@ -227,29 +227,33 @@ func (c *TimedAnimation) SetGoPointer(ptr uintptr) { | |||
| 227 | 227 | ||
| 228 | 228 | func init() { | |
| 229 | 229 | core.SetPackageName("ADW", "libadwaita-1") | |
| 230 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 231 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 232 | - | if err != nil { | |
| 233 | - | panic(err) | |
| 230 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 231 | + | var libs []uintptr | |
| 232 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 233 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 234 | + | if err != nil { | |
| 235 | + | panic(err) | |
| 236 | + | } | |
| 237 | + | libs = append(libs, lib) | |
| 234 | 238 | } | |
| 235 | 239 | ||
| 236 | - | core.PuregoSafeRegister(&xTimedAnimationGLibType, lib, "adw_timed_animation_get_type") | |
| 237 | - | ||
| 238 | - | core.PuregoSafeRegister(&xNewTimedAnimation, lib, "adw_timed_animation_new") | |
| 239 | - | ||
| 240 | - | core.PuregoSafeRegister(&xTimedAnimationGetAlternate, lib, "adw_timed_animation_get_alternate") | |
| 241 | - | core.PuregoSafeRegister(&xTimedAnimationGetDuration, lib, "adw_timed_animation_get_duration") | |
| 242 | - | core.PuregoSafeRegister(&xTimedAnimationGetEasing, lib, "adw_timed_animation_get_easing") | |
| 243 | - | core.PuregoSafeRegister(&xTimedAnimationGetRepeatCount, lib, "adw_timed_animation_get_repeat_count") | |
| 244 | - | core.PuregoSafeRegister(&xTimedAnimationGetReverse, lib, "adw_timed_animation_get_reverse") | |
| 245 | - | core.PuregoSafeRegister(&xTimedAnimationGetValueFrom, lib, "adw_timed_animation_get_value_from") | |
| 246 | - | core.PuregoSafeRegister(&xTimedAnimationGetValueTo, lib, "adw_timed_animation_get_value_to") | |
| 247 | - | core.PuregoSafeRegister(&xTimedAnimationSetAlternate, lib, "adw_timed_animation_set_alternate") | |
| 248 | - | core.PuregoSafeRegister(&xTimedAnimationSetDuration, lib, "adw_timed_animation_set_duration") | |
| 249 | - | core.PuregoSafeRegister(&xTimedAnimationSetEasing, lib, "adw_timed_animation_set_easing") | |
| 250 | - | core.PuregoSafeRegister(&xTimedAnimationSetRepeatCount, lib, "adw_timed_animation_set_repeat_count") | |
| 251 | - | core.PuregoSafeRegister(&xTimedAnimationSetReverse, lib, "adw_timed_animation_set_reverse") | |
| 252 | - | core.PuregoSafeRegister(&xTimedAnimationSetValueFrom, lib, "adw_timed_animation_set_value_from") | |
| 253 | - | core.PuregoSafeRegister(&xTimedAnimationSetValueTo, lib, "adw_timed_animation_set_value_to") | |
| 240 | + | core.PuregoSafeRegister(&xTimedAnimationGLibType, libs, "adw_timed_animation_get_type") | |
| 241 | + | ||
| 242 | + | core.PuregoSafeRegister(&xNewTimedAnimation, libs, "adw_timed_animation_new") | |
| 243 | + | ||
| 244 | + | core.PuregoSafeRegister(&xTimedAnimationGetAlternate, libs, "adw_timed_animation_get_alternate") | |
| 245 | + | core.PuregoSafeRegister(&xTimedAnimationGetDuration, libs, "adw_timed_animation_get_duration") | |
| 246 | + | core.PuregoSafeRegister(&xTimedAnimationGetEasing, libs, "adw_timed_animation_get_easing") | |
| 247 | + | core.PuregoSafeRegister(&xTimedAnimationGetRepeatCount, libs, "adw_timed_animation_get_repeat_count") | |
| 248 | + | core.PuregoSafeRegister(&xTimedAnimationGetReverse, libs, "adw_timed_animation_get_reverse") | |
| 249 | + | core.PuregoSafeRegister(&xTimedAnimationGetValueFrom, libs, "adw_timed_animation_get_value_from") | |
| 250 | + | core.PuregoSafeRegister(&xTimedAnimationGetValueTo, libs, "adw_timed_animation_get_value_to") | |
| 251 | + | core.PuregoSafeRegister(&xTimedAnimationSetAlternate, libs, "adw_timed_animation_set_alternate") | |
| 252 | + | core.PuregoSafeRegister(&xTimedAnimationSetDuration, libs, "adw_timed_animation_set_duration") | |
| 253 | + | core.PuregoSafeRegister(&xTimedAnimationSetEasing, libs, "adw_timed_animation_set_easing") | |
| 254 | + | core.PuregoSafeRegister(&xTimedAnimationSetRepeatCount, libs, "adw_timed_animation_set_repeat_count") | |
| 255 | + | core.PuregoSafeRegister(&xTimedAnimationSetReverse, libs, "adw_timed_animation_set_reverse") | |
| 256 | + | core.PuregoSafeRegister(&xTimedAnimationSetValueFrom, libs, "adw_timed_animation_set_value_from") | |
| 257 | + | core.PuregoSafeRegister(&xTimedAnimationSetValueTo, libs, "adw_timed_animation_set_value_to") | |
| 254 | 258 | ||
| 255 | 259 | } | |
M v4/adw/adw-toast-overlay.go +14 -10
| @@ -447,19 +447,23 @@ func (x *ToastOverlay) GetBuildableId() string { | |||
| 447 | 447 | ||
| 448 | 448 | func init() { | |
| 449 | 449 | core.SetPackageName("ADW", "libadwaita-1") | |
| 450 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 451 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 452 | - | if err != nil { | |
| 453 | - | panic(err) | |
| 450 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 451 | + | var libs []uintptr | |
| 452 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 453 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 454 | + | if err != nil { | |
| 455 | + | panic(err) | |
| 456 | + | } | |
| 457 | + | libs = append(libs, lib) | |
| 454 | 458 | } | |
| 455 | 459 | ||
| 456 | - | core.PuregoSafeRegister(&xToastOverlayGLibType, lib, "adw_toast_overlay_get_type") | |
| 460 | + | core.PuregoSafeRegister(&xToastOverlayGLibType, libs, "adw_toast_overlay_get_type") | |
| 457 | 461 | ||
| 458 | - | core.PuregoSafeRegister(&xNewToastOverlay, lib, "adw_toast_overlay_new") | |
| 462 | + | core.PuregoSafeRegister(&xNewToastOverlay, libs, "adw_toast_overlay_new") | |
| 459 | 463 | ||
| 460 | - | core.PuregoSafeRegister(&xToastOverlayAddToast, lib, "adw_toast_overlay_add_toast") | |
| 461 | - | core.PuregoSafeRegister(&xToastOverlayDismissAll, lib, "adw_toast_overlay_dismiss_all") | |
| 462 | - | core.PuregoSafeRegister(&xToastOverlayGetChild, lib, "adw_toast_overlay_get_child") | |
| 463 | - | core.PuregoSafeRegister(&xToastOverlaySetChild, lib, "adw_toast_overlay_set_child") | |
| 464 | + | core.PuregoSafeRegister(&xToastOverlayAddToast, libs, "adw_toast_overlay_add_toast") | |
| 465 | + | core.PuregoSafeRegister(&xToastOverlayDismissAll, libs, "adw_toast_overlay_dismiss_all") | |
| 466 | + | core.PuregoSafeRegister(&xToastOverlayGetChild, libs, "adw_toast_overlay_get_child") | |
| 467 | + | core.PuregoSafeRegister(&xToastOverlaySetChild, libs, "adw_toast_overlay_set_child") | |
| 464 | 468 | ||
| 465 | 469 | } | |
M v4/adw/adw-toast.go +34 -30
| @@ -523,37 +523,41 @@ func (x *Toast) ConnectDismissed(cb *func(Toast)) uint32 { | |||
| 523 | 523 | ||
| 524 | 524 | func init() { | |
| 525 | 525 | core.SetPackageName("ADW", "libadwaita-1") | |
| 526 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 527 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 528 | - | if err != nil { | |
| 529 | - | panic(err) | |
| 526 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 527 | + | var libs []uintptr | |
| 528 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 529 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 530 | + | if err != nil { | |
| 531 | + | panic(err) | |
| 532 | + | } | |
| 533 | + | libs = append(libs, lib) | |
| 530 | 534 | } | |
| 531 | 535 | ||
| 532 | - | core.PuregoSafeRegister(&xToastPriorityGLibType, lib, "adw_toast_priority_get_type") | |
| 533 | - | ||
| 534 | - | core.PuregoSafeRegister(&xToastGLibType, lib, "adw_toast_get_type") | |
| 535 | - | ||
| 536 | - | core.PuregoSafeRegister(&xNewToast, lib, "adw_toast_new") | |
| 537 | - | core.PuregoSafeRegister(&xNewToastFormat, lib, "adw_toast_new_format") | |
| 538 | - | ||
| 539 | - | core.PuregoSafeRegister(&xToastDismiss, lib, "adw_toast_dismiss") | |
| 540 | - | core.PuregoSafeRegister(&xToastGetActionName, lib, "adw_toast_get_action_name") | |
| 541 | - | core.PuregoSafeRegister(&xToastGetActionTargetValue, lib, "adw_toast_get_action_target_value") | |
| 542 | - | core.PuregoSafeRegister(&xToastGetButtonLabel, lib, "adw_toast_get_button_label") | |
| 543 | - | core.PuregoSafeRegister(&xToastGetCustomTitle, lib, "adw_toast_get_custom_title") | |
| 544 | - | core.PuregoSafeRegister(&xToastGetPriority, lib, "adw_toast_get_priority") | |
| 545 | - | core.PuregoSafeRegister(&xToastGetTimeout, lib, "adw_toast_get_timeout") | |
| 546 | - | core.PuregoSafeRegister(&xToastGetTitle, lib, "adw_toast_get_title") | |
| 547 | - | core.PuregoSafeRegister(&xToastGetUseMarkup, lib, "adw_toast_get_use_markup") | |
| 548 | - | core.PuregoSafeRegister(&xToastSetActionName, lib, "adw_toast_set_action_name") | |
| 549 | - | core.PuregoSafeRegister(&xToastSetActionTarget, lib, "adw_toast_set_action_target") | |
| 550 | - | core.PuregoSafeRegister(&xToastSetActionTargetValue, lib, "adw_toast_set_action_target_value") | |
| 551 | - | core.PuregoSafeRegister(&xToastSetButtonLabel, lib, "adw_toast_set_button_label") | |
| 552 | - | core.PuregoSafeRegister(&xToastSetCustomTitle, lib, "adw_toast_set_custom_title") | |
| 553 | - | core.PuregoSafeRegister(&xToastSetDetailedActionName, lib, "adw_toast_set_detailed_action_name") | |
| 554 | - | core.PuregoSafeRegister(&xToastSetPriority, lib, "adw_toast_set_priority") | |
| 555 | - | core.PuregoSafeRegister(&xToastSetTimeout, lib, "adw_toast_set_timeout") | |
| 556 | - | core.PuregoSafeRegister(&xToastSetTitle, lib, "adw_toast_set_title") | |
| 557 | - | core.PuregoSafeRegister(&xToastSetUseMarkup, lib, "adw_toast_set_use_markup") | |
| 536 | + | core.PuregoSafeRegister(&xToastPriorityGLibType, libs, "adw_toast_priority_get_type") | |
| 537 | + | ||
| 538 | + | core.PuregoSafeRegister(&xToastGLibType, libs, "adw_toast_get_type") | |
| 539 | + | ||
| 540 | + | core.PuregoSafeRegister(&xNewToast, libs, "adw_toast_new") | |
| 541 | + | core.PuregoSafeRegister(&xNewToastFormat, libs, "adw_toast_new_format") | |
| 542 | + | ||
| 543 | + | core.PuregoSafeRegister(&xToastDismiss, libs, "adw_toast_dismiss") | |
| 544 | + | core.PuregoSafeRegister(&xToastGetActionName, libs, "adw_toast_get_action_name") | |
| 545 | + | core.PuregoSafeRegister(&xToastGetActionTargetValue, libs, "adw_toast_get_action_target_value") | |
| 546 | + | core.PuregoSafeRegister(&xToastGetButtonLabel, libs, "adw_toast_get_button_label") | |
| 547 | + | core.PuregoSafeRegister(&xToastGetCustomTitle, libs, "adw_toast_get_custom_title") | |
| 548 | + | core.PuregoSafeRegister(&xToastGetPriority, libs, "adw_toast_get_priority") | |
| 549 | + | core.PuregoSafeRegister(&xToastGetTimeout, libs, "adw_toast_get_timeout") | |
| 550 | + | core.PuregoSafeRegister(&xToastGetTitle, libs, "adw_toast_get_title") | |
| 551 | + | core.PuregoSafeRegister(&xToastGetUseMarkup, libs, "adw_toast_get_use_markup") | |
| 552 | + | core.PuregoSafeRegister(&xToastSetActionName, libs, "adw_toast_set_action_name") | |
| 553 | + | core.PuregoSafeRegister(&xToastSetActionTarget, libs, "adw_toast_set_action_target") | |
| 554 | + | core.PuregoSafeRegister(&xToastSetActionTargetValue, libs, "adw_toast_set_action_target_value") | |
| 555 | + | core.PuregoSafeRegister(&xToastSetButtonLabel, libs, "adw_toast_set_button_label") | |
| 556 | + | core.PuregoSafeRegister(&xToastSetCustomTitle, libs, "adw_toast_set_custom_title") | |
| 557 | + | core.PuregoSafeRegister(&xToastSetDetailedActionName, libs, "adw_toast_set_detailed_action_name") | |
| 558 | + | core.PuregoSafeRegister(&xToastSetPriority, libs, "adw_toast_set_priority") | |
| 559 | + | core.PuregoSafeRegister(&xToastSetTimeout, libs, "adw_toast_set_timeout") | |
| 560 | + | core.PuregoSafeRegister(&xToastSetTitle, libs, "adw_toast_set_title") | |
| 561 | + | core.PuregoSafeRegister(&xToastSetUseMarkup, libs, "adw_toast_set_use_markup") | |
| 558 | 562 | ||
| 559 | 563 | } | |
M v4/adw/adw-toggle-group.go +47 -43
| @@ -868,50 +868,54 @@ func (x *ToggleGroup) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 868 | 868 | ||
| 869 | 869 | func init() { | |
| 870 | 870 | core.SetPackageName("ADW", "libadwaita-1") | |
| 871 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 872 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 873 | - | if err != nil { | |
| 874 | - | panic(err) | |
| 871 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 872 | + | var libs []uintptr | |
| 873 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 874 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 875 | + | if err != nil { | |
| 876 | + | panic(err) | |
| 877 | + | } | |
| 878 | + | libs = append(libs, lib) | |
| 875 | 879 | } | |
| 876 | 880 | ||
| 877 | - | core.PuregoSafeRegister(&xToggleGLibType, lib, "adw_toggle_get_type") | |
| 878 | - | ||
| 879 | - | core.PuregoSafeRegister(&xNewToggle, lib, "adw_toggle_new") | |
| 880 | - | ||
| 881 | - | core.PuregoSafeRegister(&xToggleGetChild, lib, "adw_toggle_get_child") | |
| 882 | - | core.PuregoSafeRegister(&xToggleGetEnabled, lib, "adw_toggle_get_enabled") | |
| 883 | - | core.PuregoSafeRegister(&xToggleGetIconName, lib, "adw_toggle_get_icon_name") | |
| 884 | - | core.PuregoSafeRegister(&xToggleGetIndex, lib, "adw_toggle_get_index") | |
| 885 | - | core.PuregoSafeRegister(&xToggleGetLabel, lib, "adw_toggle_get_label") | |
| 886 | - | core.PuregoSafeRegister(&xToggleGetName, lib, "adw_toggle_get_name") | |
| 887 | - | core.PuregoSafeRegister(&xToggleGetTooltip, lib, "adw_toggle_get_tooltip") | |
| 888 | - | core.PuregoSafeRegister(&xToggleGetUseUnderline, lib, "adw_toggle_get_use_underline") | |
| 889 | - | core.PuregoSafeRegister(&xToggleSetChild, lib, "adw_toggle_set_child") | |
| 890 | - | core.PuregoSafeRegister(&xToggleSetEnabled, lib, "adw_toggle_set_enabled") | |
| 891 | - | core.PuregoSafeRegister(&xToggleSetIconName, lib, "adw_toggle_set_icon_name") | |
| 892 | - | core.PuregoSafeRegister(&xToggleSetLabel, lib, "adw_toggle_set_label") | |
| 893 | - | core.PuregoSafeRegister(&xToggleSetName, lib, "adw_toggle_set_name") | |
| 894 | - | core.PuregoSafeRegister(&xToggleSetTooltip, lib, "adw_toggle_set_tooltip") | |
| 895 | - | core.PuregoSafeRegister(&xToggleSetUseUnderline, lib, "adw_toggle_set_use_underline") | |
| 896 | - | ||
| 897 | - | core.PuregoSafeRegister(&xToggleGroupGLibType, lib, "adw_toggle_group_get_type") | |
| 898 | - | ||
| 899 | - | core.PuregoSafeRegister(&xNewToggleGroup, lib, "adw_toggle_group_new") | |
| 900 | - | ||
| 901 | - | core.PuregoSafeRegister(&xToggleGroupAdd, lib, "adw_toggle_group_add") | |
| 902 | - | core.PuregoSafeRegister(&xToggleGroupGetActive, lib, "adw_toggle_group_get_active") | |
| 903 | - | core.PuregoSafeRegister(&xToggleGroupGetActiveName, lib, "adw_toggle_group_get_active_name") | |
| 904 | - | core.PuregoSafeRegister(&xToggleGroupGetCanShrink, lib, "adw_toggle_group_get_can_shrink") | |
| 905 | - | core.PuregoSafeRegister(&xToggleGroupGetHomogeneous, lib, "adw_toggle_group_get_homogeneous") | |
| 906 | - | core.PuregoSafeRegister(&xToggleGroupGetNToggles, lib, "adw_toggle_group_get_n_toggles") | |
| 907 | - | core.PuregoSafeRegister(&xToggleGroupGetToggle, lib, "adw_toggle_group_get_toggle") | |
| 908 | - | core.PuregoSafeRegister(&xToggleGroupGetToggleByName, lib, "adw_toggle_group_get_toggle_by_name") | |
| 909 | - | core.PuregoSafeRegister(&xToggleGroupGetToggles, lib, "adw_toggle_group_get_toggles") | |
| 910 | - | core.PuregoSafeRegister(&xToggleGroupRemove, lib, "adw_toggle_group_remove") | |
| 911 | - | core.PuregoSafeRegister(&xToggleGroupRemoveAll, lib, "adw_toggle_group_remove_all") | |
| 912 | - | core.PuregoSafeRegister(&xToggleGroupSetActive, lib, "adw_toggle_group_set_active") | |
| 913 | - | core.PuregoSafeRegister(&xToggleGroupSetActiveName, lib, "adw_toggle_group_set_active_name") | |
| 914 | - | core.PuregoSafeRegister(&xToggleGroupSetCanShrink, lib, "adw_toggle_group_set_can_shrink") | |
| 915 | - | core.PuregoSafeRegister(&xToggleGroupSetHomogeneous, lib, "adw_toggle_group_set_homogeneous") | |
| 881 | + | core.PuregoSafeRegister(&xToggleGLibType, libs, "adw_toggle_get_type") | |
| 882 | + | ||
| 883 | + | core.PuregoSafeRegister(&xNewToggle, libs, "adw_toggle_new") | |
| 884 | + | ||
| 885 | + | core.PuregoSafeRegister(&xToggleGetChild, libs, "adw_toggle_get_child") | |
| 886 | + | core.PuregoSafeRegister(&xToggleGetEnabled, libs, "adw_toggle_get_enabled") | |
| 887 | + | core.PuregoSafeRegister(&xToggleGetIconName, libs, "adw_toggle_get_icon_name") | |
| 888 | + | core.PuregoSafeRegister(&xToggleGetIndex, libs, "adw_toggle_get_index") | |
| 889 | + | core.PuregoSafeRegister(&xToggleGetLabel, libs, "adw_toggle_get_label") | |
| 890 | + | core.PuregoSafeRegister(&xToggleGetName, libs, "adw_toggle_get_name") | |
| 891 | + | core.PuregoSafeRegister(&xToggleGetTooltip, libs, "adw_toggle_get_tooltip") | |
| 892 | + | core.PuregoSafeRegister(&xToggleGetUseUnderline, libs, "adw_toggle_get_use_underline") | |
| 893 | + | core.PuregoSafeRegister(&xToggleSetChild, libs, "adw_toggle_set_child") | |
| 894 | + | core.PuregoSafeRegister(&xToggleSetEnabled, libs, "adw_toggle_set_enabled") | |
| 895 | + | core.PuregoSafeRegister(&xToggleSetIconName, libs, "adw_toggle_set_icon_name") | |
| 896 | + | core.PuregoSafeRegister(&xToggleSetLabel, libs, "adw_toggle_set_label") | |
| 897 | + | core.PuregoSafeRegister(&xToggleSetName, libs, "adw_toggle_set_name") | |
| 898 | + | core.PuregoSafeRegister(&xToggleSetTooltip, libs, "adw_toggle_set_tooltip") | |
| 899 | + | core.PuregoSafeRegister(&xToggleSetUseUnderline, libs, "adw_toggle_set_use_underline") | |
| 900 | + | ||
| 901 | + | core.PuregoSafeRegister(&xToggleGroupGLibType, libs, "adw_toggle_group_get_type") | |
| 902 | + | ||
| 903 | + | core.PuregoSafeRegister(&xNewToggleGroup, libs, "adw_toggle_group_new") | |
| 904 | + | ||
| 905 | + | core.PuregoSafeRegister(&xToggleGroupAdd, libs, "adw_toggle_group_add") | |
| 906 | + | core.PuregoSafeRegister(&xToggleGroupGetActive, libs, "adw_toggle_group_get_active") | |
| 907 | + | core.PuregoSafeRegister(&xToggleGroupGetActiveName, libs, "adw_toggle_group_get_active_name") | |
| 908 | + | core.PuregoSafeRegister(&xToggleGroupGetCanShrink, libs, "adw_toggle_group_get_can_shrink") | |
| 909 | + | core.PuregoSafeRegister(&xToggleGroupGetHomogeneous, libs, "adw_toggle_group_get_homogeneous") | |
| 910 | + | core.PuregoSafeRegister(&xToggleGroupGetNToggles, libs, "adw_toggle_group_get_n_toggles") | |
| 911 | + | core.PuregoSafeRegister(&xToggleGroupGetToggle, libs, "adw_toggle_group_get_toggle") | |
| 912 | + | core.PuregoSafeRegister(&xToggleGroupGetToggleByName, libs, "adw_toggle_group_get_toggle_by_name") | |
| 913 | + | core.PuregoSafeRegister(&xToggleGroupGetToggles, libs, "adw_toggle_group_get_toggles") | |
| 914 | + | core.PuregoSafeRegister(&xToggleGroupRemove, libs, "adw_toggle_group_remove") | |
| 915 | + | core.PuregoSafeRegister(&xToggleGroupRemoveAll, libs, "adw_toggle_group_remove_all") | |
| 916 | + | core.PuregoSafeRegister(&xToggleGroupSetActive, libs, "adw_toggle_group_set_active") | |
| 917 | + | core.PuregoSafeRegister(&xToggleGroupSetActiveName, libs, "adw_toggle_group_set_active_name") | |
| 918 | + | core.PuregoSafeRegister(&xToggleGroupSetCanShrink, libs, "adw_toggle_group_set_can_shrink") | |
| 919 | + | core.PuregoSafeRegister(&xToggleGroupSetHomogeneous, libs, "adw_toggle_group_set_homogeneous") | |
| 916 | 920 | ||
| 917 | 921 | } | |
M v4/adw/adw-toolbar-view.go +33 -29
| @@ -785,36 +785,40 @@ func (x *ToolbarView) GetBuildableId() string { | |||
| 785 | 785 | ||
| 786 | 786 | func init() { | |
| 787 | 787 | core.SetPackageName("ADW", "libadwaita-1") | |
| 788 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 789 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 790 | - | if err != nil { | |
| 791 | - | panic(err) | |
| 788 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 789 | + | var libs []uintptr | |
| 790 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 791 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 792 | + | if err != nil { | |
| 793 | + | panic(err) | |
| 794 | + | } | |
| 795 | + | libs = append(libs, lib) | |
| 792 | 796 | } | |
| 793 | 797 | ||
| 794 | - | core.PuregoSafeRegister(&xToolbarStyleGLibType, lib, "adw_toolbar_style_get_type") | |
| 795 | - | ||
| 796 | - | core.PuregoSafeRegister(&xToolbarViewGLibType, lib, "adw_toolbar_view_get_type") | |
| 797 | - | ||
| 798 | - | core.PuregoSafeRegister(&xNewToolbarView, lib, "adw_toolbar_view_new") | |
| 799 | - | ||
| 800 | - | core.PuregoSafeRegister(&xToolbarViewAddBottomBar, lib, "adw_toolbar_view_add_bottom_bar") | |
| 801 | - | core.PuregoSafeRegister(&xToolbarViewAddTopBar, lib, "adw_toolbar_view_add_top_bar") | |
| 802 | - | core.PuregoSafeRegister(&xToolbarViewGetBottomBarHeight, lib, "adw_toolbar_view_get_bottom_bar_height") | |
| 803 | - | core.PuregoSafeRegister(&xToolbarViewGetBottomBarStyle, lib, "adw_toolbar_view_get_bottom_bar_style") | |
| 804 | - | core.PuregoSafeRegister(&xToolbarViewGetContent, lib, "adw_toolbar_view_get_content") | |
| 805 | - | core.PuregoSafeRegister(&xToolbarViewGetExtendContentToBottomEdge, lib, "adw_toolbar_view_get_extend_content_to_bottom_edge") | |
| 806 | - | core.PuregoSafeRegister(&xToolbarViewGetExtendContentToTopEdge, lib, "adw_toolbar_view_get_extend_content_to_top_edge") | |
| 807 | - | core.PuregoSafeRegister(&xToolbarViewGetRevealBottomBars, lib, "adw_toolbar_view_get_reveal_bottom_bars") | |
| 808 | - | core.PuregoSafeRegister(&xToolbarViewGetRevealTopBars, lib, "adw_toolbar_view_get_reveal_top_bars") | |
| 809 | - | core.PuregoSafeRegister(&xToolbarViewGetTopBarHeight, lib, "adw_toolbar_view_get_top_bar_height") | |
| 810 | - | core.PuregoSafeRegister(&xToolbarViewGetTopBarStyle, lib, "adw_toolbar_view_get_top_bar_style") | |
| 811 | - | core.PuregoSafeRegister(&xToolbarViewRemove, lib, "adw_toolbar_view_remove") | |
| 812 | - | core.PuregoSafeRegister(&xToolbarViewSetBottomBarStyle, lib, "adw_toolbar_view_set_bottom_bar_style") | |
| 813 | - | core.PuregoSafeRegister(&xToolbarViewSetContent, lib, "adw_toolbar_view_set_content") | |
| 814 | - | core.PuregoSafeRegister(&xToolbarViewSetExtendContentToBottomEdge, lib, "adw_toolbar_view_set_extend_content_to_bottom_edge") | |
| 815 | - | core.PuregoSafeRegister(&xToolbarViewSetExtendContentToTopEdge, lib, "adw_toolbar_view_set_extend_content_to_top_edge") | |
| 816 | - | core.PuregoSafeRegister(&xToolbarViewSetRevealBottomBars, lib, "adw_toolbar_view_set_reveal_bottom_bars") | |
| 817 | - | core.PuregoSafeRegister(&xToolbarViewSetRevealTopBars, lib, "adw_toolbar_view_set_reveal_top_bars") | |
| 818 | - | core.PuregoSafeRegister(&xToolbarViewSetTopBarStyle, lib, "adw_toolbar_view_set_top_bar_style") | |
| 798 | + | core.PuregoSafeRegister(&xToolbarStyleGLibType, libs, "adw_toolbar_style_get_type") | |
| 799 | + | ||
| 800 | + | core.PuregoSafeRegister(&xToolbarViewGLibType, libs, "adw_toolbar_view_get_type") | |
| 801 | + | ||
| 802 | + | core.PuregoSafeRegister(&xNewToolbarView, libs, "adw_toolbar_view_new") | |
| 803 | + | ||
| 804 | + | core.PuregoSafeRegister(&xToolbarViewAddBottomBar, libs, "adw_toolbar_view_add_bottom_bar") | |
| 805 | + | core.PuregoSafeRegister(&xToolbarViewAddTopBar, libs, "adw_toolbar_view_add_top_bar") | |
| 806 | + | core.PuregoSafeRegister(&xToolbarViewGetBottomBarHeight, libs, "adw_toolbar_view_get_bottom_bar_height") | |
| 807 | + | core.PuregoSafeRegister(&xToolbarViewGetBottomBarStyle, libs, "adw_toolbar_view_get_bottom_bar_style") | |
| 808 | + | core.PuregoSafeRegister(&xToolbarViewGetContent, libs, "adw_toolbar_view_get_content") | |
| 809 | + | core.PuregoSafeRegister(&xToolbarViewGetExtendContentToBottomEdge, libs, "adw_toolbar_view_get_extend_content_to_bottom_edge") | |
| 810 | + | core.PuregoSafeRegister(&xToolbarViewGetExtendContentToTopEdge, libs, "adw_toolbar_view_get_extend_content_to_top_edge") | |
| 811 | + | core.PuregoSafeRegister(&xToolbarViewGetRevealBottomBars, libs, "adw_toolbar_view_get_reveal_bottom_bars") | |
| 812 | + | core.PuregoSafeRegister(&xToolbarViewGetRevealTopBars, libs, "adw_toolbar_view_get_reveal_top_bars") | |
| 813 | + | core.PuregoSafeRegister(&xToolbarViewGetTopBarHeight, libs, "adw_toolbar_view_get_top_bar_height") | |
| 814 | + | core.PuregoSafeRegister(&xToolbarViewGetTopBarStyle, libs, "adw_toolbar_view_get_top_bar_style") | |
| 815 | + | core.PuregoSafeRegister(&xToolbarViewRemove, libs, "adw_toolbar_view_remove") | |
| 816 | + | core.PuregoSafeRegister(&xToolbarViewSetBottomBarStyle, libs, "adw_toolbar_view_set_bottom_bar_style") | |
| 817 | + | core.PuregoSafeRegister(&xToolbarViewSetContent, libs, "adw_toolbar_view_set_content") | |
| 818 | + | core.PuregoSafeRegister(&xToolbarViewSetExtendContentToBottomEdge, libs, "adw_toolbar_view_set_extend_content_to_bottom_edge") | |
| 819 | + | core.PuregoSafeRegister(&xToolbarViewSetExtendContentToTopEdge, libs, "adw_toolbar_view_set_extend_content_to_top_edge") | |
| 820 | + | core.PuregoSafeRegister(&xToolbarViewSetRevealBottomBars, libs, "adw_toolbar_view_set_reveal_bottom_bars") | |
| 821 | + | core.PuregoSafeRegister(&xToolbarViewSetRevealTopBars, libs, "adw_toolbar_view_set_reveal_top_bars") | |
| 822 | + | core.PuregoSafeRegister(&xToolbarViewSetTopBarStyle, libs, "adw_toolbar_view_set_top_bar_style") | |
| 819 | 823 | ||
| 820 | 824 | } | |
M v4/adw/adw-version.go +11 -7
| @@ -68,14 +68,18 @@ func GetMinorVersion() uint { | |||
| 68 | 68 | ||
| 69 | 69 | func init() { | |
| 70 | 70 | core.SetPackageName("ADW", "libadwaita-1") | |
| 71 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 72 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 73 | - | if err != nil { | |
| 74 | - | panic(err) | |
| 71 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 72 | + | var libs []uintptr | |
| 73 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 74 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 75 | + | if err != nil { | |
| 76 | + | panic(err) | |
| 77 | + | } | |
| 78 | + | libs = append(libs, lib) | |
| 75 | 79 | } | |
| 76 | 80 | ||
| 77 | - | core.PuregoSafeRegister(&xGetMajorVersion, lib, "adw_get_major_version") | |
| 78 | - | core.PuregoSafeRegister(&xGetMicroVersion, lib, "adw_get_micro_version") | |
| 79 | - | core.PuregoSafeRegister(&xGetMinorVersion, lib, "adw_get_minor_version") | |
| 81 | + | core.PuregoSafeRegister(&xGetMajorVersion, libs, "adw_get_major_version") | |
| 82 | + | core.PuregoSafeRegister(&xGetMicroVersion, libs, "adw_get_micro_version") | |
| 83 | + | core.PuregoSafeRegister(&xGetMinorVersion, libs, "adw_get_minor_version") | |
| 80 | 84 | ||
| 81 | 85 | } | |
M v4/adw/adw-view-stack.go +56 -52
| @@ -1443,59 +1443,63 @@ func (x *ViewStackPages) UnselectRange(PositionVar uint, NItemsVar uint) bool { | |||
| 1443 | 1443 | ||
| 1444 | 1444 | func init() { | |
| 1445 | 1445 | core.SetPackageName("ADW", "libadwaita-1") | |
| 1446 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 1447 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1448 | - | if err != nil { | |
| 1449 | - | panic(err) | |
| 1446 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 1447 | + | var libs []uintptr | |
| 1448 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 1449 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1450 | + | if err != nil { | |
| 1451 | + | panic(err) | |
| 1452 | + | } | |
| 1453 | + | libs = append(libs, lib) | |
| 1450 | 1454 | } | |
| 1451 | 1455 | ||
| 1452 | - | core.PuregoSafeRegister(&xViewStackGLibType, lib, "adw_view_stack_get_type") | |
| 1453 | - | ||
| 1454 | - | core.PuregoSafeRegister(&xNewViewStack, lib, "adw_view_stack_new") | |
| 1455 | - | ||
| 1456 | - | core.PuregoSafeRegister(&xViewStackAdd, lib, "adw_view_stack_add") | |
| 1457 | - | core.PuregoSafeRegister(&xViewStackAddNamed, lib, "adw_view_stack_add_named") | |
| 1458 | - | core.PuregoSafeRegister(&xViewStackAddTitled, lib, "adw_view_stack_add_titled") | |
| 1459 | - | core.PuregoSafeRegister(&xViewStackAddTitledWithIcon, lib, "adw_view_stack_add_titled_with_icon") | |
| 1460 | - | core.PuregoSafeRegister(&xViewStackGetChildByName, lib, "adw_view_stack_get_child_by_name") | |
| 1461 | - | core.PuregoSafeRegister(&xViewStackGetEnableTransitions, lib, "adw_view_stack_get_enable_transitions") | |
| 1462 | - | core.PuregoSafeRegister(&xViewStackGetHhomogeneous, lib, "adw_view_stack_get_hhomogeneous") | |
| 1463 | - | core.PuregoSafeRegister(&xViewStackGetPage, lib, "adw_view_stack_get_page") | |
| 1464 | - | core.PuregoSafeRegister(&xViewStackGetPages, lib, "adw_view_stack_get_pages") | |
| 1465 | - | core.PuregoSafeRegister(&xViewStackGetTransitionDuration, lib, "adw_view_stack_get_transition_duration") | |
| 1466 | - | core.PuregoSafeRegister(&xViewStackGetTransitionRunning, lib, "adw_view_stack_get_transition_running") | |
| 1467 | - | core.PuregoSafeRegister(&xViewStackGetVhomogeneous, lib, "adw_view_stack_get_vhomogeneous") | |
| 1468 | - | core.PuregoSafeRegister(&xViewStackGetVisibleChild, lib, "adw_view_stack_get_visible_child") | |
| 1469 | - | core.PuregoSafeRegister(&xViewStackGetVisibleChildName, lib, "adw_view_stack_get_visible_child_name") | |
| 1470 | - | core.PuregoSafeRegister(&xViewStackRemove, lib, "adw_view_stack_remove") | |
| 1471 | - | core.PuregoSafeRegister(&xViewStackSetEnableTransitions, lib, "adw_view_stack_set_enable_transitions") | |
| 1472 | - | core.PuregoSafeRegister(&xViewStackSetHhomogeneous, lib, "adw_view_stack_set_hhomogeneous") | |
| 1473 | - | core.PuregoSafeRegister(&xViewStackSetTransitionDuration, lib, "adw_view_stack_set_transition_duration") | |
| 1474 | - | core.PuregoSafeRegister(&xViewStackSetVhomogeneous, lib, "adw_view_stack_set_vhomogeneous") | |
| 1475 | - | core.PuregoSafeRegister(&xViewStackSetVisibleChild, lib, "adw_view_stack_set_visible_child") | |
| 1476 | - | core.PuregoSafeRegister(&xViewStackSetVisibleChildName, lib, "adw_view_stack_set_visible_child_name") | |
| 1477 | - | ||
| 1478 | - | core.PuregoSafeRegister(&xViewStackPageGLibType, lib, "adw_view_stack_page_get_type") | |
| 1479 | - | ||
| 1480 | - | core.PuregoSafeRegister(&xViewStackPageGetBadgeNumber, lib, "adw_view_stack_page_get_badge_number") | |
| 1481 | - | core.PuregoSafeRegister(&xViewStackPageGetChild, lib, "adw_view_stack_page_get_child") | |
| 1482 | - | core.PuregoSafeRegister(&xViewStackPageGetIconName, lib, "adw_view_stack_page_get_icon_name") | |
| 1483 | - | core.PuregoSafeRegister(&xViewStackPageGetName, lib, "adw_view_stack_page_get_name") | |
| 1484 | - | core.PuregoSafeRegister(&xViewStackPageGetNeedsAttention, lib, "adw_view_stack_page_get_needs_attention") | |
| 1485 | - | core.PuregoSafeRegister(&xViewStackPageGetTitle, lib, "adw_view_stack_page_get_title") | |
| 1486 | - | core.PuregoSafeRegister(&xViewStackPageGetUseUnderline, lib, "adw_view_stack_page_get_use_underline") | |
| 1487 | - | core.PuregoSafeRegister(&xViewStackPageGetVisible, lib, "adw_view_stack_page_get_visible") | |
| 1488 | - | core.PuregoSafeRegister(&xViewStackPageSetBadgeNumber, lib, "adw_view_stack_page_set_badge_number") | |
| 1489 | - | core.PuregoSafeRegister(&xViewStackPageSetIconName, lib, "adw_view_stack_page_set_icon_name") | |
| 1490 | - | core.PuregoSafeRegister(&xViewStackPageSetName, lib, "adw_view_stack_page_set_name") | |
| 1491 | - | core.PuregoSafeRegister(&xViewStackPageSetNeedsAttention, lib, "adw_view_stack_page_set_needs_attention") | |
| 1492 | - | core.PuregoSafeRegister(&xViewStackPageSetTitle, lib, "adw_view_stack_page_set_title") | |
| 1493 | - | core.PuregoSafeRegister(&xViewStackPageSetUseUnderline, lib, "adw_view_stack_page_set_use_underline") | |
| 1494 | - | core.PuregoSafeRegister(&xViewStackPageSetVisible, lib, "adw_view_stack_page_set_visible") | |
| 1495 | - | ||
| 1496 | - | core.PuregoSafeRegister(&xViewStackPagesGLibType, lib, "adw_view_stack_pages_get_type") | |
| 1497 | - | ||
| 1498 | - | core.PuregoSafeRegister(&xViewStackPagesGetSelectedPage, lib, "adw_view_stack_pages_get_selected_page") | |
| 1499 | - | core.PuregoSafeRegister(&xViewStackPagesSetSelectedPage, lib, "adw_view_stack_pages_set_selected_page") | |
| 1456 | + | core.PuregoSafeRegister(&xViewStackGLibType, libs, "adw_view_stack_get_type") | |
| 1457 | + | ||
| 1458 | + | core.PuregoSafeRegister(&xNewViewStack, libs, "adw_view_stack_new") | |
| 1459 | + | ||
| 1460 | + | core.PuregoSafeRegister(&xViewStackAdd, libs, "adw_view_stack_add") | |
| 1461 | + | core.PuregoSafeRegister(&xViewStackAddNamed, libs, "adw_view_stack_add_named") | |
| 1462 | + | core.PuregoSafeRegister(&xViewStackAddTitled, libs, "adw_view_stack_add_titled") | |
| 1463 | + | core.PuregoSafeRegister(&xViewStackAddTitledWithIcon, libs, "adw_view_stack_add_titled_with_icon") | |
| 1464 | + | core.PuregoSafeRegister(&xViewStackGetChildByName, libs, "adw_view_stack_get_child_by_name") | |
| 1465 | + | core.PuregoSafeRegister(&xViewStackGetEnableTransitions, libs, "adw_view_stack_get_enable_transitions") | |
| 1466 | + | core.PuregoSafeRegister(&xViewStackGetHhomogeneous, libs, "adw_view_stack_get_hhomogeneous") | |
| 1467 | + | core.PuregoSafeRegister(&xViewStackGetPage, libs, "adw_view_stack_get_page") | |
| 1468 | + | core.PuregoSafeRegister(&xViewStackGetPages, libs, "adw_view_stack_get_pages") | |
| 1469 | + | core.PuregoSafeRegister(&xViewStackGetTransitionDuration, libs, "adw_view_stack_get_transition_duration") | |
| 1470 | + | core.PuregoSafeRegister(&xViewStackGetTransitionRunning, libs, "adw_view_stack_get_transition_running") | |
| 1471 | + | core.PuregoSafeRegister(&xViewStackGetVhomogeneous, libs, "adw_view_stack_get_vhomogeneous") | |
| 1472 | + | core.PuregoSafeRegister(&xViewStackGetVisibleChild, libs, "adw_view_stack_get_visible_child") | |
| 1473 | + | core.PuregoSafeRegister(&xViewStackGetVisibleChildName, libs, "adw_view_stack_get_visible_child_name") | |
| 1474 | + | core.PuregoSafeRegister(&xViewStackRemove, libs, "adw_view_stack_remove") | |
| 1475 | + | core.PuregoSafeRegister(&xViewStackSetEnableTransitions, libs, "adw_view_stack_set_enable_transitions") | |
| 1476 | + | core.PuregoSafeRegister(&xViewStackSetHhomogeneous, libs, "adw_view_stack_set_hhomogeneous") | |
| 1477 | + | core.PuregoSafeRegister(&xViewStackSetTransitionDuration, libs, "adw_view_stack_set_transition_duration") | |
| 1478 | + | core.PuregoSafeRegister(&xViewStackSetVhomogeneous, libs, "adw_view_stack_set_vhomogeneous") | |
| 1479 | + | core.PuregoSafeRegister(&xViewStackSetVisibleChild, libs, "adw_view_stack_set_visible_child") | |
| 1480 | + | core.PuregoSafeRegister(&xViewStackSetVisibleChildName, libs, "adw_view_stack_set_visible_child_name") | |
| 1481 | + | ||
| 1482 | + | core.PuregoSafeRegister(&xViewStackPageGLibType, libs, "adw_view_stack_page_get_type") | |
| 1483 | + | ||
| 1484 | + | core.PuregoSafeRegister(&xViewStackPageGetBadgeNumber, libs, "adw_view_stack_page_get_badge_number") | |
| 1485 | + | core.PuregoSafeRegister(&xViewStackPageGetChild, libs, "adw_view_stack_page_get_child") | |
| 1486 | + | core.PuregoSafeRegister(&xViewStackPageGetIconName, libs, "adw_view_stack_page_get_icon_name") | |
| 1487 | + | core.PuregoSafeRegister(&xViewStackPageGetName, libs, "adw_view_stack_page_get_name") | |
| 1488 | + | core.PuregoSafeRegister(&xViewStackPageGetNeedsAttention, libs, "adw_view_stack_page_get_needs_attention") | |
| 1489 | + | core.PuregoSafeRegister(&xViewStackPageGetTitle, libs, "adw_view_stack_page_get_title") | |
| 1490 | + | core.PuregoSafeRegister(&xViewStackPageGetUseUnderline, libs, "adw_view_stack_page_get_use_underline") | |
| 1491 | + | core.PuregoSafeRegister(&xViewStackPageGetVisible, libs, "adw_view_stack_page_get_visible") | |
| 1492 | + | core.PuregoSafeRegister(&xViewStackPageSetBadgeNumber, libs, "adw_view_stack_page_set_badge_number") | |
| 1493 | + | core.PuregoSafeRegister(&xViewStackPageSetIconName, libs, "adw_view_stack_page_set_icon_name") | |
| 1494 | + | core.PuregoSafeRegister(&xViewStackPageSetName, libs, "adw_view_stack_page_set_name") | |
| 1495 | + | core.PuregoSafeRegister(&xViewStackPageSetNeedsAttention, libs, "adw_view_stack_page_set_needs_attention") | |
| 1496 | + | core.PuregoSafeRegister(&xViewStackPageSetTitle, libs, "adw_view_stack_page_set_title") | |
| 1497 | + | core.PuregoSafeRegister(&xViewStackPageSetUseUnderline, libs, "adw_view_stack_page_set_use_underline") | |
| 1498 | + | core.PuregoSafeRegister(&xViewStackPageSetVisible, libs, "adw_view_stack_page_set_visible") | |
| 1499 | + | ||
| 1500 | + | core.PuregoSafeRegister(&xViewStackPagesGLibType, libs, "adw_view_stack_pages_get_type") | |
| 1501 | + | ||
| 1502 | + | core.PuregoSafeRegister(&xViewStackPagesGetSelectedPage, libs, "adw_view_stack_pages_get_selected_page") | |
| 1503 | + | core.PuregoSafeRegister(&xViewStackPagesSetSelectedPage, libs, "adw_view_stack_pages_set_selected_page") | |
| 1500 | 1504 | ||
| 1501 | 1505 | } | |
M v4/adw/adw-view-switcher-bar.go +14 -10
| @@ -453,19 +453,23 @@ func (x *ViewSwitcherBar) GetBuildableId() string { | |||
| 453 | 453 | ||
| 454 | 454 | func init() { | |
| 455 | 455 | core.SetPackageName("ADW", "libadwaita-1") | |
| 456 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 457 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 458 | - | if err != nil { | |
| 459 | - | panic(err) | |
| 456 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 457 | + | var libs []uintptr | |
| 458 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 459 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 460 | + | if err != nil { | |
| 461 | + | panic(err) | |
| 462 | + | } | |
| 463 | + | libs = append(libs, lib) | |
| 460 | 464 | } | |
| 461 | 465 | ||
| 462 | - | core.PuregoSafeRegister(&xViewSwitcherBarGLibType, lib, "adw_view_switcher_bar_get_type") | |
| 466 | + | core.PuregoSafeRegister(&xViewSwitcherBarGLibType, libs, "adw_view_switcher_bar_get_type") | |
| 463 | 467 | ||
| 464 | - | core.PuregoSafeRegister(&xNewViewSwitcherBar, lib, "adw_view_switcher_bar_new") | |
| 468 | + | core.PuregoSafeRegister(&xNewViewSwitcherBar, libs, "adw_view_switcher_bar_new") | |
| 465 | 469 | ||
| 466 | - | core.PuregoSafeRegister(&xViewSwitcherBarGetReveal, lib, "adw_view_switcher_bar_get_reveal") | |
| 467 | - | core.PuregoSafeRegister(&xViewSwitcherBarGetStack, lib, "adw_view_switcher_bar_get_stack") | |
| 468 | - | core.PuregoSafeRegister(&xViewSwitcherBarSetReveal, lib, "adw_view_switcher_bar_set_reveal") | |
| 469 | - | core.PuregoSafeRegister(&xViewSwitcherBarSetStack, lib, "adw_view_switcher_bar_set_stack") | |
| 470 | + | core.PuregoSafeRegister(&xViewSwitcherBarGetReveal, libs, "adw_view_switcher_bar_get_reveal") | |
| 471 | + | core.PuregoSafeRegister(&xViewSwitcherBarGetStack, libs, "adw_view_switcher_bar_get_stack") | |
| 472 | + | core.PuregoSafeRegister(&xViewSwitcherBarSetReveal, libs, "adw_view_switcher_bar_set_reveal") | |
| 473 | + | core.PuregoSafeRegister(&xViewSwitcherBarSetStack, libs, "adw_view_switcher_bar_set_stack") | |
| 470 | 474 | ||
| 471 | 475 | } | |
M v4/adw/adw-view-switcher-title.go +19 -15
| @@ -513,24 +513,28 @@ func (x *ViewSwitcherTitle) GetBuildableId() string { | |||
| 513 | 513 | ||
| 514 | 514 | func init() { | |
| 515 | 515 | core.SetPackageName("ADW", "libadwaita-1") | |
| 516 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 517 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 518 | - | if err != nil { | |
| 519 | - | panic(err) | |
| 516 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 517 | + | var libs []uintptr | |
| 518 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 519 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 520 | + | if err != nil { | |
| 521 | + | panic(err) | |
| 522 | + | } | |
| 523 | + | libs = append(libs, lib) | |
| 520 | 524 | } | |
| 521 | 525 | ||
| 522 | - | core.PuregoSafeRegister(&xViewSwitcherTitleGLibType, lib, "adw_view_switcher_title_get_type") | |
| 526 | + | core.PuregoSafeRegister(&xViewSwitcherTitleGLibType, libs, "adw_view_switcher_title_get_type") | |
| 523 | 527 | ||
| 524 | - | core.PuregoSafeRegister(&xNewViewSwitcherTitle, lib, "adw_view_switcher_title_new") | |
| 528 | + | core.PuregoSafeRegister(&xNewViewSwitcherTitle, libs, "adw_view_switcher_title_new") | |
| 525 | 529 | ||
| 526 | - | core.PuregoSafeRegister(&xViewSwitcherTitleGetStack, lib, "adw_view_switcher_title_get_stack") | |
| 527 | - | core.PuregoSafeRegister(&xViewSwitcherTitleGetSubtitle, lib, "adw_view_switcher_title_get_subtitle") | |
| 528 | - | core.PuregoSafeRegister(&xViewSwitcherTitleGetTitle, lib, "adw_view_switcher_title_get_title") | |
| 529 | - | core.PuregoSafeRegister(&xViewSwitcherTitleGetTitleVisible, lib, "adw_view_switcher_title_get_title_visible") | |
| 530 | - | core.PuregoSafeRegister(&xViewSwitcherTitleGetViewSwitcherEnabled, lib, "adw_view_switcher_title_get_view_switcher_enabled") | |
| 531 | - | core.PuregoSafeRegister(&xViewSwitcherTitleSetStack, lib, "adw_view_switcher_title_set_stack") | |
| 532 | - | core.PuregoSafeRegister(&xViewSwitcherTitleSetSubtitle, lib, "adw_view_switcher_title_set_subtitle") | |
| 533 | - | core.PuregoSafeRegister(&xViewSwitcherTitleSetTitle, lib, "adw_view_switcher_title_set_title") | |
| 534 | - | core.PuregoSafeRegister(&xViewSwitcherTitleSetViewSwitcherEnabled, lib, "adw_view_switcher_title_set_view_switcher_enabled") | |
| 530 | + | core.PuregoSafeRegister(&xViewSwitcherTitleGetStack, libs, "adw_view_switcher_title_get_stack") | |
| 531 | + | core.PuregoSafeRegister(&xViewSwitcherTitleGetSubtitle, libs, "adw_view_switcher_title_get_subtitle") | |
| 532 | + | core.PuregoSafeRegister(&xViewSwitcherTitleGetTitle, libs, "adw_view_switcher_title_get_title") | |
| 533 | + | core.PuregoSafeRegister(&xViewSwitcherTitleGetTitleVisible, libs, "adw_view_switcher_title_get_title_visible") | |
| 534 | + | core.PuregoSafeRegister(&xViewSwitcherTitleGetViewSwitcherEnabled, libs, "adw_view_switcher_title_get_view_switcher_enabled") | |
| 535 | + | core.PuregoSafeRegister(&xViewSwitcherTitleSetStack, libs, "adw_view_switcher_title_set_stack") | |
| 536 | + | core.PuregoSafeRegister(&xViewSwitcherTitleSetSubtitle, libs, "adw_view_switcher_title_set_subtitle") | |
| 537 | + | core.PuregoSafeRegister(&xViewSwitcherTitleSetTitle, libs, "adw_view_switcher_title_set_title") | |
| 538 | + | core.PuregoSafeRegister(&xViewSwitcherTitleSetViewSwitcherEnabled, libs, "adw_view_switcher_title_set_view_switcher_enabled") | |
| 535 | 539 | ||
| 536 | 540 | } | |
M v4/adw/adw-view-switcher.go +15 -11
| @@ -479,21 +479,25 @@ func (x *ViewSwitcher) GetBuildableId() string { | |||
| 479 | 479 | ||
| 480 | 480 | func init() { | |
| 481 | 481 | core.SetPackageName("ADW", "libadwaita-1") | |
| 482 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 483 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 484 | - | if err != nil { | |
| 485 | - | panic(err) | |
| 482 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 483 | + | var libs []uintptr | |
| 484 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 485 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 486 | + | if err != nil { | |
| 487 | + | panic(err) | |
| 488 | + | } | |
| 489 | + | libs = append(libs, lib) | |
| 486 | 490 | } | |
| 487 | 491 | ||
| 488 | - | core.PuregoSafeRegister(&xViewSwitcherPolicyGLibType, lib, "adw_view_switcher_policy_get_type") | |
| 492 | + | core.PuregoSafeRegister(&xViewSwitcherPolicyGLibType, libs, "adw_view_switcher_policy_get_type") | |
| 489 | 493 | ||
| 490 | - | core.PuregoSafeRegister(&xViewSwitcherGLibType, lib, "adw_view_switcher_get_type") | |
| 494 | + | core.PuregoSafeRegister(&xViewSwitcherGLibType, libs, "adw_view_switcher_get_type") | |
| 491 | 495 | ||
| 492 | - | core.PuregoSafeRegister(&xNewViewSwitcher, lib, "adw_view_switcher_new") | |
| 496 | + | core.PuregoSafeRegister(&xNewViewSwitcher, libs, "adw_view_switcher_new") | |
| 493 | 497 | ||
| 494 | - | core.PuregoSafeRegister(&xViewSwitcherGetPolicy, lib, "adw_view_switcher_get_policy") | |
| 495 | - | core.PuregoSafeRegister(&xViewSwitcherGetStack, lib, "adw_view_switcher_get_stack") | |
| 496 | - | core.PuregoSafeRegister(&xViewSwitcherSetPolicy, lib, "adw_view_switcher_set_policy") | |
| 497 | - | core.PuregoSafeRegister(&xViewSwitcherSetStack, lib, "adw_view_switcher_set_stack") | |
| 498 | + | core.PuregoSafeRegister(&xViewSwitcherGetPolicy, libs, "adw_view_switcher_get_policy") | |
| 499 | + | core.PuregoSafeRegister(&xViewSwitcherGetStack, libs, "adw_view_switcher_get_stack") | |
| 500 | + | core.PuregoSafeRegister(&xViewSwitcherSetPolicy, libs, "adw_view_switcher_set_policy") | |
| 501 | + | core.PuregoSafeRegister(&xViewSwitcherSetStack, libs, "adw_view_switcher_set_stack") | |
| 498 | 502 | ||
| 499 | 503 | } | |
M v4/adw/adw-window-title.go +14 -10
| @@ -402,19 +402,23 @@ func (x *WindowTitle) GetBuildableId() string { | |||
| 402 | 402 | ||
| 403 | 403 | func init() { | |
| 404 | 404 | core.SetPackageName("ADW", "libadwaita-1") | |
| 405 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 406 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 407 | - | if err != nil { | |
| 408 | - | panic(err) | |
| 405 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 406 | + | var libs []uintptr | |
| 407 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 408 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 409 | + | if err != nil { | |
| 410 | + | panic(err) | |
| 411 | + | } | |
| 412 | + | libs = append(libs, lib) | |
| 409 | 413 | } | |
| 410 | 414 | ||
| 411 | - | core.PuregoSafeRegister(&xWindowTitleGLibType, lib, "adw_window_title_get_type") | |
| 415 | + | core.PuregoSafeRegister(&xWindowTitleGLibType, libs, "adw_window_title_get_type") | |
| 412 | 416 | ||
| 413 | - | core.PuregoSafeRegister(&xNewWindowTitle, lib, "adw_window_title_new") | |
| 417 | + | core.PuregoSafeRegister(&xNewWindowTitle, libs, "adw_window_title_new") | |
| 414 | 418 | ||
| 415 | - | core.PuregoSafeRegister(&xWindowTitleGetSubtitle, lib, "adw_window_title_get_subtitle") | |
| 416 | - | core.PuregoSafeRegister(&xWindowTitleGetTitle, lib, "adw_window_title_get_title") | |
| 417 | - | core.PuregoSafeRegister(&xWindowTitleSetSubtitle, lib, "adw_window_title_set_subtitle") | |
| 418 | - | core.PuregoSafeRegister(&xWindowTitleSetTitle, lib, "adw_window_title_set_title") | |
| 419 | + | core.PuregoSafeRegister(&xWindowTitleGetSubtitle, libs, "adw_window_title_get_subtitle") | |
| 420 | + | core.PuregoSafeRegister(&xWindowTitleGetTitle, libs, "adw_window_title_get_title") | |
| 421 | + | core.PuregoSafeRegister(&xWindowTitleSetSubtitle, libs, "adw_window_title_set_subtitle") | |
| 422 | + | core.PuregoSafeRegister(&xWindowTitleSetTitle, libs, "adw_window_title_set_title") | |
| 419 | 423 | ||
| 420 | 424 | } | |
M v4/adw/adw-window.go +18 -14
| @@ -660,23 +660,27 @@ func (x *Window) SetFocus(FocusVar *gtk.Widget) { | |||
| 660 | 660 | ||
| 661 | 661 | func init() { | |
| 662 | 662 | core.SetPackageName("ADW", "libadwaita-1") | |
| 663 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 664 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 665 | - | if err != nil { | |
| 666 | - | panic(err) | |
| 663 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 664 | + | var libs []uintptr | |
| 665 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 666 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 667 | + | if err != nil { | |
| 668 | + | panic(err) | |
| 669 | + | } | |
| 670 | + | libs = append(libs, lib) | |
| 667 | 671 | } | |
| 668 | 672 | ||
| 669 | - | core.PuregoSafeRegister(&xWindowGLibType, lib, "adw_window_get_type") | |
| 673 | + | core.PuregoSafeRegister(&xWindowGLibType, libs, "adw_window_get_type") | |
| 670 | 674 | ||
| 671 | - | core.PuregoSafeRegister(&xNewWindow, lib, "adw_window_new") | |
| 675 | + | core.PuregoSafeRegister(&xNewWindow, libs, "adw_window_new") | |
| 672 | 676 | ||
| 673 | - | core.PuregoSafeRegister(&xWindowAddBreakpoint, lib, "adw_window_add_breakpoint") | |
| 674 | - | core.PuregoSafeRegister(&xWindowGetAdaptivePreview, lib, "adw_window_get_adaptive_preview") | |
| 675 | - | core.PuregoSafeRegister(&xWindowGetContent, lib, "adw_window_get_content") | |
| 676 | - | core.PuregoSafeRegister(&xWindowGetCurrentBreakpoint, lib, "adw_window_get_current_breakpoint") | |
| 677 | - | core.PuregoSafeRegister(&xWindowGetDialogs, lib, "adw_window_get_dialogs") | |
| 678 | - | core.PuregoSafeRegister(&xWindowGetVisibleDialog, lib, "adw_window_get_visible_dialog") | |
| 679 | - | core.PuregoSafeRegister(&xWindowSetAdaptivePreview, lib, "adw_window_set_adaptive_preview") | |
| 680 | - | core.PuregoSafeRegister(&xWindowSetContent, lib, "adw_window_set_content") | |
| 677 | + | core.PuregoSafeRegister(&xWindowAddBreakpoint, libs, "adw_window_add_breakpoint") | |
| 678 | + | core.PuregoSafeRegister(&xWindowGetAdaptivePreview, libs, "adw_window_get_adaptive_preview") | |
| 679 | + | core.PuregoSafeRegister(&xWindowGetContent, libs, "adw_window_get_content") | |
| 680 | + | core.PuregoSafeRegister(&xWindowGetCurrentBreakpoint, libs, "adw_window_get_current_breakpoint") | |
| 681 | + | core.PuregoSafeRegister(&xWindowGetDialogs, libs, "adw_window_get_dialogs") | |
| 682 | + | core.PuregoSafeRegister(&xWindowGetVisibleDialog, libs, "adw_window_get_visible_dialog") | |
| 683 | + | core.PuregoSafeRegister(&xWindowSetAdaptivePreview, libs, "adw_window_set_adaptive_preview") | |
| 684 | + | core.PuregoSafeRegister(&xWindowSetContent, libs, "adw_window_set_content") | |
| 681 | 685 | ||
| 682 | 686 | } | |
M v4/adw/adw-wrap-box.go +43 -39
| @@ -765,46 +765,50 @@ func (x *WrapBox) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 765 | 765 | ||
| 766 | 766 | func init() { | |
| 767 | 767 | core.SetPackageName("ADW", "libadwaita-1") | |
| 768 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 769 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 770 | - | if err != nil { | |
| 771 | - | panic(err) | |
| 768 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 769 | + | var libs []uintptr | |
| 770 | + | for _, libPath := range core.GetPaths("ADW") { | |
| 771 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 772 | + | if err != nil { | |
| 773 | + | panic(err) | |
| 774 | + | } | |
| 775 | + | libs = append(libs, lib) | |
| 772 | 776 | } | |
| 773 | 777 | ||
| 774 | - | core.PuregoSafeRegister(&xWrapBoxGLibType, lib, "adw_wrap_box_get_type") | |
| 775 | - | ||
| 776 | - | core.PuregoSafeRegister(&xNewWrapBox, lib, "adw_wrap_box_new") | |
| 777 | - | ||
| 778 | - | core.PuregoSafeRegister(&xWrapBoxAppend, lib, "adw_wrap_box_append") | |
| 779 | - | core.PuregoSafeRegister(&xWrapBoxGetAlign, lib, "adw_wrap_box_get_align") | |
| 780 | - | core.PuregoSafeRegister(&xWrapBoxGetChildSpacing, lib, "adw_wrap_box_get_child_spacing") | |
| 781 | - | core.PuregoSafeRegister(&xWrapBoxGetChildSpacingUnit, lib, "adw_wrap_box_get_child_spacing_unit") | |
| 782 | - | core.PuregoSafeRegister(&xWrapBoxGetJustify, lib, "adw_wrap_box_get_justify") | |
| 783 | - | core.PuregoSafeRegister(&xWrapBoxGetJustifyLastLine, lib, "adw_wrap_box_get_justify_last_line") | |
| 784 | - | core.PuregoSafeRegister(&xWrapBoxGetLineHomogeneous, lib, "adw_wrap_box_get_line_homogeneous") | |
| 785 | - | core.PuregoSafeRegister(&xWrapBoxGetLineSpacing, lib, "adw_wrap_box_get_line_spacing") | |
| 786 | - | core.PuregoSafeRegister(&xWrapBoxGetLineSpacingUnit, lib, "adw_wrap_box_get_line_spacing_unit") | |
| 787 | - | core.PuregoSafeRegister(&xWrapBoxGetNaturalLineLength, lib, "adw_wrap_box_get_natural_line_length") | |
| 788 | - | core.PuregoSafeRegister(&xWrapBoxGetNaturalLineLengthUnit, lib, "adw_wrap_box_get_natural_line_length_unit") | |
| 789 | - | core.PuregoSafeRegister(&xWrapBoxGetPackDirection, lib, "adw_wrap_box_get_pack_direction") | |
| 790 | - | core.PuregoSafeRegister(&xWrapBoxGetWrapPolicy, lib, "adw_wrap_box_get_wrap_policy") | |
| 791 | - | core.PuregoSafeRegister(&xWrapBoxGetWrapReverse, lib, "adw_wrap_box_get_wrap_reverse") | |
| 792 | - | core.PuregoSafeRegister(&xWrapBoxInsertChildAfter, lib, "adw_wrap_box_insert_child_after") | |
| 793 | - | core.PuregoSafeRegister(&xWrapBoxPrepend, lib, "adw_wrap_box_prepend") | |
| 794 | - | core.PuregoSafeRegister(&xWrapBoxRemove, lib, "adw_wrap_box_remove") | |
| 795 | - | core.PuregoSafeRegister(&xWrapBoxReorderChildAfter, lib, "adw_wrap_box_reorder_child_after") | |
| 796 | - | core.PuregoSafeRegister(&xWrapBoxSetAlign, lib, "adw_wrap_box_set_align") | |
| 797 | - | core.PuregoSafeRegister(&xWrapBoxSetChildSpacing, lib, "adw_wrap_box_set_child_spacing") | |
| 798 | - | core.PuregoSafeRegister(&xWrapBoxSetChildSpacingUnit, lib, "adw_wrap_box_set_child_spacing_unit") | |
| 799 | - | core.PuregoSafeRegister(&xWrapBoxSetJustify, lib, "adw_wrap_box_set_justify") | |
| 800 | - | core.PuregoSafeRegister(&xWrapBoxSetJustifyLastLine, lib, "adw_wrap_box_set_justify_last_line") | |
| 801 | - | core.PuregoSafeRegister(&xWrapBoxSetLineHomogeneous, lib, "adw_wrap_box_set_line_homogeneous") | |
| 802 | - | core.PuregoSafeRegister(&xWrapBoxSetLineSpacing, lib, "adw_wrap_box_set_line_spacing") | |
| 803 | - | core.PuregoSafeRegister(&xWrapBoxSetLineSpacingUnit, lib, "adw_wrap_box_set_line_spacing_unit") | |
| 804 | - | core.PuregoSafeRegister(&xWrapBoxSetNaturalLineLength, lib, "adw_wrap_box_set_natural_line_length") | |
| 805 | - | core.PuregoSafeRegister(&xWrapBoxSetNaturalLineLengthUnit, lib, "adw_wrap_box_set_natural_line_length_unit") | |
| 806 | - | core.PuregoSafeRegister(&xWrapBoxSetPackDirection, lib, "adw_wrap_box_set_pack_direction") | |
| 807 | - | core.PuregoSafeRegister(&xWrapBoxSetWrapPolicy, lib, "adw_wrap_box_set_wrap_policy") | |
| 808 | - | core.PuregoSafeRegister(&xWrapBoxSetWrapReverse, lib, "adw_wrap_box_set_wrap_reverse") | |
| 778 | + | core.PuregoSafeRegister(&xWrapBoxGLibType, libs, "adw_wrap_box_get_type") | |
| 779 | + | ||
| 780 | + | core.PuregoSafeRegister(&xNewWrapBox, libs, "adw_wrap_box_new") | |
| 781 | + | ||
| 782 | + | core.PuregoSafeRegister(&xWrapBoxAppend, libs, "adw_wrap_box_append") | |
| 783 | + | core.PuregoSafeRegister(&xWrapBoxGetAlign, libs, "adw_wrap_box_get_align") | |
| 784 | + | core.PuregoSafeRegister(&xWrapBoxGetChildSpacing, libs, "adw_wrap_box_get_child_spacing") | |
| 785 | + | core.PuregoSafeRegister(&xWrapBoxGetChildSpacingUnit, libs, "adw_wrap_box_get_child_spacing_unit") | |
| 786 | + | core.PuregoSafeRegister(&xWrapBoxGetJustify, libs, "adw_wrap_box_get_justify") | |
| 787 | + | core.PuregoSafeRegister(&xWrapBoxGetJustifyLastLine, libs, "adw_wrap_box_get_justify_last_line") | |
| 788 | + | core.PuregoSafeRegister(&xWrapBoxGetLineHomogeneous, libs, "adw_wrap_box_get_line_homogeneous") | |
| 789 | + | core.PuregoSafeRegister(&xWrapBoxGetLineSpacing, libs, "adw_wrap_box_get_line_spacing") | |
| 790 | + | core.PuregoSafeRegister(&xWrapBoxGetLineSpacingUnit, libs, "adw_wrap_box_get_line_spacing_unit") | |
| 791 | + | core.PuregoSafeRegister(&xWrapBoxGetNaturalLineLength, libs, "adw_wrap_box_get_natural_line_length") | |
| 792 | + | core.PuregoSafeRegister(&xWrapBoxGetNaturalLineLengthUnit, libs, "adw_wrap_box_get_natural_line_length_unit") | |
| 793 | + | core.PuregoSafeRegister(&xWrapBoxGetPackDirection, libs, "adw_wrap_box_get_pack_direction") | |
| 794 | + | core.PuregoSafeRegister(&xWrapBoxGetWrapPolicy, libs, "adw_wrap_box_get_wrap_policy") | |
| 795 | + | core.PuregoSafeRegister(&xWrapBoxGetWrapReverse, libs, "adw_wrap_box_get_wrap_reverse") | |
| 796 | + | core.PuregoSafeRegister(&xWrapBoxInsertChildAfter, libs, "adw_wrap_box_insert_child_after") | |
| 797 | + | core.PuregoSafeRegister(&xWrapBoxPrepend, libs, "adw_wrap_box_prepend") | |
| 798 | + | core.PuregoSafeRegister(&xWrapBoxRemove, libs, "adw_wrap_box_remove") | |
| 799 | + | core.PuregoSafeRegister(&xWrapBoxReorderChildAfter, libs, "adw_wrap_box_reorder_child_after") | |
| 800 | + | core.PuregoSafeRegister(&xWrapBoxSetAlign, libs, "adw_wrap_box_set_align") | |
| 801 | + | core.PuregoSafeRegister(&xWrapBoxSetChildSpacing, libs, "adw_wrap_box_set_child_spacing") | |
| 802 | + | core.PuregoSafeRegister(&xWrapBoxSetChildSpacingUnit, libs, "adw_wrap_box_set_child_spacing_unit") | |
| 803 | + | core.PuregoSafeRegister(&xWrapBoxSetJustify, libs, "adw_wrap_box_set_justify") | |
| 804 | + | core.PuregoSafeRegister(&xWrapBoxSetJustifyLastLine, libs, "adw_wrap_box_set_justify_last_line") | |
| 805 | + | core.PuregoSafeRegister(&xWrapBoxSetLineHomogeneous, libs, "adw_wrap_box_set_line_homogeneous") | |
| 806 | + | core.PuregoSafeRegister(&xWrapBoxSetLineSpacing, libs, "adw_wrap_box_set_line_spacing") | |
| 807 | + | core.PuregoSafeRegister(&xWrapBoxSetLineSpacingUnit, libs, "adw_wrap_box_set_line_spacing_unit") | |
| 808 | + | core.PuregoSafeRegister(&xWrapBoxSetNaturalLineLength, libs, "adw_wrap_box_set_natural_line_length") | |
| 809 | + | core.PuregoSafeRegister(&xWrapBoxSetNaturalLineLengthUnit, libs, "adw_wrap_box_set_natural_line_length_unit") | |
| 810 | + | core.PuregoSafeRegister(&xWrapBoxSetPackDirection, libs, "adw_wrap_box_set_pack_direction") | |
| 811 | + | core.PuregoSafeRegister(&xWrapBoxSetWrapPolicy, libs, "adw_wrap_box_set_wrap_policy") | |
| 812 | + | core.PuregoSafeRegister(&xWrapBoxSetWrapReverse, libs, "adw_wrap_box_set_wrap_reverse") | |
| 809 | 813 | ||
| 810 | 814 | } | |
M v4/adw/adw-wrap-layout.go +44 -40
| @@ -494,47 +494,51 @@ func (x *WrapLayout) SetOrientation(OrientationVar gtk.Orientation) { | |||
| 494 | 494 | ||
| 495 | 495 | func init() { | |
| 496 | 496 | core.SetPackageName("ADW", "libadwaita-1") | |
| 497 | - | core.SetSharedLibrary("ADW", "libadwaita-1.so.0") | |
| 498 | - | lib, err := purego.Dlopen(core.GetPath("ADW"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 499 | - | if err != nil { | |
| 500 | - | panic(err) | |
| 497 | + | core.SetSharedLibraries("ADW", []string{"libadwaita-1.so.0"}) | |
| 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) | |
| 501 | 505 | } | |
| 502 | 506 | ||
| 503 | - | core.PuregoSafeRegister(&xJustifyModeGLibType, lib, "adw_justify_mode_get_type") | |
| 504 | - | ||
| 505 | - | core.PuregoSafeRegister(&xPackDirectionGLibType, lib, "adw_pack_direction_get_type") | |
| 506 | - | ||
| 507 | - | core.PuregoSafeRegister(&xWrapPolicyGLibType, lib, "adw_wrap_policy_get_type") | |
| 508 | - | ||
| 509 | - | core.PuregoSafeRegister(&xWrapLayoutGLibType, lib, "adw_wrap_layout_get_type") | |
| 510 | - | ||
| 511 | - | core.PuregoSafeRegister(&xNewWrapLayout, lib, "adw_wrap_layout_new") | |
| 512 | - | ||
| 513 | - | core.PuregoSafeRegister(&xWrapLayoutGetAlign, lib, "adw_wrap_layout_get_align") | |
| 514 | - | core.PuregoSafeRegister(&xWrapLayoutGetChildSpacing, lib, "adw_wrap_layout_get_child_spacing") | |
| 515 | - | core.PuregoSafeRegister(&xWrapLayoutGetChildSpacingUnit, lib, "adw_wrap_layout_get_child_spacing_unit") | |
| 516 | - | core.PuregoSafeRegister(&xWrapLayoutGetJustify, lib, "adw_wrap_layout_get_justify") | |
| 517 | - | core.PuregoSafeRegister(&xWrapLayoutGetJustifyLastLine, lib, "adw_wrap_layout_get_justify_last_line") | |
| 518 | - | core.PuregoSafeRegister(&xWrapLayoutGetLineHomogeneous, lib, "adw_wrap_layout_get_line_homogeneous") | |
| 519 | - | core.PuregoSafeRegister(&xWrapLayoutGetLineSpacing, lib, "adw_wrap_layout_get_line_spacing") | |
| 520 | - | core.PuregoSafeRegister(&xWrapLayoutGetLineSpacingUnit, lib, "adw_wrap_layout_get_line_spacing_unit") | |
| 521 | - | core.PuregoSafeRegister(&xWrapLayoutGetNaturalLineLength, lib, "adw_wrap_layout_get_natural_line_length") | |
| 522 | - | core.PuregoSafeRegister(&xWrapLayoutGetNaturalLineLengthUnit, lib, "adw_wrap_layout_get_natural_line_length_unit") | |
| 523 | - | core.PuregoSafeRegister(&xWrapLayoutGetPackDirection, lib, "adw_wrap_layout_get_pack_direction") | |
| 524 | - | core.PuregoSafeRegister(&xWrapLayoutGetWrapPolicy, lib, "adw_wrap_layout_get_wrap_policy") | |
| 525 | - | core.PuregoSafeRegister(&xWrapLayoutGetWrapReverse, lib, "adw_wrap_layout_get_wrap_reverse") | |
| 526 | - | core.PuregoSafeRegister(&xWrapLayoutSetAlign, lib, "adw_wrap_layout_set_align") | |
| 527 | - | core.PuregoSafeRegister(&xWrapLayoutSetChildSpacing, lib, "adw_wrap_layout_set_child_spacing") | |
| 528 | - | core.PuregoSafeRegister(&xWrapLayoutSetChildSpacingUnit, lib, "adw_wrap_layout_set_child_spacing_unit") | |
| 529 | - | core.PuregoSafeRegister(&xWrapLayoutSetJustify, lib, "adw_wrap_layout_set_justify") | |
| 530 | - | core.PuregoSafeRegister(&xWrapLayoutSetJustifyLastLine, lib, "adw_wrap_layout_set_justify_last_line") | |
| 531 | - | core.PuregoSafeRegister(&xWrapLayoutSetLineHomogeneous, lib, "adw_wrap_layout_set_line_homogeneous") | |
| 532 | - | core.PuregoSafeRegister(&xWrapLayoutSetLineSpacing, lib, "adw_wrap_layout_set_line_spacing") | |
| 533 | - | core.PuregoSafeRegister(&xWrapLayoutSetLineSpacingUnit, lib, "adw_wrap_layout_set_line_spacing_unit") | |
| 534 | - | core.PuregoSafeRegister(&xWrapLayoutSetNaturalLineLength, lib, "adw_wrap_layout_set_natural_line_length") | |
| 535 | - | core.PuregoSafeRegister(&xWrapLayoutSetNaturalLineLengthUnit, lib, "adw_wrap_layout_set_natural_line_length_unit") | |
| 536 | - | core.PuregoSafeRegister(&xWrapLayoutSetPackDirection, lib, "adw_wrap_layout_set_pack_direction") | |
| 537 | - | core.PuregoSafeRegister(&xWrapLayoutSetWrapPolicy, lib, "adw_wrap_layout_set_wrap_policy") | |
| 538 | - | core.PuregoSafeRegister(&xWrapLayoutSetWrapReverse, lib, "adw_wrap_layout_set_wrap_reverse") | |
| 507 | + | core.PuregoSafeRegister(&xJustifyModeGLibType, libs, "adw_justify_mode_get_type") | |
| 508 | + | ||
| 509 | + | core.PuregoSafeRegister(&xPackDirectionGLibType, libs, "adw_pack_direction_get_type") | |
| 510 | + | ||
| 511 | + | core.PuregoSafeRegister(&xWrapPolicyGLibType, libs, "adw_wrap_policy_get_type") | |
| 512 | + | ||
| 513 | + | core.PuregoSafeRegister(&xWrapLayoutGLibType, libs, "adw_wrap_layout_get_type") | |
| 514 | + | ||
| 515 | + | core.PuregoSafeRegister(&xNewWrapLayout, libs, "adw_wrap_layout_new") | |
| 516 | + | ||
| 517 | + | core.PuregoSafeRegister(&xWrapLayoutGetAlign, libs, "adw_wrap_layout_get_align") | |
| 518 | + | core.PuregoSafeRegister(&xWrapLayoutGetChildSpacing, libs, "adw_wrap_layout_get_child_spacing") | |
| 519 | + | core.PuregoSafeRegister(&xWrapLayoutGetChildSpacingUnit, libs, "adw_wrap_layout_get_child_spacing_unit") | |
| 520 | + | core.PuregoSafeRegister(&xWrapLayoutGetJustify, libs, "adw_wrap_layout_get_justify") | |
| 521 | + | core.PuregoSafeRegister(&xWrapLayoutGetJustifyLastLine, libs, "adw_wrap_layout_get_justify_last_line") | |
| 522 | + | core.PuregoSafeRegister(&xWrapLayoutGetLineHomogeneous, libs, "adw_wrap_layout_get_line_homogeneous") | |
| 523 | + | core.PuregoSafeRegister(&xWrapLayoutGetLineSpacing, libs, "adw_wrap_layout_get_line_spacing") | |
| 524 | + | core.PuregoSafeRegister(&xWrapLayoutGetLineSpacingUnit, libs, "adw_wrap_layout_get_line_spacing_unit") | |
| 525 | + | core.PuregoSafeRegister(&xWrapLayoutGetNaturalLineLength, libs, "adw_wrap_layout_get_natural_line_length") | |
| 526 | + | core.PuregoSafeRegister(&xWrapLayoutGetNaturalLineLengthUnit, libs, "adw_wrap_layout_get_natural_line_length_unit") | |
| 527 | + | core.PuregoSafeRegister(&xWrapLayoutGetPackDirection, libs, "adw_wrap_layout_get_pack_direction") | |
| 528 | + | core.PuregoSafeRegister(&xWrapLayoutGetWrapPolicy, libs, "adw_wrap_layout_get_wrap_policy") | |
| 529 | + | core.PuregoSafeRegister(&xWrapLayoutGetWrapReverse, libs, "adw_wrap_layout_get_wrap_reverse") | |
| 530 | + | core.PuregoSafeRegister(&xWrapLayoutSetAlign, libs, "adw_wrap_layout_set_align") | |
| 531 | + | core.PuregoSafeRegister(&xWrapLayoutSetChildSpacing, libs, "adw_wrap_layout_set_child_spacing") | |
| 532 | + | core.PuregoSafeRegister(&xWrapLayoutSetChildSpacingUnit, libs, "adw_wrap_layout_set_child_spacing_unit") | |
| 533 | + | core.PuregoSafeRegister(&xWrapLayoutSetJustify, libs, "adw_wrap_layout_set_justify") | |
| 534 | + | core.PuregoSafeRegister(&xWrapLayoutSetJustifyLastLine, libs, "adw_wrap_layout_set_justify_last_line") | |
| 535 | + | core.PuregoSafeRegister(&xWrapLayoutSetLineHomogeneous, libs, "adw_wrap_layout_set_line_homogeneous") | |
| 536 | + | core.PuregoSafeRegister(&xWrapLayoutSetLineSpacing, libs, "adw_wrap_layout_set_line_spacing") | |
| 537 | + | core.PuregoSafeRegister(&xWrapLayoutSetLineSpacingUnit, libs, "adw_wrap_layout_set_line_spacing_unit") | |
| 538 | + | core.PuregoSafeRegister(&xWrapLayoutSetNaturalLineLength, libs, "adw_wrap_layout_set_natural_line_length") | |
| 539 | + | core.PuregoSafeRegister(&xWrapLayoutSetNaturalLineLengthUnit, libs, "adw_wrap_layout_set_natural_line_length_unit") | |
| 540 | + | core.PuregoSafeRegister(&xWrapLayoutSetPackDirection, libs, "adw_wrap_layout_set_pack_direction") | |
| 541 | + | core.PuregoSafeRegister(&xWrapLayoutSetWrapPolicy, libs, "adw_wrap_layout_set_wrap_policy") | |
| 542 | + | core.PuregoSafeRegister(&xWrapLayoutSetWrapReverse, libs, "adw_wrap_layout_set_wrap_reverse") | |
| 539 | 543 | ||
| 540 | 544 | } | |
M v4/cairo/main.go +41 -37
| @@ -760,76 +760,80 @@ func ImageSurfaceCreate() { | |||
| 760 | 760 | ||
| 761 | 761 | func init() { | |
| 762 | 762 | core.SetPackageName("CAIRO", "cairo-gobject") | |
| 763 | - | core.SetSharedLibrary("CAIRO", "libcairo-gobject.so.2") | |
| 764 | - | lib, err := purego.Dlopen(core.GetPath("CAIRO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 765 | - | if err != nil { | |
| 766 | - | panic(err) | |
| 763 | + | core.SetSharedLibraries("CAIRO", []string{"libcairo-gobject.so.2"}) | |
| 764 | + | var libs []uintptr | |
| 765 | + | for _, libPath := range core.GetPaths("CAIRO") { | |
| 766 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 767 | + | if err != nil { | |
| 768 | + | panic(err) | |
| 769 | + | } | |
| 770 | + | libs = append(libs, lib) | |
| 767 | 771 | } | |
| 768 | 772 | ||
| 769 | - | core.PuregoSafeRegister(&xStatusGLibType, lib, "cairo_gobject_status_get_type") | |
| 773 | + | core.PuregoSafeRegister(&xStatusGLibType, libs, "cairo_gobject_status_get_type") | |
| 770 | 774 | ||
| 771 | - | core.PuregoSafeRegister(&xContentGLibType, lib, "cairo_gobject_content_get_type") | |
| 775 | + | core.PuregoSafeRegister(&xContentGLibType, libs, "cairo_gobject_content_get_type") | |
| 772 | 776 | ||
| 773 | - | core.PuregoSafeRegister(&xOperatorGLibType, lib, "cairo_gobject_operator_get_type") | |
| 777 | + | core.PuregoSafeRegister(&xOperatorGLibType, libs, "cairo_gobject_operator_get_type") | |
| 774 | 778 | ||
| 775 | - | core.PuregoSafeRegister(&xAntialiasGLibType, lib, "cairo_gobject_antialias_get_type") | |
| 779 | + | core.PuregoSafeRegister(&xAntialiasGLibType, libs, "cairo_gobject_antialias_get_type") | |
| 776 | 780 | ||
| 777 | - | core.PuregoSafeRegister(&xFillRuleGLibType, lib, "cairo_gobject_fill_rule_get_type") | |
| 781 | + | core.PuregoSafeRegister(&xFillRuleGLibType, libs, "cairo_gobject_fill_rule_get_type") | |
| 778 | 782 | ||
| 779 | - | core.PuregoSafeRegister(&xLineCapGLibType, lib, "cairo_gobject_line_cap_get_type") | |
| 783 | + | core.PuregoSafeRegister(&xLineCapGLibType, libs, "cairo_gobject_line_cap_get_type") | |
| 780 | 784 | ||
| 781 | - | core.PuregoSafeRegister(&xLineJoinGLibType, lib, "cairo_gobject_line_join_get_type") | |
| 785 | + | core.PuregoSafeRegister(&xLineJoinGLibType, libs, "cairo_gobject_line_join_get_type") | |
| 782 | 786 | ||
| 783 | - | core.PuregoSafeRegister(&xTextClusterFlagsGLibType, lib, "cairo_gobject_text_cluster_flags_get_type") | |
| 787 | + | core.PuregoSafeRegister(&xTextClusterFlagsGLibType, libs, "cairo_gobject_text_cluster_flags_get_type") | |
| 784 | 788 | ||
| 785 | - | core.PuregoSafeRegister(&xFontSlantGLibType, lib, "cairo_gobject_font_slant_get_type") | |
| 789 | + | core.PuregoSafeRegister(&xFontSlantGLibType, libs, "cairo_gobject_font_slant_get_type") | |
| 786 | 790 | ||
| 787 | - | core.PuregoSafeRegister(&xFontWeightGLibType, lib, "cairo_gobject_font_weight_get_type") | |
| 791 | + | core.PuregoSafeRegister(&xFontWeightGLibType, libs, "cairo_gobject_font_weight_get_type") | |
| 788 | 792 | ||
| 789 | - | core.PuregoSafeRegister(&xSubpixelOrderGLibType, lib, "cairo_gobject_subpixel_order_get_type") | |
| 793 | + | core.PuregoSafeRegister(&xSubpixelOrderGLibType, libs, "cairo_gobject_subpixel_order_get_type") | |
| 790 | 794 | ||
| 791 | - | core.PuregoSafeRegister(&xHintStyleGLibType, lib, "cairo_gobject_hint_style_get_type") | |
| 795 | + | core.PuregoSafeRegister(&xHintStyleGLibType, libs, "cairo_gobject_hint_style_get_type") | |
| 792 | 796 | ||
| 793 | - | core.PuregoSafeRegister(&xHintMetricsGLibType, lib, "cairo_gobject_hint_metrics_get_type") | |
| 797 | + | core.PuregoSafeRegister(&xHintMetricsGLibType, libs, "cairo_gobject_hint_metrics_get_type") | |
| 794 | 798 | ||
| 795 | - | core.PuregoSafeRegister(&xFontTypeGLibType, lib, "cairo_gobject_font_type_get_type") | |
| 799 | + | core.PuregoSafeRegister(&xFontTypeGLibType, libs, "cairo_gobject_font_type_get_type") | |
| 796 | 800 | ||
| 797 | - | core.PuregoSafeRegister(&xPathDataTypeGLibType, lib, "cairo_gobject_path_data_type_get_type") | |
| 801 | + | core.PuregoSafeRegister(&xPathDataTypeGLibType, libs, "cairo_gobject_path_data_type_get_type") | |
| 798 | 802 | ||
| 799 | - | core.PuregoSafeRegister(&xDeviceTypeGLibType, lib, "cairo_gobject_device_type_get_type") | |
| 803 | + | core.PuregoSafeRegister(&xDeviceTypeGLibType, libs, "cairo_gobject_device_type_get_type") | |
| 800 | 804 | ||
| 801 | - | core.PuregoSafeRegister(&xSurfaceTypeGLibType, lib, "cairo_gobject_surface_type_get_type") | |
| 805 | + | core.PuregoSafeRegister(&xSurfaceTypeGLibType, libs, "cairo_gobject_surface_type_get_type") | |
| 802 | 806 | ||
| 803 | - | core.PuregoSafeRegister(&xFormatGLibType, lib, "cairo_gobject_format_get_type") | |
| 807 | + | core.PuregoSafeRegister(&xFormatGLibType, libs, "cairo_gobject_format_get_type") | |
| 804 | 808 | ||
| 805 | - | core.PuregoSafeRegister(&xPatternTypeGLibType, lib, "cairo_gobject_pattern_type_get_type") | |
| 809 | + | core.PuregoSafeRegister(&xPatternTypeGLibType, libs, "cairo_gobject_pattern_type_get_type") | |
| 806 | 810 | ||
| 807 | - | core.PuregoSafeRegister(&xExtendGLibType, lib, "cairo_gobject_extend_get_type") | |
| 811 | + | core.PuregoSafeRegister(&xExtendGLibType, libs, "cairo_gobject_extend_get_type") | |
| 808 | 812 | ||
| 809 | - | core.PuregoSafeRegister(&xFilterGLibType, lib, "cairo_gobject_filter_get_type") | |
| 813 | + | core.PuregoSafeRegister(&xFilterGLibType, libs, "cairo_gobject_filter_get_type") | |
| 810 | 814 | ||
| 811 | - | core.PuregoSafeRegister(&xRegionOverlapGLibType, lib, "cairo_gobject_region_overlap_get_type") | |
| 815 | + | core.PuregoSafeRegister(&xRegionOverlapGLibType, libs, "cairo_gobject_region_overlap_get_type") | |
| 812 | 816 | ||
| 813 | - | core.PuregoSafeRegister(&xImageSurfaceCreate, lib, "cairo_image_surface_create") | |
| 817 | + | core.PuregoSafeRegister(&xImageSurfaceCreate, libs, "cairo_image_surface_create") | |
| 814 | 818 | ||
| 815 | - | core.PuregoSafeRegister(&xContextGLibType, lib, "cairo_gobject_context_get_type") | |
| 819 | + | core.PuregoSafeRegister(&xContextGLibType, libs, "cairo_gobject_context_get_type") | |
| 816 | 820 | ||
| 817 | - | core.PuregoSafeRegister(&xDeviceGLibType, lib, "cairo_gobject_device_get_type") | |
| 821 | + | core.PuregoSafeRegister(&xDeviceGLibType, libs, "cairo_gobject_device_get_type") | |
| 818 | 822 | ||
| 819 | - | core.PuregoSafeRegister(&xSurfaceGLibType, lib, "cairo_gobject_surface_get_type") | |
| 823 | + | core.PuregoSafeRegister(&xSurfaceGLibType, libs, "cairo_gobject_surface_get_type") | |
| 820 | 824 | ||
| 821 | - | core.PuregoSafeRegister(&xPatternGLibType, lib, "cairo_gobject_pattern_get_type") | |
| 825 | + | core.PuregoSafeRegister(&xPatternGLibType, libs, "cairo_gobject_pattern_get_type") | |
| 822 | 826 | ||
| 823 | - | core.PuregoSafeRegister(&xRegionGLibType, lib, "cairo_gobject_region_get_type") | |
| 827 | + | core.PuregoSafeRegister(&xRegionGLibType, libs, "cairo_gobject_region_get_type") | |
| 824 | 828 | ||
| 825 | - | core.PuregoSafeRegister(&xFontOptionsGLibType, lib, "cairo_gobject_font_options_get_type") | |
| 829 | + | core.PuregoSafeRegister(&xFontOptionsGLibType, libs, "cairo_gobject_font_options_get_type") | |
| 826 | 830 | ||
| 827 | - | core.PuregoSafeRegister(&xFontFaceGLibType, lib, "cairo_gobject_font_face_get_type") | |
| 831 | + | core.PuregoSafeRegister(&xFontFaceGLibType, libs, "cairo_gobject_font_face_get_type") | |
| 828 | 832 | ||
| 829 | - | core.PuregoSafeRegister(&xScaledFontGLibType, lib, "cairo_gobject_scaled_font_get_type") | |
| 833 | + | core.PuregoSafeRegister(&xScaledFontGLibType, libs, "cairo_gobject_scaled_font_get_type") | |
| 830 | 834 | ||
| 831 | - | core.PuregoSafeRegister(&xRectangleGLibType, lib, "cairo_gobject_rectangle_get_type") | |
| 835 | + | core.PuregoSafeRegister(&xRectangleGLibType, libs, "cairo_gobject_rectangle_get_type") | |
| 832 | 836 | ||
| 833 | - | core.PuregoSafeRegister(&xRectangleIntGLibType, lib, "cairo_gobject_rectangle_int_get_type") | |
| 837 | + | core.PuregoSafeRegister(&xRectangleIntGLibType, libs, "cairo_gobject_rectangle_int_get_type") | |
| 834 | 838 | ||
| 835 | 839 | } | |
M v4/gdk/gdkapplaunchcontext.go +14 -10
| @@ -145,18 +145,22 @@ func (c *AppLaunchContext) SetGoPointer(ptr uintptr) { | |||
| 145 | 145 | ||
| 146 | 146 | func init() { | |
| 147 | 147 | core.SetPackageName("GDK", "gtk4") | |
| 148 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 149 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 150 | - | if err != nil { | |
| 151 | - | panic(err) | |
| 148 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 149 | + | var libs []uintptr | |
| 150 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 151 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 152 | + | if err != nil { | |
| 153 | + | panic(err) | |
| 154 | + | } | |
| 155 | + | libs = append(libs, lib) | |
| 152 | 156 | } | |
| 153 | 157 | ||
| 154 | - | core.PuregoSafeRegister(&xAppLaunchContextGLibType, lib, "gdk_app_launch_context_get_type") | |
| 158 | + | core.PuregoSafeRegister(&xAppLaunchContextGLibType, libs, "gdk_app_launch_context_get_type") | |
| 155 | 159 | ||
| 156 | - | core.PuregoSafeRegister(&xAppLaunchContextGetDisplay, lib, "gdk_app_launch_context_get_display") | |
| 157 | - | core.PuregoSafeRegister(&xAppLaunchContextSetDesktop, lib, "gdk_app_launch_context_set_desktop") | |
| 158 | - | core.PuregoSafeRegister(&xAppLaunchContextSetIcon, lib, "gdk_app_launch_context_set_icon") | |
| 159 | - | core.PuregoSafeRegister(&xAppLaunchContextSetIconName, lib, "gdk_app_launch_context_set_icon_name") | |
| 160 | - | core.PuregoSafeRegister(&xAppLaunchContextSetTimestamp, lib, "gdk_app_launch_context_set_timestamp") | |
| 160 | + | core.PuregoSafeRegister(&xAppLaunchContextGetDisplay, libs, "gdk_app_launch_context_get_display") | |
| 161 | + | core.PuregoSafeRegister(&xAppLaunchContextSetDesktop, libs, "gdk_app_launch_context_set_desktop") | |
| 162 | + | core.PuregoSafeRegister(&xAppLaunchContextSetIcon, libs, "gdk_app_launch_context_set_icon") | |
| 163 | + | core.PuregoSafeRegister(&xAppLaunchContextSetIconName, libs, "gdk_app_launch_context_set_icon_name") | |
| 164 | + | core.PuregoSafeRegister(&xAppLaunchContextSetTimestamp, libs, "gdk_app_launch_context_set_timestamp") | |
| 161 | 165 | ||
| 162 | 166 | } | |
M v4/gdk/gdkcairo.go +14 -10
| @@ -88,17 +88,21 @@ func CairoSetSourceRgba(CrVar *cairo.Context, RgbaVar *RGBA) { | |||
| 88 | 88 | ||
| 89 | 89 | func init() { | |
| 90 | 90 | core.SetPackageName("GDK", "gtk4") | |
| 91 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 92 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 93 | - | if err != nil { | |
| 94 | - | panic(err) | |
| 91 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 92 | + | var libs []uintptr | |
| 93 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 94 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 95 | + | if err != nil { | |
| 96 | + | panic(err) | |
| 97 | + | } | |
| 98 | + | libs = append(libs, lib) | |
| 95 | 99 | } | |
| 96 | 100 | ||
| 97 | - | core.PuregoSafeRegister(&xCairoDrawFromGl, lib, "gdk_cairo_draw_from_gl") | |
| 98 | - | core.PuregoSafeRegister(&xCairoRectangle, lib, "gdk_cairo_rectangle") | |
| 99 | - | core.PuregoSafeRegister(&xCairoRegion, lib, "gdk_cairo_region") | |
| 100 | - | core.PuregoSafeRegister(&xCairoRegionCreateFromSurface, lib, "gdk_cairo_region_create_from_surface") | |
| 101 | - | core.PuregoSafeRegister(&xCairoSetSourcePixbuf, lib, "gdk_cairo_set_source_pixbuf") | |
| 102 | - | core.PuregoSafeRegister(&xCairoSetSourceRgba, lib, "gdk_cairo_set_source_rgba") | |
| 101 | + | core.PuregoSafeRegister(&xCairoDrawFromGl, libs, "gdk_cairo_draw_from_gl") | |
| 102 | + | core.PuregoSafeRegister(&xCairoRectangle, libs, "gdk_cairo_rectangle") | |
| 103 | + | core.PuregoSafeRegister(&xCairoRegion, libs, "gdk_cairo_region") | |
| 104 | + | core.PuregoSafeRegister(&xCairoRegionCreateFromSurface, libs, "gdk_cairo_region_create_from_surface") | |
| 105 | + | core.PuregoSafeRegister(&xCairoSetSourcePixbuf, libs, "gdk_cairo_set_source_pixbuf") | |
| 106 | + | core.PuregoSafeRegister(&xCairoSetSourceRgba, libs, "gdk_cairo_set_source_rgba") | |
| 103 | 107 | ||
| 104 | 108 | } | |
M v4/gdk/gdkcairocontext.go +10 -6
| @@ -58,14 +58,18 @@ func (c *CairoContext) SetGoPointer(ptr uintptr) { | |||
| 58 | 58 | ||
| 59 | 59 | func init() { | |
| 60 | 60 | core.SetPackageName("GDK", "gtk4") | |
| 61 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 62 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 63 | - | if err != nil { | |
| 64 | - | panic(err) | |
| 61 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 62 | + | var libs []uintptr | |
| 63 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 64 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 65 | + | if err != nil { | |
| 66 | + | panic(err) | |
| 67 | + | } | |
| 68 | + | libs = append(libs, lib) | |
| 65 | 69 | } | |
| 66 | 70 | ||
| 67 | - | core.PuregoSafeRegister(&xCairoContextGLibType, lib, "gdk_cairo_context_get_type") | |
| 71 | + | core.PuregoSafeRegister(&xCairoContextGLibType, libs, "gdk_cairo_context_get_type") | |
| 68 | 72 | ||
| 69 | - | core.PuregoSafeRegister(&xCairoContextCairoCreate, lib, "gdk_cairo_context_cairo_create") | |
| 73 | + | core.PuregoSafeRegister(&xCairoContextCairoCreate, libs, "gdk_cairo_context_cairo_create") | |
| 70 | 74 | ||
| 71 | 75 | } | |
M v4/gdk/gdkcicpparams.go +20 -16
| @@ -201,26 +201,30 @@ func (c *CicpParams) SetGoPointer(ptr uintptr) { | |||
| 201 | 201 | ||
| 202 | 202 | func init() { | |
| 203 | 203 | core.SetPackageName("GDK", "gtk4") | |
| 204 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 205 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 206 | - | if err != nil { | |
| 207 | - | panic(err) | |
| 204 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 205 | + | var libs []uintptr | |
| 206 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 207 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 208 | + | if err != nil { | |
| 209 | + | panic(err) | |
| 210 | + | } | |
| 211 | + | libs = append(libs, lib) | |
| 208 | 212 | } | |
| 209 | 213 | ||
| 210 | - | core.PuregoSafeRegister(&xCicpRangeGLibType, lib, "gdk_cicp_range_get_type") | |
| 214 | + | core.PuregoSafeRegister(&xCicpRangeGLibType, libs, "gdk_cicp_range_get_type") | |
| 211 | 215 | ||
| 212 | - | core.PuregoSafeRegister(&xCicpParamsGLibType, lib, "gdk_cicp_params_get_type") | |
| 216 | + | core.PuregoSafeRegister(&xCicpParamsGLibType, libs, "gdk_cicp_params_get_type") | |
| 213 | 217 | ||
| 214 | - | core.PuregoSafeRegister(&xNewCicpParams, lib, "gdk_cicp_params_new") | |
| 218 | + | core.PuregoSafeRegister(&xNewCicpParams, libs, "gdk_cicp_params_new") | |
| 215 | 219 | ||
| 216 | - | core.PuregoSafeRegister(&xCicpParamsBuildColorState, lib, "gdk_cicp_params_build_color_state") | |
| 217 | - | core.PuregoSafeRegister(&xCicpParamsGetColorPrimaries, lib, "gdk_cicp_params_get_color_primaries") | |
| 218 | - | core.PuregoSafeRegister(&xCicpParamsGetMatrixCoefficients, lib, "gdk_cicp_params_get_matrix_coefficients") | |
| 219 | - | core.PuregoSafeRegister(&xCicpParamsGetRange, lib, "gdk_cicp_params_get_range") | |
| 220 | - | core.PuregoSafeRegister(&xCicpParamsGetTransferFunction, lib, "gdk_cicp_params_get_transfer_function") | |
| 221 | - | core.PuregoSafeRegister(&xCicpParamsSetColorPrimaries, lib, "gdk_cicp_params_set_color_primaries") | |
| 222 | - | core.PuregoSafeRegister(&xCicpParamsSetMatrixCoefficients, lib, "gdk_cicp_params_set_matrix_coefficients") | |
| 223 | - | core.PuregoSafeRegister(&xCicpParamsSetRange, lib, "gdk_cicp_params_set_range") | |
| 224 | - | core.PuregoSafeRegister(&xCicpParamsSetTransferFunction, lib, "gdk_cicp_params_set_transfer_function") | |
| 220 | + | core.PuregoSafeRegister(&xCicpParamsBuildColorState, libs, "gdk_cicp_params_build_color_state") | |
| 221 | + | core.PuregoSafeRegister(&xCicpParamsGetColorPrimaries, libs, "gdk_cicp_params_get_color_primaries") | |
| 222 | + | core.PuregoSafeRegister(&xCicpParamsGetMatrixCoefficients, libs, "gdk_cicp_params_get_matrix_coefficients") | |
| 223 | + | core.PuregoSafeRegister(&xCicpParamsGetRange, libs, "gdk_cicp_params_get_range") | |
| 224 | + | core.PuregoSafeRegister(&xCicpParamsGetTransferFunction, libs, "gdk_cicp_params_get_transfer_function") | |
| 225 | + | core.PuregoSafeRegister(&xCicpParamsSetColorPrimaries, libs, "gdk_cicp_params_set_color_primaries") | |
| 226 | + | core.PuregoSafeRegister(&xCicpParamsSetMatrixCoefficients, libs, "gdk_cicp_params_set_matrix_coefficients") | |
| 227 | + | core.PuregoSafeRegister(&xCicpParamsSetRange, libs, "gdk_cicp_params_set_range") | |
| 228 | + | core.PuregoSafeRegister(&xCicpParamsSetTransferFunction, libs, "gdk_cicp_params_set_transfer_function") | |
| 225 | 229 | ||
| 226 | 230 | } | |
M v4/gdk/gdkclipboard.go +30 -26
| @@ -380,33 +380,37 @@ func (x *Clipboard) ConnectChanged(cb *func(Clipboard)) uint32 { | |||
| 380 | 380 | ||
| 381 | 381 | func init() { | |
| 382 | 382 | core.SetPackageName("GDK", "gtk4") | |
| 383 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 384 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 385 | - | if err != nil { | |
| 386 | - | panic(err) | |
| 383 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 384 | + | var libs []uintptr | |
| 385 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 386 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 387 | + | if err != nil { | |
| 388 | + | panic(err) | |
| 389 | + | } | |
| 390 | + | libs = append(libs, lib) | |
| 387 | 391 | } | |
| 388 | 392 | ||
| 389 | - | core.PuregoSafeRegister(&xClipboardGLibType, lib, "gdk_clipboard_get_type") | |
| 390 | - | ||
| 391 | - | core.PuregoSafeRegister(&xClipboardGetContent, lib, "gdk_clipboard_get_content") | |
| 392 | - | core.PuregoSafeRegister(&xClipboardGetDisplay, lib, "gdk_clipboard_get_display") | |
| 393 | - | core.PuregoSafeRegister(&xClipboardGetFormats, lib, "gdk_clipboard_get_formats") | |
| 394 | - | core.PuregoSafeRegister(&xClipboardIsLocal, lib, "gdk_clipboard_is_local") | |
| 395 | - | core.PuregoSafeRegister(&xClipboardReadAsync, lib, "gdk_clipboard_read_async") | |
| 396 | - | core.PuregoSafeRegister(&xClipboardReadFinish, lib, "gdk_clipboard_read_finish") | |
| 397 | - | core.PuregoSafeRegister(&xClipboardReadTextAsync, lib, "gdk_clipboard_read_text_async") | |
| 398 | - | core.PuregoSafeRegister(&xClipboardReadTextFinish, lib, "gdk_clipboard_read_text_finish") | |
| 399 | - | core.PuregoSafeRegister(&xClipboardReadTextureAsync, lib, "gdk_clipboard_read_texture_async") | |
| 400 | - | core.PuregoSafeRegister(&xClipboardReadTextureFinish, lib, "gdk_clipboard_read_texture_finish") | |
| 401 | - | core.PuregoSafeRegister(&xClipboardReadValueAsync, lib, "gdk_clipboard_read_value_async") | |
| 402 | - | core.PuregoSafeRegister(&xClipboardReadValueFinish, lib, "gdk_clipboard_read_value_finish") | |
| 403 | - | core.PuregoSafeRegister(&xClipboardSet, lib, "gdk_clipboard_set") | |
| 404 | - | core.PuregoSafeRegister(&xClipboardSetContent, lib, "gdk_clipboard_set_content") | |
| 405 | - | core.PuregoSafeRegister(&xClipboardSetText, lib, "gdk_clipboard_set_text") | |
| 406 | - | core.PuregoSafeRegister(&xClipboardSetTexture, lib, "gdk_clipboard_set_texture") | |
| 407 | - | core.PuregoSafeRegister(&xClipboardSetValist, lib, "gdk_clipboard_set_valist") | |
| 408 | - | core.PuregoSafeRegister(&xClipboardSetValue, lib, "gdk_clipboard_set_value") | |
| 409 | - | core.PuregoSafeRegister(&xClipboardStoreAsync, lib, "gdk_clipboard_store_async") | |
| 410 | - | core.PuregoSafeRegister(&xClipboardStoreFinish, lib, "gdk_clipboard_store_finish") | |
| 393 | + | core.PuregoSafeRegister(&xClipboardGLibType, libs, "gdk_clipboard_get_type") | |
| 394 | + | ||
| 395 | + | core.PuregoSafeRegister(&xClipboardGetContent, libs, "gdk_clipboard_get_content") | |
| 396 | + | core.PuregoSafeRegister(&xClipboardGetDisplay, libs, "gdk_clipboard_get_display") | |
| 397 | + | core.PuregoSafeRegister(&xClipboardGetFormats, libs, "gdk_clipboard_get_formats") | |
| 398 | + | core.PuregoSafeRegister(&xClipboardIsLocal, libs, "gdk_clipboard_is_local") | |
| 399 | + | core.PuregoSafeRegister(&xClipboardReadAsync, libs, "gdk_clipboard_read_async") | |
| 400 | + | core.PuregoSafeRegister(&xClipboardReadFinish, libs, "gdk_clipboard_read_finish") | |
| 401 | + | core.PuregoSafeRegister(&xClipboardReadTextAsync, libs, "gdk_clipboard_read_text_async") | |
| 402 | + | core.PuregoSafeRegister(&xClipboardReadTextFinish, libs, "gdk_clipboard_read_text_finish") | |
| 403 | + | core.PuregoSafeRegister(&xClipboardReadTextureAsync, libs, "gdk_clipboard_read_texture_async") | |
| 404 | + | core.PuregoSafeRegister(&xClipboardReadTextureFinish, libs, "gdk_clipboard_read_texture_finish") | |
| 405 | + | core.PuregoSafeRegister(&xClipboardReadValueAsync, libs, "gdk_clipboard_read_value_async") | |
| 406 | + | core.PuregoSafeRegister(&xClipboardReadValueFinish, libs, "gdk_clipboard_read_value_finish") | |
| 407 | + | core.PuregoSafeRegister(&xClipboardSet, libs, "gdk_clipboard_set") | |
| 408 | + | core.PuregoSafeRegister(&xClipboardSetContent, libs, "gdk_clipboard_set_content") | |
| 409 | + | core.PuregoSafeRegister(&xClipboardSetText, libs, "gdk_clipboard_set_text") | |
| 410 | + | core.PuregoSafeRegister(&xClipboardSetTexture, libs, "gdk_clipboard_set_texture") | |
| 411 | + | core.PuregoSafeRegister(&xClipboardSetValist, libs, "gdk_clipboard_set_valist") | |
| 412 | + | core.PuregoSafeRegister(&xClipboardSetValue, libs, "gdk_clipboard_set_value") | |
| 413 | + | core.PuregoSafeRegister(&xClipboardStoreAsync, libs, "gdk_clipboard_store_async") | |
| 414 | + | core.PuregoSafeRegister(&xClipboardStoreFinish, libs, "gdk_clipboard_store_finish") | |
| 411 | 415 | ||
| 412 | 416 | } | |
M v4/gdk/gdkcolorstate.go +14 -10
| @@ -98,17 +98,21 @@ func ColorStateGetSrgbLinear() *ColorState { | |||
| 98 | 98 | ||
| 99 | 99 | func init() { | |
| 100 | 100 | core.SetPackageName("GDK", "gtk4") | |
| 101 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 102 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 103 | - | if err != nil { | |
| 104 | - | panic(err) | |
| 101 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 102 | + | var libs []uintptr | |
| 103 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 104 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 105 | + | if err != nil { | |
| 106 | + | panic(err) | |
| 107 | + | } | |
| 108 | + | libs = append(libs, lib) | |
| 105 | 109 | } | |
| 106 | 110 | ||
| 107 | - | core.PuregoSafeRegister(&xColorStateGetOklab, lib, "gdk_color_state_get_oklab") | |
| 108 | - | core.PuregoSafeRegister(&xColorStateGetOklch, lib, "gdk_color_state_get_oklch") | |
| 109 | - | core.PuregoSafeRegister(&xColorStateGetRec2100Linear, lib, "gdk_color_state_get_rec2100_linear") | |
| 110 | - | core.PuregoSafeRegister(&xColorStateGetRec2100Pq, lib, "gdk_color_state_get_rec2100_pq") | |
| 111 | - | core.PuregoSafeRegister(&xColorStateGetSrgb, lib, "gdk_color_state_get_srgb") | |
| 112 | - | core.PuregoSafeRegister(&xColorStateGetSrgbLinear, lib, "gdk_color_state_get_srgb_linear") | |
| 111 | + | core.PuregoSafeRegister(&xColorStateGetOklab, libs, "gdk_color_state_get_oklab") | |
| 112 | + | core.PuregoSafeRegister(&xColorStateGetOklch, libs, "gdk_color_state_get_oklch") | |
| 113 | + | core.PuregoSafeRegister(&xColorStateGetRec2100Linear, libs, "gdk_color_state_get_rec2100_linear") | |
| 114 | + | core.PuregoSafeRegister(&xColorStateGetRec2100Pq, libs, "gdk_color_state_get_rec2100_pq") | |
| 115 | + | core.PuregoSafeRegister(&xColorStateGetSrgb, libs, "gdk_color_state_get_srgb") | |
| 116 | + | core.PuregoSafeRegister(&xColorStateGetSrgbLinear, libs, "gdk_color_state_get_srgb_linear") | |
| 113 | 117 | ||
| 114 | 118 | } | |
M v4/gdk/gdkcontentdeserializer.go +25 -21
| @@ -259,28 +259,32 @@ func (x *ContentDeserializer) LegacyPropagateError() (bool, error) { | |||
| 259 | 259 | ||
| 260 | 260 | func init() { | |
| 261 | 261 | core.SetPackageName("GDK", "gtk4") | |
| 262 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 263 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 264 | - | if err != nil { | |
| 265 | - | panic(err) | |
| 262 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 263 | + | var libs []uintptr | |
| 264 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 265 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 266 | + | if err != nil { | |
| 267 | + | panic(err) | |
| 268 | + | } | |
| 269 | + | libs = append(libs, lib) | |
| 266 | 270 | } | |
| 267 | 271 | ||
| 268 | - | core.PuregoSafeRegister(&xContentDeserializeAsync, lib, "gdk_content_deserialize_async") | |
| 269 | - | core.PuregoSafeRegister(&xContentDeserializeFinish, lib, "gdk_content_deserialize_finish") | |
| 270 | - | core.PuregoSafeRegister(&xContentRegisterDeserializer, lib, "gdk_content_register_deserializer") | |
| 271 | - | ||
| 272 | - | core.PuregoSafeRegister(&xContentDeserializerGLibType, lib, "gdk_content_deserializer_get_type") | |
| 273 | - | ||
| 274 | - | core.PuregoSafeRegister(&xContentDeserializerGetCancellable, lib, "gdk_content_deserializer_get_cancellable") | |
| 275 | - | core.PuregoSafeRegister(&xContentDeserializerGetGtype, lib, "gdk_content_deserializer_get_gtype") | |
| 276 | - | core.PuregoSafeRegister(&xContentDeserializerGetInputStream, lib, "gdk_content_deserializer_get_input_stream") | |
| 277 | - | core.PuregoSafeRegister(&xContentDeserializerGetMimeType, lib, "gdk_content_deserializer_get_mime_type") | |
| 278 | - | core.PuregoSafeRegister(&xContentDeserializerGetPriority, lib, "gdk_content_deserializer_get_priority") | |
| 279 | - | core.PuregoSafeRegister(&xContentDeserializerGetTaskData, lib, "gdk_content_deserializer_get_task_data") | |
| 280 | - | core.PuregoSafeRegister(&xContentDeserializerGetUserData, lib, "gdk_content_deserializer_get_user_data") | |
| 281 | - | core.PuregoSafeRegister(&xContentDeserializerGetValue, lib, "gdk_content_deserializer_get_value") | |
| 282 | - | core.PuregoSafeRegister(&xContentDeserializerReturnError, lib, "gdk_content_deserializer_return_error") | |
| 283 | - | core.PuregoSafeRegister(&xContentDeserializerReturnSuccess, lib, "gdk_content_deserializer_return_success") | |
| 284 | - | core.PuregoSafeRegister(&xContentDeserializerSetTaskData, lib, "gdk_content_deserializer_set_task_data") | |
| 272 | + | core.PuregoSafeRegister(&xContentDeserializeAsync, libs, "gdk_content_deserialize_async") | |
| 273 | + | core.PuregoSafeRegister(&xContentDeserializeFinish, libs, "gdk_content_deserialize_finish") | |
| 274 | + | core.PuregoSafeRegister(&xContentRegisterDeserializer, libs, "gdk_content_register_deserializer") | |
| 275 | + | ||
| 276 | + | core.PuregoSafeRegister(&xContentDeserializerGLibType, libs, "gdk_content_deserializer_get_type") | |
| 277 | + | ||
| 278 | + | core.PuregoSafeRegister(&xContentDeserializerGetCancellable, libs, "gdk_content_deserializer_get_cancellable") | |
| 279 | + | core.PuregoSafeRegister(&xContentDeserializerGetGtype, libs, "gdk_content_deserializer_get_gtype") | |
| 280 | + | core.PuregoSafeRegister(&xContentDeserializerGetInputStream, libs, "gdk_content_deserializer_get_input_stream") | |
| 281 | + | core.PuregoSafeRegister(&xContentDeserializerGetMimeType, libs, "gdk_content_deserializer_get_mime_type") | |
| 282 | + | core.PuregoSafeRegister(&xContentDeserializerGetPriority, libs, "gdk_content_deserializer_get_priority") | |
| 283 | + | core.PuregoSafeRegister(&xContentDeserializerGetTaskData, libs, "gdk_content_deserializer_get_task_data") | |
| 284 | + | core.PuregoSafeRegister(&xContentDeserializerGetUserData, libs, "gdk_content_deserializer_get_user_data") | |
| 285 | + | core.PuregoSafeRegister(&xContentDeserializerGetValue, libs, "gdk_content_deserializer_get_value") | |
| 286 | + | core.PuregoSafeRegister(&xContentDeserializerReturnError, libs, "gdk_content_deserializer_return_error") | |
| 287 | + | core.PuregoSafeRegister(&xContentDeserializerReturnSuccess, libs, "gdk_content_deserializer_return_success") | |
| 288 | + | core.PuregoSafeRegister(&xContentDeserializerSetTaskData, libs, "gdk_content_deserializer_set_task_data") | |
| 285 | 289 | ||
| 286 | 290 | } | |
M v4/gdk/gdkcontentformats.go +23 -19
| @@ -191,32 +191,36 @@ func InternMimeType(StringVar string) string { | |||
| 191 | 191 | ||
| 192 | 192 | func init() { | |
| 193 | 193 | core.SetPackageName("GDK", "gtk4") | |
| 194 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 195 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 196 | - | if err != nil { | |
| 197 | - | panic(err) | |
| 194 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 195 | + | var libs []uintptr | |
| 196 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 197 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 198 | + | if err != nil { | |
| 199 | + | panic(err) | |
| 200 | + | } | |
| 201 | + | libs = append(libs, lib) | |
| 198 | 202 | } | |
| 199 | 203 | ||
| 200 | - | core.PuregoSafeRegister(&xContentFormatsParse, lib, "gdk_content_formats_parse") | |
| 201 | - | core.PuregoSafeRegister(&xInternMimeType, lib, "gdk_intern_mime_type") | |
| 204 | + | core.PuregoSafeRegister(&xContentFormatsParse, libs, "gdk_content_formats_parse") | |
| 205 | + | core.PuregoSafeRegister(&xInternMimeType, libs, "gdk_intern_mime_type") | |
| 202 | 206 | ||
| 203 | - | core.PuregoSafeRegister(&xContentFormatsBuilderGLibType, lib, "gdk_content_formats_builder_get_type") | |
| 207 | + | core.PuregoSafeRegister(&xContentFormatsBuilderGLibType, libs, "gdk_content_formats_builder_get_type") | |
| 204 | 208 | ||
| 205 | - | core.PuregoSafeRegister(&xNewContentFormatsBuilder, lib, "gdk_content_formats_builder_new") | |
| 209 | + | core.PuregoSafeRegister(&xNewContentFormatsBuilder, libs, "gdk_content_formats_builder_new") | |
| 206 | 210 | ||
| 207 | - | core.PuregoSafeRegister(&xContentFormatsBuilderAddFormats, lib, "gdk_content_formats_builder_add_formats") | |
| 208 | - | core.PuregoSafeRegister(&xContentFormatsBuilderAddGtype, lib, "gdk_content_formats_builder_add_gtype") | |
| 209 | - | core.PuregoSafeRegister(&xContentFormatsBuilderAddMimeType, lib, "gdk_content_formats_builder_add_mime_type") | |
| 210 | - | core.PuregoSafeRegister(&xContentFormatsBuilderFreeToFormats, lib, "gdk_content_formats_builder_free_to_formats") | |
| 211 | - | core.PuregoSafeRegister(&xContentFormatsBuilderRef, lib, "gdk_content_formats_builder_ref") | |
| 212 | - | core.PuregoSafeRegister(&xContentFormatsBuilderToFormats, lib, "gdk_content_formats_builder_to_formats") | |
| 213 | - | core.PuregoSafeRegister(&xContentFormatsBuilderUnref, lib, "gdk_content_formats_builder_unref") | |
| 211 | + | core.PuregoSafeRegister(&xContentFormatsBuilderAddFormats, libs, "gdk_content_formats_builder_add_formats") | |
| 212 | + | core.PuregoSafeRegister(&xContentFormatsBuilderAddGtype, libs, "gdk_content_formats_builder_add_gtype") | |
| 213 | + | core.PuregoSafeRegister(&xContentFormatsBuilderAddMimeType, libs, "gdk_content_formats_builder_add_mime_type") | |
| 214 | + | core.PuregoSafeRegister(&xContentFormatsBuilderFreeToFormats, libs, "gdk_content_formats_builder_free_to_formats") | |
| 215 | + | core.PuregoSafeRegister(&xContentFormatsBuilderRef, libs, "gdk_content_formats_builder_ref") | |
| 216 | + | core.PuregoSafeRegister(&xContentFormatsBuilderToFormats, libs, "gdk_content_formats_builder_to_formats") | |
| 217 | + | core.PuregoSafeRegister(&xContentFormatsBuilderUnref, libs, "gdk_content_formats_builder_unref") | |
| 214 | 218 | ||
| 215 | - | core.PuregoSafeRegister(&xFileListGLibType, lib, "gdk_file_list_get_type") | |
| 219 | + | core.PuregoSafeRegister(&xFileListGLibType, libs, "gdk_file_list_get_type") | |
| 216 | 220 | ||
| 217 | - | core.PuregoSafeRegister(&xNewFileListFromArray, lib, "gdk_file_list_new_from_array") | |
| 218 | - | core.PuregoSafeRegister(&xNewFileListFromList, lib, "gdk_file_list_new_from_list") | |
| 221 | + | core.PuregoSafeRegister(&xNewFileListFromArray, libs, "gdk_file_list_new_from_array") | |
| 222 | + | core.PuregoSafeRegister(&xNewFileListFromList, libs, "gdk_file_list_new_from_list") | |
| 219 | 223 | ||
| 220 | - | core.PuregoSafeRegister(&xFileListGetFiles, lib, "gdk_file_list_get_files") | |
| 224 | + | core.PuregoSafeRegister(&xFileListGetFiles, libs, "gdk_file_list_get_files") | |
| 221 | 225 | ||
| 222 | 226 | } | |
M v4/gdk/gdkcontentprovider.go +23 -19
| @@ -455,24 +455,28 @@ func (x *ContentProvider) ConnectContentChanged(cb *func(ContentProvider)) uint3 | |||
| 455 | 455 | ||
| 456 | 456 | func init() { | |
| 457 | 457 | core.SetPackageName("GDK", "gtk4") | |
| 458 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 459 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 460 | - | if err != nil { | |
| 461 | - | panic(err) | |
| 462 | - | } | |
| 463 | - | ||
| 464 | - | core.PuregoSafeRegister(&xContentProviderGLibType, lib, "gdk_content_provider_get_type") | |
| 465 | - | ||
| 466 | - | core.PuregoSafeRegister(&xNewContentProviderForBytes, lib, "gdk_content_provider_new_for_bytes") | |
| 467 | - | core.PuregoSafeRegister(&xNewContentProviderForValue, lib, "gdk_content_provider_new_for_value") | |
| 468 | - | core.PuregoSafeRegister(&xNewContentProviderTyped, lib, "gdk_content_provider_new_typed") | |
| 469 | - | core.PuregoSafeRegister(&xNewContentProviderUnion, lib, "gdk_content_provider_new_union") | |
| 470 | - | ||
| 471 | - | core.PuregoSafeRegister(&xContentProviderContentChanged, lib, "gdk_content_provider_content_changed") | |
| 472 | - | core.PuregoSafeRegister(&xContentProviderGetValue, lib, "gdk_content_provider_get_value") | |
| 473 | - | core.PuregoSafeRegister(&xContentProviderRefFormats, lib, "gdk_content_provider_ref_formats") | |
| 474 | - | core.PuregoSafeRegister(&xContentProviderRefStorableFormats, lib, "gdk_content_provider_ref_storable_formats") | |
| 475 | - | core.PuregoSafeRegister(&xContentProviderWriteMimeTypeAsync, lib, "gdk_content_provider_write_mime_type_async") | |
| 476 | - | core.PuregoSafeRegister(&xContentProviderWriteMimeTypeFinish, lib, "gdk_content_provider_write_mime_type_finish") | |
| 458 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 459 | + | var libs []uintptr | |
| 460 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 461 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 462 | + | if err != nil { | |
| 463 | + | panic(err) | |
| 464 | + | } | |
| 465 | + | libs = append(libs, lib) | |
| 466 | + | } | |
| 467 | + | ||
| 468 | + | core.PuregoSafeRegister(&xContentProviderGLibType, libs, "gdk_content_provider_get_type") | |
| 469 | + | ||
| 470 | + | core.PuregoSafeRegister(&xNewContentProviderForBytes, libs, "gdk_content_provider_new_for_bytes") | |
| 471 | + | core.PuregoSafeRegister(&xNewContentProviderForValue, libs, "gdk_content_provider_new_for_value") | |
| 472 | + | core.PuregoSafeRegister(&xNewContentProviderTyped, libs, "gdk_content_provider_new_typed") | |
| 473 | + | core.PuregoSafeRegister(&xNewContentProviderUnion, libs, "gdk_content_provider_new_union") | |
| 474 | + | ||
| 475 | + | core.PuregoSafeRegister(&xContentProviderContentChanged, libs, "gdk_content_provider_content_changed") | |
| 476 | + | core.PuregoSafeRegister(&xContentProviderGetValue, libs, "gdk_content_provider_get_value") | |
| 477 | + | core.PuregoSafeRegister(&xContentProviderRefFormats, libs, "gdk_content_provider_ref_formats") | |
| 478 | + | core.PuregoSafeRegister(&xContentProviderRefStorableFormats, libs, "gdk_content_provider_ref_storable_formats") | |
| 479 | + | core.PuregoSafeRegister(&xContentProviderWriteMimeTypeAsync, libs, "gdk_content_provider_write_mime_type_async") | |
| 480 | + | core.PuregoSafeRegister(&xContentProviderWriteMimeTypeFinish, libs, "gdk_content_provider_write_mime_type_finish") | |
| 477 | 481 | ||
| 478 | 482 | } | |
M v4/gdk/gdkcontentserializer.go +25 -21
| @@ -260,28 +260,32 @@ func (x *ContentSerializer) LegacyPropagateError() (bool, error) { | |||
| 260 | 260 | ||
| 261 | 261 | func init() { | |
| 262 | 262 | core.SetPackageName("GDK", "gtk4") | |
| 263 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 264 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 265 | - | if err != nil { | |
| 266 | - | panic(err) | |
| 263 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 264 | + | var libs []uintptr | |
| 265 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 266 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 267 | + | if err != nil { | |
| 268 | + | panic(err) | |
| 269 | + | } | |
| 270 | + | libs = append(libs, lib) | |
| 267 | 271 | } | |
| 268 | 272 | ||
| 269 | - | core.PuregoSafeRegister(&xContentRegisterSerializer, lib, "gdk_content_register_serializer") | |
| 270 | - | core.PuregoSafeRegister(&xContentSerializeAsync, lib, "gdk_content_serialize_async") | |
| 271 | - | core.PuregoSafeRegister(&xContentSerializeFinish, lib, "gdk_content_serialize_finish") | |
| 272 | - | ||
| 273 | - | core.PuregoSafeRegister(&xContentSerializerGLibType, lib, "gdk_content_serializer_get_type") | |
| 274 | - | ||
| 275 | - | core.PuregoSafeRegister(&xContentSerializerGetCancellable, lib, "gdk_content_serializer_get_cancellable") | |
| 276 | - | core.PuregoSafeRegister(&xContentSerializerGetGtype, lib, "gdk_content_serializer_get_gtype") | |
| 277 | - | core.PuregoSafeRegister(&xContentSerializerGetMimeType, lib, "gdk_content_serializer_get_mime_type") | |
| 278 | - | core.PuregoSafeRegister(&xContentSerializerGetOutputStream, lib, "gdk_content_serializer_get_output_stream") | |
| 279 | - | core.PuregoSafeRegister(&xContentSerializerGetPriority, lib, "gdk_content_serializer_get_priority") | |
| 280 | - | core.PuregoSafeRegister(&xContentSerializerGetTaskData, lib, "gdk_content_serializer_get_task_data") | |
| 281 | - | core.PuregoSafeRegister(&xContentSerializerGetUserData, lib, "gdk_content_serializer_get_user_data") | |
| 282 | - | core.PuregoSafeRegister(&xContentSerializerGetValue, lib, "gdk_content_serializer_get_value") | |
| 283 | - | core.PuregoSafeRegister(&xContentSerializerReturnError, lib, "gdk_content_serializer_return_error") | |
| 284 | - | core.PuregoSafeRegister(&xContentSerializerReturnSuccess, lib, "gdk_content_serializer_return_success") | |
| 285 | - | core.PuregoSafeRegister(&xContentSerializerSetTaskData, lib, "gdk_content_serializer_set_task_data") | |
| 273 | + | core.PuregoSafeRegister(&xContentRegisterSerializer, libs, "gdk_content_register_serializer") | |
| 274 | + | core.PuregoSafeRegister(&xContentSerializeAsync, libs, "gdk_content_serialize_async") | |
| 275 | + | core.PuregoSafeRegister(&xContentSerializeFinish, libs, "gdk_content_serialize_finish") | |
| 276 | + | ||
| 277 | + | core.PuregoSafeRegister(&xContentSerializerGLibType, libs, "gdk_content_serializer_get_type") | |
| 278 | + | ||
| 279 | + | core.PuregoSafeRegister(&xContentSerializerGetCancellable, libs, "gdk_content_serializer_get_cancellable") | |
| 280 | + | core.PuregoSafeRegister(&xContentSerializerGetGtype, libs, "gdk_content_serializer_get_gtype") | |
| 281 | + | core.PuregoSafeRegister(&xContentSerializerGetMimeType, libs, "gdk_content_serializer_get_mime_type") | |
| 282 | + | core.PuregoSafeRegister(&xContentSerializerGetOutputStream, libs, "gdk_content_serializer_get_output_stream") | |
| 283 | + | core.PuregoSafeRegister(&xContentSerializerGetPriority, libs, "gdk_content_serializer_get_priority") | |
| 284 | + | core.PuregoSafeRegister(&xContentSerializerGetTaskData, libs, "gdk_content_serializer_get_task_data") | |
| 285 | + | core.PuregoSafeRegister(&xContentSerializerGetUserData, libs, "gdk_content_serializer_get_user_data") | |
| 286 | + | core.PuregoSafeRegister(&xContentSerializerGetValue, libs, "gdk_content_serializer_get_value") | |
| 287 | + | core.PuregoSafeRegister(&xContentSerializerReturnError, libs, "gdk_content_serializer_return_error") | |
| 288 | + | core.PuregoSafeRegister(&xContentSerializerReturnSuccess, libs, "gdk_content_serializer_return_success") | |
| 289 | + | core.PuregoSafeRegister(&xContentSerializerSetTaskData, libs, "gdk_content_serializer_set_task_data") | |
| 286 | 290 | ||
| 287 | 291 | } | |
M v4/gdk/gdkcursor.go +17 -13
| @@ -264,22 +264,26 @@ func (c *Cursor) SetGoPointer(ptr uintptr) { | |||
| 264 | 264 | ||
| 265 | 265 | func init() { | |
| 266 | 266 | core.SetPackageName("GDK", "gtk4") | |
| 267 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 268 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 269 | - | if err != nil { | |
| 270 | - | panic(err) | |
| 267 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 268 | + | var libs []uintptr | |
| 269 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 270 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 271 | + | if err != nil { | |
| 272 | + | panic(err) | |
| 273 | + | } | |
| 274 | + | libs = append(libs, lib) | |
| 271 | 275 | } | |
| 272 | 276 | ||
| 273 | - | core.PuregoSafeRegister(&xCursorGLibType, lib, "gdk_cursor_get_type") | |
| 277 | + | core.PuregoSafeRegister(&xCursorGLibType, libs, "gdk_cursor_get_type") | |
| 274 | 278 | ||
| 275 | - | core.PuregoSafeRegister(&xNewCursorFromCallback, lib, "gdk_cursor_new_from_callback") | |
| 276 | - | core.PuregoSafeRegister(&xNewCursorFromName, lib, "gdk_cursor_new_from_name") | |
| 277 | - | core.PuregoSafeRegister(&xNewCursorFromTexture, lib, "gdk_cursor_new_from_texture") | |
| 279 | + | core.PuregoSafeRegister(&xNewCursorFromCallback, libs, "gdk_cursor_new_from_callback") | |
| 280 | + | core.PuregoSafeRegister(&xNewCursorFromName, libs, "gdk_cursor_new_from_name") | |
| 281 | + | core.PuregoSafeRegister(&xNewCursorFromTexture, libs, "gdk_cursor_new_from_texture") | |
| 278 | 282 | ||
| 279 | - | core.PuregoSafeRegister(&xCursorGetFallback, lib, "gdk_cursor_get_fallback") | |
| 280 | - | core.PuregoSafeRegister(&xCursorGetHotspotX, lib, "gdk_cursor_get_hotspot_x") | |
| 281 | - | core.PuregoSafeRegister(&xCursorGetHotspotY, lib, "gdk_cursor_get_hotspot_y") | |
| 282 | - | core.PuregoSafeRegister(&xCursorGetName, lib, "gdk_cursor_get_name") | |
| 283 | - | core.PuregoSafeRegister(&xCursorGetTexture, lib, "gdk_cursor_get_texture") | |
| 283 | + | core.PuregoSafeRegister(&xCursorGetFallback, libs, "gdk_cursor_get_fallback") | |
| 284 | + | core.PuregoSafeRegister(&xCursorGetHotspotX, libs, "gdk_cursor_get_hotspot_x") | |
| 285 | + | core.PuregoSafeRegister(&xCursorGetHotspotY, libs, "gdk_cursor_get_hotspot_y") | |
| 286 | + | core.PuregoSafeRegister(&xCursorGetName, libs, "gdk_cursor_get_name") | |
| 287 | + | core.PuregoSafeRegister(&xCursorGetTexture, libs, "gdk_cursor_get_texture") | |
| 284 | 288 | ||
| 285 | 289 | } | |
M v4/gdk/gdkdevice.go +31 -27
| @@ -412,34 +412,38 @@ func (x *Device) ConnectToolChanged(cb *func(Device, uintptr)) uint32 { | |||
| 412 | 412 | ||
| 413 | 413 | func init() { | |
| 414 | 414 | core.SetPackageName("GDK", "gtk4") | |
| 415 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 416 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 417 | - | if err != nil { | |
| 418 | - | panic(err) | |
| 415 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 416 | + | var libs []uintptr | |
| 417 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 418 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 419 | + | if err != nil { | |
| 420 | + | panic(err) | |
| 421 | + | } | |
| 422 | + | libs = append(libs, lib) | |
| 419 | 423 | } | |
| 420 | 424 | ||
| 421 | - | core.PuregoSafeRegister(&xInputSourceGLibType, lib, "gdk_input_source_get_type") | |
| 422 | - | ||
| 423 | - | core.PuregoSafeRegister(&xDeviceGLibType, lib, "gdk_device_get_type") | |
| 424 | - | ||
| 425 | - | core.PuregoSafeRegister(&xDeviceGetActiveLayoutIndex, lib, "gdk_device_get_active_layout_index") | |
| 426 | - | core.PuregoSafeRegister(&xDeviceGetCapsLockState, lib, "gdk_device_get_caps_lock_state") | |
| 427 | - | core.PuregoSafeRegister(&xDeviceGetDeviceTool, lib, "gdk_device_get_device_tool") | |
| 428 | - | core.PuregoSafeRegister(&xDeviceGetDirection, lib, "gdk_device_get_direction") | |
| 429 | - | core.PuregoSafeRegister(&xDeviceGetDisplay, lib, "gdk_device_get_display") | |
| 430 | - | core.PuregoSafeRegister(&xDeviceGetHasCursor, lib, "gdk_device_get_has_cursor") | |
| 431 | - | core.PuregoSafeRegister(&xDeviceGetLayoutNames, lib, "gdk_device_get_layout_names") | |
| 432 | - | core.PuregoSafeRegister(&xDeviceGetModifierState, lib, "gdk_device_get_modifier_state") | |
| 433 | - | core.PuregoSafeRegister(&xDeviceGetName, lib, "gdk_device_get_name") | |
| 434 | - | core.PuregoSafeRegister(&xDeviceGetNumLockState, lib, "gdk_device_get_num_lock_state") | |
| 435 | - | core.PuregoSafeRegister(&xDeviceGetNumTouches, lib, "gdk_device_get_num_touches") | |
| 436 | - | core.PuregoSafeRegister(&xDeviceGetProductId, lib, "gdk_device_get_product_id") | |
| 437 | - | core.PuregoSafeRegister(&xDeviceGetScrollLockState, lib, "gdk_device_get_scroll_lock_state") | |
| 438 | - | core.PuregoSafeRegister(&xDeviceGetSeat, lib, "gdk_device_get_seat") | |
| 439 | - | core.PuregoSafeRegister(&xDeviceGetSource, lib, "gdk_device_get_source") | |
| 440 | - | core.PuregoSafeRegister(&xDeviceGetSurfaceAtPosition, lib, "gdk_device_get_surface_at_position") | |
| 441 | - | core.PuregoSafeRegister(&xDeviceGetTimestamp, lib, "gdk_device_get_timestamp") | |
| 442 | - | core.PuregoSafeRegister(&xDeviceGetVendorId, lib, "gdk_device_get_vendor_id") | |
| 443 | - | core.PuregoSafeRegister(&xDeviceHasBidiLayouts, lib, "gdk_device_has_bidi_layouts") | |
| 425 | + | core.PuregoSafeRegister(&xInputSourceGLibType, libs, "gdk_input_source_get_type") | |
| 426 | + | ||
| 427 | + | core.PuregoSafeRegister(&xDeviceGLibType, libs, "gdk_device_get_type") | |
| 428 | + | ||
| 429 | + | core.PuregoSafeRegister(&xDeviceGetActiveLayoutIndex, libs, "gdk_device_get_active_layout_index") | |
| 430 | + | core.PuregoSafeRegister(&xDeviceGetCapsLockState, libs, "gdk_device_get_caps_lock_state") | |
| 431 | + | core.PuregoSafeRegister(&xDeviceGetDeviceTool, libs, "gdk_device_get_device_tool") | |
| 432 | + | core.PuregoSafeRegister(&xDeviceGetDirection, libs, "gdk_device_get_direction") | |
| 433 | + | core.PuregoSafeRegister(&xDeviceGetDisplay, libs, "gdk_device_get_display") | |
| 434 | + | core.PuregoSafeRegister(&xDeviceGetHasCursor, libs, "gdk_device_get_has_cursor") | |
| 435 | + | core.PuregoSafeRegister(&xDeviceGetLayoutNames, libs, "gdk_device_get_layout_names") | |
| 436 | + | core.PuregoSafeRegister(&xDeviceGetModifierState, libs, "gdk_device_get_modifier_state") | |
| 437 | + | core.PuregoSafeRegister(&xDeviceGetName, libs, "gdk_device_get_name") | |
| 438 | + | core.PuregoSafeRegister(&xDeviceGetNumLockState, libs, "gdk_device_get_num_lock_state") | |
| 439 | + | core.PuregoSafeRegister(&xDeviceGetNumTouches, libs, "gdk_device_get_num_touches") | |
| 440 | + | core.PuregoSafeRegister(&xDeviceGetProductId, libs, "gdk_device_get_product_id") | |
| 441 | + | core.PuregoSafeRegister(&xDeviceGetScrollLockState, libs, "gdk_device_get_scroll_lock_state") | |
| 442 | + | core.PuregoSafeRegister(&xDeviceGetSeat, libs, "gdk_device_get_seat") | |
| 443 | + | core.PuregoSafeRegister(&xDeviceGetSource, libs, "gdk_device_get_source") | |
| 444 | + | core.PuregoSafeRegister(&xDeviceGetSurfaceAtPosition, libs, "gdk_device_get_surface_at_position") | |
| 445 | + | core.PuregoSafeRegister(&xDeviceGetTimestamp, libs, "gdk_device_get_timestamp") | |
| 446 | + | core.PuregoSafeRegister(&xDeviceGetVendorId, libs, "gdk_device_get_vendor_id") | |
| 447 | + | core.PuregoSafeRegister(&xDeviceHasBidiLayouts, libs, "gdk_device_has_bidi_layouts") | |
| 444 | 448 | ||
| 445 | 449 | } | |
M v4/gdk/gdkdevicepad.go +14 -10
| @@ -124,19 +124,23 @@ const ( | |||
| 124 | 124 | ||
| 125 | 125 | func init() { | |
| 126 | 126 | core.SetPackageName("GDK", "gtk4") | |
| 127 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 128 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 129 | - | if err != nil { | |
| 130 | - | panic(err) | |
| 127 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 128 | + | var libs []uintptr | |
| 129 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 130 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 131 | + | if err != nil { | |
| 132 | + | panic(err) | |
| 133 | + | } | |
| 134 | + | libs = append(libs, lib) | |
| 131 | 135 | } | |
| 132 | 136 | ||
| 133 | - | core.PuregoSafeRegister(&xDevicePadFeatureGLibType, lib, "gdk_device_pad_feature_get_type") | |
| 137 | + | core.PuregoSafeRegister(&xDevicePadFeatureGLibType, libs, "gdk_device_pad_feature_get_type") | |
| 134 | 138 | ||
| 135 | - | core.PuregoSafeRegister(&xDevicePadGLibType, lib, "gdk_device_pad_get_type") | |
| 139 | + | core.PuregoSafeRegister(&xDevicePadGLibType, libs, "gdk_device_pad_get_type") | |
| 136 | 140 | ||
| 137 | - | core.PuregoSafeRegister(&XGdkDevicePadGetFeatureGroup, lib, "gdk_device_pad_get_feature_group") | |
| 138 | - | core.PuregoSafeRegister(&XGdkDevicePadGetGroupNModes, lib, "gdk_device_pad_get_group_n_modes") | |
| 139 | - | core.PuregoSafeRegister(&XGdkDevicePadGetNFeatures, lib, "gdk_device_pad_get_n_features") | |
| 140 | - | core.PuregoSafeRegister(&XGdkDevicePadGetNGroups, lib, "gdk_device_pad_get_n_groups") | |
| 141 | + | core.PuregoSafeRegister(&XGdkDevicePadGetFeatureGroup, libs, "gdk_device_pad_get_feature_group") | |
| 142 | + | core.PuregoSafeRegister(&XGdkDevicePadGetGroupNModes, libs, "gdk_device_pad_get_group_n_modes") | |
| 143 | + | core.PuregoSafeRegister(&XGdkDevicePadGetNFeatures, libs, "gdk_device_pad_get_n_features") | |
| 144 | + | core.PuregoSafeRegister(&XGdkDevicePadGetNGroups, libs, "gdk_device_pad_get_n_groups") | |
| 141 | 145 | ||
| 142 | 146 | } | |
M v4/gdk/gdkdevicetool.go +14 -10
| @@ -117,19 +117,23 @@ func (c *DeviceTool) SetGoPointer(ptr uintptr) { | |||
| 117 | 117 | ||
| 118 | 118 | func init() { | |
| 119 | 119 | core.SetPackageName("GDK", "gtk4") | |
| 120 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 121 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 122 | - | if err != nil { | |
| 123 | - | panic(err) | |
| 120 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 121 | + | var libs []uintptr | |
| 122 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 123 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 124 | + | if err != nil { | |
| 125 | + | panic(err) | |
| 126 | + | } | |
| 127 | + | libs = append(libs, lib) | |
| 124 | 128 | } | |
| 125 | 129 | ||
| 126 | - | core.PuregoSafeRegister(&xDeviceToolTypeGLibType, lib, "gdk_device_tool_type_get_type") | |
| 130 | + | core.PuregoSafeRegister(&xDeviceToolTypeGLibType, libs, "gdk_device_tool_type_get_type") | |
| 127 | 131 | ||
| 128 | - | core.PuregoSafeRegister(&xDeviceToolGLibType, lib, "gdk_device_tool_get_type") | |
| 132 | + | core.PuregoSafeRegister(&xDeviceToolGLibType, libs, "gdk_device_tool_get_type") | |
| 129 | 133 | ||
| 130 | - | core.PuregoSafeRegister(&xDeviceToolGetAxes, lib, "gdk_device_tool_get_axes") | |
| 131 | - | core.PuregoSafeRegister(&xDeviceToolGetHardwareId, lib, "gdk_device_tool_get_hardware_id") | |
| 132 | - | core.PuregoSafeRegister(&xDeviceToolGetSerial, lib, "gdk_device_tool_get_serial") | |
| 133 | - | core.PuregoSafeRegister(&xDeviceToolGetToolType, lib, "gdk_device_tool_get_tool_type") | |
| 134 | + | core.PuregoSafeRegister(&xDeviceToolGetAxes, libs, "gdk_device_tool_get_axes") | |
| 135 | + | core.PuregoSafeRegister(&xDeviceToolGetHardwareId, libs, "gdk_device_tool_get_hardware_id") | |
| 136 | + | core.PuregoSafeRegister(&xDeviceToolGetSerial, libs, "gdk_device_tool_get_serial") | |
| 137 | + | core.PuregoSafeRegister(&xDeviceToolGetToolType, libs, "gdk_device_tool_get_tool_type") | |
| 134 | 138 | ||
| 135 | 139 | } | |
M v4/gdk/gdkdisplay.go +41 -37
| @@ -649,44 +649,48 @@ func DisplayOpen(DisplayNameVar string) *Display { | |||
| 649 | 649 | ||
| 650 | 650 | func init() { | |
| 651 | 651 | core.SetPackageName("GDK", "gtk4") | |
| 652 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 653 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 654 | - | if err != nil { | |
| 655 | - | panic(err) | |
| 652 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 653 | + | var libs []uintptr | |
| 654 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 655 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 656 | + | if err != nil { | |
| 657 | + | panic(err) | |
| 658 | + | } | |
| 659 | + | libs = append(libs, lib) | |
| 656 | 660 | } | |
| 657 | 661 | ||
| 658 | - | core.PuregoSafeRegister(&xDisplayGLibType, lib, "gdk_display_get_type") | |
| 659 | - | ||
| 660 | - | core.PuregoSafeRegister(&xDisplayBeep, lib, "gdk_display_beep") | |
| 661 | - | core.PuregoSafeRegister(&xDisplayClose, lib, "gdk_display_close") | |
| 662 | - | core.PuregoSafeRegister(&xDisplayCreateGlContext, lib, "gdk_display_create_gl_context") | |
| 663 | - | core.PuregoSafeRegister(&xDisplayDeviceIsGrabbed, lib, "gdk_display_device_is_grabbed") | |
| 664 | - | core.PuregoSafeRegister(&xDisplayFlush, lib, "gdk_display_flush") | |
| 665 | - | core.PuregoSafeRegister(&xDisplayGetAppLaunchContext, lib, "gdk_display_get_app_launch_context") | |
| 666 | - | core.PuregoSafeRegister(&xDisplayGetClipboard, lib, "gdk_display_get_clipboard") | |
| 667 | - | core.PuregoSafeRegister(&xDisplayGetDefaultSeat, lib, "gdk_display_get_default_seat") | |
| 668 | - | core.PuregoSafeRegister(&xDisplayGetDmabufFormats, lib, "gdk_display_get_dmabuf_formats") | |
| 669 | - | core.PuregoSafeRegister(&xDisplayGetMonitorAtSurface, lib, "gdk_display_get_monitor_at_surface") | |
| 670 | - | core.PuregoSafeRegister(&xDisplayGetMonitors, lib, "gdk_display_get_monitors") | |
| 671 | - | core.PuregoSafeRegister(&xDisplayGetName, lib, "gdk_display_get_name") | |
| 672 | - | core.PuregoSafeRegister(&xDisplayGetPrimaryClipboard, lib, "gdk_display_get_primary_clipboard") | |
| 673 | - | core.PuregoSafeRegister(&xDisplayGetSetting, lib, "gdk_display_get_setting") | |
| 674 | - | core.PuregoSafeRegister(&xDisplayGetStartupNotificationId, lib, "gdk_display_get_startup_notification_id") | |
| 675 | - | core.PuregoSafeRegister(&xDisplayIsClosed, lib, "gdk_display_is_closed") | |
| 676 | - | core.PuregoSafeRegister(&xDisplayIsComposited, lib, "gdk_display_is_composited") | |
| 677 | - | core.PuregoSafeRegister(&xDisplayIsRgba, lib, "gdk_display_is_rgba") | |
| 678 | - | core.PuregoSafeRegister(&xDisplayListSeats, lib, "gdk_display_list_seats") | |
| 679 | - | core.PuregoSafeRegister(&xDisplayMapKeycode, lib, "gdk_display_map_keycode") | |
| 680 | - | core.PuregoSafeRegister(&xDisplayMapKeyval, lib, "gdk_display_map_keyval") | |
| 681 | - | core.PuregoSafeRegister(&xDisplayNotifyStartupComplete, lib, "gdk_display_notify_startup_complete") | |
| 682 | - | core.PuregoSafeRegister(&xDisplayPrepareGl, lib, "gdk_display_prepare_gl") | |
| 683 | - | core.PuregoSafeRegister(&xDisplayPutEvent, lib, "gdk_display_put_event") | |
| 684 | - | core.PuregoSafeRegister(&xDisplaySupportsInputShapes, lib, "gdk_display_supports_input_shapes") | |
| 685 | - | core.PuregoSafeRegister(&xDisplaySupportsShadowWidth, lib, "gdk_display_supports_shadow_width") | |
| 686 | - | core.PuregoSafeRegister(&xDisplaySync, lib, "gdk_display_sync") | |
| 687 | - | core.PuregoSafeRegister(&xDisplayTranslateKey, lib, "gdk_display_translate_key") | |
| 688 | - | ||
| 689 | - | core.PuregoSafeRegister(&xDisplayGetDefault, lib, "gdk_display_get_default") | |
| 690 | - | core.PuregoSafeRegister(&xDisplayOpen, lib, "gdk_display_open") | |
| 662 | + | core.PuregoSafeRegister(&xDisplayGLibType, libs, "gdk_display_get_type") | |
| 663 | + | ||
| 664 | + | core.PuregoSafeRegister(&xDisplayBeep, libs, "gdk_display_beep") | |
| 665 | + | core.PuregoSafeRegister(&xDisplayClose, libs, "gdk_display_close") | |
| 666 | + | core.PuregoSafeRegister(&xDisplayCreateGlContext, libs, "gdk_display_create_gl_context") | |
| 667 | + | core.PuregoSafeRegister(&xDisplayDeviceIsGrabbed, libs, "gdk_display_device_is_grabbed") | |
| 668 | + | core.PuregoSafeRegister(&xDisplayFlush, libs, "gdk_display_flush") | |
| 669 | + | core.PuregoSafeRegister(&xDisplayGetAppLaunchContext, libs, "gdk_display_get_app_launch_context") | |
| 670 | + | core.PuregoSafeRegister(&xDisplayGetClipboard, libs, "gdk_display_get_clipboard") | |
| 671 | + | core.PuregoSafeRegister(&xDisplayGetDefaultSeat, libs, "gdk_display_get_default_seat") | |
| 672 | + | core.PuregoSafeRegister(&xDisplayGetDmabufFormats, libs, "gdk_display_get_dmabuf_formats") | |
| 673 | + | core.PuregoSafeRegister(&xDisplayGetMonitorAtSurface, libs, "gdk_display_get_monitor_at_surface") | |
| 674 | + | core.PuregoSafeRegister(&xDisplayGetMonitors, libs, "gdk_display_get_monitors") | |
| 675 | + | core.PuregoSafeRegister(&xDisplayGetName, libs, "gdk_display_get_name") | |
| 676 | + | core.PuregoSafeRegister(&xDisplayGetPrimaryClipboard, libs, "gdk_display_get_primary_clipboard") | |
| 677 | + | core.PuregoSafeRegister(&xDisplayGetSetting, libs, "gdk_display_get_setting") | |
| 678 | + | core.PuregoSafeRegister(&xDisplayGetStartupNotificationId, libs, "gdk_display_get_startup_notification_id") | |
| 679 | + | core.PuregoSafeRegister(&xDisplayIsClosed, libs, "gdk_display_is_closed") | |
| 680 | + | core.PuregoSafeRegister(&xDisplayIsComposited, libs, "gdk_display_is_composited") | |
| 681 | + | core.PuregoSafeRegister(&xDisplayIsRgba, libs, "gdk_display_is_rgba") | |
| 682 | + | core.PuregoSafeRegister(&xDisplayListSeats, libs, "gdk_display_list_seats") | |
| 683 | + | core.PuregoSafeRegister(&xDisplayMapKeycode, libs, "gdk_display_map_keycode") | |
| 684 | + | core.PuregoSafeRegister(&xDisplayMapKeyval, libs, "gdk_display_map_keyval") | |
| 685 | + | core.PuregoSafeRegister(&xDisplayNotifyStartupComplete, libs, "gdk_display_notify_startup_complete") | |
| 686 | + | core.PuregoSafeRegister(&xDisplayPrepareGl, libs, "gdk_display_prepare_gl") | |
| 687 | + | core.PuregoSafeRegister(&xDisplayPutEvent, libs, "gdk_display_put_event") | |
| 688 | + | core.PuregoSafeRegister(&xDisplaySupportsInputShapes, libs, "gdk_display_supports_input_shapes") | |
| 689 | + | core.PuregoSafeRegister(&xDisplaySupportsShadowWidth, libs, "gdk_display_supports_shadow_width") | |
| 690 | + | core.PuregoSafeRegister(&xDisplaySync, libs, "gdk_display_sync") | |
| 691 | + | core.PuregoSafeRegister(&xDisplayTranslateKey, libs, "gdk_display_translate_key") | |
| 692 | + | ||
| 693 | + | core.PuregoSafeRegister(&xDisplayGetDefault, libs, "gdk_display_get_default") | |
| 694 | + | core.PuregoSafeRegister(&xDisplayOpen, libs, "gdk_display_open") | |
| 691 | 695 | ||
| 692 | 696 | } | |
M v4/gdk/gdkdisplaymanager.go +15 -11
| @@ -227,21 +227,25 @@ func DisplayManagerGet() *DisplayManager { | |||
| 227 | 227 | ||
| 228 | 228 | func init() { | |
| 229 | 229 | core.SetPackageName("GDK", "gtk4") | |
| 230 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 231 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 232 | - | if err != nil { | |
| 233 | - | panic(err) | |
| 230 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 231 | + | var libs []uintptr | |
| 232 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 233 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 234 | + | if err != nil { | |
| 235 | + | panic(err) | |
| 236 | + | } | |
| 237 | + | libs = append(libs, lib) | |
| 234 | 238 | } | |
| 235 | 239 | ||
| 236 | - | core.PuregoSafeRegister(&xSetAllowedBackends, lib, "gdk_set_allowed_backends") | |
| 240 | + | core.PuregoSafeRegister(&xSetAllowedBackends, libs, "gdk_set_allowed_backends") | |
| 237 | 241 | ||
| 238 | - | core.PuregoSafeRegister(&xDisplayManagerGLibType, lib, "gdk_display_manager_get_type") | |
| 242 | + | core.PuregoSafeRegister(&xDisplayManagerGLibType, libs, "gdk_display_manager_get_type") | |
| 239 | 243 | ||
| 240 | - | core.PuregoSafeRegister(&xDisplayManagerGetDefaultDisplay, lib, "gdk_display_manager_get_default_display") | |
| 241 | - | core.PuregoSafeRegister(&xDisplayManagerListDisplays, lib, "gdk_display_manager_list_displays") | |
| 242 | - | core.PuregoSafeRegister(&xDisplayManagerOpenDisplay, lib, "gdk_display_manager_open_display") | |
| 243 | - | core.PuregoSafeRegister(&xDisplayManagerSetDefaultDisplay, lib, "gdk_display_manager_set_default_display") | |
| 244 | + | core.PuregoSafeRegister(&xDisplayManagerGetDefaultDisplay, libs, "gdk_display_manager_get_default_display") | |
| 245 | + | core.PuregoSafeRegister(&xDisplayManagerListDisplays, libs, "gdk_display_manager_list_displays") | |
| 246 | + | core.PuregoSafeRegister(&xDisplayManagerOpenDisplay, libs, "gdk_display_manager_open_display") | |
| 247 | + | core.PuregoSafeRegister(&xDisplayManagerSetDefaultDisplay, libs, "gdk_display_manager_set_default_display") | |
| 244 | 248 | ||
| 245 | - | core.PuregoSafeRegister(&xDisplayManagerGet, lib, "gdk_display_manager_get") | |
| 249 | + | core.PuregoSafeRegister(&xDisplayManagerGet, libs, "gdk_display_manager_get") | |
| 246 | 250 | ||
| 247 | 251 | } | |
M v4/gdk/gdkdmabuftexture.go +10 -6
| @@ -303,14 +303,18 @@ func (x *DmabufTexture) LoadFinish(ResVar gio.AsyncResult, TypeVar string) (*gio | |||
| 303 | 303 | ||
| 304 | 304 | func init() { | |
| 305 | 305 | core.SetPackageName("GDK", "gtk4") | |
| 306 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 307 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 308 | - | if err != nil { | |
| 309 | - | panic(err) | |
| 306 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 307 | + | var libs []uintptr | |
| 308 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 309 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 310 | + | if err != nil { | |
| 311 | + | panic(err) | |
| 312 | + | } | |
| 313 | + | libs = append(libs, lib) | |
| 310 | 314 | } | |
| 311 | 315 | ||
| 312 | - | core.PuregoSafeRegister(&xDmabufErrorQuark, lib, "gdk_dmabuf_error_quark") | |
| 316 | + | core.PuregoSafeRegister(&xDmabufErrorQuark, libs, "gdk_dmabuf_error_quark") | |
| 313 | 317 | ||
| 314 | - | core.PuregoSafeRegister(&xDmabufTextureGLibType, lib, "gdk_dmabuf_texture_get_type") | |
| 318 | + | core.PuregoSafeRegister(&xDmabufTextureGLibType, libs, "gdk_dmabuf_texture_get_type") | |
| 315 | 319 | ||
| 316 | 320 | } | |
M v4/gdk/gdkdmabuftexturebuilder.go +39 -35
| @@ -447,42 +447,46 @@ func (c *DmabufTextureBuilder) SetGoPointer(ptr uintptr) { | |||
| 447 | 447 | ||
| 448 | 448 | func init() { | |
| 449 | 449 | core.SetPackageName("GDK", "gtk4") | |
| 450 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 451 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 452 | - | if err != nil { | |
| 453 | - | panic(err) | |
| 450 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 451 | + | var libs []uintptr | |
| 452 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 453 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 454 | + | if err != nil { | |
| 455 | + | panic(err) | |
| 456 | + | } | |
| 457 | + | libs = append(libs, lib) | |
| 454 | 458 | } | |
| 455 | 459 | ||
| 456 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGLibType, lib, "gdk_dmabuf_texture_builder_get_type") | |
| 457 | - | ||
| 458 | - | core.PuregoSafeRegister(&xNewDmabufTextureBuilder, lib, "gdk_dmabuf_texture_builder_new") | |
| 459 | - | ||
| 460 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderBuild, lib, "gdk_dmabuf_texture_builder_build") | |
| 461 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetColorState, lib, "gdk_dmabuf_texture_builder_get_color_state") | |
| 462 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetDisplay, lib, "gdk_dmabuf_texture_builder_get_display") | |
| 463 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetFd, lib, "gdk_dmabuf_texture_builder_get_fd") | |
| 464 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetFourcc, lib, "gdk_dmabuf_texture_builder_get_fourcc") | |
| 465 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetHeight, lib, "gdk_dmabuf_texture_builder_get_height") | |
| 466 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetModifier, lib, "gdk_dmabuf_texture_builder_get_modifier") | |
| 467 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetNPlanes, lib, "gdk_dmabuf_texture_builder_get_n_planes") | |
| 468 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetOffset, lib, "gdk_dmabuf_texture_builder_get_offset") | |
| 469 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetPremultiplied, lib, "gdk_dmabuf_texture_builder_get_premultiplied") | |
| 470 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetStride, lib, "gdk_dmabuf_texture_builder_get_stride") | |
| 471 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetUpdateRegion, lib, "gdk_dmabuf_texture_builder_get_update_region") | |
| 472 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetUpdateTexture, lib, "gdk_dmabuf_texture_builder_get_update_texture") | |
| 473 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderGetWidth, lib, "gdk_dmabuf_texture_builder_get_width") | |
| 474 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetColorState, lib, "gdk_dmabuf_texture_builder_set_color_state") | |
| 475 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetDisplay, lib, "gdk_dmabuf_texture_builder_set_display") | |
| 476 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetFd, lib, "gdk_dmabuf_texture_builder_set_fd") | |
| 477 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetFourcc, lib, "gdk_dmabuf_texture_builder_set_fourcc") | |
| 478 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetHeight, lib, "gdk_dmabuf_texture_builder_set_height") | |
| 479 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetModifier, lib, "gdk_dmabuf_texture_builder_set_modifier") | |
| 480 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetNPlanes, lib, "gdk_dmabuf_texture_builder_set_n_planes") | |
| 481 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetOffset, lib, "gdk_dmabuf_texture_builder_set_offset") | |
| 482 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetPremultiplied, lib, "gdk_dmabuf_texture_builder_set_premultiplied") | |
| 483 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetStride, lib, "gdk_dmabuf_texture_builder_set_stride") | |
| 484 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetUpdateRegion, lib, "gdk_dmabuf_texture_builder_set_update_region") | |
| 485 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetUpdateTexture, lib, "gdk_dmabuf_texture_builder_set_update_texture") | |
| 486 | - | core.PuregoSafeRegister(&xDmabufTextureBuilderSetWidth, lib, "gdk_dmabuf_texture_builder_set_width") | |
| 460 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGLibType, libs, "gdk_dmabuf_texture_builder_get_type") | |
| 461 | + | ||
| 462 | + | core.PuregoSafeRegister(&xNewDmabufTextureBuilder, libs, "gdk_dmabuf_texture_builder_new") | |
| 463 | + | ||
| 464 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderBuild, libs, "gdk_dmabuf_texture_builder_build") | |
| 465 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetColorState, libs, "gdk_dmabuf_texture_builder_get_color_state") | |
| 466 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetDisplay, libs, "gdk_dmabuf_texture_builder_get_display") | |
| 467 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetFd, libs, "gdk_dmabuf_texture_builder_get_fd") | |
| 468 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetFourcc, libs, "gdk_dmabuf_texture_builder_get_fourcc") | |
| 469 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetHeight, libs, "gdk_dmabuf_texture_builder_get_height") | |
| 470 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetModifier, libs, "gdk_dmabuf_texture_builder_get_modifier") | |
| 471 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetNPlanes, libs, "gdk_dmabuf_texture_builder_get_n_planes") | |
| 472 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetOffset, libs, "gdk_dmabuf_texture_builder_get_offset") | |
| 473 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetPremultiplied, libs, "gdk_dmabuf_texture_builder_get_premultiplied") | |
| 474 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetStride, libs, "gdk_dmabuf_texture_builder_get_stride") | |
| 475 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetUpdateRegion, libs, "gdk_dmabuf_texture_builder_get_update_region") | |
| 476 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetUpdateTexture, libs, "gdk_dmabuf_texture_builder_get_update_texture") | |
| 477 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderGetWidth, libs, "gdk_dmabuf_texture_builder_get_width") | |
| 478 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetColorState, libs, "gdk_dmabuf_texture_builder_set_color_state") | |
| 479 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetDisplay, libs, "gdk_dmabuf_texture_builder_set_display") | |
| 480 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetFd, libs, "gdk_dmabuf_texture_builder_set_fd") | |
| 481 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetFourcc, libs, "gdk_dmabuf_texture_builder_set_fourcc") | |
| 482 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetHeight, libs, "gdk_dmabuf_texture_builder_set_height") | |
| 483 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetModifier, libs, "gdk_dmabuf_texture_builder_set_modifier") | |
| 484 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetNPlanes, libs, "gdk_dmabuf_texture_builder_set_n_planes") | |
| 485 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetOffset, libs, "gdk_dmabuf_texture_builder_set_offset") | |
| 486 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetPremultiplied, libs, "gdk_dmabuf_texture_builder_set_premultiplied") | |
| 487 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetStride, libs, "gdk_dmabuf_texture_builder_set_stride") | |
| 488 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetUpdateRegion, libs, "gdk_dmabuf_texture_builder_set_update_region") | |
| 489 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetUpdateTexture, libs, "gdk_dmabuf_texture_builder_set_update_texture") | |
| 490 | + | core.PuregoSafeRegister(&xDmabufTextureBuilderSetWidth, libs, "gdk_dmabuf_texture_builder_set_width") | |
| 487 | 491 | ||
| 488 | 492 | } | |
M v4/gdk/gdkdrag.go +22 -18
| @@ -322,29 +322,33 @@ func DragBegin(SurfaceVar *Surface, DeviceVar *Device, ContentVar *ContentProvid | |||
| 322 | 322 | ||
| 323 | 323 | func init() { | |
| 324 | 324 | core.SetPackageName("GDK", "gtk4") | |
| 325 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 326 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 327 | - | if err != nil { | |
| 328 | - | panic(err) | |
| 325 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 326 | + | var libs []uintptr | |
| 327 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 328 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 329 | + | if err != nil { | |
| 330 | + | panic(err) | |
| 331 | + | } | |
| 332 | + | libs = append(libs, lib) | |
| 329 | 333 | } | |
| 330 | 334 | ||
| 331 | - | core.PuregoSafeRegister(&xDragCancelReasonGLibType, lib, "gdk_drag_cancel_reason_get_type") | |
| 335 | + | core.PuregoSafeRegister(&xDragCancelReasonGLibType, libs, "gdk_drag_cancel_reason_get_type") | |
| 332 | 336 | ||
| 333 | - | core.PuregoSafeRegister(&xDragActionIsUnique, lib, "gdk_drag_action_is_unique") | |
| 337 | + | core.PuregoSafeRegister(&xDragActionIsUnique, libs, "gdk_drag_action_is_unique") | |
| 334 | 338 | ||
| 335 | - | core.PuregoSafeRegister(&xDragGLibType, lib, "gdk_drag_get_type") | |
| 339 | + | core.PuregoSafeRegister(&xDragGLibType, libs, "gdk_drag_get_type") | |
| 336 | 340 | ||
| 337 | - | core.PuregoSafeRegister(&xDragDropDone, lib, "gdk_drag_drop_done") | |
| 338 | - | core.PuregoSafeRegister(&xDragGetActions, lib, "gdk_drag_get_actions") | |
| 339 | - | core.PuregoSafeRegister(&xDragGetContent, lib, "gdk_drag_get_content") | |
| 340 | - | core.PuregoSafeRegister(&xDragGetDevice, lib, "gdk_drag_get_device") | |
| 341 | - | core.PuregoSafeRegister(&xDragGetDisplay, lib, "gdk_drag_get_display") | |
| 342 | - | core.PuregoSafeRegister(&xDragGetDragSurface, lib, "gdk_drag_get_drag_surface") | |
| 343 | - | core.PuregoSafeRegister(&xDragGetFormats, lib, "gdk_drag_get_formats") | |
| 344 | - | core.PuregoSafeRegister(&xDragGetSelectedAction, lib, "gdk_drag_get_selected_action") | |
| 345 | - | core.PuregoSafeRegister(&xDragGetSurface, lib, "gdk_drag_get_surface") | |
| 346 | - | core.PuregoSafeRegister(&xDragSetHotspot, lib, "gdk_drag_set_hotspot") | |
| 341 | + | core.PuregoSafeRegister(&xDragDropDone, libs, "gdk_drag_drop_done") | |
| 342 | + | core.PuregoSafeRegister(&xDragGetActions, libs, "gdk_drag_get_actions") | |
| 343 | + | core.PuregoSafeRegister(&xDragGetContent, libs, "gdk_drag_get_content") | |
| 344 | + | core.PuregoSafeRegister(&xDragGetDevice, libs, "gdk_drag_get_device") | |
| 345 | + | core.PuregoSafeRegister(&xDragGetDisplay, libs, "gdk_drag_get_display") | |
| 346 | + | core.PuregoSafeRegister(&xDragGetDragSurface, libs, "gdk_drag_get_drag_surface") | |
| 347 | + | core.PuregoSafeRegister(&xDragGetFormats, libs, "gdk_drag_get_formats") | |
| 348 | + | core.PuregoSafeRegister(&xDragGetSelectedAction, libs, "gdk_drag_get_selected_action") | |
| 349 | + | core.PuregoSafeRegister(&xDragGetSurface, libs, "gdk_drag_get_surface") | |
| 350 | + | core.PuregoSafeRegister(&xDragSetHotspot, libs, "gdk_drag_set_hotspot") | |
| 347 | 351 | ||
| 348 | - | core.PuregoSafeRegister(&xDragBegin, lib, "gdk_drag_begin") | |
| 352 | + | core.PuregoSafeRegister(&xDragBegin, libs, "gdk_drag_begin") | |
| 349 | 353 | ||
| 350 | 354 | } | |
M v4/gdk/gdkdragsurface.go +10 -6
| @@ -58,14 +58,18 @@ var XGdkDragSurfacePresent func(uintptr, int, int) bool | |||
| 58 | 58 | ||
| 59 | 59 | func init() { | |
| 60 | 60 | core.SetPackageName("GDK", "gtk4") | |
| 61 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 62 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 63 | - | if err != nil { | |
| 64 | - | panic(err) | |
| 61 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 62 | + | var libs []uintptr | |
| 63 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 64 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 65 | + | if err != nil { | |
| 66 | + | panic(err) | |
| 67 | + | } | |
| 68 | + | libs = append(libs, lib) | |
| 65 | 69 | } | |
| 66 | 70 | ||
| 67 | - | core.PuregoSafeRegister(&xDragSurfaceGLibType, lib, "gdk_drag_surface_get_type") | |
| 71 | + | core.PuregoSafeRegister(&xDragSurfaceGLibType, libs, "gdk_drag_surface_get_type") | |
| 68 | 72 | ||
| 69 | - | core.PuregoSafeRegister(&XGdkDragSurfacePresent, lib, "gdk_drag_surface_present") | |
| 73 | + | core.PuregoSafeRegister(&XGdkDragSurfacePresent, libs, "gdk_drag_surface_present") | |
| 70 | 74 | ||
| 71 | 75 | } | |
M v4/gdk/gdkdragsurfacesize.go +10 -6
| @@ -36,14 +36,18 @@ func (x *DragSurfaceSize) SetSize(WidthVar int, HeightVar int) { | |||
| 36 | 36 | ||
| 37 | 37 | func init() { | |
| 38 | 38 | core.SetPackageName("GDK", "gtk4") | |
| 39 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 40 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 41 | - | if err != nil { | |
| 42 | - | panic(err) | |
| 39 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 40 | + | var libs []uintptr | |
| 41 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 42 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 43 | + | if err != nil { | |
| 44 | + | panic(err) | |
| 45 | + | } | |
| 46 | + | libs = append(libs, lib) | |
| 43 | 47 | } | |
| 44 | 48 | ||
| 45 | - | core.PuregoSafeRegister(&xDragSurfaceSizeGLibType, lib, "gdk_drag_surface_size_get_type") | |
| 49 | + | core.PuregoSafeRegister(&xDragSurfaceSizeGLibType, libs, "gdk_drag_surface_size_get_type") | |
| 46 | 50 | ||
| 47 | - | core.PuregoSafeRegister(&xDragSurfaceSizeSetSize, lib, "gdk_drag_surface_size_set_size") | |
| 51 | + | core.PuregoSafeRegister(&xDragSurfaceSizeSetSize, libs, "gdk_drag_surface_size_set_size") | |
| 48 | 52 | ||
| 49 | 53 | } | |
M v4/gdk/gdkdrawcontext.go +15 -11
| @@ -158,19 +158,23 @@ func (c *DrawContext) SetGoPointer(ptr uintptr) { | |||
| 158 | 158 | ||
| 159 | 159 | func init() { | |
| 160 | 160 | core.SetPackageName("GDK", "gtk4") | |
| 161 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 162 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 163 | - | if err != nil { | |
| 164 | - | panic(err) | |
| 161 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 162 | + | var libs []uintptr | |
| 163 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 164 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 165 | + | if err != nil { | |
| 166 | + | panic(err) | |
| 167 | + | } | |
| 168 | + | libs = append(libs, lib) | |
| 165 | 169 | } | |
| 166 | 170 | ||
| 167 | - | core.PuregoSafeRegister(&xDrawContextGLibType, lib, "gdk_draw_context_get_type") | |
| 171 | + | core.PuregoSafeRegister(&xDrawContextGLibType, libs, "gdk_draw_context_get_type") | |
| 168 | 172 | ||
| 169 | - | core.PuregoSafeRegister(&xDrawContextBeginFrame, lib, "gdk_draw_context_begin_frame") | |
| 170 | - | core.PuregoSafeRegister(&xDrawContextEndFrame, lib, "gdk_draw_context_end_frame") | |
| 171 | - | core.PuregoSafeRegister(&xDrawContextGetDisplay, lib, "gdk_draw_context_get_display") | |
| 172 | - | core.PuregoSafeRegister(&xDrawContextGetFrameRegion, lib, "gdk_draw_context_get_frame_region") | |
| 173 | - | core.PuregoSafeRegister(&xDrawContextGetSurface, lib, "gdk_draw_context_get_surface") | |
| 174 | - | core.PuregoSafeRegister(&xDrawContextIsInFrame, lib, "gdk_draw_context_is_in_frame") | |
| 173 | + | core.PuregoSafeRegister(&xDrawContextBeginFrame, libs, "gdk_draw_context_begin_frame") | |
| 174 | + | core.PuregoSafeRegister(&xDrawContextEndFrame, libs, "gdk_draw_context_end_frame") | |
| 175 | + | core.PuregoSafeRegister(&xDrawContextGetDisplay, libs, "gdk_draw_context_get_display") | |
| 176 | + | core.PuregoSafeRegister(&xDrawContextGetFrameRegion, libs, "gdk_draw_context_get_frame_region") | |
| 177 | + | core.PuregoSafeRegister(&xDrawContextGetSurface, libs, "gdk_draw_context_get_surface") | |
| 178 | + | core.PuregoSafeRegister(&xDrawContextIsInFrame, libs, "gdk_draw_context_is_in_frame") | |
| 175 | 179 | ||
| 176 | 180 | } | |
M v4/gdk/gdkdrop.go +22 -18
| @@ -257,25 +257,29 @@ func (c *Drop) SetGoPointer(ptr uintptr) { | |||
| 257 | 257 | ||
| 258 | 258 | func init() { | |
| 259 | 259 | core.SetPackageName("GDK", "gtk4") | |
| 260 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 261 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 262 | - | if err != nil { | |
| 263 | - | panic(err) | |
| 260 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 261 | + | var libs []uintptr | |
| 262 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 263 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 264 | + | if err != nil { | |
| 265 | + | panic(err) | |
| 266 | + | } | |
| 267 | + | libs = append(libs, lib) | |
| 264 | 268 | } | |
| 265 | 269 | ||
| 266 | - | core.PuregoSafeRegister(&xDropGLibType, lib, "gdk_drop_get_type") | |
| 267 | - | ||
| 268 | - | core.PuregoSafeRegister(&xDropFinish, lib, "gdk_drop_finish") | |
| 269 | - | core.PuregoSafeRegister(&xDropGetActions, lib, "gdk_drop_get_actions") | |
| 270 | - | core.PuregoSafeRegister(&xDropGetDevice, lib, "gdk_drop_get_device") | |
| 271 | - | core.PuregoSafeRegister(&xDropGetDisplay, lib, "gdk_drop_get_display") | |
| 272 | - | core.PuregoSafeRegister(&xDropGetDrag, lib, "gdk_drop_get_drag") | |
| 273 | - | core.PuregoSafeRegister(&xDropGetFormats, lib, "gdk_drop_get_formats") | |
| 274 | - | core.PuregoSafeRegister(&xDropGetSurface, lib, "gdk_drop_get_surface") | |
| 275 | - | core.PuregoSafeRegister(&xDropReadAsync, lib, "gdk_drop_read_async") | |
| 276 | - | core.PuregoSafeRegister(&xDropReadFinish, lib, "gdk_drop_read_finish") | |
| 277 | - | core.PuregoSafeRegister(&xDropReadValueAsync, lib, "gdk_drop_read_value_async") | |
| 278 | - | core.PuregoSafeRegister(&xDropReadValueFinish, lib, "gdk_drop_read_value_finish") | |
| 279 | - | core.PuregoSafeRegister(&xDropStatus, lib, "gdk_drop_status") | |
| 270 | + | core.PuregoSafeRegister(&xDropGLibType, libs, "gdk_drop_get_type") | |
| 271 | + | ||
| 272 | + | core.PuregoSafeRegister(&xDropFinish, libs, "gdk_drop_finish") | |
| 273 | + | core.PuregoSafeRegister(&xDropGetActions, libs, "gdk_drop_get_actions") | |
| 274 | + | core.PuregoSafeRegister(&xDropGetDevice, libs, "gdk_drop_get_device") | |
| 275 | + | core.PuregoSafeRegister(&xDropGetDisplay, libs, "gdk_drop_get_display") | |
| 276 | + | core.PuregoSafeRegister(&xDropGetDrag, libs, "gdk_drop_get_drag") | |
| 277 | + | core.PuregoSafeRegister(&xDropGetFormats, libs, "gdk_drop_get_formats") | |
| 278 | + | core.PuregoSafeRegister(&xDropGetSurface, libs, "gdk_drop_get_surface") | |
| 279 | + | core.PuregoSafeRegister(&xDropReadAsync, libs, "gdk_drop_read_async") | |
| 280 | + | core.PuregoSafeRegister(&xDropReadFinish, libs, "gdk_drop_read_finish") | |
| 281 | + | core.PuregoSafeRegister(&xDropReadValueAsync, libs, "gdk_drop_read_value_async") | |
| 282 | + | core.PuregoSafeRegister(&xDropReadValueFinish, libs, "gdk_drop_read_value_finish") | |
| 283 | + | core.PuregoSafeRegister(&xDropStatus, libs, "gdk_drop_status") | |
| 280 | 284 | ||
| 281 | 285 | } | |
M v4/gdk/gdkevents.go +82 -78
| @@ -1354,118 +1354,122 @@ func (c *TouchpadEvent) SetGoPointer(ptr uintptr) { | |||
| 1354 | 1354 | ||
| 1355 | 1355 | func init() { | |
| 1356 | 1356 | core.SetPackageName("GDK", "gtk4") | |
| 1357 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 1358 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1359 | - | if err != nil { | |
| 1360 | - | panic(err) | |
| 1357 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 1358 | + | var libs []uintptr | |
| 1359 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 1360 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1361 | + | if err != nil { | |
| 1362 | + | panic(err) | |
| 1363 | + | } | |
| 1364 | + | libs = append(libs, lib) | |
| 1361 | 1365 | } | |
| 1362 | 1366 | ||
| 1363 | - | core.PuregoSafeRegister(&xCrossingModeGLibType, lib, "gdk_crossing_mode_get_type") | |
| 1367 | + | core.PuregoSafeRegister(&xCrossingModeGLibType, libs, "gdk_crossing_mode_get_type") | |
| 1364 | 1368 | ||
| 1365 | - | core.PuregoSafeRegister(&xEventTypeGLibType, lib, "gdk_event_type_get_type") | |
| 1369 | + | core.PuregoSafeRegister(&xEventTypeGLibType, libs, "gdk_event_type_get_type") | |
| 1366 | 1370 | ||
| 1367 | - | core.PuregoSafeRegister(&xKeyMatchGLibType, lib, "gdk_key_match_get_type") | |
| 1371 | + | core.PuregoSafeRegister(&xKeyMatchGLibType, libs, "gdk_key_match_get_type") | |
| 1368 | 1372 | ||
| 1369 | - | core.PuregoSafeRegister(&xNotifyTypeGLibType, lib, "gdk_notify_type_get_type") | |
| 1373 | + | core.PuregoSafeRegister(&xNotifyTypeGLibType, libs, "gdk_notify_type_get_type") | |
| 1370 | 1374 | ||
| 1371 | - | core.PuregoSafeRegister(&xScrollDirectionGLibType, lib, "gdk_scroll_direction_get_type") | |
| 1375 | + | core.PuregoSafeRegister(&xScrollDirectionGLibType, libs, "gdk_scroll_direction_get_type") | |
| 1372 | 1376 | ||
| 1373 | - | core.PuregoSafeRegister(&xScrollUnitGLibType, lib, "gdk_scroll_unit_get_type") | |
| 1377 | + | core.PuregoSafeRegister(&xScrollUnitGLibType, libs, "gdk_scroll_unit_get_type") | |
| 1374 | 1378 | ||
| 1375 | - | core.PuregoSafeRegister(&xTouchpadGesturePhaseGLibType, lib, "gdk_touchpad_gesture_phase_get_type") | |
| 1379 | + | core.PuregoSafeRegister(&xTouchpadGesturePhaseGLibType, libs, "gdk_touchpad_gesture_phase_get_type") | |
| 1376 | 1380 | ||
| 1377 | - | core.PuregoSafeRegister(&xEventsGetAngle, lib, "gdk_events_get_angle") | |
| 1378 | - | core.PuregoSafeRegister(&xEventsGetCenter, lib, "gdk_events_get_center") | |
| 1379 | - | core.PuregoSafeRegister(&xEventsGetDistance, lib, "gdk_events_get_distance") | |
| 1381 | + | core.PuregoSafeRegister(&xEventsGetAngle, libs, "gdk_events_get_angle") | |
| 1382 | + | core.PuregoSafeRegister(&xEventsGetCenter, libs, "gdk_events_get_center") | |
| 1383 | + | core.PuregoSafeRegister(&xEventsGetDistance, libs, "gdk_events_get_distance") | |
| 1380 | 1384 | ||
| 1381 | - | core.PuregoSafeRegister(&xEventSequenceGLibType, lib, "gdk_event_sequence_get_type") | |
| 1385 | + | core.PuregoSafeRegister(&xEventSequenceGLibType, libs, "gdk_event_sequence_get_type") | |
| 1382 | 1386 | ||
| 1383 | - | core.PuregoSafeRegister(&xButtonEventGLibType, lib, "gdk_button_event_get_type") | |
| 1387 | + | core.PuregoSafeRegister(&xButtonEventGLibType, libs, "gdk_button_event_get_type") | |
| 1384 | 1388 | ||
| 1385 | - | core.PuregoSafeRegister(&xButtonEventGetButton, lib, "gdk_button_event_get_button") | |
| 1389 | + | core.PuregoSafeRegister(&xButtonEventGetButton, libs, "gdk_button_event_get_button") | |
| 1386 | 1390 | ||
| 1387 | - | core.PuregoSafeRegister(&xCrossingEventGLibType, lib, "gdk_crossing_event_get_type") | |
| 1391 | + | core.PuregoSafeRegister(&xCrossingEventGLibType, libs, "gdk_crossing_event_get_type") | |
| 1388 | 1392 | ||
| 1389 | - | core.PuregoSafeRegister(&xCrossingEventGetDetail, lib, "gdk_crossing_event_get_detail") | |
| 1390 | - | core.PuregoSafeRegister(&xCrossingEventGetFocus, lib, "gdk_crossing_event_get_focus") | |
| 1391 | - | core.PuregoSafeRegister(&xCrossingEventGetMode, lib, "gdk_crossing_event_get_mode") | |
| 1393 | + | core.PuregoSafeRegister(&xCrossingEventGetDetail, libs, "gdk_crossing_event_get_detail") | |
| 1394 | + | core.PuregoSafeRegister(&xCrossingEventGetFocus, libs, "gdk_crossing_event_get_focus") | |
| 1395 | + | core.PuregoSafeRegister(&xCrossingEventGetMode, libs, "gdk_crossing_event_get_mode") | |
| 1392 | 1396 | ||
| 1393 | - | core.PuregoSafeRegister(&xDNDEventGLibType, lib, "gdk_dnd_event_get_type") | |
| 1397 | + | core.PuregoSafeRegister(&xDNDEventGLibType, libs, "gdk_dnd_event_get_type") | |
| 1394 | 1398 | ||
| 1395 | - | core.PuregoSafeRegister(&xDNDEventGetDrop, lib, "gdk_dnd_event_get_drop") | |
| 1399 | + | core.PuregoSafeRegister(&xDNDEventGetDrop, libs, "gdk_dnd_event_get_drop") | |
| 1396 | 1400 | ||
| 1397 | - | core.PuregoSafeRegister(&xDeleteEventGLibType, lib, "gdk_delete_event_get_type") | |
| 1401 | + | core.PuregoSafeRegister(&xDeleteEventGLibType, libs, "gdk_delete_event_get_type") | |
| 1398 | 1402 | ||
| 1399 | - | core.PuregoSafeRegister(&xEventGLibType, lib, "gdk_event_get_type") | |
| 1403 | + | core.PuregoSafeRegister(&xEventGLibType, libs, "gdk_event_get_type") | |
| 1400 | 1404 | ||
| 1401 | - | core.PuregoSafeRegister(&xEventGetAngle, lib, "gdk_events_get_angle") | |
| 1402 | - | core.PuregoSafeRegister(&xEventGetCenter, lib, "gdk_events_get_center") | |
| 1403 | - | core.PuregoSafeRegister(&xEventGetDistance, lib, "gdk_events_get_distance") | |
| 1404 | - | core.PuregoSafeRegister(&xEventGetAxes, lib, "gdk_event_get_axes") | |
| 1405 | - | core.PuregoSafeRegister(&xEventGetAxis, lib, "gdk_event_get_axis") | |
| 1406 | - | core.PuregoSafeRegister(&xEventGetDevice, lib, "gdk_event_get_device") | |
| 1407 | - | core.PuregoSafeRegister(&xEventGetDeviceTool, lib, "gdk_event_get_device_tool") | |
| 1408 | - | core.PuregoSafeRegister(&xEventGetDisplay, lib, "gdk_event_get_display") | |
| 1409 | - | core.PuregoSafeRegister(&xEventGetEventSequence, lib, "gdk_event_get_event_sequence") | |
| 1410 | - | core.PuregoSafeRegister(&xEventGetEventType, lib, "gdk_event_get_event_type") | |
| 1411 | - | core.PuregoSafeRegister(&xEventGetHistory, lib, "gdk_event_get_history") | |
| 1412 | - | core.PuregoSafeRegister(&xEventGetModifierState, lib, "gdk_event_get_modifier_state") | |
| 1413 | - | core.PuregoSafeRegister(&xEventGetPointerEmulated, lib, "gdk_event_get_pointer_emulated") | |
| 1414 | - | core.PuregoSafeRegister(&xEventGetPosition, lib, "gdk_event_get_position") | |
| 1415 | - | core.PuregoSafeRegister(&xEventGetSeat, lib, "gdk_event_get_seat") | |
| 1416 | - | core.PuregoSafeRegister(&xEventGetSurface, lib, "gdk_event_get_surface") | |
| 1417 | - | core.PuregoSafeRegister(&xEventGetTime, lib, "gdk_event_get_time") | |
| 1418 | - | core.PuregoSafeRegister(&xEventRef, lib, "gdk_event_ref") | |
| 1419 | - | core.PuregoSafeRegister(&xEventTriggersContextMenu, lib, "gdk_event_triggers_context_menu") | |
| 1420 | - | core.PuregoSafeRegister(&xEventUnref, lib, "gdk_event_unref") | |
| 1405 | + | core.PuregoSafeRegister(&xEventGetAngle, libs, "gdk_events_get_angle") | |
| 1406 | + | core.PuregoSafeRegister(&xEventGetCenter, libs, "gdk_events_get_center") | |
| 1407 | + | core.PuregoSafeRegister(&xEventGetDistance, libs, "gdk_events_get_distance") | |
| 1408 | + | core.PuregoSafeRegister(&xEventGetAxes, libs, "gdk_event_get_axes") | |
| 1409 | + | core.PuregoSafeRegister(&xEventGetAxis, libs, "gdk_event_get_axis") | |
| 1410 | + | core.PuregoSafeRegister(&xEventGetDevice, libs, "gdk_event_get_device") | |
| 1411 | + | core.PuregoSafeRegister(&xEventGetDeviceTool, libs, "gdk_event_get_device_tool") | |
| 1412 | + | core.PuregoSafeRegister(&xEventGetDisplay, libs, "gdk_event_get_display") | |
| 1413 | + | core.PuregoSafeRegister(&xEventGetEventSequence, libs, "gdk_event_get_event_sequence") | |
| 1414 | + | core.PuregoSafeRegister(&xEventGetEventType, libs, "gdk_event_get_event_type") | |
| 1415 | + | core.PuregoSafeRegister(&xEventGetHistory, libs, "gdk_event_get_history") | |
| 1416 | + | core.PuregoSafeRegister(&xEventGetModifierState, libs, "gdk_event_get_modifier_state") | |
| 1417 | + | core.PuregoSafeRegister(&xEventGetPointerEmulated, libs, "gdk_event_get_pointer_emulated") | |
| 1418 | + | core.PuregoSafeRegister(&xEventGetPosition, libs, "gdk_event_get_position") | |
| 1419 | + | core.PuregoSafeRegister(&xEventGetSeat, libs, "gdk_event_get_seat") | |
| 1420 | + | core.PuregoSafeRegister(&xEventGetSurface, libs, "gdk_event_get_surface") | |
| 1421 | + | core.PuregoSafeRegister(&xEventGetTime, libs, "gdk_event_get_time") | |
| 1422 | + | core.PuregoSafeRegister(&xEventRef, libs, "gdk_event_ref") | |
| 1423 | + | core.PuregoSafeRegister(&xEventTriggersContextMenu, libs, "gdk_event_triggers_context_menu") | |
| 1424 | + | core.PuregoSafeRegister(&xEventUnref, libs, "gdk_event_unref") | |
| 1421 | 1425 | ||
| 1422 | - | core.PuregoSafeRegister(&xFocusEventGLibType, lib, "gdk_focus_event_get_type") | |
| 1426 | + | core.PuregoSafeRegister(&xFocusEventGLibType, libs, "gdk_focus_event_get_type") | |
| 1423 | 1427 | ||
| 1424 | - | core.PuregoSafeRegister(&xFocusEventGetIn, lib, "gdk_focus_event_get_in") | |
| 1428 | + | core.PuregoSafeRegister(&xFocusEventGetIn, libs, "gdk_focus_event_get_in") | |
| 1425 | 1429 | ||
| 1426 | - | core.PuregoSafeRegister(&xGrabBrokenEventGLibType, lib, "gdk_grab_broken_event_get_type") | |
| 1430 | + | core.PuregoSafeRegister(&xGrabBrokenEventGLibType, libs, "gdk_grab_broken_event_get_type") | |
| 1427 | 1431 | ||
| 1428 | - | core.PuregoSafeRegister(&xGrabBrokenEventGetGrabSurface, lib, "gdk_grab_broken_event_get_grab_surface") | |
| 1429 | - | core.PuregoSafeRegister(&xGrabBrokenEventGetImplicit, lib, "gdk_grab_broken_event_get_implicit") | |
| 1432 | + | core.PuregoSafeRegister(&xGrabBrokenEventGetGrabSurface, libs, "gdk_grab_broken_event_get_grab_surface") | |
| 1433 | + | core.PuregoSafeRegister(&xGrabBrokenEventGetImplicit, libs, "gdk_grab_broken_event_get_implicit") | |
| 1430 | 1434 | ||
| 1431 | - | core.PuregoSafeRegister(&xKeyEventGLibType, lib, "gdk_key_event_get_type") | |
| 1435 | + | core.PuregoSafeRegister(&xKeyEventGLibType, libs, "gdk_key_event_get_type") | |
| 1432 | 1436 | ||
| 1433 | - | core.PuregoSafeRegister(&xKeyEventGetConsumedModifiers, lib, "gdk_key_event_get_consumed_modifiers") | |
| 1434 | - | core.PuregoSafeRegister(&xKeyEventGetKeycode, lib, "gdk_key_event_get_keycode") | |
| 1435 | - | core.PuregoSafeRegister(&xKeyEventGetKeyval, lib, "gdk_key_event_get_keyval") | |
| 1436 | - | core.PuregoSafeRegister(&xKeyEventGetLayout, lib, "gdk_key_event_get_layout") | |
| 1437 | - | core.PuregoSafeRegister(&xKeyEventGetLevel, lib, "gdk_key_event_get_level") | |
| 1438 | - | core.PuregoSafeRegister(&xKeyEventGetMatch, lib, "gdk_key_event_get_match") | |
| 1439 | - | core.PuregoSafeRegister(&xKeyEventIsModifier, lib, "gdk_key_event_is_modifier") | |
| 1440 | - | core.PuregoSafeRegister(&xKeyEventMatches, lib, "gdk_key_event_matches") | |
| 1437 | + | core.PuregoSafeRegister(&xKeyEventGetConsumedModifiers, libs, "gdk_key_event_get_consumed_modifiers") | |
| 1438 | + | core.PuregoSafeRegister(&xKeyEventGetKeycode, libs, "gdk_key_event_get_keycode") | |
| 1439 | + | core.PuregoSafeRegister(&xKeyEventGetKeyval, libs, "gdk_key_event_get_keyval") | |
| 1440 | + | core.PuregoSafeRegister(&xKeyEventGetLayout, libs, "gdk_key_event_get_layout") | |
| 1441 | + | core.PuregoSafeRegister(&xKeyEventGetLevel, libs, "gdk_key_event_get_level") | |
| 1442 | + | core.PuregoSafeRegister(&xKeyEventGetMatch, libs, "gdk_key_event_get_match") | |
| 1443 | + | core.PuregoSafeRegister(&xKeyEventIsModifier, libs, "gdk_key_event_is_modifier") | |
| 1444 | + | core.PuregoSafeRegister(&xKeyEventMatches, libs, "gdk_key_event_matches") | |
| 1441 | 1445 | ||
| 1442 | - | core.PuregoSafeRegister(&xMotionEventGLibType, lib, "gdk_motion_event_get_type") | |
| 1446 | + | core.PuregoSafeRegister(&xMotionEventGLibType, libs, "gdk_motion_event_get_type") | |
| 1443 | 1447 | ||
| 1444 | - | core.PuregoSafeRegister(&xPadEventGLibType, lib, "gdk_pad_event_get_type") | |
| 1448 | + | core.PuregoSafeRegister(&xPadEventGLibType, libs, "gdk_pad_event_get_type") | |
| 1445 | 1449 | ||
| 1446 | - | core.PuregoSafeRegister(&xPadEventGetAxisValue, lib, "gdk_pad_event_get_axis_value") | |
| 1447 | - | core.PuregoSafeRegister(&xPadEventGetButton, lib, "gdk_pad_event_get_button") | |
| 1448 | - | core.PuregoSafeRegister(&xPadEventGetGroupMode, lib, "gdk_pad_event_get_group_mode") | |
| 1450 | + | core.PuregoSafeRegister(&xPadEventGetAxisValue, libs, "gdk_pad_event_get_axis_value") | |
| 1451 | + | core.PuregoSafeRegister(&xPadEventGetButton, libs, "gdk_pad_event_get_button") | |
| 1452 | + | core.PuregoSafeRegister(&xPadEventGetGroupMode, libs, "gdk_pad_event_get_group_mode") | |
| 1449 | 1453 | ||
| 1450 | - | core.PuregoSafeRegister(&xProximityEventGLibType, lib, "gdk_proximity_event_get_type") | |
| 1454 | + | core.PuregoSafeRegister(&xProximityEventGLibType, libs, "gdk_proximity_event_get_type") | |
| 1451 | 1455 | ||
| 1452 | - | core.PuregoSafeRegister(&xScrollEventGLibType, lib, "gdk_scroll_event_get_type") | |
| 1456 | + | core.PuregoSafeRegister(&xScrollEventGLibType, libs, "gdk_scroll_event_get_type") | |
| 1453 | 1457 | ||
| 1454 | - | core.PuregoSafeRegister(&xScrollEventGetDeltas, lib, "gdk_scroll_event_get_deltas") | |
| 1455 | - | core.PuregoSafeRegister(&xScrollEventGetDirection, lib, "gdk_scroll_event_get_direction") | |
| 1456 | - | core.PuregoSafeRegister(&xScrollEventGetUnit, lib, "gdk_scroll_event_get_unit") | |
| 1457 | - | core.PuregoSafeRegister(&xScrollEventIsStop, lib, "gdk_scroll_event_is_stop") | |
| 1458 | + | core.PuregoSafeRegister(&xScrollEventGetDeltas, libs, "gdk_scroll_event_get_deltas") | |
| 1459 | + | core.PuregoSafeRegister(&xScrollEventGetDirection, libs, "gdk_scroll_event_get_direction") | |
| 1460 | + | core.PuregoSafeRegister(&xScrollEventGetUnit, libs, "gdk_scroll_event_get_unit") | |
| 1461 | + | core.PuregoSafeRegister(&xScrollEventIsStop, libs, "gdk_scroll_event_is_stop") | |
| 1458 | 1462 | ||
| 1459 | - | core.PuregoSafeRegister(&xTouchEventGLibType, lib, "gdk_touch_event_get_type") | |
| 1463 | + | core.PuregoSafeRegister(&xTouchEventGLibType, libs, "gdk_touch_event_get_type") | |
| 1460 | 1464 | ||
| 1461 | - | core.PuregoSafeRegister(&xTouchEventGetEmulatingPointer, lib, "gdk_touch_event_get_emulating_pointer") | |
| 1465 | + | core.PuregoSafeRegister(&xTouchEventGetEmulatingPointer, libs, "gdk_touch_event_get_emulating_pointer") | |
| 1462 | 1466 | ||
| 1463 | - | core.PuregoSafeRegister(&xTouchpadEventGLibType, lib, "gdk_touchpad_event_get_type") | |
| 1467 | + | core.PuregoSafeRegister(&xTouchpadEventGLibType, libs, "gdk_touchpad_event_get_type") | |
| 1464 | 1468 | ||
| 1465 | - | core.PuregoSafeRegister(&xTouchpadEventGetDeltas, lib, "gdk_touchpad_event_get_deltas") | |
| 1466 | - | core.PuregoSafeRegister(&xTouchpadEventGetGesturePhase, lib, "gdk_touchpad_event_get_gesture_phase") | |
| 1467 | - | core.PuregoSafeRegister(&xTouchpadEventGetNFingers, lib, "gdk_touchpad_event_get_n_fingers") | |
| 1468 | - | core.PuregoSafeRegister(&xTouchpadEventGetPinchAngleDelta, lib, "gdk_touchpad_event_get_pinch_angle_delta") | |
| 1469 | - | core.PuregoSafeRegister(&xTouchpadEventGetPinchScale, lib, "gdk_touchpad_event_get_pinch_scale") | |
| 1469 | + | core.PuregoSafeRegister(&xTouchpadEventGetDeltas, libs, "gdk_touchpad_event_get_deltas") | |
| 1470 | + | core.PuregoSafeRegister(&xTouchpadEventGetGesturePhase, libs, "gdk_touchpad_event_get_gesture_phase") | |
| 1471 | + | core.PuregoSafeRegister(&xTouchpadEventGetNFingers, libs, "gdk_touchpad_event_get_n_fingers") | |
| 1472 | + | core.PuregoSafeRegister(&xTouchpadEventGetPinchAngleDelta, libs, "gdk_touchpad_event_get_pinch_angle_delta") | |
| 1473 | + | core.PuregoSafeRegister(&xTouchpadEventGetPinchScale, libs, "gdk_touchpad_event_get_pinch_scale") | |
| 1470 | 1474 | ||
| 1471 | 1475 | } | |
M v4/gdk/gdkframeclock.go +20 -16
| @@ -420,25 +420,29 @@ func (x *FrameClock) ConnectUpdate(cb *func(FrameClock)) uint32 { | |||
| 420 | 420 | ||
| 421 | 421 | func init() { | |
| 422 | 422 | core.SetPackageName("GDK", "gtk4") | |
| 423 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 424 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 425 | - | if err != nil { | |
| 426 | - | panic(err) | |
| 423 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 424 | + | var libs []uintptr | |
| 425 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 426 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 427 | + | if err != nil { | |
| 428 | + | panic(err) | |
| 429 | + | } | |
| 430 | + | libs = append(libs, lib) | |
| 427 | 431 | } | |
| 428 | 432 | ||
| 429 | - | core.PuregoSafeRegister(&xFrameClockPhaseGLibType, lib, "gdk_frame_clock_phase_get_type") | |
| 433 | + | core.PuregoSafeRegister(&xFrameClockPhaseGLibType, libs, "gdk_frame_clock_phase_get_type") | |
| 430 | 434 | ||
| 431 | - | core.PuregoSafeRegister(&xFrameClockGLibType, lib, "gdk_frame_clock_get_type") | |
| 435 | + | core.PuregoSafeRegister(&xFrameClockGLibType, libs, "gdk_frame_clock_get_type") | |
| 432 | 436 | ||
| 433 | - | core.PuregoSafeRegister(&xFrameClockBeginUpdating, lib, "gdk_frame_clock_begin_updating") | |
| 434 | - | core.PuregoSafeRegister(&xFrameClockEndUpdating, lib, "gdk_frame_clock_end_updating") | |
| 435 | - | core.PuregoSafeRegister(&xFrameClockGetCurrentTimings, lib, "gdk_frame_clock_get_current_timings") | |
| 436 | - | core.PuregoSafeRegister(&xFrameClockGetFps, lib, "gdk_frame_clock_get_fps") | |
| 437 | - | core.PuregoSafeRegister(&xFrameClockGetFrameCounter, lib, "gdk_frame_clock_get_frame_counter") | |
| 438 | - | core.PuregoSafeRegister(&xFrameClockGetFrameTime, lib, "gdk_frame_clock_get_frame_time") | |
| 439 | - | core.PuregoSafeRegister(&xFrameClockGetHistoryStart, lib, "gdk_frame_clock_get_history_start") | |
| 440 | - | core.PuregoSafeRegister(&xFrameClockGetRefreshInfo, lib, "gdk_frame_clock_get_refresh_info") | |
| 441 | - | core.PuregoSafeRegister(&xFrameClockGetTimings, lib, "gdk_frame_clock_get_timings") | |
| 442 | - | core.PuregoSafeRegister(&xFrameClockRequestPhase, lib, "gdk_frame_clock_request_phase") | |
| 437 | + | core.PuregoSafeRegister(&xFrameClockBeginUpdating, libs, "gdk_frame_clock_begin_updating") | |
| 438 | + | core.PuregoSafeRegister(&xFrameClockEndUpdating, libs, "gdk_frame_clock_end_updating") | |
| 439 | + | core.PuregoSafeRegister(&xFrameClockGetCurrentTimings, libs, "gdk_frame_clock_get_current_timings") | |
| 440 | + | core.PuregoSafeRegister(&xFrameClockGetFps, libs, "gdk_frame_clock_get_fps") | |
| 441 | + | core.PuregoSafeRegister(&xFrameClockGetFrameCounter, libs, "gdk_frame_clock_get_frame_counter") | |
| 442 | + | core.PuregoSafeRegister(&xFrameClockGetFrameTime, libs, "gdk_frame_clock_get_frame_time") | |
| 443 | + | core.PuregoSafeRegister(&xFrameClockGetHistoryStart, libs, "gdk_frame_clock_get_history_start") | |
| 444 | + | core.PuregoSafeRegister(&xFrameClockGetRefreshInfo, libs, "gdk_frame_clock_get_refresh_info") | |
| 445 | + | core.PuregoSafeRegister(&xFrameClockGetTimings, libs, "gdk_frame_clock_get_timings") | |
| 446 | + | core.PuregoSafeRegister(&xFrameClockRequestPhase, libs, "gdk_frame_clock_request_phase") | |
| 443 | 447 | ||
| 444 | 448 | } | |
M v4/gdk/gdkframetimings.go +17 -13
| @@ -140,21 +140,25 @@ func (x *FrameTimings) Unref() { | |||
| 140 | 140 | ||
| 141 | 141 | func init() { | |
| 142 | 142 | core.SetPackageName("GDK", "gtk4") | |
| 143 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 144 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 145 | - | if err != nil { | |
| 146 | - | panic(err) | |
| 143 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 144 | + | var libs []uintptr | |
| 145 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 146 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 147 | + | if err != nil { | |
| 148 | + | panic(err) | |
| 149 | + | } | |
| 150 | + | libs = append(libs, lib) | |
| 147 | 151 | } | |
| 148 | 152 | ||
| 149 | - | core.PuregoSafeRegister(&xFrameTimingsGLibType, lib, "gdk_frame_timings_get_type") | |
| 153 | + | core.PuregoSafeRegister(&xFrameTimingsGLibType, libs, "gdk_frame_timings_get_type") | |
| 150 | 154 | ||
| 151 | - | core.PuregoSafeRegister(&xFrameTimingsGetComplete, lib, "gdk_frame_timings_get_complete") | |
| 152 | - | core.PuregoSafeRegister(&xFrameTimingsGetFrameCounter, lib, "gdk_frame_timings_get_frame_counter") | |
| 153 | - | core.PuregoSafeRegister(&xFrameTimingsGetFrameTime, lib, "gdk_frame_timings_get_frame_time") | |
| 154 | - | core.PuregoSafeRegister(&xFrameTimingsGetPredictedPresentationTime, lib, "gdk_frame_timings_get_predicted_presentation_time") | |
| 155 | - | core.PuregoSafeRegister(&xFrameTimingsGetPresentationTime, lib, "gdk_frame_timings_get_presentation_time") | |
| 156 | - | core.PuregoSafeRegister(&xFrameTimingsGetRefreshInterval, lib, "gdk_frame_timings_get_refresh_interval") | |
| 157 | - | core.PuregoSafeRegister(&xFrameTimingsRef, lib, "gdk_frame_timings_ref") | |
| 158 | - | core.PuregoSafeRegister(&xFrameTimingsUnref, lib, "gdk_frame_timings_unref") | |
| 155 | + | core.PuregoSafeRegister(&xFrameTimingsGetComplete, libs, "gdk_frame_timings_get_complete") | |
| 156 | + | core.PuregoSafeRegister(&xFrameTimingsGetFrameCounter, libs, "gdk_frame_timings_get_frame_counter") | |
| 157 | + | core.PuregoSafeRegister(&xFrameTimingsGetFrameTime, libs, "gdk_frame_timings_get_frame_time") | |
| 158 | + | core.PuregoSafeRegister(&xFrameTimingsGetPredictedPresentationTime, libs, "gdk_frame_timings_get_predicted_presentation_time") | |
| 159 | + | core.PuregoSafeRegister(&xFrameTimingsGetPresentationTime, libs, "gdk_frame_timings_get_presentation_time") | |
| 160 | + | core.PuregoSafeRegister(&xFrameTimingsGetRefreshInterval, libs, "gdk_frame_timings_get_refresh_interval") | |
| 161 | + | core.PuregoSafeRegister(&xFrameTimingsRef, libs, "gdk_frame_timings_ref") | |
| 162 | + | core.PuregoSafeRegister(&xFrameTimingsUnref, libs, "gdk_frame_timings_unref") | |
| 159 | 163 | ||
| 160 | 164 | } | |
M v4/gdk/gdkglcontext.go +34 -30
| @@ -408,37 +408,41 @@ func GLContextGetCurrent() *GLContext { | |||
| 408 | 408 | ||
| 409 | 409 | func init() { | |
| 410 | 410 | core.SetPackageName("GDK", "gtk4") | |
| 411 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 412 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 413 | - | if err != nil { | |
| 414 | - | panic(err) | |
| 411 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 412 | + | var libs []uintptr | |
| 413 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 414 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 415 | + | if err != nil { | |
| 416 | + | panic(err) | |
| 417 | + | } | |
| 418 | + | libs = append(libs, lib) | |
| 415 | 419 | } | |
| 416 | 420 | ||
| 417 | - | core.PuregoSafeRegister(&xGlErrorQuark, lib, "gdk_gl_error_quark") | |
| 418 | - | ||
| 419 | - | core.PuregoSafeRegister(&xGLContextGLibType, lib, "gdk_gl_context_get_type") | |
| 420 | - | ||
| 421 | - | core.PuregoSafeRegister(&xGLContextGetAllowedApis, lib, "gdk_gl_context_get_allowed_apis") | |
| 422 | - | core.PuregoSafeRegister(&xGLContextGetApi, lib, "gdk_gl_context_get_api") | |
| 423 | - | core.PuregoSafeRegister(&xGLContextGetDebugEnabled, lib, "gdk_gl_context_get_debug_enabled") | |
| 424 | - | core.PuregoSafeRegister(&xGLContextGetDisplay, lib, "gdk_gl_context_get_display") | |
| 425 | - | core.PuregoSafeRegister(&xGLContextGetForwardCompatible, lib, "gdk_gl_context_get_forward_compatible") | |
| 426 | - | core.PuregoSafeRegister(&xGLContextGetRequiredVersion, lib, "gdk_gl_context_get_required_version") | |
| 427 | - | core.PuregoSafeRegister(&xGLContextGetSharedContext, lib, "gdk_gl_context_get_shared_context") | |
| 428 | - | core.PuregoSafeRegister(&xGLContextGetSurface, lib, "gdk_gl_context_get_surface") | |
| 429 | - | core.PuregoSafeRegister(&xGLContextGetUseEs, lib, "gdk_gl_context_get_use_es") | |
| 430 | - | core.PuregoSafeRegister(&xGLContextGetVersion, lib, "gdk_gl_context_get_version") | |
| 431 | - | core.PuregoSafeRegister(&xGLContextIsLegacy, lib, "gdk_gl_context_is_legacy") | |
| 432 | - | core.PuregoSafeRegister(&xGLContextIsShared, lib, "gdk_gl_context_is_shared") | |
| 433 | - | core.PuregoSafeRegister(&xGLContextMakeCurrent, lib, "gdk_gl_context_make_current") | |
| 434 | - | core.PuregoSafeRegister(&xGLContextRealize, lib, "gdk_gl_context_realize") | |
| 435 | - | core.PuregoSafeRegister(&xGLContextSetAllowedApis, lib, "gdk_gl_context_set_allowed_apis") | |
| 436 | - | core.PuregoSafeRegister(&xGLContextSetDebugEnabled, lib, "gdk_gl_context_set_debug_enabled") | |
| 437 | - | core.PuregoSafeRegister(&xGLContextSetForwardCompatible, lib, "gdk_gl_context_set_forward_compatible") | |
| 438 | - | core.PuregoSafeRegister(&xGLContextSetRequiredVersion, lib, "gdk_gl_context_set_required_version") | |
| 439 | - | core.PuregoSafeRegister(&xGLContextSetUseEs, lib, "gdk_gl_context_set_use_es") | |
| 440 | - | ||
| 441 | - | core.PuregoSafeRegister(&xGLContextClearCurrent, lib, "gdk_gl_context_clear_current") | |
| 442 | - | core.PuregoSafeRegister(&xGLContextGetCurrent, lib, "gdk_gl_context_get_current") | |
| 421 | + | core.PuregoSafeRegister(&xGlErrorQuark, libs, "gdk_gl_error_quark") | |
| 422 | + | ||
| 423 | + | core.PuregoSafeRegister(&xGLContextGLibType, libs, "gdk_gl_context_get_type") | |
| 424 | + | ||
| 425 | + | core.PuregoSafeRegister(&xGLContextGetAllowedApis, libs, "gdk_gl_context_get_allowed_apis") | |
| 426 | + | core.PuregoSafeRegister(&xGLContextGetApi, libs, "gdk_gl_context_get_api") | |
| 427 | + | core.PuregoSafeRegister(&xGLContextGetDebugEnabled, libs, "gdk_gl_context_get_debug_enabled") | |
| 428 | + | core.PuregoSafeRegister(&xGLContextGetDisplay, libs, "gdk_gl_context_get_display") | |
| 429 | + | core.PuregoSafeRegister(&xGLContextGetForwardCompatible, libs, "gdk_gl_context_get_forward_compatible") | |
| 430 | + | core.PuregoSafeRegister(&xGLContextGetRequiredVersion, libs, "gdk_gl_context_get_required_version") | |
| 431 | + | core.PuregoSafeRegister(&xGLContextGetSharedContext, libs, "gdk_gl_context_get_shared_context") | |
| 432 | + | core.PuregoSafeRegister(&xGLContextGetSurface, libs, "gdk_gl_context_get_surface") | |
| 433 | + | core.PuregoSafeRegister(&xGLContextGetUseEs, libs, "gdk_gl_context_get_use_es") | |
| 434 | + | core.PuregoSafeRegister(&xGLContextGetVersion, libs, "gdk_gl_context_get_version") | |
| 435 | + | core.PuregoSafeRegister(&xGLContextIsLegacy, libs, "gdk_gl_context_is_legacy") | |
| 436 | + | core.PuregoSafeRegister(&xGLContextIsShared, libs, "gdk_gl_context_is_shared") | |
| 437 | + | core.PuregoSafeRegister(&xGLContextMakeCurrent, libs, "gdk_gl_context_make_current") | |
| 438 | + | core.PuregoSafeRegister(&xGLContextRealize, libs, "gdk_gl_context_realize") | |
| 439 | + | core.PuregoSafeRegister(&xGLContextSetAllowedApis, libs, "gdk_gl_context_set_allowed_apis") | |
| 440 | + | core.PuregoSafeRegister(&xGLContextSetDebugEnabled, libs, "gdk_gl_context_set_debug_enabled") | |
| 441 | + | core.PuregoSafeRegister(&xGLContextSetForwardCompatible, libs, "gdk_gl_context_set_forward_compatible") | |
| 442 | + | core.PuregoSafeRegister(&xGLContextSetRequiredVersion, libs, "gdk_gl_context_set_required_version") | |
| 443 | + | core.PuregoSafeRegister(&xGLContextSetUseEs, libs, "gdk_gl_context_set_use_es") | |
| 444 | + | ||
| 445 | + | core.PuregoSafeRegister(&xGLContextClearCurrent, libs, "gdk_gl_context_clear_current") | |
| 446 | + | core.PuregoSafeRegister(&xGLContextGetCurrent, libs, "gdk_gl_context_get_current") | |
| 443 | 447 | ||
| 444 | 448 | } | |
M v4/gdk/gdkgltexture.go +11 -7
| @@ -322,16 +322,20 @@ func (x *GLTexture) LoadFinish(ResVar gio.AsyncResult, TypeVar string) (*gio.Inp | |||
| 322 | 322 | ||
| 323 | 323 | func init() { | |
| 324 | 324 | core.SetPackageName("GDK", "gtk4") | |
| 325 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 326 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 327 | - | if err != nil { | |
| 328 | - | panic(err) | |
| 325 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 326 | + | var libs []uintptr | |
| 327 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 328 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 329 | + | if err != nil { | |
| 330 | + | panic(err) | |
| 331 | + | } | |
| 332 | + | libs = append(libs, lib) | |
| 329 | 333 | } | |
| 330 | 334 | ||
| 331 | - | core.PuregoSafeRegister(&xGLTextureGLibType, lib, "gdk_gl_texture_get_type") | |
| 335 | + | core.PuregoSafeRegister(&xGLTextureGLibType, libs, "gdk_gl_texture_get_type") | |
| 332 | 336 | ||
| 333 | - | core.PuregoSafeRegister(&xNewGLTexture, lib, "gdk_gl_texture_new") | |
| 337 | + | core.PuregoSafeRegister(&xNewGLTexture, libs, "gdk_gl_texture_new") | |
| 334 | 338 | ||
| 335 | - | core.PuregoSafeRegister(&xGLTextureRelease, lib, "gdk_gl_texture_release") | |
| 339 | + | core.PuregoSafeRegister(&xGLTextureRelease, libs, "gdk_gl_texture_release") | |
| 336 | 340 | ||
| 337 | 341 | } | |
M v4/gdk/gdkgltexturebuilder.go +33 -29
| @@ -355,36 +355,40 @@ func (c *GLTextureBuilder) SetGoPointer(ptr uintptr) { | |||
| 355 | 355 | ||
| 356 | 356 | func init() { | |
| 357 | 357 | core.SetPackageName("GDK", "gtk4") | |
| 358 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 359 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 360 | - | if err != nil { | |
| 361 | - | panic(err) | |
| 358 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 359 | + | var libs []uintptr | |
| 360 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 361 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 362 | + | if err != nil { | |
| 363 | + | panic(err) | |
| 364 | + | } | |
| 365 | + | libs = append(libs, lib) | |
| 362 | 366 | } | |
| 363 | 367 | ||
| 364 | - | core.PuregoSafeRegister(&xGLTextureBuilderGLibType, lib, "gdk_gl_texture_builder_get_type") | |
| 365 | - | ||
| 366 | - | core.PuregoSafeRegister(&xNewGLTextureBuilder, lib, "gdk_gl_texture_builder_new") | |
| 367 | - | ||
| 368 | - | core.PuregoSafeRegister(&xGLTextureBuilderBuild, lib, "gdk_gl_texture_builder_build") | |
| 369 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetColorState, lib, "gdk_gl_texture_builder_get_color_state") | |
| 370 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetContext, lib, "gdk_gl_texture_builder_get_context") | |
| 371 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetFormat, lib, "gdk_gl_texture_builder_get_format") | |
| 372 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetHasMipmap, lib, "gdk_gl_texture_builder_get_has_mipmap") | |
| 373 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetHeight, lib, "gdk_gl_texture_builder_get_height") | |
| 374 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetId, lib, "gdk_gl_texture_builder_get_id") | |
| 375 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetSync, lib, "gdk_gl_texture_builder_get_sync") | |
| 376 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateRegion, lib, "gdk_gl_texture_builder_get_update_region") | |
| 377 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateTexture, lib, "gdk_gl_texture_builder_get_update_texture") | |
| 378 | - | core.PuregoSafeRegister(&xGLTextureBuilderGetWidth, lib, "gdk_gl_texture_builder_get_width") | |
| 379 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetColorState, lib, "gdk_gl_texture_builder_set_color_state") | |
| 380 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetContext, lib, "gdk_gl_texture_builder_set_context") | |
| 381 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetFormat, lib, "gdk_gl_texture_builder_set_format") | |
| 382 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetHasMipmap, lib, "gdk_gl_texture_builder_set_has_mipmap") | |
| 383 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetHeight, lib, "gdk_gl_texture_builder_set_height") | |
| 384 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetId, lib, "gdk_gl_texture_builder_set_id") | |
| 385 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetSync, lib, "gdk_gl_texture_builder_set_sync") | |
| 386 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateRegion, lib, "gdk_gl_texture_builder_set_update_region") | |
| 387 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateTexture, lib, "gdk_gl_texture_builder_set_update_texture") | |
| 388 | - | core.PuregoSafeRegister(&xGLTextureBuilderSetWidth, lib, "gdk_gl_texture_builder_set_width") | |
| 368 | + | core.PuregoSafeRegister(&xGLTextureBuilderGLibType, libs, "gdk_gl_texture_builder_get_type") | |
| 369 | + | ||
| 370 | + | core.PuregoSafeRegister(&xNewGLTextureBuilder, libs, "gdk_gl_texture_builder_new") | |
| 371 | + | ||
| 372 | + | core.PuregoSafeRegister(&xGLTextureBuilderBuild, libs, "gdk_gl_texture_builder_build") | |
| 373 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetColorState, libs, "gdk_gl_texture_builder_get_color_state") | |
| 374 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetContext, libs, "gdk_gl_texture_builder_get_context") | |
| 375 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetFormat, libs, "gdk_gl_texture_builder_get_format") | |
| 376 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetHasMipmap, libs, "gdk_gl_texture_builder_get_has_mipmap") | |
| 377 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetHeight, libs, "gdk_gl_texture_builder_get_height") | |
| 378 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetId, libs, "gdk_gl_texture_builder_get_id") | |
| 379 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetSync, libs, "gdk_gl_texture_builder_get_sync") | |
| 380 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateRegion, libs, "gdk_gl_texture_builder_get_update_region") | |
| 381 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetUpdateTexture, libs, "gdk_gl_texture_builder_get_update_texture") | |
| 382 | + | core.PuregoSafeRegister(&xGLTextureBuilderGetWidth, libs, "gdk_gl_texture_builder_get_width") | |
| 383 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetColorState, libs, "gdk_gl_texture_builder_set_color_state") | |
| 384 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetContext, libs, "gdk_gl_texture_builder_set_context") | |
| 385 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetFormat, libs, "gdk_gl_texture_builder_set_format") | |
| 386 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetHasMipmap, libs, "gdk_gl_texture_builder_set_has_mipmap") | |
| 387 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetHeight, libs, "gdk_gl_texture_builder_set_height") | |
| 388 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetId, libs, "gdk_gl_texture_builder_set_id") | |
| 389 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetSync, libs, "gdk_gl_texture_builder_set_sync") | |
| 390 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateRegion, libs, "gdk_gl_texture_builder_set_update_region") | |
| 391 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetUpdateTexture, libs, "gdk_gl_texture_builder_set_update_texture") | |
| 392 | + | core.PuregoSafeRegister(&xGLTextureBuilderSetWidth, libs, "gdk_gl_texture_builder_set_width") | |
| 389 | 393 | ||
| 390 | 394 | } | |
M v4/gdk/gdkkeys.go +17 -13
| @@ -104,20 +104,24 @@ func UnicodeToKeyval(WcVar uint32) uint { | |||
| 104 | 104 | ||
| 105 | 105 | func init() { | |
| 106 | 106 | core.SetPackageName("GDK", "gtk4") | |
| 107 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 108 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 109 | - | if err != nil { | |
| 110 | - | panic(err) | |
| 107 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 108 | + | var libs []uintptr | |
| 109 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 110 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 111 | + | if err != nil { | |
| 112 | + | panic(err) | |
| 113 | + | } | |
| 114 | + | libs = append(libs, lib) | |
| 111 | 115 | } | |
| 112 | 116 | ||
| 113 | - | core.PuregoSafeRegister(&xKeyvalConvertCase, lib, "gdk_keyval_convert_case") | |
| 114 | - | core.PuregoSafeRegister(&xKeyvalFromName, lib, "gdk_keyval_from_name") | |
| 115 | - | core.PuregoSafeRegister(&xKeyvalIsLower, lib, "gdk_keyval_is_lower") | |
| 116 | - | core.PuregoSafeRegister(&xKeyvalIsUpper, lib, "gdk_keyval_is_upper") | |
| 117 | - | core.PuregoSafeRegister(&xKeyvalName, lib, "gdk_keyval_name") | |
| 118 | - | core.PuregoSafeRegister(&xKeyvalToLower, lib, "gdk_keyval_to_lower") | |
| 119 | - | core.PuregoSafeRegister(&xKeyvalToUnicode, lib, "gdk_keyval_to_unicode") | |
| 120 | - | core.PuregoSafeRegister(&xKeyvalToUpper, lib, "gdk_keyval_to_upper") | |
| 121 | - | core.PuregoSafeRegister(&xUnicodeToKeyval, lib, "gdk_unicode_to_keyval") | |
| 117 | + | core.PuregoSafeRegister(&xKeyvalConvertCase, libs, "gdk_keyval_convert_case") | |
| 118 | + | core.PuregoSafeRegister(&xKeyvalFromName, libs, "gdk_keyval_from_name") | |
| 119 | + | core.PuregoSafeRegister(&xKeyvalIsLower, libs, "gdk_keyval_is_lower") | |
| 120 | + | core.PuregoSafeRegister(&xKeyvalIsUpper, libs, "gdk_keyval_is_upper") | |
| 121 | + | core.PuregoSafeRegister(&xKeyvalName, libs, "gdk_keyval_name") | |
| 122 | + | core.PuregoSafeRegister(&xKeyvalToLower, libs, "gdk_keyval_to_lower") | |
| 123 | + | core.PuregoSafeRegister(&xKeyvalToUnicode, libs, "gdk_keyval_to_unicode") | |
| 124 | + | core.PuregoSafeRegister(&xKeyvalToUpper, libs, "gdk_keyval_to_upper") | |
| 125 | + | core.PuregoSafeRegister(&xUnicodeToKeyval, libs, "gdk_unicode_to_keyval") | |
| 122 | 126 | ||
| 123 | 127 | } | |
M v4/gdk/gdkmemorytexture.go +10 -6
| @@ -308,14 +308,18 @@ func (x *MemoryTexture) LoadFinish(ResVar gio.AsyncResult, TypeVar string) (*gio | |||
| 308 | 308 | ||
| 309 | 309 | func init() { | |
| 310 | 310 | core.SetPackageName("GDK", "gtk4") | |
| 311 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 312 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 313 | - | if err != nil { | |
| 314 | - | panic(err) | |
| 311 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 312 | + | var libs []uintptr | |
| 313 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 314 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 315 | + | if err != nil { | |
| 316 | + | panic(err) | |
| 317 | + | } | |
| 318 | + | libs = append(libs, lib) | |
| 315 | 319 | } | |
| 316 | 320 | ||
| 317 | - | core.PuregoSafeRegister(&xMemoryTextureGLibType, lib, "gdk_memory_texture_get_type") | |
| 321 | + | core.PuregoSafeRegister(&xMemoryTextureGLibType, libs, "gdk_memory_texture_get_type") | |
| 318 | 322 | ||
| 319 | - | core.PuregoSafeRegister(&xNewMemoryTexture, lib, "gdk_memory_texture_new") | |
| 323 | + | core.PuregoSafeRegister(&xNewMemoryTexture, libs, "gdk_memory_texture_new") | |
| 320 | 324 | ||
| 321 | 325 | } | |
M v4/gdk/gdkmemorytexturebuilder.go +29 -25
| @@ -281,32 +281,36 @@ func (c *MemoryTextureBuilder) SetGoPointer(ptr uintptr) { | |||
| 281 | 281 | ||
| 282 | 282 | func init() { | |
| 283 | 283 | core.SetPackageName("GDK", "gtk4") | |
| 284 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 285 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 286 | - | if err != nil { | |
| 287 | - | panic(err) | |
| 284 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 285 | + | var libs []uintptr | |
| 286 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 287 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 288 | + | if err != nil { | |
| 289 | + | panic(err) | |
| 290 | + | } | |
| 291 | + | libs = append(libs, lib) | |
| 288 | 292 | } | |
| 289 | 293 | ||
| 290 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGLibType, lib, "gdk_memory_texture_builder_get_type") | |
| 291 | - | ||
| 292 | - | core.PuregoSafeRegister(&xNewMemoryTextureBuilder, lib, "gdk_memory_texture_builder_new") | |
| 293 | - | ||
| 294 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderBuild, lib, "gdk_memory_texture_builder_build") | |
| 295 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetBytes, lib, "gdk_memory_texture_builder_get_bytes") | |
| 296 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetColorState, lib, "gdk_memory_texture_builder_get_color_state") | |
| 297 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetFormat, lib, "gdk_memory_texture_builder_get_format") | |
| 298 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetHeight, lib, "gdk_memory_texture_builder_get_height") | |
| 299 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetStride, lib, "gdk_memory_texture_builder_get_stride") | |
| 300 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetUpdateRegion, lib, "gdk_memory_texture_builder_get_update_region") | |
| 301 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetUpdateTexture, lib, "gdk_memory_texture_builder_get_update_texture") | |
| 302 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderGetWidth, lib, "gdk_memory_texture_builder_get_width") | |
| 303 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetBytes, lib, "gdk_memory_texture_builder_set_bytes") | |
| 304 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetColorState, lib, "gdk_memory_texture_builder_set_color_state") | |
| 305 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetFormat, lib, "gdk_memory_texture_builder_set_format") | |
| 306 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetHeight, lib, "gdk_memory_texture_builder_set_height") | |
| 307 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetStride, lib, "gdk_memory_texture_builder_set_stride") | |
| 308 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetUpdateRegion, lib, "gdk_memory_texture_builder_set_update_region") | |
| 309 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetUpdateTexture, lib, "gdk_memory_texture_builder_set_update_texture") | |
| 310 | - | core.PuregoSafeRegister(&xMemoryTextureBuilderSetWidth, lib, "gdk_memory_texture_builder_set_width") | |
| 294 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGLibType, libs, "gdk_memory_texture_builder_get_type") | |
| 295 | + | ||
| 296 | + | core.PuregoSafeRegister(&xNewMemoryTextureBuilder, libs, "gdk_memory_texture_builder_new") | |
| 297 | + | ||
| 298 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderBuild, libs, "gdk_memory_texture_builder_build") | |
| 299 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetBytes, libs, "gdk_memory_texture_builder_get_bytes") | |
| 300 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetColorState, libs, "gdk_memory_texture_builder_get_color_state") | |
| 301 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetFormat, libs, "gdk_memory_texture_builder_get_format") | |
| 302 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetHeight, libs, "gdk_memory_texture_builder_get_height") | |
| 303 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetStride, libs, "gdk_memory_texture_builder_get_stride") | |
| 304 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetUpdateRegion, libs, "gdk_memory_texture_builder_get_update_region") | |
| 305 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetUpdateTexture, libs, "gdk_memory_texture_builder_get_update_texture") | |
| 306 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderGetWidth, libs, "gdk_memory_texture_builder_get_width") | |
| 307 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetBytes, libs, "gdk_memory_texture_builder_set_bytes") | |
| 308 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetColorState, libs, "gdk_memory_texture_builder_set_color_state") | |
| 309 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetFormat, libs, "gdk_memory_texture_builder_set_format") | |
| 310 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetHeight, libs, "gdk_memory_texture_builder_set_height") | |
| 311 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetStride, libs, "gdk_memory_texture_builder_set_stride") | |
| 312 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetUpdateRegion, libs, "gdk_memory_texture_builder_set_update_region") | |
| 313 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetUpdateTexture, libs, "gdk_memory_texture_builder_set_update_texture") | |
| 314 | + | core.PuregoSafeRegister(&xMemoryTextureBuilderSetWidth, libs, "gdk_memory_texture_builder_set_width") | |
| 311 | 315 | ||
| 312 | 316 | } | |
M v4/gdk/gdkmonitor.go +25 -21
| @@ -263,28 +263,32 @@ func (x *Monitor) ConnectInvalidate(cb *func(Monitor)) uint32 { | |||
| 263 | 263 | ||
| 264 | 264 | func init() { | |
| 265 | 265 | core.SetPackageName("GDK", "gtk4") | |
| 266 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 267 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 268 | - | if err != nil { | |
| 269 | - | panic(err) | |
| 266 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 267 | + | var libs []uintptr | |
| 268 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 269 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 270 | + | if err != nil { | |
| 271 | + | panic(err) | |
| 272 | + | } | |
| 273 | + | libs = append(libs, lib) | |
| 270 | 274 | } | |
| 271 | 275 | ||
| 272 | - | core.PuregoSafeRegister(&xSubpixelLayoutGLibType, lib, "gdk_subpixel_layout_get_type") | |
| 273 | - | ||
| 274 | - | core.PuregoSafeRegister(&xMonitorGLibType, lib, "gdk_monitor_get_type") | |
| 275 | - | ||
| 276 | - | core.PuregoSafeRegister(&xMonitorGetConnector, lib, "gdk_monitor_get_connector") | |
| 277 | - | core.PuregoSafeRegister(&xMonitorGetDescription, lib, "gdk_monitor_get_description") | |
| 278 | - | core.PuregoSafeRegister(&xMonitorGetDisplay, lib, "gdk_monitor_get_display") | |
| 279 | - | core.PuregoSafeRegister(&xMonitorGetGeometry, lib, "gdk_monitor_get_geometry") | |
| 280 | - | core.PuregoSafeRegister(&xMonitorGetHeightMm, lib, "gdk_monitor_get_height_mm") | |
| 281 | - | core.PuregoSafeRegister(&xMonitorGetManufacturer, lib, "gdk_monitor_get_manufacturer") | |
| 282 | - | core.PuregoSafeRegister(&xMonitorGetModel, lib, "gdk_monitor_get_model") | |
| 283 | - | core.PuregoSafeRegister(&xMonitorGetRefreshRate, lib, "gdk_monitor_get_refresh_rate") | |
| 284 | - | core.PuregoSafeRegister(&xMonitorGetScale, lib, "gdk_monitor_get_scale") | |
| 285 | - | core.PuregoSafeRegister(&xMonitorGetScaleFactor, lib, "gdk_monitor_get_scale_factor") | |
| 286 | - | core.PuregoSafeRegister(&xMonitorGetSubpixelLayout, lib, "gdk_monitor_get_subpixel_layout") | |
| 287 | - | core.PuregoSafeRegister(&xMonitorGetWidthMm, lib, "gdk_monitor_get_width_mm") | |
| 288 | - | core.PuregoSafeRegister(&xMonitorIsValid, lib, "gdk_monitor_is_valid") | |
| 276 | + | core.PuregoSafeRegister(&xSubpixelLayoutGLibType, libs, "gdk_subpixel_layout_get_type") | |
| 277 | + | ||
| 278 | + | core.PuregoSafeRegister(&xMonitorGLibType, libs, "gdk_monitor_get_type") | |
| 279 | + | ||
| 280 | + | core.PuregoSafeRegister(&xMonitorGetConnector, libs, "gdk_monitor_get_connector") | |
| 281 | + | core.PuregoSafeRegister(&xMonitorGetDescription, libs, "gdk_monitor_get_description") | |
| 282 | + | core.PuregoSafeRegister(&xMonitorGetDisplay, libs, "gdk_monitor_get_display") | |
| 283 | + | core.PuregoSafeRegister(&xMonitorGetGeometry, libs, "gdk_monitor_get_geometry") | |
| 284 | + | core.PuregoSafeRegister(&xMonitorGetHeightMm, libs, "gdk_monitor_get_height_mm") | |
| 285 | + | core.PuregoSafeRegister(&xMonitorGetManufacturer, libs, "gdk_monitor_get_manufacturer") | |
| 286 | + | core.PuregoSafeRegister(&xMonitorGetModel, libs, "gdk_monitor_get_model") | |
| 287 | + | core.PuregoSafeRegister(&xMonitorGetRefreshRate, libs, "gdk_monitor_get_refresh_rate") | |
| 288 | + | core.PuregoSafeRegister(&xMonitorGetScale, libs, "gdk_monitor_get_scale") | |
| 289 | + | core.PuregoSafeRegister(&xMonitorGetScaleFactor, libs, "gdk_monitor_get_scale_factor") | |
| 290 | + | core.PuregoSafeRegister(&xMonitorGetSubpixelLayout, libs, "gdk_monitor_get_subpixel_layout") | |
| 291 | + | core.PuregoSafeRegister(&xMonitorGetWidthMm, libs, "gdk_monitor_get_width_mm") | |
| 292 | + | core.PuregoSafeRegister(&xMonitorIsValid, libs, "gdk_monitor_is_valid") | |
| 289 | 293 | ||
| 290 | 294 | } | |
M v4/gdk/gdkpaintable.go +20 -16
| @@ -519,26 +519,30 @@ func PaintableNewEmpty(IntrinsicWidthVar int, IntrinsicHeightVar int) *Paintable | |||
| 519 | 519 | ||
| 520 | 520 | func init() { | |
| 521 | 521 | core.SetPackageName("GDK", "gtk4") | |
| 522 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 523 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 524 | - | if err != nil { | |
| 525 | - | panic(err) | |
| 522 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 523 | + | var libs []uintptr | |
| 524 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 525 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 526 | + | if err != nil { | |
| 527 | + | panic(err) | |
| 528 | + | } | |
| 529 | + | libs = append(libs, lib) | |
| 526 | 530 | } | |
| 527 | 531 | ||
| 528 | - | core.PuregoSafeRegister(&xPaintableFlagsGLibType, lib, "gdk_paintable_flags_get_type") | |
| 532 | + | core.PuregoSafeRegister(&xPaintableFlagsGLibType, libs, "gdk_paintable_flags_get_type") | |
| 529 | 533 | ||
| 530 | - | core.PuregoSafeRegister(&xPaintableNewEmpty, lib, "gdk_paintable_new_empty") | |
| 534 | + | core.PuregoSafeRegister(&xPaintableNewEmpty, libs, "gdk_paintable_new_empty") | |
| 531 | 535 | ||
| 532 | - | core.PuregoSafeRegister(&xPaintableGLibType, lib, "gdk_paintable_get_type") | |
| 536 | + | core.PuregoSafeRegister(&xPaintableGLibType, libs, "gdk_paintable_get_type") | |
| 533 | 537 | ||
| 534 | - | core.PuregoSafeRegister(&XGdkPaintableComputeConcreteSize, lib, "gdk_paintable_compute_concrete_size") | |
| 535 | - | core.PuregoSafeRegister(&XGdkPaintableGetCurrentImage, lib, "gdk_paintable_get_current_image") | |
| 536 | - | core.PuregoSafeRegister(&XGdkPaintableGetFlags, lib, "gdk_paintable_get_flags") | |
| 537 | - | core.PuregoSafeRegister(&XGdkPaintableGetIntrinsicAspectRatio, lib, "gdk_paintable_get_intrinsic_aspect_ratio") | |
| 538 | - | core.PuregoSafeRegister(&XGdkPaintableGetIntrinsicHeight, lib, "gdk_paintable_get_intrinsic_height") | |
| 539 | - | core.PuregoSafeRegister(&XGdkPaintableGetIntrinsicWidth, lib, "gdk_paintable_get_intrinsic_width") | |
| 540 | - | core.PuregoSafeRegister(&XGdkPaintableInvalidateContents, lib, "gdk_paintable_invalidate_contents") | |
| 541 | - | core.PuregoSafeRegister(&XGdkPaintableInvalidateSize, lib, "gdk_paintable_invalidate_size") | |
| 542 | - | core.PuregoSafeRegister(&XGdkPaintableSnapshot, lib, "gdk_paintable_snapshot") | |
| 538 | + | core.PuregoSafeRegister(&XGdkPaintableComputeConcreteSize, libs, "gdk_paintable_compute_concrete_size") | |
| 539 | + | core.PuregoSafeRegister(&XGdkPaintableGetCurrentImage, libs, "gdk_paintable_get_current_image") | |
| 540 | + | core.PuregoSafeRegister(&XGdkPaintableGetFlags, libs, "gdk_paintable_get_flags") | |
| 541 | + | core.PuregoSafeRegister(&XGdkPaintableGetIntrinsicAspectRatio, libs, "gdk_paintable_get_intrinsic_aspect_ratio") | |
| 542 | + | core.PuregoSafeRegister(&XGdkPaintableGetIntrinsicHeight, libs, "gdk_paintable_get_intrinsic_height") | |
| 543 | + | core.PuregoSafeRegister(&XGdkPaintableGetIntrinsicWidth, libs, "gdk_paintable_get_intrinsic_width") | |
| 544 | + | core.PuregoSafeRegister(&XGdkPaintableInvalidateContents, libs, "gdk_paintable_invalidate_contents") | |
| 545 | + | core.PuregoSafeRegister(&XGdkPaintableInvalidateSize, libs, "gdk_paintable_invalidate_size") | |
| 546 | + | core.PuregoSafeRegister(&XGdkPaintableSnapshot, libs, "gdk_paintable_snapshot") | |
| 543 | 547 | ||
| 544 | 548 | } | |
M v4/gdk/gdkpango.go +10 -6
| @@ -51,13 +51,17 @@ func PangoLayoutLineGetClipRegion(LineVar *pango.LayoutLine, XOriginVar int, YOr | |||
| 51 | 51 | ||
| 52 | 52 | func init() { | |
| 53 | 53 | core.SetPackageName("GDK", "gtk4") | |
| 54 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 55 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 56 | - | if err != nil { | |
| 57 | - | panic(err) | |
| 54 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 55 | + | var libs []uintptr | |
| 56 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 57 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 58 | + | if err != nil { | |
| 59 | + | panic(err) | |
| 60 | + | } | |
| 61 | + | libs = append(libs, lib) | |
| 58 | 62 | } | |
| 59 | 63 | ||
| 60 | - | core.PuregoSafeRegister(&xPangoLayoutGetClipRegion, lib, "gdk_pango_layout_get_clip_region") | |
| 61 | - | core.PuregoSafeRegister(&xPangoLayoutLineGetClipRegion, lib, "gdk_pango_layout_line_get_clip_region") | |
| 64 | + | core.PuregoSafeRegister(&xPangoLayoutGetClipRegion, libs, "gdk_pango_layout_get_clip_region") | |
| 65 | + | core.PuregoSafeRegister(&xPangoLayoutLineGetClipRegion, libs, "gdk_pango_layout_line_get_clip_region") | |
| 62 | 66 | ||
| 63 | 67 | } | |
M v4/gdk/gdkpixbuf.go +10 -6
| @@ -52,13 +52,17 @@ func PixbufGetFromTexture(TextureVar *Texture) *gdkpixbuf.Pixbuf { | |||
| 52 | 52 | ||
| 53 | 53 | func init() { | |
| 54 | 54 | core.SetPackageName("GDK", "gtk4") | |
| 55 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 56 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 57 | - | if err != nil { | |
| 58 | - | panic(err) | |
| 55 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 56 | + | var libs []uintptr | |
| 57 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 58 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 59 | + | if err != nil { | |
| 60 | + | panic(err) | |
| 61 | + | } | |
| 62 | + | libs = append(libs, lib) | |
| 59 | 63 | } | |
| 60 | 64 | ||
| 61 | - | core.PuregoSafeRegister(&xPixbufGetFromSurface, lib, "gdk_pixbuf_get_from_surface") | |
| 62 | - | core.PuregoSafeRegister(&xPixbufGetFromTexture, lib, "gdk_pixbuf_get_from_texture") | |
| 65 | + | core.PuregoSafeRegister(&xPixbufGetFromSurface, libs, "gdk_pixbuf_get_from_surface") | |
| 66 | + | core.PuregoSafeRegister(&xPixbufGetFromTexture, libs, "gdk_pixbuf_get_from_texture") | |
| 63 | 67 | ||
| 64 | 68 | } | |
M v4/gdk/gdkpopup.go +16 -12
| @@ -146,20 +146,24 @@ var XGdkPopupPresent func(uintptr, int, int, *PopupLayout) bool | |||
| 146 | 146 | ||
| 147 | 147 | func init() { | |
| 148 | 148 | core.SetPackageName("GDK", "gtk4") | |
| 149 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 150 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 151 | - | if err != nil { | |
| 152 | - | panic(err) | |
| 149 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 150 | + | var libs []uintptr | |
| 151 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 152 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 153 | + | if err != nil { | |
| 154 | + | panic(err) | |
| 155 | + | } | |
| 156 | + | libs = append(libs, lib) | |
| 153 | 157 | } | |
| 154 | 158 | ||
| 155 | - | core.PuregoSafeRegister(&xPopupGLibType, lib, "gdk_popup_get_type") | |
| 159 | + | core.PuregoSafeRegister(&xPopupGLibType, libs, "gdk_popup_get_type") | |
| 156 | 160 | ||
| 157 | - | core.PuregoSafeRegister(&XGdkPopupGetAutohide, lib, "gdk_popup_get_autohide") | |
| 158 | - | core.PuregoSafeRegister(&XGdkPopupGetParent, lib, "gdk_popup_get_parent") | |
| 159 | - | core.PuregoSafeRegister(&XGdkPopupGetPositionX, lib, "gdk_popup_get_position_x") | |
| 160 | - | core.PuregoSafeRegister(&XGdkPopupGetPositionY, lib, "gdk_popup_get_position_y") | |
| 161 | - | core.PuregoSafeRegister(&XGdkPopupGetRectAnchor, lib, "gdk_popup_get_rect_anchor") | |
| 162 | - | core.PuregoSafeRegister(&XGdkPopupGetSurfaceAnchor, lib, "gdk_popup_get_surface_anchor") | |
| 163 | - | core.PuregoSafeRegister(&XGdkPopupPresent, lib, "gdk_popup_present") | |
| 161 | + | core.PuregoSafeRegister(&XGdkPopupGetAutohide, libs, "gdk_popup_get_autohide") | |
| 162 | + | core.PuregoSafeRegister(&XGdkPopupGetParent, libs, "gdk_popup_get_parent") | |
| 163 | + | core.PuregoSafeRegister(&XGdkPopupGetPositionX, libs, "gdk_popup_get_position_x") | |
| 164 | + | core.PuregoSafeRegister(&XGdkPopupGetPositionY, libs, "gdk_popup_get_position_y") | |
| 165 | + | core.PuregoSafeRegister(&XGdkPopupGetRectAnchor, libs, "gdk_popup_get_rect_anchor") | |
| 166 | + | core.PuregoSafeRegister(&XGdkPopupGetSurfaceAnchor, libs, "gdk_popup_get_surface_anchor") | |
| 167 | + | core.PuregoSafeRegister(&XGdkPopupPresent, libs, "gdk_popup_present") | |
| 164 | 168 | ||
| 165 | 169 | } | |
M v4/gdk/gdkpopuplayout.go +30 -26
| @@ -278,33 +278,37 @@ const ( | |||
| 278 | 278 | ||
| 279 | 279 | func init() { | |
| 280 | 280 | core.SetPackageName("GDK", "gtk4") | |
| 281 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 282 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 283 | - | if err != nil { | |
| 284 | - | panic(err) | |
| 281 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 282 | + | var libs []uintptr | |
| 283 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 284 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 285 | + | if err != nil { | |
| 286 | + | panic(err) | |
| 287 | + | } | |
| 288 | + | libs = append(libs, lib) | |
| 285 | 289 | } | |
| 286 | 290 | ||
| 287 | - | core.PuregoSafeRegister(&xAnchorHintsGLibType, lib, "gdk_anchor_hints_get_type") | |
| 288 | - | ||
| 289 | - | core.PuregoSafeRegister(&xPopupLayoutGLibType, lib, "gdk_popup_layout_get_type") | |
| 290 | - | ||
| 291 | - | core.PuregoSafeRegister(&xNewPopupLayout, lib, "gdk_popup_layout_new") | |
| 292 | - | ||
| 293 | - | core.PuregoSafeRegister(&xPopupLayoutCopy, lib, "gdk_popup_layout_copy") | |
| 294 | - | core.PuregoSafeRegister(&xPopupLayoutEqual, lib, "gdk_popup_layout_equal") | |
| 295 | - | core.PuregoSafeRegister(&xPopupLayoutGetAnchorHints, lib, "gdk_popup_layout_get_anchor_hints") | |
| 296 | - | core.PuregoSafeRegister(&xPopupLayoutGetAnchorRect, lib, "gdk_popup_layout_get_anchor_rect") | |
| 297 | - | core.PuregoSafeRegister(&xPopupLayoutGetOffset, lib, "gdk_popup_layout_get_offset") | |
| 298 | - | core.PuregoSafeRegister(&xPopupLayoutGetRectAnchor, lib, "gdk_popup_layout_get_rect_anchor") | |
| 299 | - | core.PuregoSafeRegister(&xPopupLayoutGetShadowWidth, lib, "gdk_popup_layout_get_shadow_width") | |
| 300 | - | core.PuregoSafeRegister(&xPopupLayoutGetSurfaceAnchor, lib, "gdk_popup_layout_get_surface_anchor") | |
| 301 | - | core.PuregoSafeRegister(&xPopupLayoutRef, lib, "gdk_popup_layout_ref") | |
| 302 | - | core.PuregoSafeRegister(&xPopupLayoutSetAnchorHints, lib, "gdk_popup_layout_set_anchor_hints") | |
| 303 | - | core.PuregoSafeRegister(&xPopupLayoutSetAnchorRect, lib, "gdk_popup_layout_set_anchor_rect") | |
| 304 | - | core.PuregoSafeRegister(&xPopupLayoutSetOffset, lib, "gdk_popup_layout_set_offset") | |
| 305 | - | core.PuregoSafeRegister(&xPopupLayoutSetRectAnchor, lib, "gdk_popup_layout_set_rect_anchor") | |
| 306 | - | core.PuregoSafeRegister(&xPopupLayoutSetShadowWidth, lib, "gdk_popup_layout_set_shadow_width") | |
| 307 | - | core.PuregoSafeRegister(&xPopupLayoutSetSurfaceAnchor, lib, "gdk_popup_layout_set_surface_anchor") | |
| 308 | - | core.PuregoSafeRegister(&xPopupLayoutUnref, lib, "gdk_popup_layout_unref") | |
| 291 | + | core.PuregoSafeRegister(&xAnchorHintsGLibType, libs, "gdk_anchor_hints_get_type") | |
| 292 | + | ||
| 293 | + | core.PuregoSafeRegister(&xPopupLayoutGLibType, libs, "gdk_popup_layout_get_type") | |
| 294 | + | ||
| 295 | + | core.PuregoSafeRegister(&xNewPopupLayout, libs, "gdk_popup_layout_new") | |
| 296 | + | ||
| 297 | + | core.PuregoSafeRegister(&xPopupLayoutCopy, libs, "gdk_popup_layout_copy") | |
| 298 | + | core.PuregoSafeRegister(&xPopupLayoutEqual, libs, "gdk_popup_layout_equal") | |
| 299 | + | core.PuregoSafeRegister(&xPopupLayoutGetAnchorHints, libs, "gdk_popup_layout_get_anchor_hints") | |
| 300 | + | core.PuregoSafeRegister(&xPopupLayoutGetAnchorRect, libs, "gdk_popup_layout_get_anchor_rect") | |
| 301 | + | core.PuregoSafeRegister(&xPopupLayoutGetOffset, libs, "gdk_popup_layout_get_offset") | |
| 302 | + | core.PuregoSafeRegister(&xPopupLayoutGetRectAnchor, libs, "gdk_popup_layout_get_rect_anchor") | |
| 303 | + | core.PuregoSafeRegister(&xPopupLayoutGetShadowWidth, libs, "gdk_popup_layout_get_shadow_width") | |
| 304 | + | core.PuregoSafeRegister(&xPopupLayoutGetSurfaceAnchor, libs, "gdk_popup_layout_get_surface_anchor") | |
| 305 | + | core.PuregoSafeRegister(&xPopupLayoutRef, libs, "gdk_popup_layout_ref") | |
| 306 | + | core.PuregoSafeRegister(&xPopupLayoutSetAnchorHints, libs, "gdk_popup_layout_set_anchor_hints") | |
| 307 | + | core.PuregoSafeRegister(&xPopupLayoutSetAnchorRect, libs, "gdk_popup_layout_set_anchor_rect") | |
| 308 | + | core.PuregoSafeRegister(&xPopupLayoutSetOffset, libs, "gdk_popup_layout_set_offset") | |
| 309 | + | core.PuregoSafeRegister(&xPopupLayoutSetRectAnchor, libs, "gdk_popup_layout_set_rect_anchor") | |
| 310 | + | core.PuregoSafeRegister(&xPopupLayoutSetShadowWidth, libs, "gdk_popup_layout_set_shadow_width") | |
| 311 | + | core.PuregoSafeRegister(&xPopupLayoutSetSurfaceAnchor, libs, "gdk_popup_layout_set_surface_anchor") | |
| 312 | + | core.PuregoSafeRegister(&xPopupLayoutUnref, libs, "gdk_popup_layout_unref") | |
| 309 | 313 | ||
| 310 | 314 | } | |
M v4/gdk/gdkrgba.go +17 -13
| @@ -153,21 +153,25 @@ func (x *RGBA) ToString() string { | |||
| 153 | 153 | ||
| 154 | 154 | func init() { | |
| 155 | 155 | core.SetPackageName("GDK", "gtk4") | |
| 156 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 157 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 158 | - | if err != nil { | |
| 159 | - | panic(err) | |
| 156 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 157 | + | var libs []uintptr | |
| 158 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 159 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 160 | + | if err != nil { | |
| 161 | + | panic(err) | |
| 162 | + | } | |
| 163 | + | libs = append(libs, lib) | |
| 160 | 164 | } | |
| 161 | 165 | ||
| 162 | - | core.PuregoSafeRegister(&xRGBAGLibType, lib, "gdk_rgba_get_type") | |
| 166 | + | core.PuregoSafeRegister(&xRGBAGLibType, libs, "gdk_rgba_get_type") | |
| 163 | 167 | ||
| 164 | - | core.PuregoSafeRegister(&xRGBACopy, lib, "gdk_rgba_copy") | |
| 165 | - | core.PuregoSafeRegister(&xRGBAEqual, lib, "gdk_rgba_equal") | |
| 166 | - | core.PuregoSafeRegister(&xRGBAFree, lib, "gdk_rgba_free") | |
| 167 | - | core.PuregoSafeRegister(&xRGBAHash, lib, "gdk_rgba_hash") | |
| 168 | - | core.PuregoSafeRegister(&xRGBAIsClear, lib, "gdk_rgba_is_clear") | |
| 169 | - | core.PuregoSafeRegister(&xRGBAIsOpaque, lib, "gdk_rgba_is_opaque") | |
| 170 | - | core.PuregoSafeRegister(&xRGBAParse, lib, "gdk_rgba_parse") | |
| 171 | - | core.PuregoSafeRegister(&xRGBAToString, lib, "gdk_rgba_to_string") | |
| 168 | + | core.PuregoSafeRegister(&xRGBACopy, libs, "gdk_rgba_copy") | |
| 169 | + | core.PuregoSafeRegister(&xRGBAEqual, libs, "gdk_rgba_equal") | |
| 170 | + | core.PuregoSafeRegister(&xRGBAFree, libs, "gdk_rgba_free") | |
| 171 | + | core.PuregoSafeRegister(&xRGBAHash, libs, "gdk_rgba_hash") | |
| 172 | + | core.PuregoSafeRegister(&xRGBAIsClear, libs, "gdk_rgba_is_clear") | |
| 173 | + | core.PuregoSafeRegister(&xRGBAIsOpaque, libs, "gdk_rgba_is_opaque") | |
| 174 | + | core.PuregoSafeRegister(&xRGBAParse, libs, "gdk_rgba_parse") | |
| 175 | + | core.PuregoSafeRegister(&xRGBAToString, libs, "gdk_rgba_to_string") | |
| 172 | 176 | ||
| 173 | 177 | } | |
M v4/gdk/gdkseat.go +16 -12
| @@ -234,21 +234,25 @@ func (x *Seat) ConnectToolRemoved(cb *func(Seat, uintptr)) uint32 { | |||
| 234 | 234 | ||
| 235 | 235 | func init() { | |
| 236 | 236 | core.SetPackageName("GDK", "gtk4") | |
| 237 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 238 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 239 | - | if err != nil { | |
| 240 | - | panic(err) | |
| 237 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 238 | + | var libs []uintptr | |
| 239 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 240 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 241 | + | if err != nil { | |
| 242 | + | panic(err) | |
| 243 | + | } | |
| 244 | + | libs = append(libs, lib) | |
| 241 | 245 | } | |
| 242 | 246 | ||
| 243 | - | core.PuregoSafeRegister(&xSeatCapabilitiesGLibType, lib, "gdk_seat_capabilities_get_type") | |
| 247 | + | core.PuregoSafeRegister(&xSeatCapabilitiesGLibType, libs, "gdk_seat_capabilities_get_type") | |
| 244 | 248 | ||
| 245 | - | core.PuregoSafeRegister(&xSeatGLibType, lib, "gdk_seat_get_type") | |
| 249 | + | core.PuregoSafeRegister(&xSeatGLibType, libs, "gdk_seat_get_type") | |
| 246 | 250 | ||
| 247 | - | core.PuregoSafeRegister(&xSeatGetCapabilities, lib, "gdk_seat_get_capabilities") | |
| 248 | - | core.PuregoSafeRegister(&xSeatGetDevices, lib, "gdk_seat_get_devices") | |
| 249 | - | core.PuregoSafeRegister(&xSeatGetDisplay, lib, "gdk_seat_get_display") | |
| 250 | - | core.PuregoSafeRegister(&xSeatGetKeyboard, lib, "gdk_seat_get_keyboard") | |
| 251 | - | core.PuregoSafeRegister(&xSeatGetPointer, lib, "gdk_seat_get_pointer") | |
| 252 | - | core.PuregoSafeRegister(&xSeatGetTools, lib, "gdk_seat_get_tools") | |
| 251 | + | core.PuregoSafeRegister(&xSeatGetCapabilities, libs, "gdk_seat_get_capabilities") | |
| 252 | + | core.PuregoSafeRegister(&xSeatGetDevices, libs, "gdk_seat_get_devices") | |
| 253 | + | core.PuregoSafeRegister(&xSeatGetDisplay, libs, "gdk_seat_get_display") | |
| 254 | + | core.PuregoSafeRegister(&xSeatGetKeyboard, libs, "gdk_seat_get_keyboard") | |
| 255 | + | core.PuregoSafeRegister(&xSeatGetPointer, libs, "gdk_seat_get_pointer") | |
| 256 | + | core.PuregoSafeRegister(&xSeatGetTools, libs, "gdk_seat_get_tools") | |
| 253 | 257 | ||
| 254 | 258 | } | |
M v4/gdk/gdksurface.go +38 -34
| @@ -617,41 +617,45 @@ func (x *Surface) ConnectRender(cb *func(Surface, uintptr) bool) uint32 { | |||
| 617 | 617 | ||
| 618 | 618 | func init() { | |
| 619 | 619 | core.SetPackageName("GDK", "gtk4") | |
| 620 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 621 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 622 | - | if err != nil { | |
| 623 | - | panic(err) | |
| 620 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 621 | + | var libs []uintptr | |
| 622 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 623 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 624 | + | if err != nil { | |
| 625 | + | panic(err) | |
| 626 | + | } | |
| 627 | + | libs = append(libs, lib) | |
| 624 | 628 | } | |
| 625 | 629 | ||
| 626 | - | core.PuregoSafeRegister(&xSurfaceGLibType, lib, "gdk_surface_get_type") | |
| 627 | - | ||
| 628 | - | core.PuregoSafeRegister(&xNewSurfacePopup, lib, "gdk_surface_new_popup") | |
| 629 | - | core.PuregoSafeRegister(&xNewSurfaceToplevel, lib, "gdk_surface_new_toplevel") | |
| 630 | - | ||
| 631 | - | core.PuregoSafeRegister(&xSurfaceBeep, lib, "gdk_surface_beep") | |
| 632 | - | core.PuregoSafeRegister(&xSurfaceCreateCairoContext, lib, "gdk_surface_create_cairo_context") | |
| 633 | - | core.PuregoSafeRegister(&xSurfaceCreateGlContext, lib, "gdk_surface_create_gl_context") | |
| 634 | - | core.PuregoSafeRegister(&xSurfaceCreateSimilarSurface, lib, "gdk_surface_create_similar_surface") | |
| 635 | - | core.PuregoSafeRegister(&xSurfaceCreateVulkanContext, lib, "gdk_surface_create_vulkan_context") | |
| 636 | - | core.PuregoSafeRegister(&xSurfaceDestroy, lib, "gdk_surface_destroy") | |
| 637 | - | core.PuregoSafeRegister(&xSurfaceGetCursor, lib, "gdk_surface_get_cursor") | |
| 638 | - | core.PuregoSafeRegister(&xSurfaceGetDeviceCursor, lib, "gdk_surface_get_device_cursor") | |
| 639 | - | core.PuregoSafeRegister(&xSurfaceGetDevicePosition, lib, "gdk_surface_get_device_position") | |
| 640 | - | core.PuregoSafeRegister(&xSurfaceGetDisplay, lib, "gdk_surface_get_display") | |
| 641 | - | core.PuregoSafeRegister(&xSurfaceGetFrameClock, lib, "gdk_surface_get_frame_clock") | |
| 642 | - | core.PuregoSafeRegister(&xSurfaceGetHeight, lib, "gdk_surface_get_height") | |
| 643 | - | core.PuregoSafeRegister(&xSurfaceGetMapped, lib, "gdk_surface_get_mapped") | |
| 644 | - | core.PuregoSafeRegister(&xSurfaceGetScale, lib, "gdk_surface_get_scale") | |
| 645 | - | core.PuregoSafeRegister(&xSurfaceGetScaleFactor, lib, "gdk_surface_get_scale_factor") | |
| 646 | - | core.PuregoSafeRegister(&xSurfaceGetWidth, lib, "gdk_surface_get_width") | |
| 647 | - | core.PuregoSafeRegister(&xSurfaceHide, lib, "gdk_surface_hide") | |
| 648 | - | core.PuregoSafeRegister(&xSurfaceIsDestroyed, lib, "gdk_surface_is_destroyed") | |
| 649 | - | core.PuregoSafeRegister(&xSurfaceQueueRender, lib, "gdk_surface_queue_render") | |
| 650 | - | core.PuregoSafeRegister(&xSurfaceRequestLayout, lib, "gdk_surface_request_layout") | |
| 651 | - | core.PuregoSafeRegister(&xSurfaceSetCursor, lib, "gdk_surface_set_cursor") | |
| 652 | - | core.PuregoSafeRegister(&xSurfaceSetDeviceCursor, lib, "gdk_surface_set_device_cursor") | |
| 653 | - | core.PuregoSafeRegister(&xSurfaceSetInputRegion, lib, "gdk_surface_set_input_region") | |
| 654 | - | core.PuregoSafeRegister(&xSurfaceSetOpaqueRegion, lib, "gdk_surface_set_opaque_region") | |
| 655 | - | core.PuregoSafeRegister(&xSurfaceTranslateCoordinates, lib, "gdk_surface_translate_coordinates") | |
| 630 | + | core.PuregoSafeRegister(&xSurfaceGLibType, libs, "gdk_surface_get_type") | |
| 631 | + | ||
| 632 | + | core.PuregoSafeRegister(&xNewSurfacePopup, libs, "gdk_surface_new_popup") | |
| 633 | + | core.PuregoSafeRegister(&xNewSurfaceToplevel, libs, "gdk_surface_new_toplevel") | |
| 634 | + | ||
| 635 | + | core.PuregoSafeRegister(&xSurfaceBeep, libs, "gdk_surface_beep") | |
| 636 | + | core.PuregoSafeRegister(&xSurfaceCreateCairoContext, libs, "gdk_surface_create_cairo_context") | |
| 637 | + | core.PuregoSafeRegister(&xSurfaceCreateGlContext, libs, "gdk_surface_create_gl_context") | |
| 638 | + | core.PuregoSafeRegister(&xSurfaceCreateSimilarSurface, libs, "gdk_surface_create_similar_surface") | |
| 639 | + | core.PuregoSafeRegister(&xSurfaceCreateVulkanContext, libs, "gdk_surface_create_vulkan_context") | |
| 640 | + | core.PuregoSafeRegister(&xSurfaceDestroy, libs, "gdk_surface_destroy") | |
| 641 | + | core.PuregoSafeRegister(&xSurfaceGetCursor, libs, "gdk_surface_get_cursor") | |
| 642 | + | core.PuregoSafeRegister(&xSurfaceGetDeviceCursor, libs, "gdk_surface_get_device_cursor") | |
| 643 | + | core.PuregoSafeRegister(&xSurfaceGetDevicePosition, libs, "gdk_surface_get_device_position") | |
| 644 | + | core.PuregoSafeRegister(&xSurfaceGetDisplay, libs, "gdk_surface_get_display") | |
| 645 | + | core.PuregoSafeRegister(&xSurfaceGetFrameClock, libs, "gdk_surface_get_frame_clock") | |
| 646 | + | core.PuregoSafeRegister(&xSurfaceGetHeight, libs, "gdk_surface_get_height") | |
| 647 | + | core.PuregoSafeRegister(&xSurfaceGetMapped, libs, "gdk_surface_get_mapped") | |
| 648 | + | core.PuregoSafeRegister(&xSurfaceGetScale, libs, "gdk_surface_get_scale") | |
| 649 | + | core.PuregoSafeRegister(&xSurfaceGetScaleFactor, libs, "gdk_surface_get_scale_factor") | |
| 650 | + | core.PuregoSafeRegister(&xSurfaceGetWidth, libs, "gdk_surface_get_width") | |
| 651 | + | core.PuregoSafeRegister(&xSurfaceHide, libs, "gdk_surface_hide") | |
| 652 | + | core.PuregoSafeRegister(&xSurfaceIsDestroyed, libs, "gdk_surface_is_destroyed") | |
| 653 | + | core.PuregoSafeRegister(&xSurfaceQueueRender, libs, "gdk_surface_queue_render") | |
| 654 | + | core.PuregoSafeRegister(&xSurfaceRequestLayout, libs, "gdk_surface_request_layout") | |
| 655 | + | core.PuregoSafeRegister(&xSurfaceSetCursor, libs, "gdk_surface_set_cursor") | |
| 656 | + | core.PuregoSafeRegister(&xSurfaceSetDeviceCursor, libs, "gdk_surface_set_device_cursor") | |
| 657 | + | core.PuregoSafeRegister(&xSurfaceSetInputRegion, libs, "gdk_surface_set_input_region") | |
| 658 | + | core.PuregoSafeRegister(&xSurfaceSetOpaqueRegion, libs, "gdk_surface_set_opaque_region") | |
| 659 | + | core.PuregoSafeRegister(&xSurfaceTranslateCoordinates, libs, "gdk_surface_translate_coordinates") | |
| 656 | 660 | ||
| 657 | 661 | } | |
M v4/gdk/gdktexture.go +25 -21
| @@ -631,32 +631,36 @@ func (x *Texture) LoadFinish(ResVar gio.AsyncResult, TypeVar string) (*gio.Input | |||
| 631 | 631 | ||
| 632 | 632 | func init() { | |
| 633 | 633 | core.SetPackageName("GDK", "gtk4") | |
| 634 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 635 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 636 | - | if err != nil { | |
| 637 | - | panic(err) | |
| 634 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 635 | + | var libs []uintptr | |
| 636 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 637 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 638 | + | if err != nil { | |
| 639 | + | panic(err) | |
| 640 | + | } | |
| 641 | + | libs = append(libs, lib) | |
| 638 | 642 | } | |
| 639 | 643 | ||
| 640 | - | core.PuregoSafeRegister(&xTextureErrorGLibType, lib, "gdk_texture_error_get_type") | |
| 644 | + | core.PuregoSafeRegister(&xTextureErrorGLibType, libs, "gdk_texture_error_get_type") | |
| 641 | 645 | ||
| 642 | - | core.PuregoSafeRegister(&xTextureErrorQuark, lib, "gdk_texture_error_quark") | |
| 646 | + | core.PuregoSafeRegister(&xTextureErrorQuark, libs, "gdk_texture_error_quark") | |
| 643 | 647 | ||
| 644 | - | core.PuregoSafeRegister(&xTextureGLibType, lib, "gdk_texture_get_type") | |
| 648 | + | core.PuregoSafeRegister(&xTextureGLibType, libs, "gdk_texture_get_type") | |
| 645 | 649 | ||
| 646 | - | core.PuregoSafeRegister(&xNewTextureForPixbuf, lib, "gdk_texture_new_for_pixbuf") | |
| 647 | - | core.PuregoSafeRegister(&xNewTextureFromBytes, lib, "gdk_texture_new_from_bytes") | |
| 648 | - | core.PuregoSafeRegister(&xNewTextureFromFile, lib, "gdk_texture_new_from_file") | |
| 649 | - | core.PuregoSafeRegister(&xNewTextureFromFilename, lib, "gdk_texture_new_from_filename") | |
| 650 | - | core.PuregoSafeRegister(&xNewTextureFromResource, lib, "gdk_texture_new_from_resource") | |
| 650 | + | core.PuregoSafeRegister(&xNewTextureForPixbuf, libs, "gdk_texture_new_for_pixbuf") | |
| 651 | + | core.PuregoSafeRegister(&xNewTextureFromBytes, libs, "gdk_texture_new_from_bytes") | |
| 652 | + | core.PuregoSafeRegister(&xNewTextureFromFile, libs, "gdk_texture_new_from_file") | |
| 653 | + | core.PuregoSafeRegister(&xNewTextureFromFilename, libs, "gdk_texture_new_from_filename") | |
| 654 | + | core.PuregoSafeRegister(&xNewTextureFromResource, libs, "gdk_texture_new_from_resource") | |
| 651 | 655 | ||
| 652 | - | core.PuregoSafeRegister(&xTextureDownload, lib, "gdk_texture_download") | |
| 653 | - | core.PuregoSafeRegister(&xTextureGetColorState, lib, "gdk_texture_get_color_state") | |
| 654 | - | core.PuregoSafeRegister(&xTextureGetFormat, lib, "gdk_texture_get_format") | |
| 655 | - | core.PuregoSafeRegister(&xTextureGetHeight, lib, "gdk_texture_get_height") | |
| 656 | - | core.PuregoSafeRegister(&xTextureGetWidth, lib, "gdk_texture_get_width") | |
| 657 | - | core.PuregoSafeRegister(&xTextureSaveToPng, lib, "gdk_texture_save_to_png") | |
| 658 | - | core.PuregoSafeRegister(&xTextureSaveToPngBytes, lib, "gdk_texture_save_to_png_bytes") | |
| 659 | - | core.PuregoSafeRegister(&xTextureSaveToTiff, lib, "gdk_texture_save_to_tiff") | |
| 660 | - | core.PuregoSafeRegister(&xTextureSaveToTiffBytes, lib, "gdk_texture_save_to_tiff_bytes") | |
| 656 | + | core.PuregoSafeRegister(&xTextureDownload, libs, "gdk_texture_download") | |
| 657 | + | core.PuregoSafeRegister(&xTextureGetColorState, libs, "gdk_texture_get_color_state") | |
| 658 | + | core.PuregoSafeRegister(&xTextureGetFormat, libs, "gdk_texture_get_format") | |
| 659 | + | core.PuregoSafeRegister(&xTextureGetHeight, libs, "gdk_texture_get_height") | |
| 660 | + | core.PuregoSafeRegister(&xTextureGetWidth, libs, "gdk_texture_get_width") | |
| 661 | + | core.PuregoSafeRegister(&xTextureSaveToPng, libs, "gdk_texture_save_to_png") | |
| 662 | + | core.PuregoSafeRegister(&xTextureSaveToPngBytes, libs, "gdk_texture_save_to_png_bytes") | |
| 663 | + | core.PuregoSafeRegister(&xTextureSaveToTiff, libs, "gdk_texture_save_to_tiff") | |
| 664 | + | core.PuregoSafeRegister(&xTextureSaveToTiffBytes, libs, "gdk_texture_save_to_tiff_bytes") | |
| 661 | 665 | ||
| 662 | 666 | } | |
M v4/gdk/gdktoplevel.go +37 -33
| @@ -433,40 +433,44 @@ const ( | |||
| 433 | 433 | ||
| 434 | 434 | func init() { | |
| 435 | 435 | core.SetPackageName("GDK", "gtk4") | |
| 436 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 437 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 438 | - | if err != nil { | |
| 439 | - | panic(err) | |
| 436 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 437 | + | var libs []uintptr | |
| 438 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 439 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 440 | + | if err != nil { | |
| 441 | + | panic(err) | |
| 442 | + | } | |
| 443 | + | libs = append(libs, lib) | |
| 440 | 444 | } | |
| 441 | 445 | ||
| 442 | - | core.PuregoSafeRegister(&xToplevelStateGLibType, lib, "gdk_toplevel_state_get_type") | |
| 443 | - | ||
| 444 | - | core.PuregoSafeRegister(&xFullscreenModeGLibType, lib, "gdk_fullscreen_mode_get_type") | |
| 445 | - | ||
| 446 | - | core.PuregoSafeRegister(&xSurfaceEdgeGLibType, lib, "gdk_surface_edge_get_type") | |
| 447 | - | ||
| 448 | - | core.PuregoSafeRegister(&xTitlebarGestureGLibType, lib, "gdk_titlebar_gesture_get_type") | |
| 449 | - | ||
| 450 | - | core.PuregoSafeRegister(&xToplevelGLibType, lib, "gdk_toplevel_get_type") | |
| 451 | - | ||
| 452 | - | core.PuregoSafeRegister(&XGdkToplevelBeginMove, lib, "gdk_toplevel_begin_move") | |
| 453 | - | core.PuregoSafeRegister(&XGdkToplevelBeginResize, lib, "gdk_toplevel_begin_resize") | |
| 454 | - | core.PuregoSafeRegister(&XGdkToplevelFocus, lib, "gdk_toplevel_focus") | |
| 455 | - | core.PuregoSafeRegister(&XGdkToplevelGetState, lib, "gdk_toplevel_get_state") | |
| 456 | - | core.PuregoSafeRegister(&XGdkToplevelInhibitSystemShortcuts, lib, "gdk_toplevel_inhibit_system_shortcuts") | |
| 457 | - | core.PuregoSafeRegister(&XGdkToplevelLower, lib, "gdk_toplevel_lower") | |
| 458 | - | core.PuregoSafeRegister(&XGdkToplevelMinimize, lib, "gdk_toplevel_minimize") | |
| 459 | - | core.PuregoSafeRegister(&XGdkToplevelPresent, lib, "gdk_toplevel_present") | |
| 460 | - | core.PuregoSafeRegister(&XGdkToplevelRestoreSystemShortcuts, lib, "gdk_toplevel_restore_system_shortcuts") | |
| 461 | - | core.PuregoSafeRegister(&XGdkToplevelSetDecorated, lib, "gdk_toplevel_set_decorated") | |
| 462 | - | core.PuregoSafeRegister(&XGdkToplevelSetDeletable, lib, "gdk_toplevel_set_deletable") | |
| 463 | - | core.PuregoSafeRegister(&XGdkToplevelSetIconList, lib, "gdk_toplevel_set_icon_list") | |
| 464 | - | core.PuregoSafeRegister(&XGdkToplevelSetModal, lib, "gdk_toplevel_set_modal") | |
| 465 | - | core.PuregoSafeRegister(&XGdkToplevelSetStartupId, lib, "gdk_toplevel_set_startup_id") | |
| 466 | - | core.PuregoSafeRegister(&XGdkToplevelSetTitle, lib, "gdk_toplevel_set_title") | |
| 467 | - | core.PuregoSafeRegister(&XGdkToplevelSetTransientFor, lib, "gdk_toplevel_set_transient_for") | |
| 468 | - | core.PuregoSafeRegister(&XGdkToplevelShowWindowMenu, lib, "gdk_toplevel_show_window_menu") | |
| 469 | - | core.PuregoSafeRegister(&XGdkToplevelSupportsEdgeConstraints, lib, "gdk_toplevel_supports_edge_constraints") | |
| 470 | - | core.PuregoSafeRegister(&XGdkToplevelTitlebarGesture, lib, "gdk_toplevel_titlebar_gesture") | |
| 446 | + | core.PuregoSafeRegister(&xToplevelStateGLibType, libs, "gdk_toplevel_state_get_type") | |
| 447 | + | ||
| 448 | + | core.PuregoSafeRegister(&xFullscreenModeGLibType, libs, "gdk_fullscreen_mode_get_type") | |
| 449 | + | ||
| 450 | + | core.PuregoSafeRegister(&xSurfaceEdgeGLibType, libs, "gdk_surface_edge_get_type") | |
| 451 | + | ||
| 452 | + | core.PuregoSafeRegister(&xTitlebarGestureGLibType, libs, "gdk_titlebar_gesture_get_type") | |
| 453 | + | ||
| 454 | + | core.PuregoSafeRegister(&xToplevelGLibType, libs, "gdk_toplevel_get_type") | |
| 455 | + | ||
| 456 | + | core.PuregoSafeRegister(&XGdkToplevelBeginMove, libs, "gdk_toplevel_begin_move") | |
| 457 | + | core.PuregoSafeRegister(&XGdkToplevelBeginResize, libs, "gdk_toplevel_begin_resize") | |
| 458 | + | core.PuregoSafeRegister(&XGdkToplevelFocus, libs, "gdk_toplevel_focus") | |
| 459 | + | core.PuregoSafeRegister(&XGdkToplevelGetState, libs, "gdk_toplevel_get_state") | |
| 460 | + | core.PuregoSafeRegister(&XGdkToplevelInhibitSystemShortcuts, libs, "gdk_toplevel_inhibit_system_shortcuts") | |
| 461 | + | core.PuregoSafeRegister(&XGdkToplevelLower, libs, "gdk_toplevel_lower") | |
| 462 | + | core.PuregoSafeRegister(&XGdkToplevelMinimize, libs, "gdk_toplevel_minimize") | |
| 463 | + | core.PuregoSafeRegister(&XGdkToplevelPresent, libs, "gdk_toplevel_present") | |
| 464 | + | core.PuregoSafeRegister(&XGdkToplevelRestoreSystemShortcuts, libs, "gdk_toplevel_restore_system_shortcuts") | |
| 465 | + | core.PuregoSafeRegister(&XGdkToplevelSetDecorated, libs, "gdk_toplevel_set_decorated") | |
| 466 | + | core.PuregoSafeRegister(&XGdkToplevelSetDeletable, libs, "gdk_toplevel_set_deletable") | |
| 467 | + | core.PuregoSafeRegister(&XGdkToplevelSetIconList, libs, "gdk_toplevel_set_icon_list") | |
| 468 | + | core.PuregoSafeRegister(&XGdkToplevelSetModal, libs, "gdk_toplevel_set_modal") | |
| 469 | + | core.PuregoSafeRegister(&XGdkToplevelSetStartupId, libs, "gdk_toplevel_set_startup_id") | |
| 470 | + | core.PuregoSafeRegister(&XGdkToplevelSetTitle, libs, "gdk_toplevel_set_title") | |
| 471 | + | core.PuregoSafeRegister(&XGdkToplevelSetTransientFor, libs, "gdk_toplevel_set_transient_for") | |
| 472 | + | core.PuregoSafeRegister(&XGdkToplevelShowWindowMenu, libs, "gdk_toplevel_show_window_menu") | |
| 473 | + | core.PuregoSafeRegister(&XGdkToplevelSupportsEdgeConstraints, libs, "gdk_toplevel_supports_edge_constraints") | |
| 474 | + | core.PuregoSafeRegister(&XGdkToplevelTitlebarGesture, libs, "gdk_toplevel_titlebar_gesture") | |
| 471 | 475 | ||
| 472 | 476 | } | |
M v4/gdk/gdktoplevellayout.go +23 -19
| @@ -167,26 +167,30 @@ func (x *ToplevelLayout) Unref() { | |||
| 167 | 167 | ||
| 168 | 168 | func init() { | |
| 169 | 169 | core.SetPackageName("GDK", "gtk4") | |
| 170 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 171 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 172 | - | if err != nil { | |
| 173 | - | panic(err) | |
| 170 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 171 | + | var libs []uintptr | |
| 172 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 173 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 174 | + | if err != nil { | |
| 175 | + | panic(err) | |
| 176 | + | } | |
| 177 | + | libs = append(libs, lib) | |
| 174 | 178 | } | |
| 175 | 179 | ||
| 176 | - | core.PuregoSafeRegister(&xToplevelLayoutGLibType, lib, "gdk_toplevel_layout_get_type") | |
| 177 | - | ||
| 178 | - | core.PuregoSafeRegister(&xNewToplevelLayout, lib, "gdk_toplevel_layout_new") | |
| 179 | - | ||
| 180 | - | core.PuregoSafeRegister(&xToplevelLayoutCopy, lib, "gdk_toplevel_layout_copy") | |
| 181 | - | core.PuregoSafeRegister(&xToplevelLayoutEqual, lib, "gdk_toplevel_layout_equal") | |
| 182 | - | core.PuregoSafeRegister(&xToplevelLayoutGetFullscreen, lib, "gdk_toplevel_layout_get_fullscreen") | |
| 183 | - | core.PuregoSafeRegister(&xToplevelLayoutGetFullscreenMonitor, lib, "gdk_toplevel_layout_get_fullscreen_monitor") | |
| 184 | - | core.PuregoSafeRegister(&xToplevelLayoutGetMaximized, lib, "gdk_toplevel_layout_get_maximized") | |
| 185 | - | core.PuregoSafeRegister(&xToplevelLayoutGetResizable, lib, "gdk_toplevel_layout_get_resizable") | |
| 186 | - | core.PuregoSafeRegister(&xToplevelLayoutRef, lib, "gdk_toplevel_layout_ref") | |
| 187 | - | core.PuregoSafeRegister(&xToplevelLayoutSetFullscreen, lib, "gdk_toplevel_layout_set_fullscreen") | |
| 188 | - | core.PuregoSafeRegister(&xToplevelLayoutSetMaximized, lib, "gdk_toplevel_layout_set_maximized") | |
| 189 | - | core.PuregoSafeRegister(&xToplevelLayoutSetResizable, lib, "gdk_toplevel_layout_set_resizable") | |
| 190 | - | core.PuregoSafeRegister(&xToplevelLayoutUnref, lib, "gdk_toplevel_layout_unref") | |
| 180 | + | core.PuregoSafeRegister(&xToplevelLayoutGLibType, libs, "gdk_toplevel_layout_get_type") | |
| 181 | + | ||
| 182 | + | core.PuregoSafeRegister(&xNewToplevelLayout, libs, "gdk_toplevel_layout_new") | |
| 183 | + | ||
| 184 | + | core.PuregoSafeRegister(&xToplevelLayoutCopy, libs, "gdk_toplevel_layout_copy") | |
| 185 | + | core.PuregoSafeRegister(&xToplevelLayoutEqual, libs, "gdk_toplevel_layout_equal") | |
| 186 | + | core.PuregoSafeRegister(&xToplevelLayoutGetFullscreen, libs, "gdk_toplevel_layout_get_fullscreen") | |
| 187 | + | core.PuregoSafeRegister(&xToplevelLayoutGetFullscreenMonitor, libs, "gdk_toplevel_layout_get_fullscreen_monitor") | |
| 188 | + | core.PuregoSafeRegister(&xToplevelLayoutGetMaximized, libs, "gdk_toplevel_layout_get_maximized") | |
| 189 | + | core.PuregoSafeRegister(&xToplevelLayoutGetResizable, libs, "gdk_toplevel_layout_get_resizable") | |
| 190 | + | core.PuregoSafeRegister(&xToplevelLayoutRef, libs, "gdk_toplevel_layout_ref") | |
| 191 | + | core.PuregoSafeRegister(&xToplevelLayoutSetFullscreen, libs, "gdk_toplevel_layout_set_fullscreen") | |
| 192 | + | core.PuregoSafeRegister(&xToplevelLayoutSetMaximized, libs, "gdk_toplevel_layout_set_maximized") | |
| 193 | + | core.PuregoSafeRegister(&xToplevelLayoutSetResizable, libs, "gdk_toplevel_layout_set_resizable") | |
| 194 | + | core.PuregoSafeRegister(&xToplevelLayoutUnref, libs, "gdk_toplevel_layout_unref") | |
| 191 | 195 | ||
| 192 | 196 | } | |
M v4/gdk/gdktoplevelsize.go +13 -9
| @@ -89,17 +89,21 @@ func (x *ToplevelSize) SetSize(WidthVar int, HeightVar int) { | |||
| 89 | 89 | ||
| 90 | 90 | func init() { | |
| 91 | 91 | core.SetPackageName("GDK", "gtk4") | |
| 92 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 93 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 94 | - | if err != nil { | |
| 95 | - | panic(err) | |
| 92 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 93 | + | var libs []uintptr | |
| 94 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 95 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 96 | + | if err != nil { | |
| 97 | + | panic(err) | |
| 98 | + | } | |
| 99 | + | libs = append(libs, lib) | |
| 96 | 100 | } | |
| 97 | 101 | ||
| 98 | - | core.PuregoSafeRegister(&xToplevelSizeGLibType, lib, "gdk_toplevel_size_get_type") | |
| 102 | + | core.PuregoSafeRegister(&xToplevelSizeGLibType, libs, "gdk_toplevel_size_get_type") | |
| 99 | 103 | ||
| 100 | - | core.PuregoSafeRegister(&xToplevelSizeGetBounds, lib, "gdk_toplevel_size_get_bounds") | |
| 101 | - | core.PuregoSafeRegister(&xToplevelSizeSetMinSize, lib, "gdk_toplevel_size_set_min_size") | |
| 102 | - | core.PuregoSafeRegister(&xToplevelSizeSetShadowWidth, lib, "gdk_toplevel_size_set_shadow_width") | |
| 103 | - | core.PuregoSafeRegister(&xToplevelSizeSetSize, lib, "gdk_toplevel_size_set_size") | |
| 104 | + | core.PuregoSafeRegister(&xToplevelSizeGetBounds, libs, "gdk_toplevel_size_get_bounds") | |
| 105 | + | core.PuregoSafeRegister(&xToplevelSizeSetMinSize, libs, "gdk_toplevel_size_set_min_size") | |
| 106 | + | core.PuregoSafeRegister(&xToplevelSizeSetShadowWidth, libs, "gdk_toplevel_size_set_shadow_width") | |
| 107 | + | core.PuregoSafeRegister(&xToplevelSizeSetSize, libs, "gdk_toplevel_size_set_size") | |
| 104 | 108 | ||
| 105 | 109 | } | |
M v4/gdk/gdktypes.go +68 -64
| @@ -687,71 +687,75 @@ const ( | |||
| 687 | 687 | ||
| 688 | 688 | func init() { | |
| 689 | 689 | core.SetPackageName("GDK", "gtk4") | |
| 690 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 691 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 692 | - | if err != nil { | |
| 693 | - | panic(err) | |
| 690 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 691 | + | var libs []uintptr | |
| 692 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 693 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 694 | + | if err != nil { | |
| 695 | + | panic(err) | |
| 696 | + | } | |
| 697 | + | libs = append(libs, lib) | |
| 694 | 698 | } | |
| 695 | 699 | ||
| 696 | - | core.PuregoSafeRegister(&xColorStateGLibType, lib, "gdk_color_state_get_type") | |
| 697 | - | ||
| 698 | - | core.PuregoSafeRegister(&xColorStateCreateCicpParams, lib, "gdk_color_state_create_cicp_params") | |
| 699 | - | core.PuregoSafeRegister(&xColorStateEqual, lib, "gdk_color_state_equal") | |
| 700 | - | core.PuregoSafeRegister(&xColorStateRef, lib, "gdk_color_state_ref") | |
| 701 | - | core.PuregoSafeRegister(&xColorStateUnref, lib, "gdk_color_state_unref") | |
| 702 | - | ||
| 703 | - | core.PuregoSafeRegister(&xContentFormatsGLibType, lib, "gdk_content_formats_get_type") | |
| 704 | - | ||
| 705 | - | core.PuregoSafeRegister(&xNewContentFormats, lib, "gdk_content_formats_new") | |
| 706 | - | core.PuregoSafeRegister(&xNewContentFormatsForGtype, lib, "gdk_content_formats_new_for_gtype") | |
| 707 | - | ||
| 708 | - | core.PuregoSafeRegister(&xContentFormatsContainGtype, lib, "gdk_content_formats_contain_gtype") | |
| 709 | - | core.PuregoSafeRegister(&xContentFormatsContainMimeType, lib, "gdk_content_formats_contain_mime_type") | |
| 710 | - | core.PuregoSafeRegister(&xContentFormatsGetGtypes, lib, "gdk_content_formats_get_gtypes") | |
| 711 | - | core.PuregoSafeRegister(&xContentFormatsGetMimeTypes, lib, "gdk_content_formats_get_mime_types") | |
| 712 | - | core.PuregoSafeRegister(&xContentFormatsIsEmpty, lib, "gdk_content_formats_is_empty") | |
| 713 | - | core.PuregoSafeRegister(&xContentFormatsMatch, lib, "gdk_content_formats_match") | |
| 714 | - | core.PuregoSafeRegister(&xContentFormatsMatchGtype, lib, "gdk_content_formats_match_gtype") | |
| 715 | - | core.PuregoSafeRegister(&xContentFormatsMatchMimeType, lib, "gdk_content_formats_match_mime_type") | |
| 716 | - | core.PuregoSafeRegister(&xContentFormatsPrint, lib, "gdk_content_formats_print") | |
| 717 | - | core.PuregoSafeRegister(&xContentFormatsRef, lib, "gdk_content_formats_ref") | |
| 718 | - | core.PuregoSafeRegister(&xContentFormatsToString, lib, "gdk_content_formats_to_string") | |
| 719 | - | core.PuregoSafeRegister(&xContentFormatsUnion, lib, "gdk_content_formats_union") | |
| 720 | - | core.PuregoSafeRegister(&xContentFormatsUnionDeserializeGtypes, lib, "gdk_content_formats_union_deserialize_gtypes") | |
| 721 | - | core.PuregoSafeRegister(&xContentFormatsUnionDeserializeMimeTypes, lib, "gdk_content_formats_union_deserialize_mime_types") | |
| 722 | - | core.PuregoSafeRegister(&xContentFormatsUnionSerializeGtypes, lib, "gdk_content_formats_union_serialize_gtypes") | |
| 723 | - | core.PuregoSafeRegister(&xContentFormatsUnionSerializeMimeTypes, lib, "gdk_content_formats_union_serialize_mime_types") | |
| 724 | - | core.PuregoSafeRegister(&xContentFormatsUnref, lib, "gdk_content_formats_unref") | |
| 725 | - | ||
| 726 | - | core.PuregoSafeRegister(&xDmabufFormatsGLibType, lib, "gdk_dmabuf_formats_get_type") | |
| 727 | - | ||
| 728 | - | core.PuregoSafeRegister(&xDmabufFormatsContains, lib, "gdk_dmabuf_formats_contains") | |
| 729 | - | core.PuregoSafeRegister(&xDmabufFormatsEqual, lib, "gdk_dmabuf_formats_equal") | |
| 730 | - | core.PuregoSafeRegister(&xDmabufFormatsGetFormat, lib, "gdk_dmabuf_formats_get_format") | |
| 731 | - | core.PuregoSafeRegister(&xDmabufFormatsGetNFormats, lib, "gdk_dmabuf_formats_get_n_formats") | |
| 732 | - | core.PuregoSafeRegister(&xDmabufFormatsRef, lib, "gdk_dmabuf_formats_ref") | |
| 733 | - | core.PuregoSafeRegister(&xDmabufFormatsUnref, lib, "gdk_dmabuf_formats_unref") | |
| 734 | - | ||
| 735 | - | core.PuregoSafeRegister(&xRectangleGLibType, lib, "gdk_rectangle_get_type") | |
| 736 | - | ||
| 737 | - | core.PuregoSafeRegister(&xRectangleContainsPoint, lib, "gdk_rectangle_contains_point") | |
| 738 | - | core.PuregoSafeRegister(&xRectangleEqual, lib, "gdk_rectangle_equal") | |
| 739 | - | core.PuregoSafeRegister(&xRectangleIntersect, lib, "gdk_rectangle_intersect") | |
| 740 | - | core.PuregoSafeRegister(&xRectangleUnion, lib, "gdk_rectangle_union") | |
| 741 | - | ||
| 742 | - | core.PuregoSafeRegister(&xTextureDownloaderGLibType, lib, "gdk_texture_downloader_get_type") | |
| 743 | - | ||
| 744 | - | core.PuregoSafeRegister(&xNewTextureDownloader, lib, "gdk_texture_downloader_new") | |
| 745 | - | ||
| 746 | - | core.PuregoSafeRegister(&xTextureDownloaderCopy, lib, "gdk_texture_downloader_copy") | |
| 747 | - | core.PuregoSafeRegister(&xTextureDownloaderDownloadBytes, lib, "gdk_texture_downloader_download_bytes") | |
| 748 | - | core.PuregoSafeRegister(&xTextureDownloaderDownloadInto, lib, "gdk_texture_downloader_download_into") | |
| 749 | - | core.PuregoSafeRegister(&xTextureDownloaderFree, lib, "gdk_texture_downloader_free") | |
| 750 | - | core.PuregoSafeRegister(&xTextureDownloaderGetColorState, lib, "gdk_texture_downloader_get_color_state") | |
| 751 | - | core.PuregoSafeRegister(&xTextureDownloaderGetFormat, lib, "gdk_texture_downloader_get_format") | |
| 752 | - | core.PuregoSafeRegister(&xTextureDownloaderGetTexture, lib, "gdk_texture_downloader_get_texture") | |
| 753 | - | core.PuregoSafeRegister(&xTextureDownloaderSetColorState, lib, "gdk_texture_downloader_set_color_state") | |
| 754 | - | core.PuregoSafeRegister(&xTextureDownloaderSetFormat, lib, "gdk_texture_downloader_set_format") | |
| 755 | - | core.PuregoSafeRegister(&xTextureDownloaderSetTexture, lib, "gdk_texture_downloader_set_texture") | |
| 700 | + | core.PuregoSafeRegister(&xColorStateGLibType, libs, "gdk_color_state_get_type") | |
| 701 | + | ||
| 702 | + | core.PuregoSafeRegister(&xColorStateCreateCicpParams, libs, "gdk_color_state_create_cicp_params") | |
| 703 | + | core.PuregoSafeRegister(&xColorStateEqual, libs, "gdk_color_state_equal") | |
| 704 | + | core.PuregoSafeRegister(&xColorStateRef, libs, "gdk_color_state_ref") | |
| 705 | + | core.PuregoSafeRegister(&xColorStateUnref, libs, "gdk_color_state_unref") | |
| 706 | + | ||
| 707 | + | core.PuregoSafeRegister(&xContentFormatsGLibType, libs, "gdk_content_formats_get_type") | |
| 708 | + | ||
| 709 | + | core.PuregoSafeRegister(&xNewContentFormats, libs, "gdk_content_formats_new") | |
| 710 | + | core.PuregoSafeRegister(&xNewContentFormatsForGtype, libs, "gdk_content_formats_new_for_gtype") | |
| 711 | + | ||
| 712 | + | core.PuregoSafeRegister(&xContentFormatsContainGtype, libs, "gdk_content_formats_contain_gtype") | |
| 713 | + | core.PuregoSafeRegister(&xContentFormatsContainMimeType, libs, "gdk_content_formats_contain_mime_type") | |
| 714 | + | core.PuregoSafeRegister(&xContentFormatsGetGtypes, libs, "gdk_content_formats_get_gtypes") | |
| 715 | + | core.PuregoSafeRegister(&xContentFormatsGetMimeTypes, libs, "gdk_content_formats_get_mime_types") | |
| 716 | + | core.PuregoSafeRegister(&xContentFormatsIsEmpty, libs, "gdk_content_formats_is_empty") | |
| 717 | + | core.PuregoSafeRegister(&xContentFormatsMatch, libs, "gdk_content_formats_match") | |
| 718 | + | core.PuregoSafeRegister(&xContentFormatsMatchGtype, libs, "gdk_content_formats_match_gtype") | |
| 719 | + | core.PuregoSafeRegister(&xContentFormatsMatchMimeType, libs, "gdk_content_formats_match_mime_type") | |
| 720 | + | core.PuregoSafeRegister(&xContentFormatsPrint, libs, "gdk_content_formats_print") | |
| 721 | + | core.PuregoSafeRegister(&xContentFormatsRef, libs, "gdk_content_formats_ref") | |
| 722 | + | core.PuregoSafeRegister(&xContentFormatsToString, libs, "gdk_content_formats_to_string") | |
| 723 | + | core.PuregoSafeRegister(&xContentFormatsUnion, libs, "gdk_content_formats_union") | |
| 724 | + | core.PuregoSafeRegister(&xContentFormatsUnionDeserializeGtypes, libs, "gdk_content_formats_union_deserialize_gtypes") | |
| 725 | + | core.PuregoSafeRegister(&xContentFormatsUnionDeserializeMimeTypes, libs, "gdk_content_formats_union_deserialize_mime_types") | |
| 726 | + | core.PuregoSafeRegister(&xContentFormatsUnionSerializeGtypes, libs, "gdk_content_formats_union_serialize_gtypes") | |
| 727 | + | core.PuregoSafeRegister(&xContentFormatsUnionSerializeMimeTypes, libs, "gdk_content_formats_union_serialize_mime_types") | |
| 728 | + | core.PuregoSafeRegister(&xContentFormatsUnref, libs, "gdk_content_formats_unref") | |
| 729 | + | ||
| 730 | + | core.PuregoSafeRegister(&xDmabufFormatsGLibType, libs, "gdk_dmabuf_formats_get_type") | |
| 731 | + | ||
| 732 | + | core.PuregoSafeRegister(&xDmabufFormatsContains, libs, "gdk_dmabuf_formats_contains") | |
| 733 | + | core.PuregoSafeRegister(&xDmabufFormatsEqual, libs, "gdk_dmabuf_formats_equal") | |
| 734 | + | core.PuregoSafeRegister(&xDmabufFormatsGetFormat, libs, "gdk_dmabuf_formats_get_format") | |
| 735 | + | core.PuregoSafeRegister(&xDmabufFormatsGetNFormats, libs, "gdk_dmabuf_formats_get_n_formats") | |
| 736 | + | core.PuregoSafeRegister(&xDmabufFormatsRef, libs, "gdk_dmabuf_formats_ref") | |
| 737 | + | core.PuregoSafeRegister(&xDmabufFormatsUnref, libs, "gdk_dmabuf_formats_unref") | |
| 738 | + | ||
| 739 | + | core.PuregoSafeRegister(&xRectangleGLibType, libs, "gdk_rectangle_get_type") | |
| 740 | + | ||
| 741 | + | core.PuregoSafeRegister(&xRectangleContainsPoint, libs, "gdk_rectangle_contains_point") | |
| 742 | + | core.PuregoSafeRegister(&xRectangleEqual, libs, "gdk_rectangle_equal") | |
| 743 | + | core.PuregoSafeRegister(&xRectangleIntersect, libs, "gdk_rectangle_intersect") | |
| 744 | + | core.PuregoSafeRegister(&xRectangleUnion, libs, "gdk_rectangle_union") | |
| 745 | + | ||
| 746 | + | core.PuregoSafeRegister(&xTextureDownloaderGLibType, libs, "gdk_texture_downloader_get_type") | |
| 747 | + | ||
| 748 | + | core.PuregoSafeRegister(&xNewTextureDownloader, libs, "gdk_texture_downloader_new") | |
| 749 | + | ||
| 750 | + | core.PuregoSafeRegister(&xTextureDownloaderCopy, libs, "gdk_texture_downloader_copy") | |
| 751 | + | core.PuregoSafeRegister(&xTextureDownloaderDownloadBytes, libs, "gdk_texture_downloader_download_bytes") | |
| 752 | + | core.PuregoSafeRegister(&xTextureDownloaderDownloadInto, libs, "gdk_texture_downloader_download_into") | |
| 753 | + | core.PuregoSafeRegister(&xTextureDownloaderFree, libs, "gdk_texture_downloader_free") | |
| 754 | + | core.PuregoSafeRegister(&xTextureDownloaderGetColorState, libs, "gdk_texture_downloader_get_color_state") | |
| 755 | + | core.PuregoSafeRegister(&xTextureDownloaderGetFormat, libs, "gdk_texture_downloader_get_format") | |
| 756 | + | core.PuregoSafeRegister(&xTextureDownloaderGetTexture, libs, "gdk_texture_downloader_get_texture") | |
| 757 | + | core.PuregoSafeRegister(&xTextureDownloaderSetColorState, libs, "gdk_texture_downloader_set_color_state") | |
| 758 | + | core.PuregoSafeRegister(&xTextureDownloaderSetFormat, libs, "gdk_texture_downloader_set_format") | |
| 759 | + | core.PuregoSafeRegister(&xTextureDownloaderSetTexture, libs, "gdk_texture_downloader_set_texture") | |
| 756 | 760 | ||
| 757 | 761 | } | |
M v4/gdk/gdkvulkancontext.go +10 -6
| @@ -130,14 +130,18 @@ func (x *VulkanContext) Init(CancellableVar *gio.Cancellable) (bool, error) { | |||
| 130 | 130 | ||
| 131 | 131 | func init() { | |
| 132 | 132 | core.SetPackageName("GDK", "gtk4") | |
| 133 | - | core.SetSharedLibrary("GDK", "libgtk-4.so.1") | |
| 134 | - | lib, err := purego.Dlopen(core.GetPath("GDK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 135 | - | if err != nil { | |
| 136 | - | panic(err) | |
| 133 | + | core.SetSharedLibraries("GDK", []string{"libgtk-4.so.1"}) | |
| 134 | + | var libs []uintptr | |
| 135 | + | for _, libPath := range core.GetPaths("GDK") { | |
| 136 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 137 | + | if err != nil { | |
| 138 | + | panic(err) | |
| 139 | + | } | |
| 140 | + | libs = append(libs, lib) | |
| 137 | 141 | } | |
| 138 | 142 | ||
| 139 | - | core.PuregoSafeRegister(&xVulkanErrorQuark, lib, "gdk_vulkan_error_quark") | |
| 143 | + | core.PuregoSafeRegister(&xVulkanErrorQuark, libs, "gdk_vulkan_error_quark") | |
| 140 | 144 | ||
| 141 | - | core.PuregoSafeRegister(&xVulkanContextGLibType, lib, "gdk_vulkan_context_get_type") | |
| 145 | + | core.PuregoSafeRegister(&xVulkanContextGLibType, libs, "gdk_vulkan_context_get_type") | |
| 142 | 146 | ||
| 143 | 147 | } | |
M v4/gdkpixbuf/gdk-pixbuf-animation.go +26 -22
| @@ -714,34 +714,38 @@ func (c *PixbufAnimationIter) SetGoPointer(ptr uintptr) { | |||
| 714 | 714 | ||
| 715 | 715 | func init() { | |
| 716 | 716 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 717 | - | core.SetSharedLibrary("GDKPIXBUF", "libgdk_pixbuf-2.0.so.0") | |
| 718 | - | lib, err := purego.Dlopen(core.GetPath("GDKPIXBUF"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 719 | - | if err != nil { | |
| 720 | - | panic(err) | |
| 717 | + | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0"}) | |
| 718 | + | var libs []uintptr | |
| 719 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 720 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 721 | + | if err != nil { | |
| 722 | + | panic(err) | |
| 723 | + | } | |
| 724 | + | libs = append(libs, lib) | |
| 721 | 725 | } | |
| 722 | 726 | ||
| 723 | - | core.PuregoSafeRegister(&xPixbufAnimationGLibType, lib, "gdk_pixbuf_animation_get_type") | |
| 727 | + | core.PuregoSafeRegister(&xPixbufAnimationGLibType, libs, "gdk_pixbuf_animation_get_type") | |
| 724 | 728 | ||
| 725 | - | core.PuregoSafeRegister(&xNewPixbufAnimationFromFile, lib, "gdk_pixbuf_animation_new_from_file") | |
| 726 | - | core.PuregoSafeRegister(&xNewPixbufAnimationFromResource, lib, "gdk_pixbuf_animation_new_from_resource") | |
| 727 | - | core.PuregoSafeRegister(&xNewPixbufAnimationFromStream, lib, "gdk_pixbuf_animation_new_from_stream") | |
| 728 | - | core.PuregoSafeRegister(&xNewPixbufAnimationFromStreamFinish, lib, "gdk_pixbuf_animation_new_from_stream_finish") | |
| 729 | + | core.PuregoSafeRegister(&xNewPixbufAnimationFromFile, libs, "gdk_pixbuf_animation_new_from_file") | |
| 730 | + | core.PuregoSafeRegister(&xNewPixbufAnimationFromResource, libs, "gdk_pixbuf_animation_new_from_resource") | |
| 731 | + | core.PuregoSafeRegister(&xNewPixbufAnimationFromStream, libs, "gdk_pixbuf_animation_new_from_stream") | |
| 732 | + | core.PuregoSafeRegister(&xNewPixbufAnimationFromStreamFinish, libs, "gdk_pixbuf_animation_new_from_stream_finish") | |
| 729 | 733 | ||
| 730 | - | core.PuregoSafeRegister(&xPixbufAnimationGetHeight, lib, "gdk_pixbuf_animation_get_height") | |
| 731 | - | core.PuregoSafeRegister(&xPixbufAnimationGetIter, lib, "gdk_pixbuf_animation_get_iter") | |
| 732 | - | core.PuregoSafeRegister(&xPixbufAnimationGetStaticImage, lib, "gdk_pixbuf_animation_get_static_image") | |
| 733 | - | core.PuregoSafeRegister(&xPixbufAnimationGetWidth, lib, "gdk_pixbuf_animation_get_width") | |
| 734 | - | core.PuregoSafeRegister(&xPixbufAnimationIsStaticImage, lib, "gdk_pixbuf_animation_is_static_image") | |
| 735 | - | core.PuregoSafeRegister(&xPixbufAnimationRef, lib, "gdk_pixbuf_animation_ref") | |
| 736 | - | core.PuregoSafeRegister(&xPixbufAnimationUnref, lib, "gdk_pixbuf_animation_unref") | |
| 734 | + | core.PuregoSafeRegister(&xPixbufAnimationGetHeight, libs, "gdk_pixbuf_animation_get_height") | |
| 735 | + | core.PuregoSafeRegister(&xPixbufAnimationGetIter, libs, "gdk_pixbuf_animation_get_iter") | |
| 736 | + | core.PuregoSafeRegister(&xPixbufAnimationGetStaticImage, libs, "gdk_pixbuf_animation_get_static_image") | |
| 737 | + | core.PuregoSafeRegister(&xPixbufAnimationGetWidth, libs, "gdk_pixbuf_animation_get_width") | |
| 738 | + | core.PuregoSafeRegister(&xPixbufAnimationIsStaticImage, libs, "gdk_pixbuf_animation_is_static_image") | |
| 739 | + | core.PuregoSafeRegister(&xPixbufAnimationRef, libs, "gdk_pixbuf_animation_ref") | |
| 740 | + | core.PuregoSafeRegister(&xPixbufAnimationUnref, libs, "gdk_pixbuf_animation_unref") | |
| 737 | 741 | ||
| 738 | - | core.PuregoSafeRegister(&xPixbufAnimationNewFromStreamAsync, lib, "gdk_pixbuf_animation_new_from_stream_async") | |
| 742 | + | core.PuregoSafeRegister(&xPixbufAnimationNewFromStreamAsync, libs, "gdk_pixbuf_animation_new_from_stream_async") | |
| 739 | 743 | ||
| 740 | - | core.PuregoSafeRegister(&xPixbufAnimationIterGLibType, lib, "gdk_pixbuf_animation_iter_get_type") | |
| 744 | + | core.PuregoSafeRegister(&xPixbufAnimationIterGLibType, libs, "gdk_pixbuf_animation_iter_get_type") | |
| 741 | 745 | ||
| 742 | - | core.PuregoSafeRegister(&xPixbufAnimationIterAdvance, lib, "gdk_pixbuf_animation_iter_advance") | |
| 743 | - | core.PuregoSafeRegister(&xPixbufAnimationIterGetDelayTime, lib, "gdk_pixbuf_animation_iter_get_delay_time") | |
| 744 | - | core.PuregoSafeRegister(&xPixbufAnimationIterGetPixbuf, lib, "gdk_pixbuf_animation_iter_get_pixbuf") | |
| 745 | - | core.PuregoSafeRegister(&xPixbufAnimationIterOnCurrentlyLoadingFrame, lib, "gdk_pixbuf_animation_iter_on_currently_loading_frame") | |
| 746 | + | core.PuregoSafeRegister(&xPixbufAnimationIterAdvance, libs, "gdk_pixbuf_animation_iter_advance") | |
| 747 | + | core.PuregoSafeRegister(&xPixbufAnimationIterGetDelayTime, libs, "gdk_pixbuf_animation_iter_get_delay_time") | |
| 748 | + | core.PuregoSafeRegister(&xPixbufAnimationIterGetPixbuf, libs, "gdk_pixbuf_animation_iter_get_pixbuf") | |
| 749 | + | core.PuregoSafeRegister(&xPixbufAnimationIterOnCurrentlyLoadingFrame, libs, "gdk_pixbuf_animation_iter_on_currently_loading_frame") | |
| 746 | 750 | ||
| 747 | 751 | } | |
M v4/gdkpixbuf/gdk-pixbuf-io.go +22 -18
| @@ -507,25 +507,29 @@ const ( | |||
| 507 | 507 | ||
| 508 | 508 | func init() { | |
| 509 | 509 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 510 | - | core.SetSharedLibrary("GDKPIXBUF", "libgdk_pixbuf-2.0.so.0") | |
| 511 | - | lib, err := purego.Dlopen(core.GetPath("GDKPIXBUF"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 512 | - | if err != nil { | |
| 513 | - | panic(err) | |
| 510 | + | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0"}) | |
| 511 | + | var libs []uintptr | |
| 512 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 513 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 514 | + | if err != nil { | |
| 515 | + | panic(err) | |
| 516 | + | } | |
| 517 | + | libs = append(libs, lib) | |
| 514 | 518 | } | |
| 515 | 519 | ||
| 516 | - | core.PuregoSafeRegister(&xPixbufFormatGLibType, lib, "gdk_pixbuf_format_get_type") | |
| 517 | - | ||
| 518 | - | core.PuregoSafeRegister(&xPixbufFormatCopy, lib, "gdk_pixbuf_format_copy") | |
| 519 | - | core.PuregoSafeRegister(&xPixbufFormatFree, lib, "gdk_pixbuf_format_free") | |
| 520 | - | core.PuregoSafeRegister(&xPixbufFormatGetDescription, lib, "gdk_pixbuf_format_get_description") | |
| 521 | - | core.PuregoSafeRegister(&xPixbufFormatGetExtensions, lib, "gdk_pixbuf_format_get_extensions") | |
| 522 | - | core.PuregoSafeRegister(&xPixbufFormatGetLicense, lib, "gdk_pixbuf_format_get_license") | |
| 523 | - | core.PuregoSafeRegister(&xPixbufFormatGetMimeTypes, lib, "gdk_pixbuf_format_get_mime_types") | |
| 524 | - | core.PuregoSafeRegister(&xPixbufFormatGetName, lib, "gdk_pixbuf_format_get_name") | |
| 525 | - | core.PuregoSafeRegister(&xPixbufFormatIsDisabled, lib, "gdk_pixbuf_format_is_disabled") | |
| 526 | - | core.PuregoSafeRegister(&xPixbufFormatIsSaveOptionSupported, lib, "gdk_pixbuf_format_is_save_option_supported") | |
| 527 | - | core.PuregoSafeRegister(&xPixbufFormatIsScalable, lib, "gdk_pixbuf_format_is_scalable") | |
| 528 | - | core.PuregoSafeRegister(&xPixbufFormatIsWritable, lib, "gdk_pixbuf_format_is_writable") | |
| 529 | - | core.PuregoSafeRegister(&xPixbufFormatSetDisabled, lib, "gdk_pixbuf_format_set_disabled") | |
| 520 | + | core.PuregoSafeRegister(&xPixbufFormatGLibType, libs, "gdk_pixbuf_format_get_type") | |
| 521 | + | ||
| 522 | + | core.PuregoSafeRegister(&xPixbufFormatCopy, libs, "gdk_pixbuf_format_copy") | |
| 523 | + | core.PuregoSafeRegister(&xPixbufFormatFree, libs, "gdk_pixbuf_format_free") | |
| 524 | + | core.PuregoSafeRegister(&xPixbufFormatGetDescription, libs, "gdk_pixbuf_format_get_description") | |
| 525 | + | core.PuregoSafeRegister(&xPixbufFormatGetExtensions, libs, "gdk_pixbuf_format_get_extensions") | |
| 526 | + | core.PuregoSafeRegister(&xPixbufFormatGetLicense, libs, "gdk_pixbuf_format_get_license") | |
| 527 | + | core.PuregoSafeRegister(&xPixbufFormatGetMimeTypes, libs, "gdk_pixbuf_format_get_mime_types") | |
| 528 | + | core.PuregoSafeRegister(&xPixbufFormatGetName, libs, "gdk_pixbuf_format_get_name") | |
| 529 | + | core.PuregoSafeRegister(&xPixbufFormatIsDisabled, libs, "gdk_pixbuf_format_is_disabled") | |
| 530 | + | core.PuregoSafeRegister(&xPixbufFormatIsSaveOptionSupported, libs, "gdk_pixbuf_format_is_save_option_supported") | |
| 531 | + | core.PuregoSafeRegister(&xPixbufFormatIsScalable, libs, "gdk_pixbuf_format_is_scalable") | |
| 532 | + | core.PuregoSafeRegister(&xPixbufFormatIsWritable, libs, "gdk_pixbuf_format_is_writable") | |
| 533 | + | core.PuregoSafeRegister(&xPixbufFormatSetDisabled, libs, "gdk_pixbuf_format_set_disabled") | |
| 530 | 534 | ||
| 531 | 535 | } | |
M v4/gdkpixbuf/gdk-pixbuf-loader.go +23 -19
| @@ -520,24 +520,28 @@ func (x *PixbufLoader) ConnectSizePrepared(cb *func(PixbufLoader, int, int)) uin | |||
| 520 | 520 | ||
| 521 | 521 | func init() { | |
| 522 | 522 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 523 | - | core.SetSharedLibrary("GDKPIXBUF", "libgdk_pixbuf-2.0.so.0") | |
| 524 | - | lib, err := purego.Dlopen(core.GetPath("GDKPIXBUF"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 525 | - | if err != nil { | |
| 526 | - | panic(err) | |
| 527 | - | } | |
| 528 | - | ||
| 529 | - | core.PuregoSafeRegister(&xPixbufLoaderGLibType, lib, "gdk_pixbuf_loader_get_type") | |
| 530 | - | ||
| 531 | - | core.PuregoSafeRegister(&xNewPixbufLoader, lib, "gdk_pixbuf_loader_new") | |
| 532 | - | core.PuregoSafeRegister(&xNewPixbufLoaderWithMimeType, lib, "gdk_pixbuf_loader_new_with_mime_type") | |
| 533 | - | core.PuregoSafeRegister(&xNewPixbufLoaderWithType, lib, "gdk_pixbuf_loader_new_with_type") | |
| 534 | - | ||
| 535 | - | core.PuregoSafeRegister(&xPixbufLoaderClose, lib, "gdk_pixbuf_loader_close") | |
| 536 | - | core.PuregoSafeRegister(&xPixbufLoaderGetAnimation, lib, "gdk_pixbuf_loader_get_animation") | |
| 537 | - | core.PuregoSafeRegister(&xPixbufLoaderGetFormat, lib, "gdk_pixbuf_loader_get_format") | |
| 538 | - | core.PuregoSafeRegister(&xPixbufLoaderGetPixbuf, lib, "gdk_pixbuf_loader_get_pixbuf") | |
| 539 | - | core.PuregoSafeRegister(&xPixbufLoaderSetSize, lib, "gdk_pixbuf_loader_set_size") | |
| 540 | - | core.PuregoSafeRegister(&xPixbufLoaderWrite, lib, "gdk_pixbuf_loader_write") | |
| 541 | - | core.PuregoSafeRegister(&xPixbufLoaderWriteBytes, lib, "gdk_pixbuf_loader_write_bytes") | |
| 523 | + | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0"}) | |
| 524 | + | var libs []uintptr | |
| 525 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 526 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 527 | + | if err != nil { | |
| 528 | + | panic(err) | |
| 529 | + | } | |
| 530 | + | libs = append(libs, lib) | |
| 531 | + | } | |
| 532 | + | ||
| 533 | + | core.PuregoSafeRegister(&xPixbufLoaderGLibType, libs, "gdk_pixbuf_loader_get_type") | |
| 534 | + | ||
| 535 | + | core.PuregoSafeRegister(&xNewPixbufLoader, libs, "gdk_pixbuf_loader_new") | |
| 536 | + | core.PuregoSafeRegister(&xNewPixbufLoaderWithMimeType, libs, "gdk_pixbuf_loader_new_with_mime_type") | |
| 537 | + | core.PuregoSafeRegister(&xNewPixbufLoaderWithType, libs, "gdk_pixbuf_loader_new_with_type") | |
| 538 | + | ||
| 539 | + | core.PuregoSafeRegister(&xPixbufLoaderClose, libs, "gdk_pixbuf_loader_close") | |
| 540 | + | core.PuregoSafeRegister(&xPixbufLoaderGetAnimation, libs, "gdk_pixbuf_loader_get_animation") | |
| 541 | + | core.PuregoSafeRegister(&xPixbufLoaderGetFormat, libs, "gdk_pixbuf_loader_get_format") | |
| 542 | + | core.PuregoSafeRegister(&xPixbufLoaderGetPixbuf, libs, "gdk_pixbuf_loader_get_pixbuf") | |
| 543 | + | core.PuregoSafeRegister(&xPixbufLoaderSetSize, libs, "gdk_pixbuf_loader_set_size") | |
| 544 | + | core.PuregoSafeRegister(&xPixbufLoaderWrite, libs, "gdk_pixbuf_loader_write") | |
| 545 | + | core.PuregoSafeRegister(&xPixbufLoaderWriteBytes, libs, "gdk_pixbuf_loader_write_bytes") | |
| 542 | 546 | ||
| 543 | 547 | } | |
M v4/gdkpixbuf/gdk-pixbuf-simple-anim.go +13 -9
| @@ -93,18 +93,22 @@ func (c *PixbufSimpleAnim) SetGoPointer(ptr uintptr) { | |||
| 93 | 93 | ||
| 94 | 94 | func init() { | |
| 95 | 95 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 96 | - | core.SetSharedLibrary("GDKPIXBUF", "libgdk_pixbuf-2.0.so.0") | |
| 97 | - | lib, err := purego.Dlopen(core.GetPath("GDKPIXBUF"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 98 | - | if err != nil { | |
| 99 | - | panic(err) | |
| 96 | + | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0"}) | |
| 97 | + | var libs []uintptr | |
| 98 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 99 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 100 | + | if err != nil { | |
| 101 | + | panic(err) | |
| 102 | + | } | |
| 103 | + | libs = append(libs, lib) | |
| 100 | 104 | } | |
| 101 | 105 | ||
| 102 | - | core.PuregoSafeRegister(&xPixbufSimpleAnimGLibType, lib, "gdk_pixbuf_simple_anim_get_type") | |
| 106 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimGLibType, libs, "gdk_pixbuf_simple_anim_get_type") | |
| 103 | 107 | ||
| 104 | - | core.PuregoSafeRegister(&xNewPixbufSimpleAnim, lib, "gdk_pixbuf_simple_anim_new") | |
| 108 | + | core.PuregoSafeRegister(&xNewPixbufSimpleAnim, libs, "gdk_pixbuf_simple_anim_new") | |
| 105 | 109 | ||
| 106 | - | core.PuregoSafeRegister(&xPixbufSimpleAnimAddFrame, lib, "gdk_pixbuf_simple_anim_add_frame") | |
| 107 | - | core.PuregoSafeRegister(&xPixbufSimpleAnimGetLoop, lib, "gdk_pixbuf_simple_anim_get_loop") | |
| 108 | - | core.PuregoSafeRegister(&xPixbufSimpleAnimSetLoop, lib, "gdk_pixbuf_simple_anim_set_loop") | |
| 110 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimAddFrame, libs, "gdk_pixbuf_simple_anim_add_frame") | |
| 111 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimGetLoop, libs, "gdk_pixbuf_simple_anim_get_loop") | |
| 112 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimSetLoop, libs, "gdk_pixbuf_simple_anim_set_loop") | |
| 109 | 113 | ||
| 110 | 114 | } | |
M v4/gdkpixbuf/gdk-pixbuf.go +77 -73
| @@ -1583,80 +1583,84 @@ func PixbufSaveToStreamFinish(AsyncResultVar gio.AsyncResult) (bool, error) { | |||
| 1583 | 1583 | ||
| 1584 | 1584 | func init() { | |
| 1585 | 1585 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 1586 | - | core.SetSharedLibrary("GDKPIXBUF", "libgdk_pixbuf-2.0.so.0") | |
| 1587 | - | lib, err := purego.Dlopen(core.GetPath("GDKPIXBUF"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1588 | - | if err != nil { | |
| 1589 | - | panic(err) | |
| 1586 | + | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0"}) | |
| 1587 | + | var libs []uintptr | |
| 1588 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 1589 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1590 | + | if err != nil { | |
| 1591 | + | panic(err) | |
| 1592 | + | } | |
| 1593 | + | libs = append(libs, lib) | |
| 1590 | 1594 | } | |
| 1591 | 1595 | ||
| 1592 | - | core.PuregoSafeRegister(&xPixbufGLibType, lib, "gdk_pixbuf_get_type") | |
| 1593 | - | ||
| 1594 | - | core.PuregoSafeRegister(&xNewPixbuf, lib, "gdk_pixbuf_new") | |
| 1595 | - | core.PuregoSafeRegister(&xNewPixbufFromBytes, lib, "gdk_pixbuf_new_from_bytes") | |
| 1596 | - | core.PuregoSafeRegister(&xNewPixbufFromData, lib, "gdk_pixbuf_new_from_data") | |
| 1597 | - | core.PuregoSafeRegister(&xNewPixbufFromFile, lib, "gdk_pixbuf_new_from_file") | |
| 1598 | - | core.PuregoSafeRegister(&xNewPixbufFromFileAtScale, lib, "gdk_pixbuf_new_from_file_at_scale") | |
| 1599 | - | core.PuregoSafeRegister(&xNewPixbufFromFileAtSize, lib, "gdk_pixbuf_new_from_file_at_size") | |
| 1600 | - | core.PuregoSafeRegister(&xNewPixbufFromInline, lib, "gdk_pixbuf_new_from_inline") | |
| 1601 | - | core.PuregoSafeRegister(&xNewPixbufFromResource, lib, "gdk_pixbuf_new_from_resource") | |
| 1602 | - | core.PuregoSafeRegister(&xNewPixbufFromResourceAtScale, lib, "gdk_pixbuf_new_from_resource_at_scale") | |
| 1603 | - | core.PuregoSafeRegister(&xNewPixbufFromStream, lib, "gdk_pixbuf_new_from_stream") | |
| 1604 | - | core.PuregoSafeRegister(&xNewPixbufFromStreamAtScale, lib, "gdk_pixbuf_new_from_stream_at_scale") | |
| 1605 | - | core.PuregoSafeRegister(&xNewPixbufFromStreamFinish, lib, "gdk_pixbuf_new_from_stream_finish") | |
| 1606 | - | core.PuregoSafeRegister(&xNewPixbufFromXpmData, lib, "gdk_pixbuf_new_from_xpm_data") | |
| 1607 | - | ||
| 1608 | - | core.PuregoSafeRegister(&xPixbufAddAlpha, lib, "gdk_pixbuf_add_alpha") | |
| 1609 | - | core.PuregoSafeRegister(&xPixbufApplyEmbeddedOrientation, lib, "gdk_pixbuf_apply_embedded_orientation") | |
| 1610 | - | core.PuregoSafeRegister(&xPixbufComposite, lib, "gdk_pixbuf_composite") | |
| 1611 | - | core.PuregoSafeRegister(&xPixbufCompositeColor, lib, "gdk_pixbuf_composite_color") | |
| 1612 | - | core.PuregoSafeRegister(&xPixbufCompositeColorSimple, lib, "gdk_pixbuf_composite_color_simple") | |
| 1613 | - | core.PuregoSafeRegister(&xPixbufCopy, lib, "gdk_pixbuf_copy") | |
| 1614 | - | core.PuregoSafeRegister(&xPixbufCopyArea, lib, "gdk_pixbuf_copy_area") | |
| 1615 | - | core.PuregoSafeRegister(&xPixbufCopyOptions, lib, "gdk_pixbuf_copy_options") | |
| 1616 | - | core.PuregoSafeRegister(&xPixbufFill, lib, "gdk_pixbuf_fill") | |
| 1617 | - | core.PuregoSafeRegister(&xPixbufFlip, lib, "gdk_pixbuf_flip") | |
| 1618 | - | core.PuregoSafeRegister(&xPixbufGetBitsPerSample, lib, "gdk_pixbuf_get_bits_per_sample") | |
| 1619 | - | core.PuregoSafeRegister(&xPixbufGetByteLength, lib, "gdk_pixbuf_get_byte_length") | |
| 1620 | - | core.PuregoSafeRegister(&xPixbufGetColorspace, lib, "gdk_pixbuf_get_colorspace") | |
| 1621 | - | core.PuregoSafeRegister(&xPixbufGetHasAlpha, lib, "gdk_pixbuf_get_has_alpha") | |
| 1622 | - | core.PuregoSafeRegister(&xPixbufGetHeight, lib, "gdk_pixbuf_get_height") | |
| 1623 | - | core.PuregoSafeRegister(&xPixbufGetNChannels, lib, "gdk_pixbuf_get_n_channels") | |
| 1624 | - | core.PuregoSafeRegister(&xPixbufGetOption, lib, "gdk_pixbuf_get_option") | |
| 1625 | - | core.PuregoSafeRegister(&xPixbufGetOptions, lib, "gdk_pixbuf_get_options") | |
| 1626 | - | core.PuregoSafeRegister(&xPixbufGetPixels, lib, "gdk_pixbuf_get_pixels") | |
| 1627 | - | core.PuregoSafeRegister(&xPixbufGetPixelsWithLength, lib, "gdk_pixbuf_get_pixels_with_length") | |
| 1628 | - | core.PuregoSafeRegister(&xPixbufGetRowstride, lib, "gdk_pixbuf_get_rowstride") | |
| 1629 | - | core.PuregoSafeRegister(&xPixbufGetWidth, lib, "gdk_pixbuf_get_width") | |
| 1630 | - | core.PuregoSafeRegister(&xPixbufNewSubpixbuf, lib, "gdk_pixbuf_new_subpixbuf") | |
| 1631 | - | core.PuregoSafeRegister(&xPixbufReadPixelBytes, lib, "gdk_pixbuf_read_pixel_bytes") | |
| 1632 | - | core.PuregoSafeRegister(&xPixbufReadPixels, lib, "gdk_pixbuf_read_pixels") | |
| 1633 | - | core.PuregoSafeRegister(&xPixbufRef, lib, "gdk_pixbuf_ref") | |
| 1634 | - | core.PuregoSafeRegister(&xPixbufRemoveOption, lib, "gdk_pixbuf_remove_option") | |
| 1635 | - | core.PuregoSafeRegister(&xPixbufRotateSimple, lib, "gdk_pixbuf_rotate_simple") | |
| 1636 | - | core.PuregoSafeRegister(&xPixbufSaturateAndPixelate, lib, "gdk_pixbuf_saturate_and_pixelate") | |
| 1637 | - | core.PuregoSafeRegister(&xPixbufSave, lib, "gdk_pixbuf_save") | |
| 1638 | - | core.PuregoSafeRegister(&xPixbufSaveToBuffer, lib, "gdk_pixbuf_save_to_buffer") | |
| 1639 | - | core.PuregoSafeRegister(&xPixbufSaveToBufferv, lib, "gdk_pixbuf_save_to_bufferv") | |
| 1640 | - | core.PuregoSafeRegister(&xPixbufSaveToCallback, lib, "gdk_pixbuf_save_to_callback") | |
| 1641 | - | core.PuregoSafeRegister(&xPixbufSaveToCallbackv, lib, "gdk_pixbuf_save_to_callbackv") | |
| 1642 | - | core.PuregoSafeRegister(&xPixbufSaveToStream, lib, "gdk_pixbuf_save_to_stream") | |
| 1643 | - | core.PuregoSafeRegister(&xPixbufSaveToStreamAsync, lib, "gdk_pixbuf_save_to_stream_async") | |
| 1644 | - | core.PuregoSafeRegister(&xPixbufSaveToStreamv, lib, "gdk_pixbuf_save_to_streamv") | |
| 1645 | - | core.PuregoSafeRegister(&xPixbufSaveToStreamvAsync, lib, "gdk_pixbuf_save_to_streamv_async") | |
| 1646 | - | core.PuregoSafeRegister(&xPixbufSavev, lib, "gdk_pixbuf_savev") | |
| 1647 | - | core.PuregoSafeRegister(&xPixbufScale, lib, "gdk_pixbuf_scale") | |
| 1648 | - | core.PuregoSafeRegister(&xPixbufScaleSimple, lib, "gdk_pixbuf_scale_simple") | |
| 1649 | - | core.PuregoSafeRegister(&xPixbufSetOption, lib, "gdk_pixbuf_set_option") | |
| 1650 | - | core.PuregoSafeRegister(&xPixbufUnref, lib, "gdk_pixbuf_unref") | |
| 1651 | - | ||
| 1652 | - | core.PuregoSafeRegister(&xPixbufCalculateRowstride, lib, "gdk_pixbuf_calculate_rowstride") | |
| 1653 | - | core.PuregoSafeRegister(&xPixbufGetFileInfo, lib, "gdk_pixbuf_get_file_info") | |
| 1654 | - | core.PuregoSafeRegister(&xPixbufGetFileInfoAsync, lib, "gdk_pixbuf_get_file_info_async") | |
| 1655 | - | core.PuregoSafeRegister(&xPixbufGetFileInfoFinish, lib, "gdk_pixbuf_get_file_info_finish") | |
| 1656 | - | core.PuregoSafeRegister(&xPixbufGetFormats, lib, "gdk_pixbuf_get_formats") | |
| 1657 | - | core.PuregoSafeRegister(&xPixbufInitModules, lib, "gdk_pixbuf_init_modules") | |
| 1658 | - | core.PuregoSafeRegister(&xPixbufNewFromStreamAsync, lib, "gdk_pixbuf_new_from_stream_async") | |
| 1659 | - | core.PuregoSafeRegister(&xPixbufNewFromStreamAtScaleAsync, lib, "gdk_pixbuf_new_from_stream_at_scale_async") | |
| 1660 | - | core.PuregoSafeRegister(&xPixbufSaveToStreamFinish, lib, "gdk_pixbuf_save_to_stream_finish") | |
| 1596 | + | core.PuregoSafeRegister(&xPixbufGLibType, libs, "gdk_pixbuf_get_type") | |
| 1597 | + | ||
| 1598 | + | core.PuregoSafeRegister(&xNewPixbuf, libs, "gdk_pixbuf_new") | |
| 1599 | + | core.PuregoSafeRegister(&xNewPixbufFromBytes, libs, "gdk_pixbuf_new_from_bytes") | |
| 1600 | + | core.PuregoSafeRegister(&xNewPixbufFromData, libs, "gdk_pixbuf_new_from_data") | |
| 1601 | + | core.PuregoSafeRegister(&xNewPixbufFromFile, libs, "gdk_pixbuf_new_from_file") | |
| 1602 | + | core.PuregoSafeRegister(&xNewPixbufFromFileAtScale, libs, "gdk_pixbuf_new_from_file_at_scale") | |
| 1603 | + | core.PuregoSafeRegister(&xNewPixbufFromFileAtSize, libs, "gdk_pixbuf_new_from_file_at_size") | |
| 1604 | + | core.PuregoSafeRegister(&xNewPixbufFromInline, libs, "gdk_pixbuf_new_from_inline") | |
| 1605 | + | core.PuregoSafeRegister(&xNewPixbufFromResource, libs, "gdk_pixbuf_new_from_resource") | |
| 1606 | + | core.PuregoSafeRegister(&xNewPixbufFromResourceAtScale, libs, "gdk_pixbuf_new_from_resource_at_scale") | |
| 1607 | + | core.PuregoSafeRegister(&xNewPixbufFromStream, libs, "gdk_pixbuf_new_from_stream") | |
| 1608 | + | core.PuregoSafeRegister(&xNewPixbufFromStreamAtScale, libs, "gdk_pixbuf_new_from_stream_at_scale") | |
| 1609 | + | core.PuregoSafeRegister(&xNewPixbufFromStreamFinish, libs, "gdk_pixbuf_new_from_stream_finish") | |
| 1610 | + | core.PuregoSafeRegister(&xNewPixbufFromXpmData, libs, "gdk_pixbuf_new_from_xpm_data") | |
| 1611 | + | ||
| 1612 | + | core.PuregoSafeRegister(&xPixbufAddAlpha, libs, "gdk_pixbuf_add_alpha") | |
| 1613 | + | core.PuregoSafeRegister(&xPixbufApplyEmbeddedOrientation, libs, "gdk_pixbuf_apply_embedded_orientation") | |
| 1614 | + | core.PuregoSafeRegister(&xPixbufComposite, libs, "gdk_pixbuf_composite") | |
| 1615 | + | core.PuregoSafeRegister(&xPixbufCompositeColor, libs, "gdk_pixbuf_composite_color") | |
| 1616 | + | core.PuregoSafeRegister(&xPixbufCompositeColorSimple, libs, "gdk_pixbuf_composite_color_simple") | |
| 1617 | + | core.PuregoSafeRegister(&xPixbufCopy, libs, "gdk_pixbuf_copy") | |
| 1618 | + | core.PuregoSafeRegister(&xPixbufCopyArea, libs, "gdk_pixbuf_copy_area") | |
| 1619 | + | core.PuregoSafeRegister(&xPixbufCopyOptions, libs, "gdk_pixbuf_copy_options") | |
| 1620 | + | core.PuregoSafeRegister(&xPixbufFill, libs, "gdk_pixbuf_fill") | |
| 1621 | + | core.PuregoSafeRegister(&xPixbufFlip, libs, "gdk_pixbuf_flip") | |
| 1622 | + | core.PuregoSafeRegister(&xPixbufGetBitsPerSample, libs, "gdk_pixbuf_get_bits_per_sample") | |
| 1623 | + | core.PuregoSafeRegister(&xPixbufGetByteLength, libs, "gdk_pixbuf_get_byte_length") | |
| 1624 | + | core.PuregoSafeRegister(&xPixbufGetColorspace, libs, "gdk_pixbuf_get_colorspace") | |
| 1625 | + | core.PuregoSafeRegister(&xPixbufGetHasAlpha, libs, "gdk_pixbuf_get_has_alpha") | |
| 1626 | + | core.PuregoSafeRegister(&xPixbufGetHeight, libs, "gdk_pixbuf_get_height") | |
| 1627 | + | core.PuregoSafeRegister(&xPixbufGetNChannels, libs, "gdk_pixbuf_get_n_channels") | |
| 1628 | + | core.PuregoSafeRegister(&xPixbufGetOption, libs, "gdk_pixbuf_get_option") | |
| 1629 | + | core.PuregoSafeRegister(&xPixbufGetOptions, libs, "gdk_pixbuf_get_options") | |
| 1630 | + | core.PuregoSafeRegister(&xPixbufGetPixels, libs, "gdk_pixbuf_get_pixels") | |
| 1631 | + | core.PuregoSafeRegister(&xPixbufGetPixelsWithLength, libs, "gdk_pixbuf_get_pixels_with_length") | |
| 1632 | + | core.PuregoSafeRegister(&xPixbufGetRowstride, libs, "gdk_pixbuf_get_rowstride") | |
| 1633 | + | core.PuregoSafeRegister(&xPixbufGetWidth, libs, "gdk_pixbuf_get_width") | |
| 1634 | + | core.PuregoSafeRegister(&xPixbufNewSubpixbuf, libs, "gdk_pixbuf_new_subpixbuf") | |
| 1635 | + | core.PuregoSafeRegister(&xPixbufReadPixelBytes, libs, "gdk_pixbuf_read_pixel_bytes") | |
| 1636 | + | core.PuregoSafeRegister(&xPixbufReadPixels, libs, "gdk_pixbuf_read_pixels") | |
| 1637 | + | core.PuregoSafeRegister(&xPixbufRef, libs, "gdk_pixbuf_ref") | |
| 1638 | + | core.PuregoSafeRegister(&xPixbufRemoveOption, libs, "gdk_pixbuf_remove_option") | |
| 1639 | + | core.PuregoSafeRegister(&xPixbufRotateSimple, libs, "gdk_pixbuf_rotate_simple") | |
| 1640 | + | core.PuregoSafeRegister(&xPixbufSaturateAndPixelate, libs, "gdk_pixbuf_saturate_and_pixelate") | |
| 1641 | + | core.PuregoSafeRegister(&xPixbufSave, libs, "gdk_pixbuf_save") | |
| 1642 | + | core.PuregoSafeRegister(&xPixbufSaveToBuffer, libs, "gdk_pixbuf_save_to_buffer") | |
| 1643 | + | core.PuregoSafeRegister(&xPixbufSaveToBufferv, libs, "gdk_pixbuf_save_to_bufferv") | |
| 1644 | + | core.PuregoSafeRegister(&xPixbufSaveToCallback, libs, "gdk_pixbuf_save_to_callback") | |
| 1645 | + | core.PuregoSafeRegister(&xPixbufSaveToCallbackv, libs, "gdk_pixbuf_save_to_callbackv") | |
| 1646 | + | core.PuregoSafeRegister(&xPixbufSaveToStream, libs, "gdk_pixbuf_save_to_stream") | |
| 1647 | + | core.PuregoSafeRegister(&xPixbufSaveToStreamAsync, libs, "gdk_pixbuf_save_to_stream_async") | |
| 1648 | + | core.PuregoSafeRegister(&xPixbufSaveToStreamv, libs, "gdk_pixbuf_save_to_streamv") | |
| 1649 | + | core.PuregoSafeRegister(&xPixbufSaveToStreamvAsync, libs, "gdk_pixbuf_save_to_streamv_async") | |
| 1650 | + | core.PuregoSafeRegister(&xPixbufSavev, libs, "gdk_pixbuf_savev") | |
| 1651 | + | core.PuregoSafeRegister(&xPixbufScale, libs, "gdk_pixbuf_scale") | |
| 1652 | + | core.PuregoSafeRegister(&xPixbufScaleSimple, libs, "gdk_pixbuf_scale_simple") | |
| 1653 | + | core.PuregoSafeRegister(&xPixbufSetOption, libs, "gdk_pixbuf_set_option") | |
| 1654 | + | core.PuregoSafeRegister(&xPixbufUnref, libs, "gdk_pixbuf_unref") | |
| 1655 | + | ||
| 1656 | + | core.PuregoSafeRegister(&xPixbufCalculateRowstride, libs, "gdk_pixbuf_calculate_rowstride") | |
| 1657 | + | core.PuregoSafeRegister(&xPixbufGetFileInfo, libs, "gdk_pixbuf_get_file_info") | |
| 1658 | + | core.PuregoSafeRegister(&xPixbufGetFileInfoAsync, libs, "gdk_pixbuf_get_file_info_async") | |
| 1659 | + | core.PuregoSafeRegister(&xPixbufGetFileInfoFinish, libs, "gdk_pixbuf_get_file_info_finish") | |
| 1660 | + | core.PuregoSafeRegister(&xPixbufGetFormats, libs, "gdk_pixbuf_get_formats") | |
| 1661 | + | core.PuregoSafeRegister(&xPixbufInitModules, libs, "gdk_pixbuf_init_modules") | |
| 1662 | + | core.PuregoSafeRegister(&xPixbufNewFromStreamAsync, libs, "gdk_pixbuf_new_from_stream_async") | |
| 1663 | + | core.PuregoSafeRegister(&xPixbufNewFromStreamAtScaleAsync, libs, "gdk_pixbuf_new_from_stream_at_scale_async") | |
| 1664 | + | core.PuregoSafeRegister(&xPixbufSaveToStreamFinish, libs, "gdk_pixbuf_save_to_stream_finish") | |
| 1661 | 1665 | ||
| 1662 | 1666 | } | |
M v4/gdkpixbuf/main.go +12 -8
| @@ -87,18 +87,22 @@ func (c *PixbufSimpleAnimIter) SetGoPointer(ptr uintptr) { | |||
| 87 | 87 | ||
| 88 | 88 | func init() { | |
| 89 | 89 | core.SetPackageName("GDKPIXBUF", "gdk-pixbuf-2.0") | |
| 90 | - | core.SetSharedLibrary("GDKPIXBUF", "libgdk_pixbuf-2.0.so.0") | |
| 91 | - | lib, err := purego.Dlopen(core.GetPath("GDKPIXBUF"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 92 | - | if err != nil { | |
| 93 | - | panic(err) | |
| 90 | + | core.SetSharedLibraries("GDKPIXBUF", []string{"libgdk_pixbuf-2.0.so.0"}) | |
| 91 | + | var libs []uintptr | |
| 92 | + | for _, libPath := range core.GetPaths("GDKPIXBUF") { | |
| 93 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 94 | + | if err != nil { | |
| 95 | + | panic(err) | |
| 96 | + | } | |
| 97 | + | libs = append(libs, lib) | |
| 94 | 98 | } | |
| 95 | 99 | ||
| 96 | - | core.PuregoSafeRegister(&xPixbufErrorQuark, lib, "gdk_pixbuf_error_quark") | |
| 100 | + | core.PuregoSafeRegister(&xPixbufErrorQuark, libs, "gdk_pixbuf_error_quark") | |
| 97 | 101 | ||
| 98 | - | core.PuregoSafeRegister(&xPixbufNonAnimGLibType, lib, "gdk_pixbuf_non_anim_get_type") | |
| 102 | + | core.PuregoSafeRegister(&xPixbufNonAnimGLibType, libs, "gdk_pixbuf_non_anim_get_type") | |
| 99 | 103 | ||
| 100 | - | core.PuregoSafeRegister(&xNewPixbufNonAnim, lib, "gdk_pixbuf_non_anim_new") | |
| 104 | + | core.PuregoSafeRegister(&xNewPixbufNonAnim, libs, "gdk_pixbuf_non_anim_new") | |
| 101 | 105 | ||
| 102 | - | core.PuregoSafeRegister(&xPixbufSimpleAnimIterGLibType, lib, "gdk_pixbuf_simple_anim_iter_get_type") | |
| 106 | + | core.PuregoSafeRegister(&xPixbufSimpleAnimIterGLibType, libs, "gdk_pixbuf_simple_anim_iter_get_type") | |
| 103 | 107 | ||
| 104 | 108 | } | |
M v4/gio/gaction.go +20 -16
| @@ -509,25 +509,29 @@ func ActionPrintDetailedName(ActionNameVar string, TargetValueVar *glib.Variant) | |||
| 509 | 509 | ||
| 510 | 510 | func init() { | |
| 511 | 511 | core.SetPackageName("GIO", "gio-2.0") | |
| 512 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 513 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 514 | - | if err != nil { | |
| 515 | - | panic(err) | |
| 512 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 513 | + | var libs []uintptr | |
| 514 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 515 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 516 | + | if err != nil { | |
| 517 | + | panic(err) | |
| 518 | + | } | |
| 519 | + | libs = append(libs, lib) | |
| 516 | 520 | } | |
| 517 | 521 | ||
| 518 | - | core.PuregoSafeRegister(&xActionNameIsValid, lib, "g_action_name_is_valid") | |
| 519 | - | core.PuregoSafeRegister(&xActionParseDetailedName, lib, "g_action_parse_detailed_name") | |
| 520 | - | core.PuregoSafeRegister(&xActionPrintDetailedName, lib, "g_action_print_detailed_name") | |
| 522 | + | core.PuregoSafeRegister(&xActionNameIsValid, libs, "g_action_name_is_valid") | |
| 523 | + | core.PuregoSafeRegister(&xActionParseDetailedName, libs, "g_action_parse_detailed_name") | |
| 524 | + | core.PuregoSafeRegister(&xActionPrintDetailedName, libs, "g_action_print_detailed_name") | |
| 521 | 525 | ||
| 522 | - | core.PuregoSafeRegister(&xActionGLibType, lib, "g_action_get_type") | |
| 526 | + | core.PuregoSafeRegister(&xActionGLibType, libs, "g_action_get_type") | |
| 523 | 527 | ||
| 524 | - | core.PuregoSafeRegister(&XGActionActivate, lib, "g_action_activate") | |
| 525 | - | core.PuregoSafeRegister(&XGActionChangeState, lib, "g_action_change_state") | |
| 526 | - | core.PuregoSafeRegister(&XGActionGetEnabled, lib, "g_action_get_enabled") | |
| 527 | - | core.PuregoSafeRegister(&XGActionGetName, lib, "g_action_get_name") | |
| 528 | - | core.PuregoSafeRegister(&XGActionGetParameterType, lib, "g_action_get_parameter_type") | |
| 529 | - | core.PuregoSafeRegister(&XGActionGetState, lib, "g_action_get_state") | |
| 530 | - | core.PuregoSafeRegister(&XGActionGetStateHint, lib, "g_action_get_state_hint") | |
| 531 | - | core.PuregoSafeRegister(&XGActionGetStateType, lib, "g_action_get_state_type") | |
| 528 | + | core.PuregoSafeRegister(&XGActionActivate, libs, "g_action_activate") | |
| 529 | + | core.PuregoSafeRegister(&XGActionChangeState, libs, "g_action_change_state") | |
| 530 | + | core.PuregoSafeRegister(&XGActionGetEnabled, libs, "g_action_get_enabled") | |
| 531 | + | core.PuregoSafeRegister(&XGActionGetName, libs, "g_action_get_name") | |
| 532 | + | core.PuregoSafeRegister(&XGActionGetParameterType, libs, "g_action_get_parameter_type") | |
| 533 | + | core.PuregoSafeRegister(&XGActionGetState, libs, "g_action_get_state") | |
| 534 | + | core.PuregoSafeRegister(&XGActionGetStateHint, libs, "g_action_get_state_hint") | |
| 535 | + | core.PuregoSafeRegister(&XGActionGetStateType, libs, "g_action_get_state_type") | |
| 532 | 536 | ||
| 533 | 537 | } | |
M v4/gio/gactiongroup.go +26 -22
| @@ -732,27 +732,31 @@ var XGActionGroupQueryAction func(uintptr, string, bool, **glib.VariantType, **g | |||
| 732 | 732 | ||
| 733 | 733 | func init() { | |
| 734 | 734 | core.SetPackageName("GIO", "gio-2.0") | |
| 735 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 736 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 737 | - | if err != nil { | |
| 738 | - | panic(err) | |
| 739 | - | } | |
| 740 | - | ||
| 741 | - | core.PuregoSafeRegister(&xActionGroupGLibType, lib, "g_action_group_get_type") | |
| 742 | - | ||
| 743 | - | core.PuregoSafeRegister(&XGActionGroupActionAdded, lib, "g_action_group_action_added") | |
| 744 | - | core.PuregoSafeRegister(&XGActionGroupActionEnabledChanged, lib, "g_action_group_action_enabled_changed") | |
| 745 | - | core.PuregoSafeRegister(&XGActionGroupActionRemoved, lib, "g_action_group_action_removed") | |
| 746 | - | core.PuregoSafeRegister(&XGActionGroupActionStateChanged, lib, "g_action_group_action_state_changed") | |
| 747 | - | core.PuregoSafeRegister(&XGActionGroupActivateAction, lib, "g_action_group_activate_action") | |
| 748 | - | core.PuregoSafeRegister(&XGActionGroupChangeActionState, lib, "g_action_group_change_action_state") | |
| 749 | - | core.PuregoSafeRegister(&XGActionGroupGetActionEnabled, lib, "g_action_group_get_action_enabled") | |
| 750 | - | core.PuregoSafeRegister(&XGActionGroupGetActionParameterType, lib, "g_action_group_get_action_parameter_type") | |
| 751 | - | core.PuregoSafeRegister(&XGActionGroupGetActionState, lib, "g_action_group_get_action_state") | |
| 752 | - | core.PuregoSafeRegister(&XGActionGroupGetActionStateHint, lib, "g_action_group_get_action_state_hint") | |
| 753 | - | core.PuregoSafeRegister(&XGActionGroupGetActionStateType, lib, "g_action_group_get_action_state_type") | |
| 754 | - | core.PuregoSafeRegister(&XGActionGroupHasAction, lib, "g_action_group_has_action") | |
| 755 | - | core.PuregoSafeRegister(&XGActionGroupListActions, lib, "g_action_group_list_actions") | |
| 756 | - | core.PuregoSafeRegister(&XGActionGroupQueryAction, lib, "g_action_group_query_action") | |
| 735 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 736 | + | var libs []uintptr | |
| 737 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 738 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 739 | + | if err != nil { | |
| 740 | + | panic(err) | |
| 741 | + | } | |
| 742 | + | libs = append(libs, lib) | |
| 743 | + | } | |
| 744 | + | ||
| 745 | + | core.PuregoSafeRegister(&xActionGroupGLibType, libs, "g_action_group_get_type") | |
| 746 | + | ||
| 747 | + | core.PuregoSafeRegister(&XGActionGroupActionAdded, libs, "g_action_group_action_added") | |
| 748 | + | core.PuregoSafeRegister(&XGActionGroupActionEnabledChanged, libs, "g_action_group_action_enabled_changed") | |
| 749 | + | core.PuregoSafeRegister(&XGActionGroupActionRemoved, libs, "g_action_group_action_removed") | |
| 750 | + | core.PuregoSafeRegister(&XGActionGroupActionStateChanged, libs, "g_action_group_action_state_changed") | |
| 751 | + | core.PuregoSafeRegister(&XGActionGroupActivateAction, libs, "g_action_group_activate_action") | |
| 752 | + | core.PuregoSafeRegister(&XGActionGroupChangeActionState, libs, "g_action_group_change_action_state") | |
| 753 | + | core.PuregoSafeRegister(&XGActionGroupGetActionEnabled, libs, "g_action_group_get_action_enabled") | |
| 754 | + | core.PuregoSafeRegister(&XGActionGroupGetActionParameterType, libs, "g_action_group_get_action_parameter_type") | |
| 755 | + | core.PuregoSafeRegister(&XGActionGroupGetActionState, libs, "g_action_group_get_action_state") | |
| 756 | + | core.PuregoSafeRegister(&XGActionGroupGetActionStateHint, libs, "g_action_group_get_action_state_hint") | |
| 757 | + | core.PuregoSafeRegister(&XGActionGroupGetActionStateType, libs, "g_action_group_get_action_state_type") | |
| 758 | + | core.PuregoSafeRegister(&XGActionGroupHasAction, libs, "g_action_group_has_action") | |
| 759 | + | core.PuregoSafeRegister(&XGActionGroupListActions, libs, "g_action_group_list_actions") | |
| 760 | + | core.PuregoSafeRegister(&XGActionGroupQueryAction, libs, "g_action_group_query_action") | |
| 757 | 761 | ||
| 758 | 762 | } | |
M v4/gio/gactionmap.go +14 -10
| @@ -392,18 +392,22 @@ var XGActionMapRemoveActionEntries func(uintptr, []ActionEntry, int) | |||
| 392 | 392 | ||
| 393 | 393 | func init() { | |
| 394 | 394 | core.SetPackageName("GIO", "gio-2.0") | |
| 395 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 396 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 397 | - | if err != nil { | |
| 398 | - | panic(err) | |
| 395 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 396 | + | var libs []uintptr | |
| 397 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 398 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 399 | + | if err != nil { | |
| 400 | + | panic(err) | |
| 401 | + | } | |
| 402 | + | libs = append(libs, lib) | |
| 399 | 403 | } | |
| 400 | 404 | ||
| 401 | - | core.PuregoSafeRegister(&xActionMapGLibType, lib, "g_action_map_get_type") | |
| 405 | + | core.PuregoSafeRegister(&xActionMapGLibType, libs, "g_action_map_get_type") | |
| 402 | 406 | ||
| 403 | - | core.PuregoSafeRegister(&XGActionMapAddAction, lib, "g_action_map_add_action") | |
| 404 | - | core.PuregoSafeRegister(&XGActionMapAddActionEntries, lib, "g_action_map_add_action_entries") | |
| 405 | - | core.PuregoSafeRegister(&XGActionMapLookupAction, lib, "g_action_map_lookup_action") | |
| 406 | - | core.PuregoSafeRegister(&XGActionMapRemoveAction, lib, "g_action_map_remove_action") | |
| 407 | - | core.PuregoSafeRegister(&XGActionMapRemoveActionEntries, lib, "g_action_map_remove_action_entries") | |
| 407 | + | core.PuregoSafeRegister(&XGActionMapAddAction, libs, "g_action_map_add_action") | |
| 408 | + | core.PuregoSafeRegister(&XGActionMapAddActionEntries, libs, "g_action_map_add_action_entries") | |
| 409 | + | core.PuregoSafeRegister(&XGActionMapLookupAction, libs, "g_action_map_lookup_action") | |
| 410 | + | core.PuregoSafeRegister(&XGActionMapRemoveAction, libs, "g_action_map_remove_action") | |
| 411 | + | core.PuregoSafeRegister(&XGActionMapRemoveActionEntries, libs, "g_action_map_remove_action_entries") | |
| 408 | 412 | ||
| 409 | 413 | } | |
M v4/gio/gappinfo.go +68 -64
| @@ -2040,69 +2040,73 @@ func (x *AppLaunchContext) ConnectLaunched(cb *func(AppLaunchContext, uintptr, u | |||
| 2040 | 2040 | ||
| 2041 | 2041 | func init() { | |
| 2042 | 2042 | core.SetPackageName("GIO", "gio-2.0") | |
| 2043 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 2044 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 2045 | - | if err != nil { | |
| 2046 | - | panic(err) | |
| 2047 | - | } | |
| 2048 | - | ||
| 2049 | - | core.PuregoSafeRegister(&xAppInfoCreateFromCommandline, lib, "g_app_info_create_from_commandline") | |
| 2050 | - | core.PuregoSafeRegister(&xAppInfoGetAll, lib, "g_app_info_get_all") | |
| 2051 | - | core.PuregoSafeRegister(&xAppInfoGetAllForType, lib, "g_app_info_get_all_for_type") | |
| 2052 | - | core.PuregoSafeRegister(&xAppInfoGetDefaultForType, lib, "g_app_info_get_default_for_type") | |
| 2053 | - | core.PuregoSafeRegister(&xAppInfoGetDefaultForTypeAsync, lib, "g_app_info_get_default_for_type_async") | |
| 2054 | - | core.PuregoSafeRegister(&xAppInfoGetDefaultForTypeFinish, lib, "g_app_info_get_default_for_type_finish") | |
| 2055 | - | core.PuregoSafeRegister(&xAppInfoGetDefaultForUriScheme, lib, "g_app_info_get_default_for_uri_scheme") | |
| 2056 | - | core.PuregoSafeRegister(&xAppInfoGetDefaultForUriSchemeAsync, lib, "g_app_info_get_default_for_uri_scheme_async") | |
| 2057 | - | core.PuregoSafeRegister(&xAppInfoGetDefaultForUriSchemeFinish, lib, "g_app_info_get_default_for_uri_scheme_finish") | |
| 2058 | - | core.PuregoSafeRegister(&xAppInfoGetFallbackForType, lib, "g_app_info_get_fallback_for_type") | |
| 2059 | - | core.PuregoSafeRegister(&xAppInfoGetRecommendedForType, lib, "g_app_info_get_recommended_for_type") | |
| 2060 | - | core.PuregoSafeRegister(&xAppInfoLaunchDefaultForUri, lib, "g_app_info_launch_default_for_uri") | |
| 2061 | - | core.PuregoSafeRegister(&xAppInfoLaunchDefaultForUriAsync, lib, "g_app_info_launch_default_for_uri_async") | |
| 2062 | - | core.PuregoSafeRegister(&xAppInfoLaunchDefaultForUriFinish, lib, "g_app_info_launch_default_for_uri_finish") | |
| 2063 | - | core.PuregoSafeRegister(&xAppInfoResetTypeAssociations, lib, "g_app_info_reset_type_associations") | |
| 2064 | - | ||
| 2065 | - | core.PuregoSafeRegister(&xAppInfoMonitorGLibType, lib, "g_app_info_monitor_get_type") | |
| 2066 | - | ||
| 2067 | - | core.PuregoSafeRegister(&xAppInfoMonitorGet, lib, "g_app_info_monitor_get") | |
| 2068 | - | ||
| 2069 | - | core.PuregoSafeRegister(&xAppLaunchContextGLibType, lib, "g_app_launch_context_get_type") | |
| 2070 | - | ||
| 2071 | - | core.PuregoSafeRegister(&xNewAppLaunchContext, lib, "g_app_launch_context_new") | |
| 2072 | - | ||
| 2073 | - | core.PuregoSafeRegister(&xAppLaunchContextGetDisplay, lib, "g_app_launch_context_get_display") | |
| 2074 | - | core.PuregoSafeRegister(&xAppLaunchContextGetEnvironment, lib, "g_app_launch_context_get_environment") | |
| 2075 | - | core.PuregoSafeRegister(&xAppLaunchContextGetStartupNotifyId, lib, "g_app_launch_context_get_startup_notify_id") | |
| 2076 | - | core.PuregoSafeRegister(&xAppLaunchContextLaunchFailed, lib, "g_app_launch_context_launch_failed") | |
| 2077 | - | core.PuregoSafeRegister(&xAppLaunchContextSetenv, lib, "g_app_launch_context_setenv") | |
| 2078 | - | core.PuregoSafeRegister(&xAppLaunchContextUnsetenv, lib, "g_app_launch_context_unsetenv") | |
| 2079 | - | ||
| 2080 | - | core.PuregoSafeRegister(&xAppInfoGLibType, lib, "g_app_info_get_type") | |
| 2081 | - | ||
| 2082 | - | core.PuregoSafeRegister(&XGAppInfoAddSupportsType, lib, "g_app_info_add_supports_type") | |
| 2083 | - | core.PuregoSafeRegister(&XGAppInfoCanDelete, lib, "g_app_info_can_delete") | |
| 2084 | - | core.PuregoSafeRegister(&XGAppInfoCanRemoveSupportsType, lib, "g_app_info_can_remove_supports_type") | |
| 2085 | - | core.PuregoSafeRegister(&XGAppInfoDelete, lib, "g_app_info_delete") | |
| 2086 | - | core.PuregoSafeRegister(&XGAppInfoDup, lib, "g_app_info_dup") | |
| 2087 | - | core.PuregoSafeRegister(&XGAppInfoEqual, lib, "g_app_info_equal") | |
| 2088 | - | core.PuregoSafeRegister(&XGAppInfoGetCommandline, lib, "g_app_info_get_commandline") | |
| 2089 | - | core.PuregoSafeRegister(&XGAppInfoGetDescription, lib, "g_app_info_get_description") | |
| 2090 | - | core.PuregoSafeRegister(&XGAppInfoGetDisplayName, lib, "g_app_info_get_display_name") | |
| 2091 | - | core.PuregoSafeRegister(&XGAppInfoGetExecutable, lib, "g_app_info_get_executable") | |
| 2092 | - | core.PuregoSafeRegister(&XGAppInfoGetIcon, lib, "g_app_info_get_icon") | |
| 2093 | - | core.PuregoSafeRegister(&XGAppInfoGetId, lib, "g_app_info_get_id") | |
| 2094 | - | core.PuregoSafeRegister(&XGAppInfoGetName, lib, "g_app_info_get_name") | |
| 2095 | - | core.PuregoSafeRegister(&XGAppInfoGetSupportedTypes, lib, "g_app_info_get_supported_types") | |
| 2096 | - | core.PuregoSafeRegister(&XGAppInfoLaunch, lib, "g_app_info_launch") | |
| 2097 | - | core.PuregoSafeRegister(&XGAppInfoLaunchUris, lib, "g_app_info_launch_uris") | |
| 2098 | - | core.PuregoSafeRegister(&XGAppInfoLaunchUrisAsync, lib, "g_app_info_launch_uris_async") | |
| 2099 | - | core.PuregoSafeRegister(&XGAppInfoLaunchUrisFinish, lib, "g_app_info_launch_uris_finish") | |
| 2100 | - | core.PuregoSafeRegister(&XGAppInfoRemoveSupportsType, lib, "g_app_info_remove_supports_type") | |
| 2101 | - | core.PuregoSafeRegister(&XGAppInfoSetAsDefaultForExtension, lib, "g_app_info_set_as_default_for_extension") | |
| 2102 | - | core.PuregoSafeRegister(&XGAppInfoSetAsDefaultForType, lib, "g_app_info_set_as_default_for_type") | |
| 2103 | - | core.PuregoSafeRegister(&XGAppInfoSetAsLastUsedForType, lib, "g_app_info_set_as_last_used_for_type") | |
| 2104 | - | core.PuregoSafeRegister(&XGAppInfoShouldShow, lib, "g_app_info_should_show") | |
| 2105 | - | core.PuregoSafeRegister(&XGAppInfoSupportsFiles, lib, "g_app_info_supports_files") | |
| 2106 | - | core.PuregoSafeRegister(&XGAppInfoSupportsUris, lib, "g_app_info_supports_uris") | |
| 2043 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 2044 | + | var libs []uintptr | |
| 2045 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 2046 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 2047 | + | if err != nil { | |
| 2048 | + | panic(err) | |
| 2049 | + | } | |
| 2050 | + | libs = append(libs, lib) | |
| 2051 | + | } | |
| 2052 | + | ||
| 2053 | + | core.PuregoSafeRegister(&xAppInfoCreateFromCommandline, libs, "g_app_info_create_from_commandline") | |
| 2054 | + | core.PuregoSafeRegister(&xAppInfoGetAll, libs, "g_app_info_get_all") | |
| 2055 | + | core.PuregoSafeRegister(&xAppInfoGetAllForType, libs, "g_app_info_get_all_for_type") | |
| 2056 | + | core.PuregoSafeRegister(&xAppInfoGetDefaultForType, libs, "g_app_info_get_default_for_type") | |
| 2057 | + | core.PuregoSafeRegister(&xAppInfoGetDefaultForTypeAsync, libs, "g_app_info_get_default_for_type_async") | |
| 2058 | + | core.PuregoSafeRegister(&xAppInfoGetDefaultForTypeFinish, libs, "g_app_info_get_default_for_type_finish") | |
| 2059 | + | core.PuregoSafeRegister(&xAppInfoGetDefaultForUriScheme, libs, "g_app_info_get_default_for_uri_scheme") | |
| 2060 | + | core.PuregoSafeRegister(&xAppInfoGetDefaultForUriSchemeAsync, libs, "g_app_info_get_default_for_uri_scheme_async") | |
| 2061 | + | core.PuregoSafeRegister(&xAppInfoGetDefaultForUriSchemeFinish, libs, "g_app_info_get_default_for_uri_scheme_finish") | |
| 2062 | + | core.PuregoSafeRegister(&xAppInfoGetFallbackForType, libs, "g_app_info_get_fallback_for_type") | |
| 2063 | + | core.PuregoSafeRegister(&xAppInfoGetRecommendedForType, libs, "g_app_info_get_recommended_for_type") | |
| 2064 | + | core.PuregoSafeRegister(&xAppInfoLaunchDefaultForUri, libs, "g_app_info_launch_default_for_uri") | |
| 2065 | + | core.PuregoSafeRegister(&xAppInfoLaunchDefaultForUriAsync, libs, "g_app_info_launch_default_for_uri_async") | |
| 2066 | + | core.PuregoSafeRegister(&xAppInfoLaunchDefaultForUriFinish, libs, "g_app_info_launch_default_for_uri_finish") | |
| 2067 | + | core.PuregoSafeRegister(&xAppInfoResetTypeAssociations, libs, "g_app_info_reset_type_associations") | |
| 2068 | + | ||
| 2069 | + | core.PuregoSafeRegister(&xAppInfoMonitorGLibType, libs, "g_app_info_monitor_get_type") | |
| 2070 | + | ||
| 2071 | + | core.PuregoSafeRegister(&xAppInfoMonitorGet, libs, "g_app_info_monitor_get") | |
| 2072 | + | ||
| 2073 | + | core.PuregoSafeRegister(&xAppLaunchContextGLibType, libs, "g_app_launch_context_get_type") | |
| 2074 | + | ||
| 2075 | + | core.PuregoSafeRegister(&xNewAppLaunchContext, libs, "g_app_launch_context_new") | |
| 2076 | + | ||
| 2077 | + | core.PuregoSafeRegister(&xAppLaunchContextGetDisplay, libs, "g_app_launch_context_get_display") | |
| 2078 | + | core.PuregoSafeRegister(&xAppLaunchContextGetEnvironment, libs, "g_app_launch_context_get_environment") | |
| 2079 | + | core.PuregoSafeRegister(&xAppLaunchContextGetStartupNotifyId, libs, "g_app_launch_context_get_startup_notify_id") | |
| 2080 | + | core.PuregoSafeRegister(&xAppLaunchContextLaunchFailed, libs, "g_app_launch_context_launch_failed") | |
| 2081 | + | core.PuregoSafeRegister(&xAppLaunchContextSetenv, libs, "g_app_launch_context_setenv") | |
| 2082 | + | core.PuregoSafeRegister(&xAppLaunchContextUnsetenv, libs, "g_app_launch_context_unsetenv") | |
| 2083 | + | ||
| 2084 | + | core.PuregoSafeRegister(&xAppInfoGLibType, libs, "g_app_info_get_type") | |
| 2085 | + | ||
| 2086 | + | core.PuregoSafeRegister(&XGAppInfoAddSupportsType, libs, "g_app_info_add_supports_type") | |
| 2087 | + | core.PuregoSafeRegister(&XGAppInfoCanDelete, libs, "g_app_info_can_delete") | |
| 2088 | + | core.PuregoSafeRegister(&XGAppInfoCanRemoveSupportsType, libs, "g_app_info_can_remove_supports_type") | |
| 2089 | + | core.PuregoSafeRegister(&XGAppInfoDelete, libs, "g_app_info_delete") | |
| 2090 | + | core.PuregoSafeRegister(&XGAppInfoDup, libs, "g_app_info_dup") | |
| 2091 | + | core.PuregoSafeRegister(&XGAppInfoEqual, libs, "g_app_info_equal") | |
| 2092 | + | core.PuregoSafeRegister(&XGAppInfoGetCommandline, libs, "g_app_info_get_commandline") | |
| 2093 | + | core.PuregoSafeRegister(&XGAppInfoGetDescription, libs, "g_app_info_get_description") | |
| 2094 | + | core.PuregoSafeRegister(&XGAppInfoGetDisplayName, libs, "g_app_info_get_display_name") | |
| 2095 | + | core.PuregoSafeRegister(&XGAppInfoGetExecutable, libs, "g_app_info_get_executable") | |
| 2096 | + | core.PuregoSafeRegister(&XGAppInfoGetIcon, libs, "g_app_info_get_icon") | |
| 2097 | + | core.PuregoSafeRegister(&XGAppInfoGetId, libs, "g_app_info_get_id") | |
| 2098 | + | core.PuregoSafeRegister(&XGAppInfoGetName, libs, "g_app_info_get_name") | |
| 2099 | + | core.PuregoSafeRegister(&XGAppInfoGetSupportedTypes, libs, "g_app_info_get_supported_types") | |
| 2100 | + | core.PuregoSafeRegister(&XGAppInfoLaunch, libs, "g_app_info_launch") | |
| 2101 | + | core.PuregoSafeRegister(&XGAppInfoLaunchUris, libs, "g_app_info_launch_uris") | |
| 2102 | + | core.PuregoSafeRegister(&XGAppInfoLaunchUrisAsync, libs, "g_app_info_launch_uris_async") | |
| 2103 | + | core.PuregoSafeRegister(&XGAppInfoLaunchUrisFinish, libs, "g_app_info_launch_uris_finish") | |
| 2104 | + | core.PuregoSafeRegister(&XGAppInfoRemoveSupportsType, libs, "g_app_info_remove_supports_type") | |
| 2105 | + | core.PuregoSafeRegister(&XGAppInfoSetAsDefaultForExtension, libs, "g_app_info_set_as_default_for_extension") | |
| 2106 | + | core.PuregoSafeRegister(&XGAppInfoSetAsDefaultForType, libs, "g_app_info_set_as_default_for_type") | |
| 2107 | + | core.PuregoSafeRegister(&XGAppInfoSetAsLastUsedForType, libs, "g_app_info_set_as_last_used_for_type") | |
| 2108 | + | core.PuregoSafeRegister(&XGAppInfoShouldShow, libs, "g_app_info_should_show") | |
| 2109 | + | core.PuregoSafeRegister(&XGAppInfoSupportsFiles, libs, "g_app_info_supports_files") | |
| 2110 | + | core.PuregoSafeRegister(&XGAppInfoSupportsUris, libs, "g_app_info_supports_uris") | |
| 2107 | 2111 | ||
| 2108 | 2112 | } | |
M v4/gio/gapplication.go +53 -49
| @@ -2049,54 +2049,58 @@ func ApplicationIdIsValid(ApplicationIdVar string) bool { | |||
| 2049 | 2049 | ||
| 2050 | 2050 | func init() { | |
| 2051 | 2051 | core.SetPackageName("GIO", "gio-2.0") | |
| 2052 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 2053 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 2054 | - | if err != nil { | |
| 2055 | - | panic(err) | |
| 2056 | - | } | |
| 2057 | - | ||
| 2058 | - | core.PuregoSafeRegister(&xApplicationGLibType, lib, "g_application_get_type") | |
| 2059 | - | ||
| 2060 | - | core.PuregoSafeRegister(&xNewApplication, lib, "g_application_new") | |
| 2061 | - | ||
| 2062 | - | core.PuregoSafeRegister(&xApplicationActivate, lib, "g_application_activate") | |
| 2063 | - | core.PuregoSafeRegister(&xApplicationAddMainOption, lib, "g_application_add_main_option") | |
| 2064 | - | core.PuregoSafeRegister(&xApplicationAddMainOptionEntries, lib, "g_application_add_main_option_entries") | |
| 2065 | - | core.PuregoSafeRegister(&xApplicationAddOptionGroup, lib, "g_application_add_option_group") | |
| 2066 | - | core.PuregoSafeRegister(&xApplicationBindBusyProperty, lib, "g_application_bind_busy_property") | |
| 2067 | - | core.PuregoSafeRegister(&xApplicationGetApplicationId, lib, "g_application_get_application_id") | |
| 2068 | - | core.PuregoSafeRegister(&xApplicationGetDbusConnection, lib, "g_application_get_dbus_connection") | |
| 2069 | - | core.PuregoSafeRegister(&xApplicationGetDbusObjectPath, lib, "g_application_get_dbus_object_path") | |
| 2070 | - | core.PuregoSafeRegister(&xApplicationGetFlags, lib, "g_application_get_flags") | |
| 2071 | - | core.PuregoSafeRegister(&xApplicationGetInactivityTimeout, lib, "g_application_get_inactivity_timeout") | |
| 2072 | - | core.PuregoSafeRegister(&xApplicationGetIsBusy, lib, "g_application_get_is_busy") | |
| 2073 | - | core.PuregoSafeRegister(&xApplicationGetIsRegistered, lib, "g_application_get_is_registered") | |
| 2074 | - | core.PuregoSafeRegister(&xApplicationGetIsRemote, lib, "g_application_get_is_remote") | |
| 2075 | - | core.PuregoSafeRegister(&xApplicationGetResourceBasePath, lib, "g_application_get_resource_base_path") | |
| 2076 | - | core.PuregoSafeRegister(&xApplicationGetVersion, lib, "g_application_get_version") | |
| 2077 | - | core.PuregoSafeRegister(&xApplicationHold, lib, "g_application_hold") | |
| 2078 | - | core.PuregoSafeRegister(&xApplicationMarkBusy, lib, "g_application_mark_busy") | |
| 2079 | - | core.PuregoSafeRegister(&xApplicationOpen, lib, "g_application_open") | |
| 2080 | - | core.PuregoSafeRegister(&xApplicationQuit, lib, "g_application_quit") | |
| 2081 | - | core.PuregoSafeRegister(&xApplicationRegister, lib, "g_application_register") | |
| 2082 | - | core.PuregoSafeRegister(&xApplicationRelease, lib, "g_application_release") | |
| 2083 | - | core.PuregoSafeRegister(&xApplicationRun, lib, "g_application_run") | |
| 2084 | - | core.PuregoSafeRegister(&xApplicationSendNotification, lib, "g_application_send_notification") | |
| 2085 | - | core.PuregoSafeRegister(&xApplicationSetActionGroup, lib, "g_application_set_action_group") | |
| 2086 | - | core.PuregoSafeRegister(&xApplicationSetApplicationId, lib, "g_application_set_application_id") | |
| 2087 | - | core.PuregoSafeRegister(&xApplicationSetDefault, lib, "g_application_set_default") | |
| 2088 | - | core.PuregoSafeRegister(&xApplicationSetFlags, lib, "g_application_set_flags") | |
| 2089 | - | core.PuregoSafeRegister(&xApplicationSetInactivityTimeout, lib, "g_application_set_inactivity_timeout") | |
| 2090 | - | core.PuregoSafeRegister(&xApplicationSetOptionContextDescription, lib, "g_application_set_option_context_description") | |
| 2091 | - | core.PuregoSafeRegister(&xApplicationSetOptionContextParameterString, lib, "g_application_set_option_context_parameter_string") | |
| 2092 | - | core.PuregoSafeRegister(&xApplicationSetOptionContextSummary, lib, "g_application_set_option_context_summary") | |
| 2093 | - | core.PuregoSafeRegister(&xApplicationSetResourceBasePath, lib, "g_application_set_resource_base_path") | |
| 2094 | - | core.PuregoSafeRegister(&xApplicationSetVersion, lib, "g_application_set_version") | |
| 2095 | - | core.PuregoSafeRegister(&xApplicationUnbindBusyProperty, lib, "g_application_unbind_busy_property") | |
| 2096 | - | core.PuregoSafeRegister(&xApplicationUnmarkBusy, lib, "g_application_unmark_busy") | |
| 2097 | - | core.PuregoSafeRegister(&xApplicationWithdrawNotification, lib, "g_application_withdraw_notification") | |
| 2098 | - | ||
| 2099 | - | core.PuregoSafeRegister(&xApplicationGetDefault, lib, "g_application_get_default") | |
| 2100 | - | core.PuregoSafeRegister(&xApplicationIdIsValid, lib, "g_application_id_is_valid") | |
| 2052 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 2053 | + | var libs []uintptr | |
| 2054 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 2055 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 2056 | + | if err != nil { | |
| 2057 | + | panic(err) | |
| 2058 | + | } | |
| 2059 | + | libs = append(libs, lib) | |
| 2060 | + | } | |
| 2061 | + | ||
| 2062 | + | core.PuregoSafeRegister(&xApplicationGLibType, libs, "g_application_get_type") | |
| 2063 | + | ||
| 2064 | + | core.PuregoSafeRegister(&xNewApplication, libs, "g_application_new") | |
| 2065 | + | ||
| 2066 | + | core.PuregoSafeRegister(&xApplicationActivate, libs, "g_application_activate") | |
| 2067 | + | core.PuregoSafeRegister(&xApplicationAddMainOption, libs, "g_application_add_main_option") | |
| 2068 | + | core.PuregoSafeRegister(&xApplicationAddMainOptionEntries, libs, "g_application_add_main_option_entries") | |
| 2069 | + | core.PuregoSafeRegister(&xApplicationAddOptionGroup, libs, "g_application_add_option_group") | |
| 2070 | + | core.PuregoSafeRegister(&xApplicationBindBusyProperty, libs, "g_application_bind_busy_property") | |
| 2071 | + | core.PuregoSafeRegister(&xApplicationGetApplicationId, libs, "g_application_get_application_id") | |
| 2072 | + | core.PuregoSafeRegister(&xApplicationGetDbusConnection, libs, "g_application_get_dbus_connection") | |
| 2073 | + | core.PuregoSafeRegister(&xApplicationGetDbusObjectPath, libs, "g_application_get_dbus_object_path") | |
| 2074 | + | core.PuregoSafeRegister(&xApplicationGetFlags, libs, "g_application_get_flags") | |
| 2075 | + | core.PuregoSafeRegister(&xApplicationGetInactivityTimeout, libs, "g_application_get_inactivity_timeout") | |
| 2076 | + | core.PuregoSafeRegister(&xApplicationGetIsBusy, libs, "g_application_get_is_busy") | |
| 2077 | + | core.PuregoSafeRegister(&xApplicationGetIsRegistered, libs, "g_application_get_is_registered") | |
| 2078 | + | core.PuregoSafeRegister(&xApplicationGetIsRemote, libs, "g_application_get_is_remote") | |
| 2079 | + | core.PuregoSafeRegister(&xApplicationGetResourceBasePath, libs, "g_application_get_resource_base_path") | |
| 2080 | + | core.PuregoSafeRegister(&xApplicationGetVersion, libs, "g_application_get_version") | |
| 2081 | + | core.PuregoSafeRegister(&xApplicationHold, libs, "g_application_hold") | |
| 2082 | + | core.PuregoSafeRegister(&xApplicationMarkBusy, libs, "g_application_mark_busy") | |
| 2083 | + | core.PuregoSafeRegister(&xApplicationOpen, libs, "g_application_open") | |
| 2084 | + | core.PuregoSafeRegister(&xApplicationQuit, libs, "g_application_quit") | |
| 2085 | + | core.PuregoSafeRegister(&xApplicationRegister, libs, "g_application_register") | |
| 2086 | + | core.PuregoSafeRegister(&xApplicationRelease, libs, "g_application_release") | |
| 2087 | + | core.PuregoSafeRegister(&xApplicationRun, libs, "g_application_run") | |
| 2088 | + | core.PuregoSafeRegister(&xApplicationSendNotification, libs, "g_application_send_notification") | |
| 2089 | + | core.PuregoSafeRegister(&xApplicationSetActionGroup, libs, "g_application_set_action_group") | |
| 2090 | + | core.PuregoSafeRegister(&xApplicationSetApplicationId, libs, "g_application_set_application_id") | |
| 2091 | + | core.PuregoSafeRegister(&xApplicationSetDefault, libs, "g_application_set_default") | |
| 2092 | + | core.PuregoSafeRegister(&xApplicationSetFlags, libs, "g_application_set_flags") | |
| 2093 | + | core.PuregoSafeRegister(&xApplicationSetInactivityTimeout, libs, "g_application_set_inactivity_timeout") | |
| 2094 | + | core.PuregoSafeRegister(&xApplicationSetOptionContextDescription, libs, "g_application_set_option_context_description") | |
| 2095 | + | core.PuregoSafeRegister(&xApplicationSetOptionContextParameterString, libs, "g_application_set_option_context_parameter_string") | |
| 2096 | + | core.PuregoSafeRegister(&xApplicationSetOptionContextSummary, libs, "g_application_set_option_context_summary") | |
| 2097 | + | core.PuregoSafeRegister(&xApplicationSetResourceBasePath, libs, "g_application_set_resource_base_path") | |
| 2098 | + | core.PuregoSafeRegister(&xApplicationSetVersion, libs, "g_application_set_version") | |
| 2099 | + | core.PuregoSafeRegister(&xApplicationUnbindBusyProperty, libs, "g_application_unbind_busy_property") | |
| 2100 | + | core.PuregoSafeRegister(&xApplicationUnmarkBusy, libs, "g_application_unmark_busy") | |
| 2101 | + | core.PuregoSafeRegister(&xApplicationWithdrawNotification, libs, "g_application_withdraw_notification") | |
| 2102 | + | ||
| 2103 | + | core.PuregoSafeRegister(&xApplicationGetDefault, libs, "g_application_get_default") | |
| 2104 | + | core.PuregoSafeRegister(&xApplicationIdIsValid, libs, "g_application_id_is_valid") | |
| 2101 | 2105 | ||
| 2102 | 2106 | } | |
M v4/gio/gapplicationcommandline.go +26 -22
| @@ -642,29 +642,33 @@ func (c *ApplicationCommandLine) SetGoPointer(ptr uintptr) { | |||
| 642 | 642 | ||
| 643 | 643 | func init() { | |
| 644 | 644 | core.SetPackageName("GIO", "gio-2.0") | |
| 645 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 646 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 647 | - | if err != nil { | |
| 648 | - | panic(err) | |
| 645 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 646 | + | var libs []uintptr | |
| 647 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 648 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 649 | + | if err != nil { | |
| 650 | + | panic(err) | |
| 651 | + | } | |
| 652 | + | libs = append(libs, lib) | |
| 649 | 653 | } | |
| 650 | 654 | ||
| 651 | - | core.PuregoSafeRegister(&xApplicationCommandLineGLibType, lib, "g_application_command_line_get_type") | |
| 652 | - | ||
| 653 | - | core.PuregoSafeRegister(&xApplicationCommandLineCreateFileForArg, lib, "g_application_command_line_create_file_for_arg") | |
| 654 | - | core.PuregoSafeRegister(&xApplicationCommandLineDone, lib, "g_application_command_line_done") | |
| 655 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetArguments, lib, "g_application_command_line_get_arguments") | |
| 656 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetCwd, lib, "g_application_command_line_get_cwd") | |
| 657 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetEnviron, lib, "g_application_command_line_get_environ") | |
| 658 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetExitStatus, lib, "g_application_command_line_get_exit_status") | |
| 659 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetIsRemote, lib, "g_application_command_line_get_is_remote") | |
| 660 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetOptionsDict, lib, "g_application_command_line_get_options_dict") | |
| 661 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetPlatformData, lib, "g_application_command_line_get_platform_data") | |
| 662 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetStdin, lib, "g_application_command_line_get_stdin") | |
| 663 | - | core.PuregoSafeRegister(&xApplicationCommandLineGetenv, lib, "g_application_command_line_getenv") | |
| 664 | - | core.PuregoSafeRegister(&xApplicationCommandLinePrint, lib, "g_application_command_line_print") | |
| 665 | - | core.PuregoSafeRegister(&xApplicationCommandLinePrintLiteral, lib, "g_application_command_line_print_literal") | |
| 666 | - | core.PuregoSafeRegister(&xApplicationCommandLinePrinterr, lib, "g_application_command_line_printerr") | |
| 667 | - | core.PuregoSafeRegister(&xApplicationCommandLinePrinterrLiteral, lib, "g_application_command_line_printerr_literal") | |
| 668 | - | core.PuregoSafeRegister(&xApplicationCommandLineSetExitStatus, lib, "g_application_command_line_set_exit_status") | |
| 655 | + | core.PuregoSafeRegister(&xApplicationCommandLineGLibType, libs, "g_application_command_line_get_type") | |
| 656 | + | ||
| 657 | + | core.PuregoSafeRegister(&xApplicationCommandLineCreateFileForArg, libs, "g_application_command_line_create_file_for_arg") | |
| 658 | + | core.PuregoSafeRegister(&xApplicationCommandLineDone, libs, "g_application_command_line_done") | |
| 659 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetArguments, libs, "g_application_command_line_get_arguments") | |
| 660 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetCwd, libs, "g_application_command_line_get_cwd") | |
| 661 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetEnviron, libs, "g_application_command_line_get_environ") | |
| 662 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetExitStatus, libs, "g_application_command_line_get_exit_status") | |
| 663 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetIsRemote, libs, "g_application_command_line_get_is_remote") | |
| 664 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetOptionsDict, libs, "g_application_command_line_get_options_dict") | |
| 665 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetPlatformData, libs, "g_application_command_line_get_platform_data") | |
| 666 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetStdin, libs, "g_application_command_line_get_stdin") | |
| 667 | + | core.PuregoSafeRegister(&xApplicationCommandLineGetenv, libs, "g_application_command_line_getenv") | |
| 668 | + | core.PuregoSafeRegister(&xApplicationCommandLinePrint, libs, "g_application_command_line_print") | |
| 669 | + | core.PuregoSafeRegister(&xApplicationCommandLinePrintLiteral, libs, "g_application_command_line_print_literal") | |
| 670 | + | core.PuregoSafeRegister(&xApplicationCommandLinePrinterr, libs, "g_application_command_line_printerr") | |
| 671 | + | core.PuregoSafeRegister(&xApplicationCommandLinePrinterrLiteral, libs, "g_application_command_line_printerr_literal") | |
| 672 | + | core.PuregoSafeRegister(&xApplicationCommandLineSetExitStatus, libs, "g_application_command_line_set_exit_status") | |
| 669 | 673 | ||
| 670 | 674 | } | |
M v4/gio/gasyncinitable.go +13 -9
| @@ -312,18 +312,22 @@ func AsyncInitableNewvAsync(ObjectTypeVar types.GType, NParametersVar uint, Para | |||
| 312 | 312 | ||
| 313 | 313 | func init() { | |
| 314 | 314 | core.SetPackageName("GIO", "gio-2.0") | |
| 315 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 316 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 317 | - | if err != nil { | |
| 318 | - | panic(err) | |
| 315 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 316 | + | var libs []uintptr | |
| 317 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 318 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 319 | + | if err != nil { | |
| 320 | + | panic(err) | |
| 321 | + | } | |
| 322 | + | libs = append(libs, lib) | |
| 319 | 323 | } | |
| 320 | 324 | ||
| 321 | - | core.PuregoSafeRegister(&xAsyncInitableNewvAsync, lib, "g_async_initable_newv_async") | |
| 325 | + | core.PuregoSafeRegister(&xAsyncInitableNewvAsync, libs, "g_async_initable_newv_async") | |
| 322 | 326 | ||
| 323 | - | core.PuregoSafeRegister(&xAsyncInitableGLibType, lib, "g_async_initable_get_type") | |
| 327 | + | core.PuregoSafeRegister(&xAsyncInitableGLibType, libs, "g_async_initable_get_type") | |
| 324 | 328 | ||
| 325 | - | core.PuregoSafeRegister(&XGAsyncInitableInitAsync, lib, "g_async_initable_init_async") | |
| 326 | - | core.PuregoSafeRegister(&XGAsyncInitableInitFinish, lib, "g_async_initable_init_finish") | |
| 327 | - | core.PuregoSafeRegister(&XGAsyncInitableNewFinish, lib, "g_async_initable_new_finish") | |
| 329 | + | core.PuregoSafeRegister(&XGAsyncInitableInitAsync, libs, "g_async_initable_init_async") | |
| 330 | + | core.PuregoSafeRegister(&XGAsyncInitableInitFinish, libs, "g_async_initable_init_finish") | |
| 331 | + | core.PuregoSafeRegister(&XGAsyncInitableNewFinish, libs, "g_async_initable_new_finish") | |
| 328 | 332 | ||
| 329 | 333 | } | |
M v4/gio/gasyncresult.go +13 -9
| @@ -292,17 +292,21 @@ var XGAsyncResultLegacyPropagateError func(uintptr) bool | |||
| 292 | 292 | ||
| 293 | 293 | func init() { | |
| 294 | 294 | core.SetPackageName("GIO", "gio-2.0") | |
| 295 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 296 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 297 | - | if err != nil { | |
| 298 | - | panic(err) | |
| 295 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 296 | + | var libs []uintptr | |
| 297 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 298 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 299 | + | if err != nil { | |
| 300 | + | panic(err) | |
| 301 | + | } | |
| 302 | + | libs = append(libs, lib) | |
| 299 | 303 | } | |
| 300 | 304 | ||
| 301 | - | core.PuregoSafeRegister(&xAsyncResultGLibType, lib, "g_async_result_get_type") | |
| 305 | + | core.PuregoSafeRegister(&xAsyncResultGLibType, libs, "g_async_result_get_type") | |
| 302 | 306 | ||
| 303 | - | core.PuregoSafeRegister(&XGAsyncResultGetSourceObject, lib, "g_async_result_get_source_object") | |
| 304 | - | core.PuregoSafeRegister(&XGAsyncResultGetUserData, lib, "g_async_result_get_user_data") | |
| 305 | - | core.PuregoSafeRegister(&XGAsyncResultIsTagged, lib, "g_async_result_is_tagged") | |
| 306 | - | core.PuregoSafeRegister(&XGAsyncResultLegacyPropagateError, lib, "g_async_result_legacy_propagate_error") | |
| 307 | + | core.PuregoSafeRegister(&XGAsyncResultGetSourceObject, libs, "g_async_result_get_source_object") | |
| 308 | + | core.PuregoSafeRegister(&XGAsyncResultGetUserData, libs, "g_async_result_get_user_data") | |
| 309 | + | core.PuregoSafeRegister(&XGAsyncResultIsTagged, libs, "g_async_result_is_tagged") | |
| 310 | + | core.PuregoSafeRegister(&XGAsyncResultLegacyPropagateError, libs, "g_async_result_legacy_propagate_error") | |
| 307 | 311 | ||
| 308 | 312 | } | |
M v4/gio/gbufferedinputstream.go +24 -20
| @@ -514,25 +514,29 @@ func (x *BufferedInputStream) Truncate(OffsetVar int64, CancellableVar *Cancella | |||
| 514 | 514 | ||
| 515 | 515 | func init() { | |
| 516 | 516 | core.SetPackageName("GIO", "gio-2.0") | |
| 517 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 518 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 519 | - | if err != nil { | |
| 520 | - | panic(err) | |
| 521 | - | } | |
| 522 | - | ||
| 523 | - | core.PuregoSafeRegister(&xBufferedInputStreamGLibType, lib, "g_buffered_input_stream_get_type") | |
| 524 | - | ||
| 525 | - | core.PuregoSafeRegister(&xNewBufferedInputStream, lib, "g_buffered_input_stream_new") | |
| 526 | - | core.PuregoSafeRegister(&xNewBufferedInputStreamSized, lib, "g_buffered_input_stream_new_sized") | |
| 527 | - | ||
| 528 | - | core.PuregoSafeRegister(&xBufferedInputStreamFill, lib, "g_buffered_input_stream_fill") | |
| 529 | - | core.PuregoSafeRegister(&xBufferedInputStreamFillAsync, lib, "g_buffered_input_stream_fill_async") | |
| 530 | - | core.PuregoSafeRegister(&xBufferedInputStreamFillFinish, lib, "g_buffered_input_stream_fill_finish") | |
| 531 | - | core.PuregoSafeRegister(&xBufferedInputStreamGetAvailable, lib, "g_buffered_input_stream_get_available") | |
| 532 | - | core.PuregoSafeRegister(&xBufferedInputStreamGetBufferSize, lib, "g_buffered_input_stream_get_buffer_size") | |
| 533 | - | core.PuregoSafeRegister(&xBufferedInputStreamPeek, lib, "g_buffered_input_stream_peek") | |
| 534 | - | core.PuregoSafeRegister(&xBufferedInputStreamPeekBuffer, lib, "g_buffered_input_stream_peek_buffer") | |
| 535 | - | core.PuregoSafeRegister(&xBufferedInputStreamReadByte, lib, "g_buffered_input_stream_read_byte") | |
| 536 | - | core.PuregoSafeRegister(&xBufferedInputStreamSetBufferSize, lib, "g_buffered_input_stream_set_buffer_size") | |
| 517 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 518 | + | var libs []uintptr | |
| 519 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 520 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 521 | + | if err != nil { | |
| 522 | + | panic(err) | |
| 523 | + | } | |
| 524 | + | libs = append(libs, lib) | |
| 525 | + | } | |
| 526 | + | ||
| 527 | + | core.PuregoSafeRegister(&xBufferedInputStreamGLibType, libs, "g_buffered_input_stream_get_type") | |
| 528 | + | ||
| 529 | + | core.PuregoSafeRegister(&xNewBufferedInputStream, libs, "g_buffered_input_stream_new") | |
| 530 | + | core.PuregoSafeRegister(&xNewBufferedInputStreamSized, libs, "g_buffered_input_stream_new_sized") | |
| 531 | + | ||
| 532 | + | core.PuregoSafeRegister(&xBufferedInputStreamFill, libs, "g_buffered_input_stream_fill") | |
| 533 | + | core.PuregoSafeRegister(&xBufferedInputStreamFillAsync, libs, "g_buffered_input_stream_fill_async") | |
| 534 | + | core.PuregoSafeRegister(&xBufferedInputStreamFillFinish, libs, "g_buffered_input_stream_fill_finish") | |
| 535 | + | core.PuregoSafeRegister(&xBufferedInputStreamGetAvailable, libs, "g_buffered_input_stream_get_available") | |
| 536 | + | core.PuregoSafeRegister(&xBufferedInputStreamGetBufferSize, libs, "g_buffered_input_stream_get_buffer_size") | |
| 537 | + | core.PuregoSafeRegister(&xBufferedInputStreamPeek, libs, "g_buffered_input_stream_peek") | |
| 538 | + | core.PuregoSafeRegister(&xBufferedInputStreamPeekBuffer, libs, "g_buffered_input_stream_peek_buffer") | |
| 539 | + | core.PuregoSafeRegister(&xBufferedInputStreamReadByte, libs, "g_buffered_input_stream_read_byte") | |
| 540 | + | core.PuregoSafeRegister(&xBufferedInputStreamSetBufferSize, libs, "g_buffered_input_stream_set_buffer_size") | |
| 537 | 541 | ||
| 538 | 542 | } | |
M v4/gio/gbufferedoutputstream.go +15 -11
| @@ -259,20 +259,24 @@ func (x *BufferedOutputStream) Truncate(OffsetVar int64, CancellableVar *Cancell | |||
| 259 | 259 | ||
| 260 | 260 | func init() { | |
| 261 | 261 | core.SetPackageName("GIO", "gio-2.0") | |
| 262 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 263 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 264 | - | if err != nil { | |
| 265 | - | panic(err) | |
| 262 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 263 | + | var libs []uintptr | |
| 264 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 265 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 266 | + | if err != nil { | |
| 267 | + | panic(err) | |
| 268 | + | } | |
| 269 | + | libs = append(libs, lib) | |
| 266 | 270 | } | |
| 267 | 271 | ||
| 268 | - | core.PuregoSafeRegister(&xBufferedOutputStreamGLibType, lib, "g_buffered_output_stream_get_type") | |
| 272 | + | core.PuregoSafeRegister(&xBufferedOutputStreamGLibType, libs, "g_buffered_output_stream_get_type") | |
| 269 | 273 | ||
| 270 | - | core.PuregoSafeRegister(&xNewBufferedOutputStream, lib, "g_buffered_output_stream_new") | |
| 271 | - | core.PuregoSafeRegister(&xNewBufferedOutputStreamSized, lib, "g_buffered_output_stream_new_sized") | |
| 274 | + | core.PuregoSafeRegister(&xNewBufferedOutputStream, libs, "g_buffered_output_stream_new") | |
| 275 | + | core.PuregoSafeRegister(&xNewBufferedOutputStreamSized, libs, "g_buffered_output_stream_new_sized") | |
| 272 | 276 | ||
| 273 | - | core.PuregoSafeRegister(&xBufferedOutputStreamGetAutoGrow, lib, "g_buffered_output_stream_get_auto_grow") | |
| 274 | - | core.PuregoSafeRegister(&xBufferedOutputStreamGetBufferSize, lib, "g_buffered_output_stream_get_buffer_size") | |
| 275 | - | core.PuregoSafeRegister(&xBufferedOutputStreamSetAutoGrow, lib, "g_buffered_output_stream_set_auto_grow") | |
| 276 | - | core.PuregoSafeRegister(&xBufferedOutputStreamSetBufferSize, lib, "g_buffered_output_stream_set_buffer_size") | |
| 277 | + | core.PuregoSafeRegister(&xBufferedOutputStreamGetAutoGrow, libs, "g_buffered_output_stream_get_auto_grow") | |
| 278 | + | core.PuregoSafeRegister(&xBufferedOutputStreamGetBufferSize, libs, "g_buffered_output_stream_get_buffer_size") | |
| 279 | + | core.PuregoSafeRegister(&xBufferedOutputStreamSetAutoGrow, libs, "g_buffered_output_stream_set_auto_grow") | |
| 280 | + | core.PuregoSafeRegister(&xBufferedOutputStreamSetBufferSize, libs, "g_buffered_output_stream_set_buffer_size") | |
| 277 | 281 | ||
| 278 | 282 | } | |
M v4/gio/gbytesicon.go +11 -7
| @@ -163,16 +163,20 @@ func (x *BytesIcon) LoadFinish(ResVar AsyncResult, TypeVar string) (*InputStream | |||
| 163 | 163 | ||
| 164 | 164 | func init() { | |
| 165 | 165 | core.SetPackageName("GIO", "gio-2.0") | |
| 166 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 167 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 168 | - | if err != nil { | |
| 169 | - | panic(err) | |
| 166 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 167 | + | var libs []uintptr | |
| 168 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 169 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 170 | + | if err != nil { | |
| 171 | + | panic(err) | |
| 172 | + | } | |
| 173 | + | libs = append(libs, lib) | |
| 170 | 174 | } | |
| 171 | 175 | ||
| 172 | - | core.PuregoSafeRegister(&xBytesIconGLibType, lib, "g_bytes_icon_get_type") | |
| 176 | + | core.PuregoSafeRegister(&xBytesIconGLibType, libs, "g_bytes_icon_get_type") | |
| 173 | 177 | ||
| 174 | - | core.PuregoSafeRegister(&xNewBytesIcon, lib, "g_bytes_icon_new") | |
| 178 | + | core.PuregoSafeRegister(&xNewBytesIcon, libs, "g_bytes_icon_new") | |
| 175 | 179 | ||
| 176 | - | core.PuregoSafeRegister(&xBytesIconGetBytes, lib, "g_bytes_icon_get_bytes") | |
| 180 | + | core.PuregoSafeRegister(&xBytesIconGetBytes, libs, "g_bytes_icon_get_bytes") | |
| 177 | 181 | ||
| 178 | 182 | } | |
M v4/gio/gcancellable.go +23 -19
| @@ -583,29 +583,33 @@ func CancellableGetCurrent() *Cancellable { | |||
| 583 | 583 | ||
| 584 | 584 | func init() { | |
| 585 | 585 | core.SetPackageName("GIO", "gio-2.0") | |
| 586 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 587 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 588 | - | if err != nil { | |
| 589 | - | panic(err) | |
| 586 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 587 | + | var libs []uintptr | |
| 588 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 589 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 590 | + | if err != nil { | |
| 591 | + | panic(err) | |
| 592 | + | } | |
| 593 | + | libs = append(libs, lib) | |
| 590 | 594 | } | |
| 591 | 595 | ||
| 592 | - | core.PuregoSafeRegister(&xCancellableGLibType, lib, "g_cancellable_get_type") | |
| 596 | + | core.PuregoSafeRegister(&xCancellableGLibType, libs, "g_cancellable_get_type") | |
| 593 | 597 | ||
| 594 | - | core.PuregoSafeRegister(&xNewCancellable, lib, "g_cancellable_new") | |
| 598 | + | core.PuregoSafeRegister(&xNewCancellable, libs, "g_cancellable_new") | |
| 595 | 599 | ||
| 596 | - | core.PuregoSafeRegister(&xCancellableCancel, lib, "g_cancellable_cancel") | |
| 597 | - | core.PuregoSafeRegister(&xCancellableConnect, lib, "g_cancellable_connect") | |
| 598 | - | core.PuregoSafeRegister(&xCancellableDisconnect, lib, "g_cancellable_disconnect") | |
| 599 | - | core.PuregoSafeRegister(&xCancellableGetFd, lib, "g_cancellable_get_fd") | |
| 600 | - | core.PuregoSafeRegister(&xCancellableIsCancelled, lib, "g_cancellable_is_cancelled") | |
| 601 | - | core.PuregoSafeRegister(&xCancellableMakePollfd, lib, "g_cancellable_make_pollfd") | |
| 602 | - | core.PuregoSafeRegister(&xCancellablePopCurrent, lib, "g_cancellable_pop_current") | |
| 603 | - | core.PuregoSafeRegister(&xCancellablePushCurrent, lib, "g_cancellable_push_current") | |
| 604 | - | core.PuregoSafeRegister(&xCancellableReleaseFd, lib, "g_cancellable_release_fd") | |
| 605 | - | core.PuregoSafeRegister(&xCancellableReset, lib, "g_cancellable_reset") | |
| 606 | - | core.PuregoSafeRegister(&xCancellableSetErrorIfCancelled, lib, "g_cancellable_set_error_if_cancelled") | |
| 607 | - | core.PuregoSafeRegister(&xCancellableSourceNew, lib, "g_cancellable_source_new") | |
| 600 | + | core.PuregoSafeRegister(&xCancellableCancel, libs, "g_cancellable_cancel") | |
| 601 | + | core.PuregoSafeRegister(&xCancellableConnect, libs, "g_cancellable_connect") | |
| 602 | + | core.PuregoSafeRegister(&xCancellableDisconnect, libs, "g_cancellable_disconnect") | |
| 603 | + | core.PuregoSafeRegister(&xCancellableGetFd, libs, "g_cancellable_get_fd") | |
| 604 | + | core.PuregoSafeRegister(&xCancellableIsCancelled, libs, "g_cancellable_is_cancelled") | |
| 605 | + | core.PuregoSafeRegister(&xCancellableMakePollfd, libs, "g_cancellable_make_pollfd") | |
| 606 | + | core.PuregoSafeRegister(&xCancellablePopCurrent, libs, "g_cancellable_pop_current") | |
| 607 | + | core.PuregoSafeRegister(&xCancellablePushCurrent, libs, "g_cancellable_push_current") | |
| 608 | + | core.PuregoSafeRegister(&xCancellableReleaseFd, libs, "g_cancellable_release_fd") | |
| 609 | + | core.PuregoSafeRegister(&xCancellableReset, libs, "g_cancellable_reset") | |
| 610 | + | core.PuregoSafeRegister(&xCancellableSetErrorIfCancelled, libs, "g_cancellable_set_error_if_cancelled") | |
| 611 | + | core.PuregoSafeRegister(&xCancellableSourceNew, libs, "g_cancellable_source_new") | |
| 608 | 612 | ||
| 609 | - | core.PuregoSafeRegister(&xCancellableGetCurrent, lib, "g_cancellable_get_current") | |
| 613 | + | core.PuregoSafeRegister(&xCancellableGetCurrent, libs, "g_cancellable_get_current") | |
| 610 | 614 | ||
| 611 | 615 | } | |
M v4/gio/gcharsetconverter.go +13 -9
| @@ -264,18 +264,22 @@ func (x *CharsetConverter) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 264 | 264 | ||
| 265 | 265 | func init() { | |
| 266 | 266 | core.SetPackageName("GIO", "gio-2.0") | |
| 267 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 268 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 269 | - | if err != nil { | |
| 270 | - | panic(err) | |
| 267 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 268 | + | var libs []uintptr | |
| 269 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 270 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 271 | + | if err != nil { | |
| 272 | + | panic(err) | |
| 273 | + | } | |
| 274 | + | libs = append(libs, lib) | |
| 271 | 275 | } | |
| 272 | 276 | ||
| 273 | - | core.PuregoSafeRegister(&xCharsetConverterGLibType, lib, "g_charset_converter_get_type") | |
| 277 | + | core.PuregoSafeRegister(&xCharsetConverterGLibType, libs, "g_charset_converter_get_type") | |
| 274 | 278 | ||
| 275 | - | core.PuregoSafeRegister(&xNewCharsetConverter, lib, "g_charset_converter_new") | |
| 279 | + | core.PuregoSafeRegister(&xNewCharsetConverter, libs, "g_charset_converter_new") | |
| 276 | 280 | ||
| 277 | - | core.PuregoSafeRegister(&xCharsetConverterGetNumFallbacks, lib, "g_charset_converter_get_num_fallbacks") | |
| 278 | - | core.PuregoSafeRegister(&xCharsetConverterGetUseFallback, lib, "g_charset_converter_get_use_fallback") | |
| 279 | - | core.PuregoSafeRegister(&xCharsetConverterSetUseFallback, lib, "g_charset_converter_set_use_fallback") | |
| 281 | + | core.PuregoSafeRegister(&xCharsetConverterGetNumFallbacks, libs, "g_charset_converter_get_num_fallbacks") | |
| 282 | + | core.PuregoSafeRegister(&xCharsetConverterGetUseFallback, libs, "g_charset_converter_get_use_fallback") | |
| 283 | + | core.PuregoSafeRegister(&xCharsetConverterSetUseFallback, libs, "g_charset_converter_set_use_fallback") | |
| 280 | 284 | ||
| 281 | 285 | } | |
M v4/gio/gcontenttype.go +24 -20
| @@ -217,27 +217,31 @@ func ContentTypesGetRegistered() *glib.List { | |||
| 217 | 217 | ||
| 218 | 218 | func init() { | |
| 219 | 219 | core.SetPackageName("GIO", "gio-2.0") | |
| 220 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 221 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 222 | - | if err != nil { | |
| 223 | - | panic(err) | |
| 220 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 221 | + | var libs []uintptr | |
| 222 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 223 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 224 | + | if err != nil { | |
| 225 | + | panic(err) | |
| 226 | + | } | |
| 227 | + | libs = append(libs, lib) | |
| 224 | 228 | } | |
| 225 | 229 | ||
| 226 | - | core.PuregoSafeRegister(&xContentTypeCanBeExecutable, lib, "g_content_type_can_be_executable") | |
| 227 | - | core.PuregoSafeRegister(&xContentTypeEquals, lib, "g_content_type_equals") | |
| 228 | - | core.PuregoSafeRegister(&xContentTypeFromMimeType, lib, "g_content_type_from_mime_type") | |
| 229 | - | core.PuregoSafeRegister(&xContentTypeGetDescription, lib, "g_content_type_get_description") | |
| 230 | - | core.PuregoSafeRegister(&xContentTypeGetGenericIconName, lib, "g_content_type_get_generic_icon_name") | |
| 231 | - | core.PuregoSafeRegister(&xContentTypeGetIcon, lib, "g_content_type_get_icon") | |
| 232 | - | core.PuregoSafeRegister(&xContentTypeGetMimeDirs, lib, "g_content_type_get_mime_dirs") | |
| 233 | - | core.PuregoSafeRegister(&xContentTypeGetMimeType, lib, "g_content_type_get_mime_type") | |
| 234 | - | core.PuregoSafeRegister(&xContentTypeGetSymbolicIcon, lib, "g_content_type_get_symbolic_icon") | |
| 235 | - | core.PuregoSafeRegister(&xContentTypeGuess, lib, "g_content_type_guess") | |
| 236 | - | core.PuregoSafeRegister(&xContentTypeGuessForTree, lib, "g_content_type_guess_for_tree") | |
| 237 | - | core.PuregoSafeRegister(&xContentTypeIsA, lib, "g_content_type_is_a") | |
| 238 | - | core.PuregoSafeRegister(&xContentTypeIsMimeType, lib, "g_content_type_is_mime_type") | |
| 239 | - | core.PuregoSafeRegister(&xContentTypeIsUnknown, lib, "g_content_type_is_unknown") | |
| 240 | - | core.PuregoSafeRegister(&xContentTypeSetMimeDirs, lib, "g_content_type_set_mime_dirs") | |
| 241 | - | core.PuregoSafeRegister(&xContentTypesGetRegistered, lib, "g_content_types_get_registered") | |
| 230 | + | core.PuregoSafeRegister(&xContentTypeCanBeExecutable, libs, "g_content_type_can_be_executable") | |
| 231 | + | core.PuregoSafeRegister(&xContentTypeEquals, libs, "g_content_type_equals") | |
| 232 | + | core.PuregoSafeRegister(&xContentTypeFromMimeType, libs, "g_content_type_from_mime_type") | |
| 233 | + | core.PuregoSafeRegister(&xContentTypeGetDescription, libs, "g_content_type_get_description") | |
| 234 | + | core.PuregoSafeRegister(&xContentTypeGetGenericIconName, libs, "g_content_type_get_generic_icon_name") | |
| 235 | + | core.PuregoSafeRegister(&xContentTypeGetIcon, libs, "g_content_type_get_icon") | |
| 236 | + | core.PuregoSafeRegister(&xContentTypeGetMimeDirs, libs, "g_content_type_get_mime_dirs") | |
| 237 | + | core.PuregoSafeRegister(&xContentTypeGetMimeType, libs, "g_content_type_get_mime_type") | |
| 238 | + | core.PuregoSafeRegister(&xContentTypeGetSymbolicIcon, libs, "g_content_type_get_symbolic_icon") | |
| 239 | + | core.PuregoSafeRegister(&xContentTypeGuess, libs, "g_content_type_guess") | |
| 240 | + | core.PuregoSafeRegister(&xContentTypeGuessForTree, libs, "g_content_type_guess_for_tree") | |
| 241 | + | core.PuregoSafeRegister(&xContentTypeIsA, libs, "g_content_type_is_a") | |
| 242 | + | core.PuregoSafeRegister(&xContentTypeIsMimeType, libs, "g_content_type_is_mime_type") | |
| 243 | + | core.PuregoSafeRegister(&xContentTypeIsUnknown, libs, "g_content_type_is_unknown") | |
| 244 | + | core.PuregoSafeRegister(&xContentTypeSetMimeDirs, libs, "g_content_type_set_mime_dirs") | |
| 245 | + | core.PuregoSafeRegister(&xContentTypesGetRegistered, libs, "g_content_types_get_registered") | |
| 242 | 246 | ||
| 243 | 247 | } | |
M v4/gio/gconverter.go +12 -8
| @@ -236,16 +236,20 @@ var XGConverterReset func(uintptr) | |||
| 236 | 236 | ||
| 237 | 237 | func init() { | |
| 238 | 238 | core.SetPackageName("GIO", "gio-2.0") | |
| 239 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 240 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 241 | - | if err != nil { | |
| 242 | - | panic(err) | |
| 239 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 240 | + | var libs []uintptr | |
| 241 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 242 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 243 | + | if err != nil { | |
| 244 | + | panic(err) | |
| 245 | + | } | |
| 246 | + | libs = append(libs, lib) | |
| 243 | 247 | } | |
| 244 | 248 | ||
| 245 | - | core.PuregoSafeRegister(&xConverterGLibType, lib, "g_converter_get_type") | |
| 249 | + | core.PuregoSafeRegister(&xConverterGLibType, libs, "g_converter_get_type") | |
| 246 | 250 | ||
| 247 | - | core.PuregoSafeRegister(&XGConverterConvert, lib, "g_converter_convert") | |
| 248 | - | core.PuregoSafeRegister(&XGConverterConvertBytes, lib, "g_converter_convert_bytes") | |
| 249 | - | core.PuregoSafeRegister(&XGConverterReset, lib, "g_converter_reset") | |
| 251 | + | core.PuregoSafeRegister(&XGConverterConvert, libs, "g_converter_convert") | |
| 252 | + | core.PuregoSafeRegister(&XGConverterConvertBytes, libs, "g_converter_convert_bytes") | |
| 253 | + | core.PuregoSafeRegister(&XGConverterReset, libs, "g_converter_reset") | |
| 250 | 254 | ||
| 251 | 255 | } | |
M v4/gio/gconverterinputstream.go +11 -7
| @@ -294,16 +294,20 @@ func (x *ConverterInputStream) ReadNonblocking(BufferVar []byte, CountVar uint, | |||
| 294 | 294 | ||
| 295 | 295 | func init() { | |
| 296 | 296 | core.SetPackageName("GIO", "gio-2.0") | |
| 297 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 298 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 299 | - | if err != nil { | |
| 300 | - | panic(err) | |
| 297 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 298 | + | var libs []uintptr | |
| 299 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 300 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 301 | + | if err != nil { | |
| 302 | + | panic(err) | |
| 303 | + | } | |
| 304 | + | libs = append(libs, lib) | |
| 301 | 305 | } | |
| 302 | 306 | ||
| 303 | - | core.PuregoSafeRegister(&xConverterInputStreamGLibType, lib, "g_converter_input_stream_get_type") | |
| 307 | + | core.PuregoSafeRegister(&xConverterInputStreamGLibType, libs, "g_converter_input_stream_get_type") | |
| 304 | 308 | ||
| 305 | - | core.PuregoSafeRegister(&xNewConverterInputStream, lib, "g_converter_input_stream_new") | |
| 309 | + | core.PuregoSafeRegister(&xNewConverterInputStream, libs, "g_converter_input_stream_new") | |
| 306 | 310 | ||
| 307 | - | core.PuregoSafeRegister(&xConverterInputStreamGetConverter, lib, "g_converter_input_stream_get_converter") | |
| 311 | + | core.PuregoSafeRegister(&xConverterInputStreamGetConverter, libs, "g_converter_input_stream_get_converter") | |
| 308 | 312 | ||
| 309 | 313 | } | |
M v4/gio/gconverteroutputstream.go +11 -7
| @@ -328,16 +328,20 @@ func (x *ConverterOutputStream) WritevNonblocking(VectorsVar []OutputVector, NVe | |||
| 328 | 328 | ||
| 329 | 329 | func init() { | |
| 330 | 330 | core.SetPackageName("GIO", "gio-2.0") | |
| 331 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 332 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 333 | - | if err != nil { | |
| 334 | - | panic(err) | |
| 331 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 332 | + | var libs []uintptr | |
| 333 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 334 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 335 | + | if err != nil { | |
| 336 | + | panic(err) | |
| 337 | + | } | |
| 338 | + | libs = append(libs, lib) | |
| 335 | 339 | } | |
| 336 | 340 | ||
| 337 | - | core.PuregoSafeRegister(&xConverterOutputStreamGLibType, lib, "g_converter_output_stream_get_type") | |
| 341 | + | core.PuregoSafeRegister(&xConverterOutputStreamGLibType, libs, "g_converter_output_stream_get_type") | |
| 338 | 342 | ||
| 339 | - | core.PuregoSafeRegister(&xNewConverterOutputStream, lib, "g_converter_output_stream_new") | |
| 343 | + | core.PuregoSafeRegister(&xNewConverterOutputStream, libs, "g_converter_output_stream_new") | |
| 340 | 344 | ||
| 341 | - | core.PuregoSafeRegister(&xConverterOutputStreamGetConverter, lib, "g_converter_output_stream_get_converter") | |
| 345 | + | core.PuregoSafeRegister(&xConverterOutputStreamGetConverter, libs, "g_converter_output_stream_get_converter") | |
| 342 | 346 | ||
| 343 | 347 | } | |
M v4/gio/gcredentials.go +17 -13
| @@ -216,22 +216,26 @@ func (c *Credentials) SetGoPointer(ptr uintptr) { | |||
| 216 | 216 | ||
| 217 | 217 | func init() { | |
| 218 | 218 | core.SetPackageName("GIO", "gio-2.0") | |
| 219 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 220 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 221 | - | if err != nil { | |
| 222 | - | panic(err) | |
| 219 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 220 | + | var libs []uintptr | |
| 221 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 222 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 223 | + | if err != nil { | |
| 224 | + | panic(err) | |
| 225 | + | } | |
| 226 | + | libs = append(libs, lib) | |
| 223 | 227 | } | |
| 224 | 228 | ||
| 225 | - | core.PuregoSafeRegister(&xCredentialsGLibType, lib, "g_credentials_get_type") | |
| 229 | + | core.PuregoSafeRegister(&xCredentialsGLibType, libs, "g_credentials_get_type") | |
| 226 | 230 | ||
| 227 | - | core.PuregoSafeRegister(&xNewCredentials, lib, "g_credentials_new") | |
| 231 | + | core.PuregoSafeRegister(&xNewCredentials, libs, "g_credentials_new") | |
| 228 | 232 | ||
| 229 | - | core.PuregoSafeRegister(&xCredentialsGetNative, lib, "g_credentials_get_native") | |
| 230 | - | core.PuregoSafeRegister(&xCredentialsGetUnixPid, lib, "g_credentials_get_unix_pid") | |
| 231 | - | core.PuregoSafeRegister(&xCredentialsGetUnixUser, lib, "g_credentials_get_unix_user") | |
| 232 | - | core.PuregoSafeRegister(&xCredentialsIsSameUser, lib, "g_credentials_is_same_user") | |
| 233 | - | core.PuregoSafeRegister(&xCredentialsSetNative, lib, "g_credentials_set_native") | |
| 234 | - | core.PuregoSafeRegister(&xCredentialsSetUnixUser, lib, "g_credentials_set_unix_user") | |
| 235 | - | core.PuregoSafeRegister(&xCredentialsToString, lib, "g_credentials_to_string") | |
| 233 | + | core.PuregoSafeRegister(&xCredentialsGetNative, libs, "g_credentials_get_native") | |
| 234 | + | core.PuregoSafeRegister(&xCredentialsGetUnixPid, libs, "g_credentials_get_unix_pid") | |
| 235 | + | core.PuregoSafeRegister(&xCredentialsGetUnixUser, libs, "g_credentials_get_unix_user") | |
| 236 | + | core.PuregoSafeRegister(&xCredentialsIsSameUser, libs, "g_credentials_is_same_user") | |
| 237 | + | core.PuregoSafeRegister(&xCredentialsSetNative, libs, "g_credentials_set_native") | |
| 238 | + | core.PuregoSafeRegister(&xCredentialsSetUnixUser, libs, "g_credentials_set_unix_user") | |
| 239 | + | core.PuregoSafeRegister(&xCredentialsToString, libs, "g_credentials_to_string") | |
| 236 | 240 | ||
| 237 | 241 | } | |
M v4/gio/gdatagrambased.go +14 -10
| @@ -445,18 +445,22 @@ var XGDatagramBasedSendMessages func(uintptr, []OutputMessage, uint, int, int64, | |||
| 445 | 445 | ||
| 446 | 446 | func init() { | |
| 447 | 447 | core.SetPackageName("GIO", "gio-2.0") | |
| 448 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 449 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 450 | - | if err != nil { | |
| 451 | - | panic(err) | |
| 448 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 449 | + | var libs []uintptr | |
| 450 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 451 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 452 | + | if err != nil { | |
| 453 | + | panic(err) | |
| 454 | + | } | |
| 455 | + | libs = append(libs, lib) | |
| 452 | 456 | } | |
| 453 | 457 | ||
| 454 | - | core.PuregoSafeRegister(&xDatagramBasedGLibType, lib, "g_datagram_based_get_type") | |
| 458 | + | core.PuregoSafeRegister(&xDatagramBasedGLibType, libs, "g_datagram_based_get_type") | |
| 455 | 459 | ||
| 456 | - | core.PuregoSafeRegister(&XGDatagramBasedConditionCheck, lib, "g_datagram_based_condition_check") | |
| 457 | - | core.PuregoSafeRegister(&XGDatagramBasedConditionWait, lib, "g_datagram_based_condition_wait") | |
| 458 | - | core.PuregoSafeRegister(&XGDatagramBasedCreateSource, lib, "g_datagram_based_create_source") | |
| 459 | - | core.PuregoSafeRegister(&XGDatagramBasedReceiveMessages, lib, "g_datagram_based_receive_messages") | |
| 460 | - | core.PuregoSafeRegister(&XGDatagramBasedSendMessages, lib, "g_datagram_based_send_messages") | |
| 460 | + | core.PuregoSafeRegister(&XGDatagramBasedConditionCheck, libs, "g_datagram_based_condition_check") | |
| 461 | + | core.PuregoSafeRegister(&XGDatagramBasedConditionWait, libs, "g_datagram_based_condition_wait") | |
| 462 | + | core.PuregoSafeRegister(&XGDatagramBasedCreateSource, libs, "g_datagram_based_create_source") | |
| 463 | + | core.PuregoSafeRegister(&XGDatagramBasedReceiveMessages, libs, "g_datagram_based_receive_messages") | |
| 464 | + | core.PuregoSafeRegister(&XGDatagramBasedSendMessages, libs, "g_datagram_based_send_messages") | |
| 461 | 465 | ||
| 462 | 466 | } | |
M v4/gio/gdatainputstream.go +36 -32
| @@ -655,37 +655,41 @@ func (x *DataInputStream) Truncate(OffsetVar int64, CancellableVar *Cancellable) | |||
| 655 | 655 | ||
| 656 | 656 | func init() { | |
| 657 | 657 | core.SetPackageName("GIO", "gio-2.0") | |
| 658 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 659 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 660 | - | if err != nil { | |
| 661 | - | panic(err) | |
| 662 | - | } | |
| 663 | - | ||
| 664 | - | core.PuregoSafeRegister(&xDataInputStreamGLibType, lib, "g_data_input_stream_get_type") | |
| 665 | - | ||
| 666 | - | core.PuregoSafeRegister(&xNewDataInputStream, lib, "g_data_input_stream_new") | |
| 667 | - | ||
| 668 | - | core.PuregoSafeRegister(&xDataInputStreamGetByteOrder, lib, "g_data_input_stream_get_byte_order") | |
| 669 | - | core.PuregoSafeRegister(&xDataInputStreamGetNewlineType, lib, "g_data_input_stream_get_newline_type") | |
| 670 | - | core.PuregoSafeRegister(&xDataInputStreamReadByte, lib, "g_data_input_stream_read_byte") | |
| 671 | - | core.PuregoSafeRegister(&xDataInputStreamReadInt16, lib, "g_data_input_stream_read_int16") | |
| 672 | - | core.PuregoSafeRegister(&xDataInputStreamReadInt32, lib, "g_data_input_stream_read_int32") | |
| 673 | - | core.PuregoSafeRegister(&xDataInputStreamReadInt64, lib, "g_data_input_stream_read_int64") | |
| 674 | - | core.PuregoSafeRegister(&xDataInputStreamReadLine, lib, "g_data_input_stream_read_line") | |
| 675 | - | core.PuregoSafeRegister(&xDataInputStreamReadLineAsync, lib, "g_data_input_stream_read_line_async") | |
| 676 | - | core.PuregoSafeRegister(&xDataInputStreamReadLineFinish, lib, "g_data_input_stream_read_line_finish") | |
| 677 | - | core.PuregoSafeRegister(&xDataInputStreamReadLineFinishUtf8, lib, "g_data_input_stream_read_line_finish_utf8") | |
| 678 | - | core.PuregoSafeRegister(&xDataInputStreamReadLineUtf8, lib, "g_data_input_stream_read_line_utf8") | |
| 679 | - | core.PuregoSafeRegister(&xDataInputStreamReadUint16, lib, "g_data_input_stream_read_uint16") | |
| 680 | - | core.PuregoSafeRegister(&xDataInputStreamReadUint32, lib, "g_data_input_stream_read_uint32") | |
| 681 | - | core.PuregoSafeRegister(&xDataInputStreamReadUint64, lib, "g_data_input_stream_read_uint64") | |
| 682 | - | core.PuregoSafeRegister(&xDataInputStreamReadUntil, lib, "g_data_input_stream_read_until") | |
| 683 | - | core.PuregoSafeRegister(&xDataInputStreamReadUntilAsync, lib, "g_data_input_stream_read_until_async") | |
| 684 | - | core.PuregoSafeRegister(&xDataInputStreamReadUntilFinish, lib, "g_data_input_stream_read_until_finish") | |
| 685 | - | core.PuregoSafeRegister(&xDataInputStreamReadUpto, lib, "g_data_input_stream_read_upto") | |
| 686 | - | core.PuregoSafeRegister(&xDataInputStreamReadUptoAsync, lib, "g_data_input_stream_read_upto_async") | |
| 687 | - | core.PuregoSafeRegister(&xDataInputStreamReadUptoFinish, lib, "g_data_input_stream_read_upto_finish") | |
| 688 | - | core.PuregoSafeRegister(&xDataInputStreamSetByteOrder, lib, "g_data_input_stream_set_byte_order") | |
| 689 | - | core.PuregoSafeRegister(&xDataInputStreamSetNewlineType, lib, "g_data_input_stream_set_newline_type") | |
| 658 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 659 | + | var libs []uintptr | |
| 660 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 661 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 662 | + | if err != nil { | |
| 663 | + | panic(err) | |
| 664 | + | } | |
| 665 | + | libs = append(libs, lib) | |
| 666 | + | } | |
| 667 | + | ||
| 668 | + | core.PuregoSafeRegister(&xDataInputStreamGLibType, libs, "g_data_input_stream_get_type") | |
| 669 | + | ||
| 670 | + | core.PuregoSafeRegister(&xNewDataInputStream, libs, "g_data_input_stream_new") | |
| 671 | + | ||
| 672 | + | core.PuregoSafeRegister(&xDataInputStreamGetByteOrder, libs, "g_data_input_stream_get_byte_order") | |
| 673 | + | core.PuregoSafeRegister(&xDataInputStreamGetNewlineType, libs, "g_data_input_stream_get_newline_type") | |
| 674 | + | core.PuregoSafeRegister(&xDataInputStreamReadByte, libs, "g_data_input_stream_read_byte") | |
| 675 | + | core.PuregoSafeRegister(&xDataInputStreamReadInt16, libs, "g_data_input_stream_read_int16") | |
| 676 | + | core.PuregoSafeRegister(&xDataInputStreamReadInt32, libs, "g_data_input_stream_read_int32") | |
| 677 | + | core.PuregoSafeRegister(&xDataInputStreamReadInt64, libs, "g_data_input_stream_read_int64") | |
| 678 | + | core.PuregoSafeRegister(&xDataInputStreamReadLine, libs, "g_data_input_stream_read_line") | |
| 679 | + | core.PuregoSafeRegister(&xDataInputStreamReadLineAsync, libs, "g_data_input_stream_read_line_async") | |
| 680 | + | core.PuregoSafeRegister(&xDataInputStreamReadLineFinish, libs, "g_data_input_stream_read_line_finish") | |
| 681 | + | core.PuregoSafeRegister(&xDataInputStreamReadLineFinishUtf8, libs, "g_data_input_stream_read_line_finish_utf8") | |
| 682 | + | core.PuregoSafeRegister(&xDataInputStreamReadLineUtf8, libs, "g_data_input_stream_read_line_utf8") | |
| 683 | + | core.PuregoSafeRegister(&xDataInputStreamReadUint16, libs, "g_data_input_stream_read_uint16") | |
| 684 | + | core.PuregoSafeRegister(&xDataInputStreamReadUint32, libs, "g_data_input_stream_read_uint32") | |
| 685 | + | core.PuregoSafeRegister(&xDataInputStreamReadUint64, libs, "g_data_input_stream_read_uint64") | |
| 686 | + | core.PuregoSafeRegister(&xDataInputStreamReadUntil, libs, "g_data_input_stream_read_until") | |
| 687 | + | core.PuregoSafeRegister(&xDataInputStreamReadUntilAsync, libs, "g_data_input_stream_read_until_async") | |
| 688 | + | core.PuregoSafeRegister(&xDataInputStreamReadUntilFinish, libs, "g_data_input_stream_read_until_finish") | |
| 689 | + | core.PuregoSafeRegister(&xDataInputStreamReadUpto, libs, "g_data_input_stream_read_upto") | |
| 690 | + | core.PuregoSafeRegister(&xDataInputStreamReadUptoAsync, libs, "g_data_input_stream_read_upto_async") | |
| 691 | + | core.PuregoSafeRegister(&xDataInputStreamReadUptoFinish, libs, "g_data_input_stream_read_upto_finish") | |
| 692 | + | core.PuregoSafeRegister(&xDataInputStreamSetByteOrder, libs, "g_data_input_stream_set_byte_order") | |
| 693 | + | core.PuregoSafeRegister(&xDataInputStreamSetNewlineType, libs, "g_data_input_stream_set_newline_type") | |
| 690 | 694 | ||
| 691 | 695 | } | |
M v4/gio/gdataoutputstream.go +20 -16
| @@ -398,25 +398,29 @@ func (x *DataOutputStream) Truncate(OffsetVar int64, CancellableVar *Cancellable | |||
| 398 | 398 | ||
| 399 | 399 | func init() { | |
| 400 | 400 | core.SetPackageName("GIO", "gio-2.0") | |
| 401 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 402 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 403 | - | if err != nil { | |
| 404 | - | panic(err) | |
| 401 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 402 | + | var libs []uintptr | |
| 403 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 404 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 405 | + | if err != nil { | |
| 406 | + | panic(err) | |
| 407 | + | } | |
| 408 | + | libs = append(libs, lib) | |
| 405 | 409 | } | |
| 406 | 410 | ||
| 407 | - | core.PuregoSafeRegister(&xDataOutputStreamGLibType, lib, "g_data_output_stream_get_type") | |
| 411 | + | core.PuregoSafeRegister(&xDataOutputStreamGLibType, libs, "g_data_output_stream_get_type") | |
| 408 | 412 | ||
| 409 | - | core.PuregoSafeRegister(&xNewDataOutputStream, lib, "g_data_output_stream_new") | |
| 413 | + | core.PuregoSafeRegister(&xNewDataOutputStream, libs, "g_data_output_stream_new") | |
| 410 | 414 | ||
| 411 | - | core.PuregoSafeRegister(&xDataOutputStreamGetByteOrder, lib, "g_data_output_stream_get_byte_order") | |
| 412 | - | core.PuregoSafeRegister(&xDataOutputStreamPutByte, lib, "g_data_output_stream_put_byte") | |
| 413 | - | core.PuregoSafeRegister(&xDataOutputStreamPutInt16, lib, "g_data_output_stream_put_int16") | |
| 414 | - | core.PuregoSafeRegister(&xDataOutputStreamPutInt32, lib, "g_data_output_stream_put_int32") | |
| 415 | - | core.PuregoSafeRegister(&xDataOutputStreamPutInt64, lib, "g_data_output_stream_put_int64") | |
| 416 | - | core.PuregoSafeRegister(&xDataOutputStreamPutString, lib, "g_data_output_stream_put_string") | |
| 417 | - | core.PuregoSafeRegister(&xDataOutputStreamPutUint16, lib, "g_data_output_stream_put_uint16") | |
| 418 | - | core.PuregoSafeRegister(&xDataOutputStreamPutUint32, lib, "g_data_output_stream_put_uint32") | |
| 419 | - | core.PuregoSafeRegister(&xDataOutputStreamPutUint64, lib, "g_data_output_stream_put_uint64") | |
| 420 | - | core.PuregoSafeRegister(&xDataOutputStreamSetByteOrder, lib, "g_data_output_stream_set_byte_order") | |
| 415 | + | core.PuregoSafeRegister(&xDataOutputStreamGetByteOrder, libs, "g_data_output_stream_get_byte_order") | |
| 416 | + | core.PuregoSafeRegister(&xDataOutputStreamPutByte, libs, "g_data_output_stream_put_byte") | |
| 417 | + | core.PuregoSafeRegister(&xDataOutputStreamPutInt16, libs, "g_data_output_stream_put_int16") | |
| 418 | + | core.PuregoSafeRegister(&xDataOutputStreamPutInt32, libs, "g_data_output_stream_put_int32") | |
| 419 | + | core.PuregoSafeRegister(&xDataOutputStreamPutInt64, libs, "g_data_output_stream_put_int64") | |
| 420 | + | core.PuregoSafeRegister(&xDataOutputStreamPutString, libs, "g_data_output_stream_put_string") | |
| 421 | + | core.PuregoSafeRegister(&xDataOutputStreamPutUint16, libs, "g_data_output_stream_put_uint16") | |
| 422 | + | core.PuregoSafeRegister(&xDataOutputStreamPutUint32, libs, "g_data_output_stream_put_uint32") | |
| 423 | + | core.PuregoSafeRegister(&xDataOutputStreamPutUint64, libs, "g_data_output_stream_put_uint64") | |
| 424 | + | core.PuregoSafeRegister(&xDataOutputStreamSetByteOrder, libs, "g_data_output_stream_set_byte_order") | |
| 421 | 425 | ||
| 422 | 426 | } | |
M v4/gio/gdbusactiongroup.go +10 -6
| @@ -332,14 +332,18 @@ func DBusActionGroupGet(ConnectionVar *DBusConnection, BusNameVar string, Object | |||
| 332 | 332 | ||
| 333 | 333 | func init() { | |
| 334 | 334 | core.SetPackageName("GIO", "gio-2.0") | |
| 335 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 336 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 337 | - | if err != nil { | |
| 338 | - | panic(err) | |
| 335 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 336 | + | var libs []uintptr | |
| 337 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 338 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 339 | + | if err != nil { | |
| 340 | + | panic(err) | |
| 341 | + | } | |
| 342 | + | libs = append(libs, lib) | |
| 339 | 343 | } | |
| 340 | 344 | ||
| 341 | - | core.PuregoSafeRegister(&xDBusActionGroupGLibType, lib, "g_dbus_action_group_get_type") | |
| 345 | + | core.PuregoSafeRegister(&xDBusActionGroupGLibType, libs, "g_dbus_action_group_get_type") | |
| 342 | 346 | ||
| 343 | - | core.PuregoSafeRegister(&xDBusActionGroupGet, lib, "g_dbus_action_group_get") | |
| 347 | + | core.PuregoSafeRegister(&xDBusActionGroupGet, libs, "g_dbus_action_group_get") | |
| 344 | 348 | ||
| 345 | 349 | } | |
M v4/gio/gdbusaddress.go +15 -11
| @@ -147,18 +147,22 @@ func DbusIsSupportedAddress(StringVar string) (bool, error) { | |||
| 147 | 147 | ||
| 148 | 148 | func init() { | |
| 149 | 149 | core.SetPackageName("GIO", "gio-2.0") | |
| 150 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 151 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 152 | - | if err != nil { | |
| 153 | - | panic(err) | |
| 150 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 151 | + | var libs []uintptr | |
| 152 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 153 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 154 | + | if err != nil { | |
| 155 | + | panic(err) | |
| 156 | + | } | |
| 157 | + | libs = append(libs, lib) | |
| 154 | 158 | } | |
| 155 | 159 | ||
| 156 | - | core.PuregoSafeRegister(&xDbusAddressEscapeValue, lib, "g_dbus_address_escape_value") | |
| 157 | - | core.PuregoSafeRegister(&xDbusAddressGetForBusSync, lib, "g_dbus_address_get_for_bus_sync") | |
| 158 | - | core.PuregoSafeRegister(&xDbusAddressGetStream, lib, "g_dbus_address_get_stream") | |
| 159 | - | core.PuregoSafeRegister(&xDbusAddressGetStreamFinish, lib, "g_dbus_address_get_stream_finish") | |
| 160 | - | core.PuregoSafeRegister(&xDbusAddressGetStreamSync, lib, "g_dbus_address_get_stream_sync") | |
| 161 | - | core.PuregoSafeRegister(&xDbusIsAddress, lib, "g_dbus_is_address") | |
| 162 | - | core.PuregoSafeRegister(&xDbusIsSupportedAddress, lib, "g_dbus_is_supported_address") | |
| 160 | + | core.PuregoSafeRegister(&xDbusAddressEscapeValue, libs, "g_dbus_address_escape_value") | |
| 161 | + | core.PuregoSafeRegister(&xDbusAddressGetForBusSync, libs, "g_dbus_address_get_for_bus_sync") | |
| 162 | + | core.PuregoSafeRegister(&xDbusAddressGetStream, libs, "g_dbus_address_get_stream") | |
| 163 | + | core.PuregoSafeRegister(&xDbusAddressGetStreamFinish, libs, "g_dbus_address_get_stream_finish") | |
| 164 | + | core.PuregoSafeRegister(&xDbusAddressGetStreamSync, libs, "g_dbus_address_get_stream_sync") | |
| 165 | + | core.PuregoSafeRegister(&xDbusIsAddress, libs, "g_dbus_is_address") | |
| 166 | + | core.PuregoSafeRegister(&xDbusIsSupportedAddress, libs, "g_dbus_is_supported_address") | |
| 163 | 167 | ||
| 164 | 168 | } | |
M v4/gio/gdbusauthobserver.go +12 -8
| @@ -184,17 +184,21 @@ func (x *DBusAuthObserver) ConnectAuthorizeAuthenticatedPeer(cb *func(DBusAuthOb | |||
| 184 | 184 | ||
| 185 | 185 | func init() { | |
| 186 | 186 | core.SetPackageName("GIO", "gio-2.0") | |
| 187 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 188 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 189 | - | if err != nil { | |
| 190 | - | panic(err) | |
| 187 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 188 | + | var libs []uintptr | |
| 189 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 190 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 191 | + | if err != nil { | |
| 192 | + | panic(err) | |
| 193 | + | } | |
| 194 | + | libs = append(libs, lib) | |
| 191 | 195 | } | |
| 192 | 196 | ||
| 193 | - | core.PuregoSafeRegister(&xDBusAuthObserverGLibType, lib, "g_dbus_auth_observer_get_type") | |
| 197 | + | core.PuregoSafeRegister(&xDBusAuthObserverGLibType, libs, "g_dbus_auth_observer_get_type") | |
| 194 | 198 | ||
| 195 | - | core.PuregoSafeRegister(&xNewDBusAuthObserver, lib, "g_dbus_auth_observer_new") | |
| 199 | + | core.PuregoSafeRegister(&xNewDBusAuthObserver, libs, "g_dbus_auth_observer_new") | |
| 196 | 200 | ||
| 197 | - | core.PuregoSafeRegister(&xDBusAuthObserverAllowMechanism, lib, "g_dbus_auth_observer_allow_mechanism") | |
| 198 | - | core.PuregoSafeRegister(&xDBusAuthObserverAuthorizeAuthenticatedPeer, lib, "g_dbus_auth_observer_authorize_authenticated_peer") | |
| 201 | + | core.PuregoSafeRegister(&xDBusAuthObserverAllowMechanism, libs, "g_dbus_auth_observer_allow_mechanism") | |
| 202 | + | core.PuregoSafeRegister(&xDBusAuthObserverAuthorizeAuthenticatedPeer, libs, "g_dbus_auth_observer_authorize_authenticated_peer") | |
| 199 | 203 | ||
| 200 | 204 | } | |
M v4/gio/gdbusconnection.go +64 -60
| @@ -1717,67 +1717,71 @@ func DBusConnectionNewForAddress(AddressVar string, FlagsVar DBusConnectionFlags | |||
| 1717 | 1717 | ||
| 1718 | 1718 | func init() { | |
| 1719 | 1719 | core.SetPackageName("GIO", "gio-2.0") | |
| 1720 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1721 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1722 | - | if err != nil { | |
| 1723 | - | panic(err) | |
| 1720 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1721 | + | var libs []uintptr | |
| 1722 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1723 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1724 | + | if err != nil { | |
| 1725 | + | panic(err) | |
| 1726 | + | } | |
| 1727 | + | libs = append(libs, lib) | |
| 1724 | 1728 | } | |
| 1725 | 1729 | ||
| 1726 | - | core.PuregoSafeRegister(&xBusGet, lib, "g_bus_get") | |
| 1727 | - | core.PuregoSafeRegister(&xBusGetFinish, lib, "g_bus_get_finish") | |
| 1728 | - | core.PuregoSafeRegister(&xBusGetSync, lib, "g_bus_get_sync") | |
| 1729 | - | ||
| 1730 | - | core.PuregoSafeRegister(&xDBusConnectionGLibType, lib, "g_dbus_connection_get_type") | |
| 1731 | - | ||
| 1732 | - | core.PuregoSafeRegister(&xNewDBusConnectionFinish, lib, "g_dbus_connection_new_finish") | |
| 1733 | - | core.PuregoSafeRegister(&xNewDBusConnectionForAddressFinish, lib, "g_dbus_connection_new_for_address_finish") | |
| 1734 | - | core.PuregoSafeRegister(&xNewDBusConnectionForAddressSync, lib, "g_dbus_connection_new_for_address_sync") | |
| 1735 | - | core.PuregoSafeRegister(&xNewDBusConnectionSync, lib, "g_dbus_connection_new_sync") | |
| 1736 | - | ||
| 1737 | - | core.PuregoSafeRegister(&xDBusConnectionAddFilter, lib, "g_dbus_connection_add_filter") | |
| 1738 | - | core.PuregoSafeRegister(&xDBusConnectionCall, lib, "g_dbus_connection_call") | |
| 1739 | - | core.PuregoSafeRegister(&xDBusConnectionCallFinish, lib, "g_dbus_connection_call_finish") | |
| 1740 | - | core.PuregoSafeRegister(&xDBusConnectionCallSync, lib, "g_dbus_connection_call_sync") | |
| 1741 | - | core.PuregoSafeRegister(&xDBusConnectionCallWithUnixFdList, lib, "g_dbus_connection_call_with_unix_fd_list") | |
| 1742 | - | core.PuregoSafeRegister(&xDBusConnectionCallWithUnixFdListFinish, lib, "g_dbus_connection_call_with_unix_fd_list_finish") | |
| 1743 | - | core.PuregoSafeRegister(&xDBusConnectionCallWithUnixFdListSync, lib, "g_dbus_connection_call_with_unix_fd_list_sync") | |
| 1744 | - | core.PuregoSafeRegister(&xDBusConnectionClose, lib, "g_dbus_connection_close") | |
| 1745 | - | core.PuregoSafeRegister(&xDBusConnectionCloseFinish, lib, "g_dbus_connection_close_finish") | |
| 1746 | - | core.PuregoSafeRegister(&xDBusConnectionCloseSync, lib, "g_dbus_connection_close_sync") | |
| 1747 | - | core.PuregoSafeRegister(&xDBusConnectionEmitSignal, lib, "g_dbus_connection_emit_signal") | |
| 1748 | - | core.PuregoSafeRegister(&xDBusConnectionExportActionGroup, lib, "g_dbus_connection_export_action_group") | |
| 1749 | - | core.PuregoSafeRegister(&xDBusConnectionExportMenuModel, lib, "g_dbus_connection_export_menu_model") | |
| 1750 | - | core.PuregoSafeRegister(&xDBusConnectionFlush, lib, "g_dbus_connection_flush") | |
| 1751 | - | core.PuregoSafeRegister(&xDBusConnectionFlushFinish, lib, "g_dbus_connection_flush_finish") | |
| 1752 | - | core.PuregoSafeRegister(&xDBusConnectionFlushSync, lib, "g_dbus_connection_flush_sync") | |
| 1753 | - | core.PuregoSafeRegister(&xDBusConnectionGetCapabilities, lib, "g_dbus_connection_get_capabilities") | |
| 1754 | - | core.PuregoSafeRegister(&xDBusConnectionGetExitOnClose, lib, "g_dbus_connection_get_exit_on_close") | |
| 1755 | - | core.PuregoSafeRegister(&xDBusConnectionGetFlags, lib, "g_dbus_connection_get_flags") | |
| 1756 | - | core.PuregoSafeRegister(&xDBusConnectionGetGuid, lib, "g_dbus_connection_get_guid") | |
| 1757 | - | core.PuregoSafeRegister(&xDBusConnectionGetLastSerial, lib, "g_dbus_connection_get_last_serial") | |
| 1758 | - | core.PuregoSafeRegister(&xDBusConnectionGetPeerCredentials, lib, "g_dbus_connection_get_peer_credentials") | |
| 1759 | - | core.PuregoSafeRegister(&xDBusConnectionGetStream, lib, "g_dbus_connection_get_stream") | |
| 1760 | - | core.PuregoSafeRegister(&xDBusConnectionGetUniqueName, lib, "g_dbus_connection_get_unique_name") | |
| 1761 | - | core.PuregoSafeRegister(&xDBusConnectionIsClosed, lib, "g_dbus_connection_is_closed") | |
| 1762 | - | core.PuregoSafeRegister(&xDBusConnectionRegisterObject, lib, "g_dbus_connection_register_object") | |
| 1763 | - | core.PuregoSafeRegister(&xDBusConnectionRegisterObjectWithClosures, lib, "g_dbus_connection_register_object_with_closures") | |
| 1764 | - | core.PuregoSafeRegister(&xDBusConnectionRegisterObjectWithClosures2, lib, "g_dbus_connection_register_object_with_closures2") | |
| 1765 | - | core.PuregoSafeRegister(&xDBusConnectionRegisterSubtree, lib, "g_dbus_connection_register_subtree") | |
| 1766 | - | core.PuregoSafeRegister(&xDBusConnectionRemoveFilter, lib, "g_dbus_connection_remove_filter") | |
| 1767 | - | core.PuregoSafeRegister(&xDBusConnectionSendMessage, lib, "g_dbus_connection_send_message") | |
| 1768 | - | core.PuregoSafeRegister(&xDBusConnectionSendMessageWithReply, lib, "g_dbus_connection_send_message_with_reply") | |
| 1769 | - | core.PuregoSafeRegister(&xDBusConnectionSendMessageWithReplyFinish, lib, "g_dbus_connection_send_message_with_reply_finish") | |
| 1770 | - | core.PuregoSafeRegister(&xDBusConnectionSendMessageWithReplySync, lib, "g_dbus_connection_send_message_with_reply_sync") | |
| 1771 | - | core.PuregoSafeRegister(&xDBusConnectionSetExitOnClose, lib, "g_dbus_connection_set_exit_on_close") | |
| 1772 | - | core.PuregoSafeRegister(&xDBusConnectionSignalSubscribe, lib, "g_dbus_connection_signal_subscribe") | |
| 1773 | - | core.PuregoSafeRegister(&xDBusConnectionSignalUnsubscribe, lib, "g_dbus_connection_signal_unsubscribe") | |
| 1774 | - | core.PuregoSafeRegister(&xDBusConnectionStartMessageProcessing, lib, "g_dbus_connection_start_message_processing") | |
| 1775 | - | core.PuregoSafeRegister(&xDBusConnectionUnexportActionGroup, lib, "g_dbus_connection_unexport_action_group") | |
| 1776 | - | core.PuregoSafeRegister(&xDBusConnectionUnexportMenuModel, lib, "g_dbus_connection_unexport_menu_model") | |
| 1777 | - | core.PuregoSafeRegister(&xDBusConnectionUnregisterObject, lib, "g_dbus_connection_unregister_object") | |
| 1778 | - | core.PuregoSafeRegister(&xDBusConnectionUnregisterSubtree, lib, "g_dbus_connection_unregister_subtree") | |
| 1779 | - | ||
| 1780 | - | core.PuregoSafeRegister(&xDBusConnectionNew, lib, "g_dbus_connection_new") | |
| 1781 | - | core.PuregoSafeRegister(&xDBusConnectionNewForAddress, lib, "g_dbus_connection_new_for_address") | |
| 1730 | + | core.PuregoSafeRegister(&xBusGet, libs, "g_bus_get") | |
| 1731 | + | core.PuregoSafeRegister(&xBusGetFinish, libs, "g_bus_get_finish") | |
| 1732 | + | core.PuregoSafeRegister(&xBusGetSync, libs, "g_bus_get_sync") | |
| 1733 | + | ||
| 1734 | + | core.PuregoSafeRegister(&xDBusConnectionGLibType, libs, "g_dbus_connection_get_type") | |
| 1735 | + | ||
| 1736 | + | core.PuregoSafeRegister(&xNewDBusConnectionFinish, libs, "g_dbus_connection_new_finish") | |
| 1737 | + | core.PuregoSafeRegister(&xNewDBusConnectionForAddressFinish, libs, "g_dbus_connection_new_for_address_finish") | |
| 1738 | + | core.PuregoSafeRegister(&xNewDBusConnectionForAddressSync, libs, "g_dbus_connection_new_for_address_sync") | |
| 1739 | + | core.PuregoSafeRegister(&xNewDBusConnectionSync, libs, "g_dbus_connection_new_sync") | |
| 1740 | + | ||
| 1741 | + | core.PuregoSafeRegister(&xDBusConnectionAddFilter, libs, "g_dbus_connection_add_filter") | |
| 1742 | + | core.PuregoSafeRegister(&xDBusConnectionCall, libs, "g_dbus_connection_call") | |
| 1743 | + | core.PuregoSafeRegister(&xDBusConnectionCallFinish, libs, "g_dbus_connection_call_finish") | |
| 1744 | + | core.PuregoSafeRegister(&xDBusConnectionCallSync, libs, "g_dbus_connection_call_sync") | |
| 1745 | + | core.PuregoSafeRegister(&xDBusConnectionCallWithUnixFdList, libs, "g_dbus_connection_call_with_unix_fd_list") | |
| 1746 | + | core.PuregoSafeRegister(&xDBusConnectionCallWithUnixFdListFinish, libs, "g_dbus_connection_call_with_unix_fd_list_finish") | |
| 1747 | + | core.PuregoSafeRegister(&xDBusConnectionCallWithUnixFdListSync, libs, "g_dbus_connection_call_with_unix_fd_list_sync") | |
| 1748 | + | core.PuregoSafeRegister(&xDBusConnectionClose, libs, "g_dbus_connection_close") | |
| 1749 | + | core.PuregoSafeRegister(&xDBusConnectionCloseFinish, libs, "g_dbus_connection_close_finish") | |
| 1750 | + | core.PuregoSafeRegister(&xDBusConnectionCloseSync, libs, "g_dbus_connection_close_sync") | |
| 1751 | + | core.PuregoSafeRegister(&xDBusConnectionEmitSignal, libs, "g_dbus_connection_emit_signal") | |
| 1752 | + | core.PuregoSafeRegister(&xDBusConnectionExportActionGroup, libs, "g_dbus_connection_export_action_group") | |
| 1753 | + | core.PuregoSafeRegister(&xDBusConnectionExportMenuModel, libs, "g_dbus_connection_export_menu_model") | |
| 1754 | + | core.PuregoSafeRegister(&xDBusConnectionFlush, libs, "g_dbus_connection_flush") | |
| 1755 | + | core.PuregoSafeRegister(&xDBusConnectionFlushFinish, libs, "g_dbus_connection_flush_finish") | |
| 1756 | + | core.PuregoSafeRegister(&xDBusConnectionFlushSync, libs, "g_dbus_connection_flush_sync") | |
| 1757 | + | core.PuregoSafeRegister(&xDBusConnectionGetCapabilities, libs, "g_dbus_connection_get_capabilities") | |
| 1758 | + | core.PuregoSafeRegister(&xDBusConnectionGetExitOnClose, libs, "g_dbus_connection_get_exit_on_close") | |
| 1759 | + | core.PuregoSafeRegister(&xDBusConnectionGetFlags, libs, "g_dbus_connection_get_flags") | |
| 1760 | + | core.PuregoSafeRegister(&xDBusConnectionGetGuid, libs, "g_dbus_connection_get_guid") | |
| 1761 | + | core.PuregoSafeRegister(&xDBusConnectionGetLastSerial, libs, "g_dbus_connection_get_last_serial") | |
| 1762 | + | core.PuregoSafeRegister(&xDBusConnectionGetPeerCredentials, libs, "g_dbus_connection_get_peer_credentials") | |
| 1763 | + | core.PuregoSafeRegister(&xDBusConnectionGetStream, libs, "g_dbus_connection_get_stream") | |
| 1764 | + | core.PuregoSafeRegister(&xDBusConnectionGetUniqueName, libs, "g_dbus_connection_get_unique_name") | |
| 1765 | + | core.PuregoSafeRegister(&xDBusConnectionIsClosed, libs, "g_dbus_connection_is_closed") | |
| 1766 | + | core.PuregoSafeRegister(&xDBusConnectionRegisterObject, libs, "g_dbus_connection_register_object") | |
| 1767 | + | core.PuregoSafeRegister(&xDBusConnectionRegisterObjectWithClosures, libs, "g_dbus_connection_register_object_with_closures") | |
| 1768 | + | core.PuregoSafeRegister(&xDBusConnectionRegisterObjectWithClosures2, libs, "g_dbus_connection_register_object_with_closures2") | |
| 1769 | + | core.PuregoSafeRegister(&xDBusConnectionRegisterSubtree, libs, "g_dbus_connection_register_subtree") | |
| 1770 | + | core.PuregoSafeRegister(&xDBusConnectionRemoveFilter, libs, "g_dbus_connection_remove_filter") | |
| 1771 | + | core.PuregoSafeRegister(&xDBusConnectionSendMessage, libs, "g_dbus_connection_send_message") | |
| 1772 | + | core.PuregoSafeRegister(&xDBusConnectionSendMessageWithReply, libs, "g_dbus_connection_send_message_with_reply") | |
| 1773 | + | core.PuregoSafeRegister(&xDBusConnectionSendMessageWithReplyFinish, libs, "g_dbus_connection_send_message_with_reply_finish") | |
| 1774 | + | core.PuregoSafeRegister(&xDBusConnectionSendMessageWithReplySync, libs, "g_dbus_connection_send_message_with_reply_sync") | |
| 1775 | + | core.PuregoSafeRegister(&xDBusConnectionSetExitOnClose, libs, "g_dbus_connection_set_exit_on_close") | |
| 1776 | + | core.PuregoSafeRegister(&xDBusConnectionSignalSubscribe, libs, "g_dbus_connection_signal_subscribe") | |
| 1777 | + | core.PuregoSafeRegister(&xDBusConnectionSignalUnsubscribe, libs, "g_dbus_connection_signal_unsubscribe") | |
| 1778 | + | core.PuregoSafeRegister(&xDBusConnectionStartMessageProcessing, libs, "g_dbus_connection_start_message_processing") | |
| 1779 | + | core.PuregoSafeRegister(&xDBusConnectionUnexportActionGroup, libs, "g_dbus_connection_unexport_action_group") | |
| 1780 | + | core.PuregoSafeRegister(&xDBusConnectionUnexportMenuModel, libs, "g_dbus_connection_unexport_menu_model") | |
| 1781 | + | core.PuregoSafeRegister(&xDBusConnectionUnregisterObject, libs, "g_dbus_connection_unregister_object") | |
| 1782 | + | core.PuregoSafeRegister(&xDBusConnectionUnregisterSubtree, libs, "g_dbus_connection_unregister_subtree") | |
| 1783 | + | ||
| 1784 | + | core.PuregoSafeRegister(&xDBusConnectionNew, libs, "g_dbus_connection_new") | |
| 1785 | + | core.PuregoSafeRegister(&xDBusConnectionNewForAddress, libs, "g_dbus_connection_new_for_address") | |
| 1782 | 1786 | ||
| 1783 | 1787 | } | |
M v4/gio/gdbuserror.go +16 -12
| @@ -150,19 +150,23 @@ func DbusErrorUnregisterError(ErrorDomainVar glib.Quark, ErrorCodeVar int, DbusE | |||
| 150 | 150 | ||
| 151 | 151 | func init() { | |
| 152 | 152 | core.SetPackageName("GIO", "gio-2.0") | |
| 153 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 154 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 155 | - | if err != nil { | |
| 156 | - | panic(err) | |
| 153 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 154 | + | var libs []uintptr | |
| 155 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 156 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 157 | + | if err != nil { | |
| 158 | + | panic(err) | |
| 159 | + | } | |
| 160 | + | libs = append(libs, lib) | |
| 157 | 161 | } | |
| 158 | 162 | ||
| 159 | - | core.PuregoSafeRegister(&xDbusErrorEncodeGerror, lib, "g_dbus_error_encode_gerror") | |
| 160 | - | core.PuregoSafeRegister(&xDbusErrorGetRemoteError, lib, "g_dbus_error_get_remote_error") | |
| 161 | - | core.PuregoSafeRegister(&xDbusErrorIsRemoteError, lib, "g_dbus_error_is_remote_error") | |
| 162 | - | core.PuregoSafeRegister(&xDbusErrorNewForDbusError, lib, "g_dbus_error_new_for_dbus_error") | |
| 163 | - | core.PuregoSafeRegister(&xDbusErrorRegisterError, lib, "g_dbus_error_register_error") | |
| 164 | - | core.PuregoSafeRegister(&xDbusErrorRegisterErrorDomain, lib, "g_dbus_error_register_error_domain") | |
| 165 | - | core.PuregoSafeRegister(&xDbusErrorStripRemoteError, lib, "g_dbus_error_strip_remote_error") | |
| 166 | - | core.PuregoSafeRegister(&xDbusErrorUnregisterError, lib, "g_dbus_error_unregister_error") | |
| 163 | + | core.PuregoSafeRegister(&xDbusErrorEncodeGerror, libs, "g_dbus_error_encode_gerror") | |
| 164 | + | core.PuregoSafeRegister(&xDbusErrorGetRemoteError, libs, "g_dbus_error_get_remote_error") | |
| 165 | + | core.PuregoSafeRegister(&xDbusErrorIsRemoteError, libs, "g_dbus_error_is_remote_error") | |
| 166 | + | core.PuregoSafeRegister(&xDbusErrorNewForDbusError, libs, "g_dbus_error_new_for_dbus_error") | |
| 167 | + | core.PuregoSafeRegister(&xDbusErrorRegisterError, libs, "g_dbus_error_register_error") | |
| 168 | + | core.PuregoSafeRegister(&xDbusErrorRegisterErrorDomain, libs, "g_dbus_error_register_error_domain") | |
| 169 | + | core.PuregoSafeRegister(&xDbusErrorStripRemoteError, libs, "g_dbus_error_strip_remote_error") | |
| 170 | + | core.PuregoSafeRegister(&xDbusErrorUnregisterError, libs, "g_dbus_error_unregister_error") | |
| 167 | 171 | ||
| 168 | 172 | } | |
M v4/gio/gdbusinterface.go +13 -9
| @@ -242,17 +242,21 @@ var XGDbusInterfaceSetObject func(uintptr, uintptr) | |||
| 242 | 242 | ||
| 243 | 243 | func init() { | |
| 244 | 244 | core.SetPackageName("GIO", "gio-2.0") | |
| 245 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 246 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 247 | - | if err != nil { | |
| 248 | - | panic(err) | |
| 245 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 246 | + | var libs []uintptr | |
| 247 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 248 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 249 | + | if err != nil { | |
| 250 | + | panic(err) | |
| 251 | + | } | |
| 252 | + | libs = append(libs, lib) | |
| 249 | 253 | } | |
| 250 | 254 | ||
| 251 | - | core.PuregoSafeRegister(&xDBusInterfaceGLibType, lib, "g_dbus_interface_get_type") | |
| 255 | + | core.PuregoSafeRegister(&xDBusInterfaceGLibType, libs, "g_dbus_interface_get_type") | |
| 252 | 256 | ||
| 253 | - | core.PuregoSafeRegister(&XGDbusInterfaceDupObject, lib, "g_dbus_interface_dup_object") | |
| 254 | - | core.PuregoSafeRegister(&XGDbusInterfaceGetInfo, lib, "g_dbus_interface_get_info") | |
| 255 | - | core.PuregoSafeRegister(&XGDbusInterfaceGetObject, lib, "g_dbus_interface_get_object") | |
| 256 | - | core.PuregoSafeRegister(&XGDbusInterfaceSetObject, lib, "g_dbus_interface_set_object") | |
| 257 | + | core.PuregoSafeRegister(&XGDbusInterfaceDupObject, libs, "g_dbus_interface_dup_object") | |
| 258 | + | core.PuregoSafeRegister(&XGDbusInterfaceGetInfo, libs, "g_dbus_interface_get_info") | |
| 259 | + | core.PuregoSafeRegister(&XGDbusInterfaceGetObject, libs, "g_dbus_interface_get_object") | |
| 260 | + | core.PuregoSafeRegister(&XGDbusInterfaceSetObject, libs, "g_dbus_interface_set_object") | |
| 257 | 261 | ||
| 258 | 262 | } | |
M v4/gio/gdbusinterfaceskeleton.go +23 -19
| @@ -447,26 +447,30 @@ func (x *DBusInterfaceSkeleton) SetObject(ObjectVar DBusObject) { | |||
| 447 | 447 | ||
| 448 | 448 | func init() { | |
| 449 | 449 | core.SetPackageName("GIO", "gio-2.0") | |
| 450 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 451 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 452 | - | if err != nil { | |
| 453 | - | panic(err) | |
| 450 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 451 | + | var libs []uintptr | |
| 452 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 453 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 454 | + | if err != nil { | |
| 455 | + | panic(err) | |
| 456 | + | } | |
| 457 | + | libs = append(libs, lib) | |
| 454 | 458 | } | |
| 455 | 459 | ||
| 456 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGLibType, lib, "g_dbus_interface_skeleton_get_type") | |
| 457 | - | ||
| 458 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonExport, lib, "g_dbus_interface_skeleton_export") | |
| 459 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonFlush, lib, "g_dbus_interface_skeleton_flush") | |
| 460 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetConnection, lib, "g_dbus_interface_skeleton_get_connection") | |
| 461 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetConnections, lib, "g_dbus_interface_skeleton_get_connections") | |
| 462 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetFlags, lib, "g_dbus_interface_skeleton_get_flags") | |
| 463 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetInfo, lib, "g_dbus_interface_skeleton_get_info") | |
| 464 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetObjectPath, lib, "g_dbus_interface_skeleton_get_object_path") | |
| 465 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetProperties, lib, "g_dbus_interface_skeleton_get_properties") | |
| 466 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetVtable, lib, "g_dbus_interface_skeleton_get_vtable") | |
| 467 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonHasConnection, lib, "g_dbus_interface_skeleton_has_connection") | |
| 468 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonSetFlags, lib, "g_dbus_interface_skeleton_set_flags") | |
| 469 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonUnexport, lib, "g_dbus_interface_skeleton_unexport") | |
| 470 | - | core.PuregoSafeRegister(&xDBusInterfaceSkeletonUnexportFromConnection, lib, "g_dbus_interface_skeleton_unexport_from_connection") | |
| 460 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGLibType, libs, "g_dbus_interface_skeleton_get_type") | |
| 461 | + | ||
| 462 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonExport, libs, "g_dbus_interface_skeleton_export") | |
| 463 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonFlush, libs, "g_dbus_interface_skeleton_flush") | |
| 464 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetConnection, libs, "g_dbus_interface_skeleton_get_connection") | |
| 465 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetConnections, libs, "g_dbus_interface_skeleton_get_connections") | |
| 466 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetFlags, libs, "g_dbus_interface_skeleton_get_flags") | |
| 467 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetInfo, libs, "g_dbus_interface_skeleton_get_info") | |
| 468 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetObjectPath, libs, "g_dbus_interface_skeleton_get_object_path") | |
| 469 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetProperties, libs, "g_dbus_interface_skeleton_get_properties") | |
| 470 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonGetVtable, libs, "g_dbus_interface_skeleton_get_vtable") | |
| 471 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonHasConnection, libs, "g_dbus_interface_skeleton_has_connection") | |
| 472 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonSetFlags, libs, "g_dbus_interface_skeleton_set_flags") | |
| 473 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonUnexport, libs, "g_dbus_interface_skeleton_unexport") | |
| 474 | + | core.PuregoSafeRegister(&xDBusInterfaceSkeletonUnexportFromConnection, libs, "g_dbus_interface_skeleton_unexport_from_connection") | |
| 471 | 475 | ||
| 472 | 476 | } | |
M v4/gio/gdbusintrospection.go +39 -35
| @@ -465,57 +465,61 @@ func DbusAnnotationInfoLookup(AnnotationsVar uintptr, NameVar string) string { | |||
| 465 | 465 | ||
| 466 | 466 | func init() { | |
| 467 | 467 | core.SetPackageName("GIO", "gio-2.0") | |
| 468 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 469 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 470 | - | if err != nil { | |
| 471 | - | panic(err) | |
| 468 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 469 | + | var libs []uintptr | |
| 470 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 471 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 472 | + | if err != nil { | |
| 473 | + | panic(err) | |
| 474 | + | } | |
| 475 | + | libs = append(libs, lib) | |
| 472 | 476 | } | |
| 473 | 477 | ||
| 474 | - | core.PuregoSafeRegister(&xDbusAnnotationInfoLookup, lib, "g_dbus_annotation_info_lookup") | |
| 478 | + | core.PuregoSafeRegister(&xDbusAnnotationInfoLookup, libs, "g_dbus_annotation_info_lookup") | |
| 475 | 479 | ||
| 476 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoGLibType, lib, "g_dbus_annotation_info_get_type") | |
| 480 | + | core.PuregoSafeRegister(&xDBusAnnotationInfoGLibType, libs, "g_dbus_annotation_info_get_type") | |
| 477 | 481 | ||
| 478 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoRef, lib, "g_dbus_annotation_info_ref") | |
| 479 | - | core.PuregoSafeRegister(&xDBusAnnotationInfoUnref, lib, "g_dbus_annotation_info_unref") | |
| 482 | + | core.PuregoSafeRegister(&xDBusAnnotationInfoRef, libs, "g_dbus_annotation_info_ref") | |
| 483 | + | core.PuregoSafeRegister(&xDBusAnnotationInfoUnref, libs, "g_dbus_annotation_info_unref") | |
| 480 | 484 | ||
| 481 | - | core.PuregoSafeRegister(&xDBusArgInfoGLibType, lib, "g_dbus_arg_info_get_type") | |
| 485 | + | core.PuregoSafeRegister(&xDBusArgInfoGLibType, libs, "g_dbus_arg_info_get_type") | |
| 482 | 486 | ||
| 483 | - | core.PuregoSafeRegister(&xDBusArgInfoRef, lib, "g_dbus_arg_info_ref") | |
| 484 | - | core.PuregoSafeRegister(&xDBusArgInfoUnref, lib, "g_dbus_arg_info_unref") | |
| 487 | + | core.PuregoSafeRegister(&xDBusArgInfoRef, libs, "g_dbus_arg_info_ref") | |
| 488 | + | core.PuregoSafeRegister(&xDBusArgInfoUnref, libs, "g_dbus_arg_info_unref") | |
| 485 | 489 | ||
| 486 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoGLibType, lib, "g_dbus_interface_info_get_type") | |
| 490 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoGLibType, libs, "g_dbus_interface_info_get_type") | |
| 487 | 491 | ||
| 488 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheBuild, lib, "g_dbus_interface_info_cache_build") | |
| 489 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheRelease, lib, "g_dbus_interface_info_cache_release") | |
| 490 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoGenerateXml, lib, "g_dbus_interface_info_generate_xml") | |
| 491 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupMethod, lib, "g_dbus_interface_info_lookup_method") | |
| 492 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupProperty, lib, "g_dbus_interface_info_lookup_property") | |
| 493 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupSignal, lib, "g_dbus_interface_info_lookup_signal") | |
| 494 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoRef, lib, "g_dbus_interface_info_ref") | |
| 495 | - | core.PuregoSafeRegister(&xDBusInterfaceInfoUnref, lib, "g_dbus_interface_info_unref") | |
| 492 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheBuild, libs, "g_dbus_interface_info_cache_build") | |
| 493 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoCacheRelease, libs, "g_dbus_interface_info_cache_release") | |
| 494 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoGenerateXml, libs, "g_dbus_interface_info_generate_xml") | |
| 495 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupMethod, libs, "g_dbus_interface_info_lookup_method") | |
| 496 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupProperty, libs, "g_dbus_interface_info_lookup_property") | |
| 497 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoLookupSignal, libs, "g_dbus_interface_info_lookup_signal") | |
| 498 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoRef, libs, "g_dbus_interface_info_ref") | |
| 499 | + | core.PuregoSafeRegister(&xDBusInterfaceInfoUnref, libs, "g_dbus_interface_info_unref") | |
| 496 | 500 | ||
| 497 | - | core.PuregoSafeRegister(&xDBusMethodInfoGLibType, lib, "g_dbus_method_info_get_type") | |
| 501 | + | core.PuregoSafeRegister(&xDBusMethodInfoGLibType, libs, "g_dbus_method_info_get_type") | |
| 498 | 502 | ||
| 499 | - | core.PuregoSafeRegister(&xDBusMethodInfoRef, lib, "g_dbus_method_info_ref") | |
| 500 | - | core.PuregoSafeRegister(&xDBusMethodInfoUnref, lib, "g_dbus_method_info_unref") | |
| 503 | + | core.PuregoSafeRegister(&xDBusMethodInfoRef, libs, "g_dbus_method_info_ref") | |
| 504 | + | core.PuregoSafeRegister(&xDBusMethodInfoUnref, libs, "g_dbus_method_info_unref") | |
| 501 | 505 | ||
| 502 | - | core.PuregoSafeRegister(&xDBusNodeInfoGLibType, lib, "g_dbus_node_info_get_type") | |
| 506 | + | core.PuregoSafeRegister(&xDBusNodeInfoGLibType, libs, "g_dbus_node_info_get_type") | |
| 503 | 507 | ||
| 504 | - | core.PuregoSafeRegister(&xNewDBusNodeInfoForXml, lib, "g_dbus_node_info_new_for_xml") | |
| 508 | + | core.PuregoSafeRegister(&xNewDBusNodeInfoForXml, libs, "g_dbus_node_info_new_for_xml") | |
| 505 | 509 | ||
| 506 | - | core.PuregoSafeRegister(&xDBusNodeInfoGenerateXml, lib, "g_dbus_node_info_generate_xml") | |
| 507 | - | core.PuregoSafeRegister(&xDBusNodeInfoLookupInterface, lib, "g_dbus_node_info_lookup_interface") | |
| 508 | - | core.PuregoSafeRegister(&xDBusNodeInfoRef, lib, "g_dbus_node_info_ref") | |
| 509 | - | core.PuregoSafeRegister(&xDBusNodeInfoUnref, lib, "g_dbus_node_info_unref") | |
| 510 | + | core.PuregoSafeRegister(&xDBusNodeInfoGenerateXml, libs, "g_dbus_node_info_generate_xml") | |
| 511 | + | core.PuregoSafeRegister(&xDBusNodeInfoLookupInterface, libs, "g_dbus_node_info_lookup_interface") | |
| 512 | + | core.PuregoSafeRegister(&xDBusNodeInfoRef, libs, "g_dbus_node_info_ref") | |
| 513 | + | core.PuregoSafeRegister(&xDBusNodeInfoUnref, libs, "g_dbus_node_info_unref") | |
| 510 | 514 | ||
| 511 | - | core.PuregoSafeRegister(&xDBusPropertyInfoGLibType, lib, "g_dbus_property_info_get_type") | |
| 515 | + | core.PuregoSafeRegister(&xDBusPropertyInfoGLibType, libs, "g_dbus_property_info_get_type") | |
| 512 | 516 | ||
| 513 | - | core.PuregoSafeRegister(&xDBusPropertyInfoRef, lib, "g_dbus_property_info_ref") | |
| 514 | - | core.PuregoSafeRegister(&xDBusPropertyInfoUnref, lib, "g_dbus_property_info_unref") | |
| 517 | + | core.PuregoSafeRegister(&xDBusPropertyInfoRef, libs, "g_dbus_property_info_ref") | |
| 518 | + | core.PuregoSafeRegister(&xDBusPropertyInfoUnref, libs, "g_dbus_property_info_unref") | |
| 515 | 519 | ||
| 516 | - | core.PuregoSafeRegister(&xDBusSignalInfoGLibType, lib, "g_dbus_signal_info_get_type") | |
| 520 | + | core.PuregoSafeRegister(&xDBusSignalInfoGLibType, libs, "g_dbus_signal_info_get_type") | |
| 517 | 521 | ||
| 518 | - | core.PuregoSafeRegister(&xDBusSignalInfoRef, lib, "g_dbus_signal_info_ref") | |
| 519 | - | core.PuregoSafeRegister(&xDBusSignalInfoUnref, lib, "g_dbus_signal_info_unref") | |
| 522 | + | core.PuregoSafeRegister(&xDBusSignalInfoRef, libs, "g_dbus_signal_info_ref") | |
| 523 | + | core.PuregoSafeRegister(&xDBusSignalInfoUnref, libs, "g_dbus_signal_info_unref") | |
| 520 | 524 | ||
| 521 | 525 | } | |
M v4/gio/gdbusmenumodel.go +10 -6
| @@ -62,14 +62,18 @@ func DBusMenuModelGet(ConnectionVar *DBusConnection, BusNameVar string, ObjectPa | |||
| 62 | 62 | ||
| 63 | 63 | func init() { | |
| 64 | 64 | core.SetPackageName("GIO", "gio-2.0") | |
| 65 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 66 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 67 | - | if err != nil { | |
| 68 | - | panic(err) | |
| 65 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 66 | + | var libs []uintptr | |
| 67 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 68 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 69 | + | if err != nil { | |
| 70 | + | panic(err) | |
| 71 | + | } | |
| 72 | + | libs = append(libs, lib) | |
| 69 | 73 | } | |
| 70 | 74 | ||
| 71 | - | core.PuregoSafeRegister(&xDBusMenuModelGLibType, lib, "g_dbus_menu_model_get_type") | |
| 75 | + | core.PuregoSafeRegister(&xDBusMenuModelGLibType, libs, "g_dbus_menu_model_get_type") | |
| 72 | 76 | ||
| 73 | - | core.PuregoSafeRegister(&xDBusMenuModelGet, lib, "g_dbus_menu_model_get") | |
| 77 | + | core.PuregoSafeRegister(&xDBusMenuModelGet, libs, "g_dbus_menu_model_get") | |
| 74 | 78 | ||
| 75 | 79 | } | |
M v4/gio/gdbusmessage.go +62 -58
| @@ -682,65 +682,69 @@ func DBusMessageBytesNeeded(BlobVar []byte, BlobLenVar uint) (int, error) { | |||
| 682 | 682 | ||
| 683 | 683 | func init() { | |
| 684 | 684 | core.SetPackageName("GIO", "gio-2.0") | |
| 685 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 686 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 687 | - | if err != nil { | |
| 688 | - | panic(err) | |
| 685 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 686 | + | var libs []uintptr | |
| 687 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 688 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 689 | + | if err != nil { | |
| 690 | + | panic(err) | |
| 691 | + | } | |
| 692 | + | libs = append(libs, lib) | |
| 689 | 693 | } | |
| 690 | 694 | ||
| 691 | - | core.PuregoSafeRegister(&xDBusMessageGLibType, lib, "g_dbus_message_get_type") | |
| 692 | - | ||
| 693 | - | core.PuregoSafeRegister(&xNewDBusMessage, lib, "g_dbus_message_new") | |
| 694 | - | core.PuregoSafeRegister(&xNewDBusMessageFromBlob, lib, "g_dbus_message_new_from_blob") | |
| 695 | - | core.PuregoSafeRegister(&xNewDBusMessageMethodCall, lib, "g_dbus_message_new_method_call") | |
| 696 | - | core.PuregoSafeRegister(&xNewDBusMessageSignal, lib, "g_dbus_message_new_signal") | |
| 697 | - | ||
| 698 | - | core.PuregoSafeRegister(&xDBusMessageCopy, lib, "g_dbus_message_copy") | |
| 699 | - | core.PuregoSafeRegister(&xDBusMessageGetArg0, lib, "g_dbus_message_get_arg0") | |
| 700 | - | core.PuregoSafeRegister(&xDBusMessageGetArg0Path, lib, "g_dbus_message_get_arg0_path") | |
| 701 | - | core.PuregoSafeRegister(&xDBusMessageGetBody, lib, "g_dbus_message_get_body") | |
| 702 | - | core.PuregoSafeRegister(&xDBusMessageGetByteOrder, lib, "g_dbus_message_get_byte_order") | |
| 703 | - | core.PuregoSafeRegister(&xDBusMessageGetDestination, lib, "g_dbus_message_get_destination") | |
| 704 | - | core.PuregoSafeRegister(&xDBusMessageGetErrorName, lib, "g_dbus_message_get_error_name") | |
| 705 | - | core.PuregoSafeRegister(&xDBusMessageGetFlags, lib, "g_dbus_message_get_flags") | |
| 706 | - | core.PuregoSafeRegister(&xDBusMessageGetHeader, lib, "g_dbus_message_get_header") | |
| 707 | - | core.PuregoSafeRegister(&xDBusMessageGetHeaderFields, lib, "g_dbus_message_get_header_fields") | |
| 708 | - | core.PuregoSafeRegister(&xDBusMessageGetInterface, lib, "g_dbus_message_get_interface") | |
| 709 | - | core.PuregoSafeRegister(&xDBusMessageGetLocked, lib, "g_dbus_message_get_locked") | |
| 710 | - | core.PuregoSafeRegister(&xDBusMessageGetMember, lib, "g_dbus_message_get_member") | |
| 711 | - | core.PuregoSafeRegister(&xDBusMessageGetMessageType, lib, "g_dbus_message_get_message_type") | |
| 712 | - | core.PuregoSafeRegister(&xDBusMessageGetNumUnixFds, lib, "g_dbus_message_get_num_unix_fds") | |
| 713 | - | core.PuregoSafeRegister(&xDBusMessageGetPath, lib, "g_dbus_message_get_path") | |
| 714 | - | core.PuregoSafeRegister(&xDBusMessageGetReplySerial, lib, "g_dbus_message_get_reply_serial") | |
| 715 | - | core.PuregoSafeRegister(&xDBusMessageGetSender, lib, "g_dbus_message_get_sender") | |
| 716 | - | core.PuregoSafeRegister(&xDBusMessageGetSerial, lib, "g_dbus_message_get_serial") | |
| 717 | - | core.PuregoSafeRegister(&xDBusMessageGetSignature, lib, "g_dbus_message_get_signature") | |
| 718 | - | core.PuregoSafeRegister(&xDBusMessageGetUnixFdList, lib, "g_dbus_message_get_unix_fd_list") | |
| 719 | - | core.PuregoSafeRegister(&xDBusMessageLock, lib, "g_dbus_message_lock") | |
| 720 | - | core.PuregoSafeRegister(&xDBusMessageNewMethodError, lib, "g_dbus_message_new_method_error") | |
| 721 | - | core.PuregoSafeRegister(&xDBusMessageNewMethodErrorLiteral, lib, "g_dbus_message_new_method_error_literal") | |
| 722 | - | core.PuregoSafeRegister(&xDBusMessageNewMethodErrorValist, lib, "g_dbus_message_new_method_error_valist") | |
| 723 | - | core.PuregoSafeRegister(&xDBusMessageNewMethodReply, lib, "g_dbus_message_new_method_reply") | |
| 724 | - | core.PuregoSafeRegister(&xDBusMessagePrint, lib, "g_dbus_message_print") | |
| 725 | - | core.PuregoSafeRegister(&xDBusMessageSetBody, lib, "g_dbus_message_set_body") | |
| 726 | - | core.PuregoSafeRegister(&xDBusMessageSetByteOrder, lib, "g_dbus_message_set_byte_order") | |
| 727 | - | core.PuregoSafeRegister(&xDBusMessageSetDestination, lib, "g_dbus_message_set_destination") | |
| 728 | - | core.PuregoSafeRegister(&xDBusMessageSetErrorName, lib, "g_dbus_message_set_error_name") | |
| 729 | - | core.PuregoSafeRegister(&xDBusMessageSetFlags, lib, "g_dbus_message_set_flags") | |
| 730 | - | core.PuregoSafeRegister(&xDBusMessageSetHeader, lib, "g_dbus_message_set_header") | |
| 731 | - | core.PuregoSafeRegister(&xDBusMessageSetInterface, lib, "g_dbus_message_set_interface") | |
| 732 | - | core.PuregoSafeRegister(&xDBusMessageSetMember, lib, "g_dbus_message_set_member") | |
| 733 | - | core.PuregoSafeRegister(&xDBusMessageSetMessageType, lib, "g_dbus_message_set_message_type") | |
| 734 | - | core.PuregoSafeRegister(&xDBusMessageSetNumUnixFds, lib, "g_dbus_message_set_num_unix_fds") | |
| 735 | - | core.PuregoSafeRegister(&xDBusMessageSetPath, lib, "g_dbus_message_set_path") | |
| 736 | - | core.PuregoSafeRegister(&xDBusMessageSetReplySerial, lib, "g_dbus_message_set_reply_serial") | |
| 737 | - | core.PuregoSafeRegister(&xDBusMessageSetSender, lib, "g_dbus_message_set_sender") | |
| 738 | - | core.PuregoSafeRegister(&xDBusMessageSetSerial, lib, "g_dbus_message_set_serial") | |
| 739 | - | core.PuregoSafeRegister(&xDBusMessageSetSignature, lib, "g_dbus_message_set_signature") | |
| 740 | - | core.PuregoSafeRegister(&xDBusMessageSetUnixFdList, lib, "g_dbus_message_set_unix_fd_list") | |
| 741 | - | core.PuregoSafeRegister(&xDBusMessageToBlob, lib, "g_dbus_message_to_blob") | |
| 742 | - | core.PuregoSafeRegister(&xDBusMessageToGerror, lib, "g_dbus_message_to_gerror") | |
| 743 | - | ||
| 744 | - | core.PuregoSafeRegister(&xDBusMessageBytesNeeded, lib, "g_dbus_message_bytes_needed") | |
| 695 | + | core.PuregoSafeRegister(&xDBusMessageGLibType, libs, "g_dbus_message_get_type") | |
| 696 | + | ||
| 697 | + | core.PuregoSafeRegister(&xNewDBusMessage, libs, "g_dbus_message_new") | |
| 698 | + | core.PuregoSafeRegister(&xNewDBusMessageFromBlob, libs, "g_dbus_message_new_from_blob") | |
| 699 | + | core.PuregoSafeRegister(&xNewDBusMessageMethodCall, libs, "g_dbus_message_new_method_call") | |
| 700 | + | core.PuregoSafeRegister(&xNewDBusMessageSignal, libs, "g_dbus_message_new_signal") | |
| 701 | + | ||
| 702 | + | core.PuregoSafeRegister(&xDBusMessageCopy, libs, "g_dbus_message_copy") | |
| 703 | + | core.PuregoSafeRegister(&xDBusMessageGetArg0, libs, "g_dbus_message_get_arg0") | |
| 704 | + | core.PuregoSafeRegister(&xDBusMessageGetArg0Path, libs, "g_dbus_message_get_arg0_path") | |
| 705 | + | core.PuregoSafeRegister(&xDBusMessageGetBody, libs, "g_dbus_message_get_body") | |
| 706 | + | core.PuregoSafeRegister(&xDBusMessageGetByteOrder, libs, "g_dbus_message_get_byte_order") | |
| 707 | + | core.PuregoSafeRegister(&xDBusMessageGetDestination, libs, "g_dbus_message_get_destination") | |
| 708 | + | core.PuregoSafeRegister(&xDBusMessageGetErrorName, libs, "g_dbus_message_get_error_name") | |
| 709 | + | core.PuregoSafeRegister(&xDBusMessageGetFlags, libs, "g_dbus_message_get_flags") | |
| 710 | + | core.PuregoSafeRegister(&xDBusMessageGetHeader, libs, "g_dbus_message_get_header") | |
| 711 | + | core.PuregoSafeRegister(&xDBusMessageGetHeaderFields, libs, "g_dbus_message_get_header_fields") | |
| 712 | + | core.PuregoSafeRegister(&xDBusMessageGetInterface, libs, "g_dbus_message_get_interface") | |
| 713 | + | core.PuregoSafeRegister(&xDBusMessageGetLocked, libs, "g_dbus_message_get_locked") | |
| 714 | + | core.PuregoSafeRegister(&xDBusMessageGetMember, libs, "g_dbus_message_get_member") | |
| 715 | + | core.PuregoSafeRegister(&xDBusMessageGetMessageType, libs, "g_dbus_message_get_message_type") | |
| 716 | + | core.PuregoSafeRegister(&xDBusMessageGetNumUnixFds, libs, "g_dbus_message_get_num_unix_fds") | |
| 717 | + | core.PuregoSafeRegister(&xDBusMessageGetPath, libs, "g_dbus_message_get_path") | |
| 718 | + | core.PuregoSafeRegister(&xDBusMessageGetReplySerial, libs, "g_dbus_message_get_reply_serial") | |
| 719 | + | core.PuregoSafeRegister(&xDBusMessageGetSender, libs, "g_dbus_message_get_sender") | |
| 720 | + | core.PuregoSafeRegister(&xDBusMessageGetSerial, libs, "g_dbus_message_get_serial") | |
| 721 | + | core.PuregoSafeRegister(&xDBusMessageGetSignature, libs, "g_dbus_message_get_signature") | |
| 722 | + | core.PuregoSafeRegister(&xDBusMessageGetUnixFdList, libs, "g_dbus_message_get_unix_fd_list") | |
| 723 | + | core.PuregoSafeRegister(&xDBusMessageLock, libs, "g_dbus_message_lock") | |
| 724 | + | core.PuregoSafeRegister(&xDBusMessageNewMethodError, libs, "g_dbus_message_new_method_error") | |
| 725 | + | core.PuregoSafeRegister(&xDBusMessageNewMethodErrorLiteral, libs, "g_dbus_message_new_method_error_literal") | |
| 726 | + | core.PuregoSafeRegister(&xDBusMessageNewMethodErrorValist, libs, "g_dbus_message_new_method_error_valist") | |
| 727 | + | core.PuregoSafeRegister(&xDBusMessageNewMethodReply, libs, "g_dbus_message_new_method_reply") | |
| 728 | + | core.PuregoSafeRegister(&xDBusMessagePrint, libs, "g_dbus_message_print") | |
| 729 | + | core.PuregoSafeRegister(&xDBusMessageSetBody, libs, "g_dbus_message_set_body") | |
| 730 | + | core.PuregoSafeRegister(&xDBusMessageSetByteOrder, libs, "g_dbus_message_set_byte_order") | |
| 731 | + | core.PuregoSafeRegister(&xDBusMessageSetDestination, libs, "g_dbus_message_set_destination") | |
| 732 | + | core.PuregoSafeRegister(&xDBusMessageSetErrorName, libs, "g_dbus_message_set_error_name") | |
| 733 | + | core.PuregoSafeRegister(&xDBusMessageSetFlags, libs, "g_dbus_message_set_flags") | |
| 734 | + | core.PuregoSafeRegister(&xDBusMessageSetHeader, libs, "g_dbus_message_set_header") | |
| 735 | + | core.PuregoSafeRegister(&xDBusMessageSetInterface, libs, "g_dbus_message_set_interface") | |
| 736 | + | core.PuregoSafeRegister(&xDBusMessageSetMember, libs, "g_dbus_message_set_member") | |
| 737 | + | core.PuregoSafeRegister(&xDBusMessageSetMessageType, libs, "g_dbus_message_set_message_type") | |
| 738 | + | core.PuregoSafeRegister(&xDBusMessageSetNumUnixFds, libs, "g_dbus_message_set_num_unix_fds") | |
| 739 | + | core.PuregoSafeRegister(&xDBusMessageSetPath, libs, "g_dbus_message_set_path") | |
| 740 | + | core.PuregoSafeRegister(&xDBusMessageSetReplySerial, libs, "g_dbus_message_set_reply_serial") | |
| 741 | + | core.PuregoSafeRegister(&xDBusMessageSetSender, libs, "g_dbus_message_set_sender") | |
| 742 | + | core.PuregoSafeRegister(&xDBusMessageSetSerial, libs, "g_dbus_message_set_serial") | |
| 743 | + | core.PuregoSafeRegister(&xDBusMessageSetSignature, libs, "g_dbus_message_set_signature") | |
| 744 | + | core.PuregoSafeRegister(&xDBusMessageSetUnixFdList, libs, "g_dbus_message_set_unix_fd_list") | |
| 745 | + | core.PuregoSafeRegister(&xDBusMessageToBlob, libs, "g_dbus_message_to_blob") | |
| 746 | + | core.PuregoSafeRegister(&xDBusMessageToGerror, libs, "g_dbus_message_to_gerror") | |
| 747 | + | ||
| 748 | + | core.PuregoSafeRegister(&xDBusMessageBytesNeeded, libs, "g_dbus_message_bytes_needed") | |
| 745 | 749 | ||
| 746 | 750 | } | |
M v4/gio/gdbusmethodinvocation.go +28 -24
| @@ -367,31 +367,35 @@ func (c *DBusMethodInvocation) SetGoPointer(ptr uintptr) { | |||
| 367 | 367 | ||
| 368 | 368 | func init() { | |
| 369 | 369 | core.SetPackageName("GIO", "gio-2.0") | |
| 370 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 371 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 372 | - | if err != nil { | |
| 373 | - | panic(err) | |
| 370 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 371 | + | var libs []uintptr | |
| 372 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 373 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 374 | + | if err != nil { | |
| 375 | + | panic(err) | |
| 376 | + | } | |
| 377 | + | libs = append(libs, lib) | |
| 374 | 378 | } | |
| 375 | 379 | ||
| 376 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGLibType, lib, "g_dbus_method_invocation_get_type") | |
| 377 | - | ||
| 378 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetConnection, lib, "g_dbus_method_invocation_get_connection") | |
| 379 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetInterfaceName, lib, "g_dbus_method_invocation_get_interface_name") | |
| 380 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetMessage, lib, "g_dbus_method_invocation_get_message") | |
| 381 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetMethodInfo, lib, "g_dbus_method_invocation_get_method_info") | |
| 382 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetMethodName, lib, "g_dbus_method_invocation_get_method_name") | |
| 383 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetObjectPath, lib, "g_dbus_method_invocation_get_object_path") | |
| 384 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetParameters, lib, "g_dbus_method_invocation_get_parameters") | |
| 385 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetPropertyInfo, lib, "g_dbus_method_invocation_get_property_info") | |
| 386 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetSender, lib, "g_dbus_method_invocation_get_sender") | |
| 387 | - | core.PuregoSafeRegister(&xDBusMethodInvocationGetUserData, lib, "g_dbus_method_invocation_get_user_data") | |
| 388 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnDbusError, lib, "g_dbus_method_invocation_return_dbus_error") | |
| 389 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnError, lib, "g_dbus_method_invocation_return_error") | |
| 390 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnErrorLiteral, lib, "g_dbus_method_invocation_return_error_literal") | |
| 391 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnErrorValist, lib, "g_dbus_method_invocation_return_error_valist") | |
| 392 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnGerror, lib, "g_dbus_method_invocation_return_gerror") | |
| 393 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnValue, lib, "g_dbus_method_invocation_return_value") | |
| 394 | - | core.PuregoSafeRegister(&xDBusMethodInvocationReturnValueWithUnixFdList, lib, "g_dbus_method_invocation_return_value_with_unix_fd_list") | |
| 395 | - | core.PuregoSafeRegister(&xDBusMethodInvocationTakeError, lib, "g_dbus_method_invocation_take_error") | |
| 380 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGLibType, libs, "g_dbus_method_invocation_get_type") | |
| 381 | + | ||
| 382 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetConnection, libs, "g_dbus_method_invocation_get_connection") | |
| 383 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetInterfaceName, libs, "g_dbus_method_invocation_get_interface_name") | |
| 384 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetMessage, libs, "g_dbus_method_invocation_get_message") | |
| 385 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetMethodInfo, libs, "g_dbus_method_invocation_get_method_info") | |
| 386 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetMethodName, libs, "g_dbus_method_invocation_get_method_name") | |
| 387 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetObjectPath, libs, "g_dbus_method_invocation_get_object_path") | |
| 388 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetParameters, libs, "g_dbus_method_invocation_get_parameters") | |
| 389 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetPropertyInfo, libs, "g_dbus_method_invocation_get_property_info") | |
| 390 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetSender, libs, "g_dbus_method_invocation_get_sender") | |
| 391 | + | core.PuregoSafeRegister(&xDBusMethodInvocationGetUserData, libs, "g_dbus_method_invocation_get_user_data") | |
| 392 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnDbusError, libs, "g_dbus_method_invocation_return_dbus_error") | |
| 393 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnError, libs, "g_dbus_method_invocation_return_error") | |
| 394 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnErrorLiteral, libs, "g_dbus_method_invocation_return_error_literal") | |
| 395 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnErrorValist, libs, "g_dbus_method_invocation_return_error_valist") | |
| 396 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnGerror, libs, "g_dbus_method_invocation_return_gerror") | |
| 397 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnValue, libs, "g_dbus_method_invocation_return_value") | |
| 398 | + | core.PuregoSafeRegister(&xDBusMethodInvocationReturnValueWithUnixFdList, libs, "g_dbus_method_invocation_return_value_with_unix_fd_list") | |
| 399 | + | core.PuregoSafeRegister(&xDBusMethodInvocationTakeError, libs, "g_dbus_method_invocation_take_error") | |
| 396 | 400 | ||
| 397 | 401 | } | |
M v4/gio/gdbusnameowning.go +13 -9
| @@ -124,16 +124,20 @@ func BusUnownName(OwnerIdVar uint) { | |||
| 124 | 124 | ||
| 125 | 125 | func init() { | |
| 126 | 126 | core.SetPackageName("GIO", "gio-2.0") | |
| 127 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 128 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 129 | - | if err != nil { | |
| 130 | - | panic(err) | |
| 127 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 128 | + | var libs []uintptr | |
| 129 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 130 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 131 | + | if err != nil { | |
| 132 | + | panic(err) | |
| 133 | + | } | |
| 134 | + | libs = append(libs, lib) | |
| 131 | 135 | } | |
| 132 | 136 | ||
| 133 | - | core.PuregoSafeRegister(&xBusOwnName, lib, "g_bus_own_name") | |
| 134 | - | core.PuregoSafeRegister(&xBusOwnNameOnConnection, lib, "g_bus_own_name_on_connection") | |
| 135 | - | core.PuregoSafeRegister(&xBusOwnNameOnConnectionWithClosures, lib, "g_bus_own_name_on_connection_with_closures") | |
| 136 | - | core.PuregoSafeRegister(&xBusOwnNameWithClosures, lib, "g_bus_own_name_with_closures") | |
| 137 | - | core.PuregoSafeRegister(&xBusUnownName, lib, "g_bus_unown_name") | |
| 137 | + | core.PuregoSafeRegister(&xBusOwnName, libs, "g_bus_own_name") | |
| 138 | + | core.PuregoSafeRegister(&xBusOwnNameOnConnection, libs, "g_bus_own_name_on_connection") | |
| 139 | + | core.PuregoSafeRegister(&xBusOwnNameOnConnectionWithClosures, libs, "g_bus_own_name_on_connection_with_closures") | |
| 140 | + | core.PuregoSafeRegister(&xBusOwnNameWithClosures, libs, "g_bus_own_name_with_closures") | |
| 141 | + | core.PuregoSafeRegister(&xBusUnownName, libs, "g_bus_unown_name") | |
| 138 | 142 | ||
| 139 | 143 | } | |
M v4/gio/gdbusnamewatching.go +13 -9
| @@ -103,16 +103,20 @@ func BusWatchNameWithClosures(BusTypeVar BusType, NameVar string, FlagsVar BusNa | |||
| 103 | 103 | ||
| 104 | 104 | func init() { | |
| 105 | 105 | core.SetPackageName("GIO", "gio-2.0") | |
| 106 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 107 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 108 | - | if err != nil { | |
| 109 | - | panic(err) | |
| 106 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 107 | + | var libs []uintptr | |
| 108 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 109 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 110 | + | if err != nil { | |
| 111 | + | panic(err) | |
| 112 | + | } | |
| 113 | + | libs = append(libs, lib) | |
| 110 | 114 | } | |
| 111 | 115 | ||
| 112 | - | core.PuregoSafeRegister(&xBusUnwatchName, lib, "g_bus_unwatch_name") | |
| 113 | - | core.PuregoSafeRegister(&xBusWatchName, lib, "g_bus_watch_name") | |
| 114 | - | core.PuregoSafeRegister(&xBusWatchNameOnConnection, lib, "g_bus_watch_name_on_connection") | |
| 115 | - | core.PuregoSafeRegister(&xBusWatchNameOnConnectionWithClosures, lib, "g_bus_watch_name_on_connection_with_closures") | |
| 116 | - | core.PuregoSafeRegister(&xBusWatchNameWithClosures, lib, "g_bus_watch_name_with_closures") | |
| 116 | + | core.PuregoSafeRegister(&xBusUnwatchName, libs, "g_bus_unwatch_name") | |
| 117 | + | core.PuregoSafeRegister(&xBusWatchName, libs, "g_bus_watch_name") | |
| 118 | + | core.PuregoSafeRegister(&xBusWatchNameOnConnection, libs, "g_bus_watch_name_on_connection") | |
| 119 | + | core.PuregoSafeRegister(&xBusWatchNameOnConnectionWithClosures, libs, "g_bus_watch_name_on_connection_with_closures") | |
| 120 | + | core.PuregoSafeRegister(&xBusWatchNameWithClosures, libs, "g_bus_watch_name_with_closures") | |
| 117 | 121 | ||
| 118 | 122 | } | |
M v4/gio/gdbusobject.go +12 -8
| @@ -235,16 +235,20 @@ var XGDbusObjectGetObjectPath func(uintptr) string | |||
| 235 | 235 | ||
| 236 | 236 | func init() { | |
| 237 | 237 | core.SetPackageName("GIO", "gio-2.0") | |
| 238 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 239 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 240 | - | if err != nil { | |
| 241 | - | panic(err) | |
| 238 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 239 | + | var libs []uintptr | |
| 240 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 241 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 242 | + | if err != nil { | |
| 243 | + | panic(err) | |
| 244 | + | } | |
| 245 | + | libs = append(libs, lib) | |
| 242 | 246 | } | |
| 243 | 247 | ||
| 244 | - | core.PuregoSafeRegister(&xDBusObjectGLibType, lib, "g_dbus_object_get_type") | |
| 248 | + | core.PuregoSafeRegister(&xDBusObjectGLibType, libs, "g_dbus_object_get_type") | |
| 245 | 249 | ||
| 246 | - | core.PuregoSafeRegister(&XGDbusObjectGetInterface, lib, "g_dbus_object_get_interface") | |
| 247 | - | core.PuregoSafeRegister(&XGDbusObjectGetInterfaces, lib, "g_dbus_object_get_interfaces") | |
| 248 | - | core.PuregoSafeRegister(&XGDbusObjectGetObjectPath, lib, "g_dbus_object_get_object_path") | |
| 250 | + | core.PuregoSafeRegister(&XGDbusObjectGetInterface, libs, "g_dbus_object_get_interface") | |
| 251 | + | core.PuregoSafeRegister(&XGDbusObjectGetInterfaces, libs, "g_dbus_object_get_interfaces") | |
| 252 | + | core.PuregoSafeRegister(&XGDbusObjectGetObjectPath, libs, "g_dbus_object_get_object_path") | |
| 249 | 253 | ||
| 250 | 254 | } | |
M v4/gio/gdbusobjectmanager.go +13 -9
| @@ -345,17 +345,21 @@ var XGDbusObjectManagerGetObjects func(uintptr) *glib.List | |||
| 345 | 345 | ||
| 346 | 346 | func init() { | |
| 347 | 347 | core.SetPackageName("GIO", "gio-2.0") | |
| 348 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 349 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 350 | - | if err != nil { | |
| 351 | - | panic(err) | |
| 348 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 349 | + | var libs []uintptr | |
| 350 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 351 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 352 | + | if err != nil { | |
| 353 | + | panic(err) | |
| 354 | + | } | |
| 355 | + | libs = append(libs, lib) | |
| 352 | 356 | } | |
| 353 | 357 | ||
| 354 | - | core.PuregoSafeRegister(&xDBusObjectManagerGLibType, lib, "g_dbus_object_manager_get_type") | |
| 358 | + | core.PuregoSafeRegister(&xDBusObjectManagerGLibType, libs, "g_dbus_object_manager_get_type") | |
| 355 | 359 | ||
| 356 | - | core.PuregoSafeRegister(&XGDbusObjectManagerGetInterface, lib, "g_dbus_object_manager_get_interface") | |
| 357 | - | core.PuregoSafeRegister(&XGDbusObjectManagerGetObject, lib, "g_dbus_object_manager_get_object") | |
| 358 | - | core.PuregoSafeRegister(&XGDbusObjectManagerGetObjectPath, lib, "g_dbus_object_manager_get_object_path") | |
| 359 | - | core.PuregoSafeRegister(&XGDbusObjectManagerGetObjects, lib, "g_dbus_object_manager_get_objects") | |
| 360 | + | core.PuregoSafeRegister(&XGDbusObjectManagerGetInterface, libs, "g_dbus_object_manager_get_interface") | |
| 361 | + | core.PuregoSafeRegister(&XGDbusObjectManagerGetObject, libs, "g_dbus_object_manager_get_object") | |
| 362 | + | core.PuregoSafeRegister(&XGDbusObjectManagerGetObjectPath, libs, "g_dbus_object_manager_get_object_path") | |
| 363 | + | core.PuregoSafeRegister(&XGDbusObjectManagerGetObjects, libs, "g_dbus_object_manager_get_objects") | |
| 360 | 364 | ||
| 361 | 365 | } | |
M v4/gio/gdbusobjectmanagerclient.go +19 -15
| @@ -592,25 +592,29 @@ func DBusObjectManagerClientNewForBus(BusTypeVar BusType, FlagsVar DBusObjectMan | |||
| 592 | 592 | ||
| 593 | 593 | func init() { | |
| 594 | 594 | core.SetPackageName("GIO", "gio-2.0") | |
| 595 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 596 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 597 | - | if err != nil { | |
| 598 | - | panic(err) | |
| 595 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 596 | + | var libs []uintptr | |
| 597 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 598 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 599 | + | if err != nil { | |
| 600 | + | panic(err) | |
| 601 | + | } | |
| 602 | + | libs = append(libs, lib) | |
| 599 | 603 | } | |
| 600 | 604 | ||
| 601 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientGLibType, lib, "g_dbus_object_manager_client_get_type") | |
| 605 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientGLibType, libs, "g_dbus_object_manager_client_get_type") | |
| 602 | 606 | ||
| 603 | - | core.PuregoSafeRegister(&xNewDBusObjectManagerClientFinish, lib, "g_dbus_object_manager_client_new_finish") | |
| 604 | - | core.PuregoSafeRegister(&xNewDBusObjectManagerClientForBusFinish, lib, "g_dbus_object_manager_client_new_for_bus_finish") | |
| 605 | - | core.PuregoSafeRegister(&xNewDBusObjectManagerClientForBusSync, lib, "g_dbus_object_manager_client_new_for_bus_sync") | |
| 606 | - | core.PuregoSafeRegister(&xNewDBusObjectManagerClientSync, lib, "g_dbus_object_manager_client_new_sync") | |
| 607 | + | core.PuregoSafeRegister(&xNewDBusObjectManagerClientFinish, libs, "g_dbus_object_manager_client_new_finish") | |
| 608 | + | core.PuregoSafeRegister(&xNewDBusObjectManagerClientForBusFinish, libs, "g_dbus_object_manager_client_new_for_bus_finish") | |
| 609 | + | core.PuregoSafeRegister(&xNewDBusObjectManagerClientForBusSync, libs, "g_dbus_object_manager_client_new_for_bus_sync") | |
| 610 | + | core.PuregoSafeRegister(&xNewDBusObjectManagerClientSync, libs, "g_dbus_object_manager_client_new_sync") | |
| 607 | 611 | ||
| 608 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientGetConnection, lib, "g_dbus_object_manager_client_get_connection") | |
| 609 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientGetFlags, lib, "g_dbus_object_manager_client_get_flags") | |
| 610 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientGetName, lib, "g_dbus_object_manager_client_get_name") | |
| 611 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientGetNameOwner, lib, "g_dbus_object_manager_client_get_name_owner") | |
| 612 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientGetConnection, libs, "g_dbus_object_manager_client_get_connection") | |
| 613 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientGetFlags, libs, "g_dbus_object_manager_client_get_flags") | |
| 614 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientGetName, libs, "g_dbus_object_manager_client_get_name") | |
| 615 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientGetNameOwner, libs, "g_dbus_object_manager_client_get_name_owner") | |
| 612 | 616 | ||
| 613 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientNew, lib, "g_dbus_object_manager_client_new") | |
| 614 | - | core.PuregoSafeRegister(&xDBusObjectManagerClientNewForBus, lib, "g_dbus_object_manager_client_new_for_bus") | |
| 617 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientNew, libs, "g_dbus_object_manager_client_new") | |
| 618 | + | core.PuregoSafeRegister(&xDBusObjectManagerClientNewForBus, libs, "g_dbus_object_manager_client_new_for_bus") | |
| 615 | 619 | ||
| 616 | 620 | } | |
M v4/gio/gdbusobjectmanagerserver.go +16 -12
| @@ -226,21 +226,25 @@ func (x *DBusObjectManagerServer) GetObjects() *glib.List { | |||
| 226 | 226 | ||
| 227 | 227 | func init() { | |
| 228 | 228 | core.SetPackageName("GIO", "gio-2.0") | |
| 229 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 230 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 231 | - | if err != nil { | |
| 232 | - | panic(err) | |
| 229 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 230 | + | var libs []uintptr | |
| 231 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 232 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 233 | + | if err != nil { | |
| 234 | + | panic(err) | |
| 235 | + | } | |
| 236 | + | libs = append(libs, lib) | |
| 233 | 237 | } | |
| 234 | 238 | ||
| 235 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerGLibType, lib, "g_dbus_object_manager_server_get_type") | |
| 239 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerGLibType, libs, "g_dbus_object_manager_server_get_type") | |
| 236 | 240 | ||
| 237 | - | core.PuregoSafeRegister(&xNewDBusObjectManagerServer, lib, "g_dbus_object_manager_server_new") | |
| 241 | + | core.PuregoSafeRegister(&xNewDBusObjectManagerServer, libs, "g_dbus_object_manager_server_new") | |
| 238 | 242 | ||
| 239 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerExport, lib, "g_dbus_object_manager_server_export") | |
| 240 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerExportUniquely, lib, "g_dbus_object_manager_server_export_uniquely") | |
| 241 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerGetConnection, lib, "g_dbus_object_manager_server_get_connection") | |
| 242 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerIsExported, lib, "g_dbus_object_manager_server_is_exported") | |
| 243 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerSetConnection, lib, "g_dbus_object_manager_server_set_connection") | |
| 244 | - | core.PuregoSafeRegister(&xDBusObjectManagerServerUnexport, lib, "g_dbus_object_manager_server_unexport") | |
| 243 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerExport, libs, "g_dbus_object_manager_server_export") | |
| 244 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerExportUniquely, libs, "g_dbus_object_manager_server_export_uniquely") | |
| 245 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerGetConnection, libs, "g_dbus_object_manager_server_get_connection") | |
| 246 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerIsExported, libs, "g_dbus_object_manager_server_is_exported") | |
| 247 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerSetConnection, libs, "g_dbus_object_manager_server_set_connection") | |
| 248 | + | core.PuregoSafeRegister(&xDBusObjectManagerServerUnexport, libs, "g_dbus_object_manager_server_unexport") | |
| 245 | 249 | ||
| 246 | 250 | } | |
M v4/gio/gdbusobjectproxy.go +11 -7
| @@ -129,16 +129,20 @@ func (x *DBusObjectProxy) GetObjectPath() string { | |||
| 129 | 129 | ||
| 130 | 130 | func init() { | |
| 131 | 131 | core.SetPackageName("GIO", "gio-2.0") | |
| 132 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 133 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 134 | - | if err != nil { | |
| 135 | - | panic(err) | |
| 132 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 133 | + | var libs []uintptr | |
| 134 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 135 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 136 | + | if err != nil { | |
| 137 | + | panic(err) | |
| 138 | + | } | |
| 139 | + | libs = append(libs, lib) | |
| 136 | 140 | } | |
| 137 | 141 | ||
| 138 | - | core.PuregoSafeRegister(&xDBusObjectProxyGLibType, lib, "g_dbus_object_proxy_get_type") | |
| 142 | + | core.PuregoSafeRegister(&xDBusObjectProxyGLibType, libs, "g_dbus_object_proxy_get_type") | |
| 139 | 143 | ||
| 140 | - | core.PuregoSafeRegister(&xNewDBusObjectProxy, lib, "g_dbus_object_proxy_new") | |
| 144 | + | core.PuregoSafeRegister(&xNewDBusObjectProxy, libs, "g_dbus_object_proxy_new") | |
| 141 | 145 | ||
| 142 | - | core.PuregoSafeRegister(&xDBusObjectProxyGetConnection, lib, "g_dbus_object_proxy_get_connection") | |
| 146 | + | core.PuregoSafeRegister(&xDBusObjectProxyGetConnection, libs, "g_dbus_object_proxy_get_connection") | |
| 143 | 147 | ||
| 144 | 148 | } | |
M v4/gio/gdbusobjectskeleton.go +15 -11
| @@ -222,20 +222,24 @@ func (x *DBusObjectSkeleton) GetObjectPath() string { | |||
| 222 | 222 | ||
| 223 | 223 | func init() { | |
| 224 | 224 | core.SetPackageName("GIO", "gio-2.0") | |
| 225 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 226 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 227 | - | if err != nil { | |
| 228 | - | panic(err) | |
| 225 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 226 | + | var libs []uintptr | |
| 227 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 228 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 229 | + | if err != nil { | |
| 230 | + | panic(err) | |
| 231 | + | } | |
| 232 | + | libs = append(libs, lib) | |
| 229 | 233 | } | |
| 230 | 234 | ||
| 231 | - | core.PuregoSafeRegister(&xDBusObjectSkeletonGLibType, lib, "g_dbus_object_skeleton_get_type") | |
| 235 | + | core.PuregoSafeRegister(&xDBusObjectSkeletonGLibType, libs, "g_dbus_object_skeleton_get_type") | |
| 232 | 236 | ||
| 233 | - | core.PuregoSafeRegister(&xNewDBusObjectSkeleton, lib, "g_dbus_object_skeleton_new") | |
| 237 | + | core.PuregoSafeRegister(&xNewDBusObjectSkeleton, libs, "g_dbus_object_skeleton_new") | |
| 234 | 238 | ||
| 235 | - | core.PuregoSafeRegister(&xDBusObjectSkeletonAddInterface, lib, "g_dbus_object_skeleton_add_interface") | |
| 236 | - | core.PuregoSafeRegister(&xDBusObjectSkeletonFlush, lib, "g_dbus_object_skeleton_flush") | |
| 237 | - | core.PuregoSafeRegister(&xDBusObjectSkeletonRemoveInterface, lib, "g_dbus_object_skeleton_remove_interface") | |
| 238 | - | core.PuregoSafeRegister(&xDBusObjectSkeletonRemoveInterfaceByName, lib, "g_dbus_object_skeleton_remove_interface_by_name") | |
| 239 | - | core.PuregoSafeRegister(&xDBusObjectSkeletonSetObjectPath, lib, "g_dbus_object_skeleton_set_object_path") | |
| 239 | + | core.PuregoSafeRegister(&xDBusObjectSkeletonAddInterface, libs, "g_dbus_object_skeleton_add_interface") | |
| 240 | + | core.PuregoSafeRegister(&xDBusObjectSkeletonFlush, libs, "g_dbus_object_skeleton_flush") | |
| 241 | + | core.PuregoSafeRegister(&xDBusObjectSkeletonRemoveInterface, libs, "g_dbus_object_skeleton_remove_interface") | |
| 242 | + | core.PuregoSafeRegister(&xDBusObjectSkeletonRemoveInterfaceByName, libs, "g_dbus_object_skeleton_remove_interface_by_name") | |
| 243 | + | core.PuregoSafeRegister(&xDBusObjectSkeletonSetObjectPath, libs, "g_dbus_object_skeleton_set_object_path") | |
| 240 | 244 | ||
| 241 | 245 | } | |
M v4/gio/gdbusproxy.go +37 -33
| @@ -884,40 +884,44 @@ func DBusProxyNewForBus(BusTypeVar BusType, FlagsVar DBusProxyFlags, InfoVar *DB | |||
| 884 | 884 | ||
| 885 | 885 | func init() { | |
| 886 | 886 | core.SetPackageName("GIO", "gio-2.0") | |
| 887 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 888 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 889 | - | if err != nil { | |
| 890 | - | panic(err) | |
| 887 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 888 | + | var libs []uintptr | |
| 889 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 890 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 891 | + | if err != nil { | |
| 892 | + | panic(err) | |
| 893 | + | } | |
| 894 | + | libs = append(libs, lib) | |
| 891 | 895 | } | |
| 892 | 896 | ||
| 893 | - | core.PuregoSafeRegister(&xDBusProxyGLibType, lib, "g_dbus_proxy_get_type") | |
| 894 | - | ||
| 895 | - | core.PuregoSafeRegister(&xNewDBusProxyFinish, lib, "g_dbus_proxy_new_finish") | |
| 896 | - | core.PuregoSafeRegister(&xNewDBusProxyForBusFinish, lib, "g_dbus_proxy_new_for_bus_finish") | |
| 897 | - | core.PuregoSafeRegister(&xNewDBusProxyForBusSync, lib, "g_dbus_proxy_new_for_bus_sync") | |
| 898 | - | core.PuregoSafeRegister(&xNewDBusProxySync, lib, "g_dbus_proxy_new_sync") | |
| 899 | - | ||
| 900 | - | core.PuregoSafeRegister(&xDBusProxyCall, lib, "g_dbus_proxy_call") | |
| 901 | - | core.PuregoSafeRegister(&xDBusProxyCallFinish, lib, "g_dbus_proxy_call_finish") | |
| 902 | - | core.PuregoSafeRegister(&xDBusProxyCallSync, lib, "g_dbus_proxy_call_sync") | |
| 903 | - | core.PuregoSafeRegister(&xDBusProxyCallWithUnixFdList, lib, "g_dbus_proxy_call_with_unix_fd_list") | |
| 904 | - | core.PuregoSafeRegister(&xDBusProxyCallWithUnixFdListFinish, lib, "g_dbus_proxy_call_with_unix_fd_list_finish") | |
| 905 | - | core.PuregoSafeRegister(&xDBusProxyCallWithUnixFdListSync, lib, "g_dbus_proxy_call_with_unix_fd_list_sync") | |
| 906 | - | core.PuregoSafeRegister(&xDBusProxyGetCachedProperty, lib, "g_dbus_proxy_get_cached_property") | |
| 907 | - | core.PuregoSafeRegister(&xDBusProxyGetCachedPropertyNames, lib, "g_dbus_proxy_get_cached_property_names") | |
| 908 | - | core.PuregoSafeRegister(&xDBusProxyGetConnection, lib, "g_dbus_proxy_get_connection") | |
| 909 | - | core.PuregoSafeRegister(&xDBusProxyGetDefaultTimeout, lib, "g_dbus_proxy_get_default_timeout") | |
| 910 | - | core.PuregoSafeRegister(&xDBusProxyGetFlags, lib, "g_dbus_proxy_get_flags") | |
| 911 | - | core.PuregoSafeRegister(&xDBusProxyGetInterfaceInfo, lib, "g_dbus_proxy_get_interface_info") | |
| 912 | - | core.PuregoSafeRegister(&xDBusProxyGetInterfaceName, lib, "g_dbus_proxy_get_interface_name") | |
| 913 | - | core.PuregoSafeRegister(&xDBusProxyGetName, lib, "g_dbus_proxy_get_name") | |
| 914 | - | core.PuregoSafeRegister(&xDBusProxyGetNameOwner, lib, "g_dbus_proxy_get_name_owner") | |
| 915 | - | core.PuregoSafeRegister(&xDBusProxyGetObjectPath, lib, "g_dbus_proxy_get_object_path") | |
| 916 | - | core.PuregoSafeRegister(&xDBusProxySetCachedProperty, lib, "g_dbus_proxy_set_cached_property") | |
| 917 | - | core.PuregoSafeRegister(&xDBusProxySetDefaultTimeout, lib, "g_dbus_proxy_set_default_timeout") | |
| 918 | - | core.PuregoSafeRegister(&xDBusProxySetInterfaceInfo, lib, "g_dbus_proxy_set_interface_info") | |
| 919 | - | ||
| 920 | - | core.PuregoSafeRegister(&xDBusProxyNew, lib, "g_dbus_proxy_new") | |
| 921 | - | core.PuregoSafeRegister(&xDBusProxyNewForBus, lib, "g_dbus_proxy_new_for_bus") | |
| 897 | + | core.PuregoSafeRegister(&xDBusProxyGLibType, libs, "g_dbus_proxy_get_type") | |
| 898 | + | ||
| 899 | + | core.PuregoSafeRegister(&xNewDBusProxyFinish, libs, "g_dbus_proxy_new_finish") | |
| 900 | + | core.PuregoSafeRegister(&xNewDBusProxyForBusFinish, libs, "g_dbus_proxy_new_for_bus_finish") | |
| 901 | + | core.PuregoSafeRegister(&xNewDBusProxyForBusSync, libs, "g_dbus_proxy_new_for_bus_sync") | |
| 902 | + | core.PuregoSafeRegister(&xNewDBusProxySync, libs, "g_dbus_proxy_new_sync") | |
| 903 | + | ||
| 904 | + | core.PuregoSafeRegister(&xDBusProxyCall, libs, "g_dbus_proxy_call") | |
| 905 | + | core.PuregoSafeRegister(&xDBusProxyCallFinish, libs, "g_dbus_proxy_call_finish") | |
| 906 | + | core.PuregoSafeRegister(&xDBusProxyCallSync, libs, "g_dbus_proxy_call_sync") | |
| 907 | + | core.PuregoSafeRegister(&xDBusProxyCallWithUnixFdList, libs, "g_dbus_proxy_call_with_unix_fd_list") | |
| 908 | + | core.PuregoSafeRegister(&xDBusProxyCallWithUnixFdListFinish, libs, "g_dbus_proxy_call_with_unix_fd_list_finish") | |
| 909 | + | core.PuregoSafeRegister(&xDBusProxyCallWithUnixFdListSync, libs, "g_dbus_proxy_call_with_unix_fd_list_sync") | |
| 910 | + | core.PuregoSafeRegister(&xDBusProxyGetCachedProperty, libs, "g_dbus_proxy_get_cached_property") | |
| 911 | + | core.PuregoSafeRegister(&xDBusProxyGetCachedPropertyNames, libs, "g_dbus_proxy_get_cached_property_names") | |
| 912 | + | core.PuregoSafeRegister(&xDBusProxyGetConnection, libs, "g_dbus_proxy_get_connection") | |
| 913 | + | core.PuregoSafeRegister(&xDBusProxyGetDefaultTimeout, libs, "g_dbus_proxy_get_default_timeout") | |
| 914 | + | core.PuregoSafeRegister(&xDBusProxyGetFlags, libs, "g_dbus_proxy_get_flags") | |
| 915 | + | core.PuregoSafeRegister(&xDBusProxyGetInterfaceInfo, libs, "g_dbus_proxy_get_interface_info") | |
| 916 | + | core.PuregoSafeRegister(&xDBusProxyGetInterfaceName, libs, "g_dbus_proxy_get_interface_name") | |
| 917 | + | core.PuregoSafeRegister(&xDBusProxyGetName, libs, "g_dbus_proxy_get_name") | |
| 918 | + | core.PuregoSafeRegister(&xDBusProxyGetNameOwner, libs, "g_dbus_proxy_get_name_owner") | |
| 919 | + | core.PuregoSafeRegister(&xDBusProxyGetObjectPath, libs, "g_dbus_proxy_get_object_path") | |
| 920 | + | core.PuregoSafeRegister(&xDBusProxySetCachedProperty, libs, "g_dbus_proxy_set_cached_property") | |
| 921 | + | core.PuregoSafeRegister(&xDBusProxySetDefaultTimeout, libs, "g_dbus_proxy_set_default_timeout") | |
| 922 | + | core.PuregoSafeRegister(&xDBusProxySetInterfaceInfo, libs, "g_dbus_proxy_set_interface_info") | |
| 923 | + | ||
| 924 | + | core.PuregoSafeRegister(&xDBusProxyNew, libs, "g_dbus_proxy_new") | |
| 925 | + | core.PuregoSafeRegister(&xDBusProxyNewForBus, libs, "g_dbus_proxy_new_for_bus") | |
| 922 | 926 | ||
| 923 | 927 | } | |
M v4/gio/gdbusserver.go +16 -12
| @@ -247,21 +247,25 @@ func (x *DBusServer) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 247 | 247 | ||
| 248 | 248 | func init() { | |
| 249 | 249 | core.SetPackageName("GIO", "gio-2.0") | |
| 250 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 251 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 252 | - | if err != nil { | |
| 253 | - | panic(err) | |
| 250 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 251 | + | var libs []uintptr | |
| 252 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 253 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 254 | + | if err != nil { | |
| 255 | + | panic(err) | |
| 256 | + | } | |
| 257 | + | libs = append(libs, lib) | |
| 254 | 258 | } | |
| 255 | 259 | ||
| 256 | - | core.PuregoSafeRegister(&xDBusServerGLibType, lib, "g_dbus_server_get_type") | |
| 260 | + | core.PuregoSafeRegister(&xDBusServerGLibType, libs, "g_dbus_server_get_type") | |
| 257 | 261 | ||
| 258 | - | core.PuregoSafeRegister(&xNewDBusServerSync, lib, "g_dbus_server_new_sync") | |
| 262 | + | core.PuregoSafeRegister(&xNewDBusServerSync, libs, "g_dbus_server_new_sync") | |
| 259 | 263 | ||
| 260 | - | core.PuregoSafeRegister(&xDBusServerGetClientAddress, lib, "g_dbus_server_get_client_address") | |
| 261 | - | core.PuregoSafeRegister(&xDBusServerGetFlags, lib, "g_dbus_server_get_flags") | |
| 262 | - | core.PuregoSafeRegister(&xDBusServerGetGuid, lib, "g_dbus_server_get_guid") | |
| 263 | - | core.PuregoSafeRegister(&xDBusServerIsActive, lib, "g_dbus_server_is_active") | |
| 264 | - | core.PuregoSafeRegister(&xDBusServerStart, lib, "g_dbus_server_start") | |
| 265 | - | core.PuregoSafeRegister(&xDBusServerStop, lib, "g_dbus_server_stop") | |
| 264 | + | core.PuregoSafeRegister(&xDBusServerGetClientAddress, libs, "g_dbus_server_get_client_address") | |
| 265 | + | core.PuregoSafeRegister(&xDBusServerGetFlags, libs, "g_dbus_server_get_flags") | |
| 266 | + | core.PuregoSafeRegister(&xDBusServerGetGuid, libs, "g_dbus_server_get_guid") | |
| 267 | + | core.PuregoSafeRegister(&xDBusServerIsActive, libs, "g_dbus_server_is_active") | |
| 268 | + | core.PuregoSafeRegister(&xDBusServerStart, libs, "g_dbus_server_start") | |
| 269 | + | core.PuregoSafeRegister(&xDBusServerStop, libs, "g_dbus_server_stop") | |
| 266 | 270 | ||
| 267 | 271 | } | |
M v4/gio/gdbusutils.go +20 -16
| @@ -194,23 +194,27 @@ func DbusUnescapeObjectPath(SVar string) uintptr { | |||
| 194 | 194 | ||
| 195 | 195 | func init() { | |
| 196 | 196 | core.SetPackageName("GIO", "gio-2.0") | |
| 197 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 198 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 199 | - | if err != nil { | |
| 200 | - | panic(err) | |
| 197 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 198 | + | var libs []uintptr | |
| 199 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 200 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 201 | + | if err != nil { | |
| 202 | + | panic(err) | |
| 203 | + | } | |
| 204 | + | libs = append(libs, lib) | |
| 201 | 205 | } | |
| 202 | 206 | ||
| 203 | - | core.PuregoSafeRegister(&xDbusEscapeObjectPath, lib, "g_dbus_escape_object_path") | |
| 204 | - | core.PuregoSafeRegister(&xDbusEscapeObjectPathBytestring, lib, "g_dbus_escape_object_path_bytestring") | |
| 205 | - | core.PuregoSafeRegister(&xDbusGenerateGuid, lib, "g_dbus_generate_guid") | |
| 206 | - | core.PuregoSafeRegister(&xDbusGvalueToGvariant, lib, "g_dbus_gvalue_to_gvariant") | |
| 207 | - | core.PuregoSafeRegister(&xDbusGvariantToGvalue, lib, "g_dbus_gvariant_to_gvalue") | |
| 208 | - | core.PuregoSafeRegister(&xDbusIsErrorName, lib, "g_dbus_is_error_name") | |
| 209 | - | core.PuregoSafeRegister(&xDbusIsGuid, lib, "g_dbus_is_guid") | |
| 210 | - | core.PuregoSafeRegister(&xDbusIsInterfaceName, lib, "g_dbus_is_interface_name") | |
| 211 | - | core.PuregoSafeRegister(&xDbusIsMemberName, lib, "g_dbus_is_member_name") | |
| 212 | - | core.PuregoSafeRegister(&xDbusIsName, lib, "g_dbus_is_name") | |
| 213 | - | core.PuregoSafeRegister(&xDbusIsUniqueName, lib, "g_dbus_is_unique_name") | |
| 214 | - | core.PuregoSafeRegister(&xDbusUnescapeObjectPath, lib, "g_dbus_unescape_object_path") | |
| 207 | + | core.PuregoSafeRegister(&xDbusEscapeObjectPath, libs, "g_dbus_escape_object_path") | |
| 208 | + | core.PuregoSafeRegister(&xDbusEscapeObjectPathBytestring, libs, "g_dbus_escape_object_path_bytestring") | |
| 209 | + | core.PuregoSafeRegister(&xDbusGenerateGuid, libs, "g_dbus_generate_guid") | |
| 210 | + | core.PuregoSafeRegister(&xDbusGvalueToGvariant, libs, "g_dbus_gvalue_to_gvariant") | |
| 211 | + | core.PuregoSafeRegister(&xDbusGvariantToGvalue, libs, "g_dbus_gvariant_to_gvalue") | |
| 212 | + | core.PuregoSafeRegister(&xDbusIsErrorName, libs, "g_dbus_is_error_name") | |
| 213 | + | core.PuregoSafeRegister(&xDbusIsGuid, libs, "g_dbus_is_guid") | |
| 214 | + | core.PuregoSafeRegister(&xDbusIsInterfaceName, libs, "g_dbus_is_interface_name") | |
| 215 | + | core.PuregoSafeRegister(&xDbusIsMemberName, libs, "g_dbus_is_member_name") | |
| 216 | + | core.PuregoSafeRegister(&xDbusIsName, libs, "g_dbus_is_name") | |
| 217 | + | core.PuregoSafeRegister(&xDbusIsUniqueName, libs, "g_dbus_is_unique_name") | |
| 218 | + | core.PuregoSafeRegister(&xDbusUnescapeObjectPath, libs, "g_dbus_unescape_object_path") | |
| 215 | 219 | ||
| 216 | 220 | } | |
M v4/gio/gdebugcontroller.go +11 -7
| @@ -90,15 +90,19 @@ const ( | |||
| 90 | 90 | ||
| 91 | 91 | func init() { | |
| 92 | 92 | core.SetPackageName("GIO", "gio-2.0") | |
| 93 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 94 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 95 | - | if err != nil { | |
| 96 | - | panic(err) | |
| 93 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 94 | + | var libs []uintptr | |
| 95 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 96 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 97 | + | if err != nil { | |
| 98 | + | panic(err) | |
| 99 | + | } | |
| 100 | + | libs = append(libs, lib) | |
| 97 | 101 | } | |
| 98 | 102 | ||
| 99 | - | core.PuregoSafeRegister(&xDebugControllerGLibType, lib, "g_debug_controller_get_type") | |
| 103 | + | core.PuregoSafeRegister(&xDebugControllerGLibType, libs, "g_debug_controller_get_type") | |
| 100 | 104 | ||
| 101 | - | core.PuregoSafeRegister(&XGDebugControllerGetDebugEnabled, lib, "g_debug_controller_get_debug_enabled") | |
| 102 | - | core.PuregoSafeRegister(&XGDebugControllerSetDebugEnabled, lib, "g_debug_controller_set_debug_enabled") | |
| 105 | + | core.PuregoSafeRegister(&XGDebugControllerGetDebugEnabled, libs, "g_debug_controller_get_debug_enabled") | |
| 106 | + | core.PuregoSafeRegister(&XGDebugControllerSetDebugEnabled, libs, "g_debug_controller_set_debug_enabled") | |
| 103 | 107 | ||
| 104 | 108 | } | |
M v4/gio/gdebugcontrollerdbus.go +11 -7
| @@ -347,16 +347,20 @@ func (x *DebugControllerDBus) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 347 | 347 | ||
| 348 | 348 | func init() { | |
| 349 | 349 | core.SetPackageName("GIO", "gio-2.0") | |
| 350 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 351 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 352 | - | if err != nil { | |
| 353 | - | panic(err) | |
| 350 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 351 | + | var libs []uintptr | |
| 352 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 353 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 354 | + | if err != nil { | |
| 355 | + | panic(err) | |
| 356 | + | } | |
| 357 | + | libs = append(libs, lib) | |
| 354 | 358 | } | |
| 355 | 359 | ||
| 356 | - | core.PuregoSafeRegister(&xDebugControllerDBusGLibType, lib, "g_debug_controller_dbus_get_type") | |
| 360 | + | core.PuregoSafeRegister(&xDebugControllerDBusGLibType, libs, "g_debug_controller_dbus_get_type") | |
| 357 | 361 | ||
| 358 | - | core.PuregoSafeRegister(&xNewDebugControllerDBus, lib, "g_debug_controller_dbus_new") | |
| 362 | + | core.PuregoSafeRegister(&xNewDebugControllerDBus, libs, "g_debug_controller_dbus_new") | |
| 359 | 363 | ||
| 360 | - | core.PuregoSafeRegister(&xDebugControllerDBusStop, lib, "g_debug_controller_dbus_stop") | |
| 364 | + | core.PuregoSafeRegister(&xDebugControllerDBusStop, libs, "g_debug_controller_dbus_stop") | |
| 361 | 365 | ||
| 362 | 366 | } | |
M v4/gio/gdesktopappinfo.go +40 -36
| @@ -837,43 +837,47 @@ func DesktopAppInfoSetDesktopEnv(DesktopEnvVar string) { | |||
| 837 | 837 | ||
| 838 | 838 | func init() { | |
| 839 | 839 | core.SetPackageName("GIO", "gio-2.0") | |
| 840 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 841 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 842 | - | if err != nil { | |
| 843 | - | panic(err) | |
| 840 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 841 | + | var libs []uintptr | |
| 842 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 843 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 844 | + | if err != nil { | |
| 845 | + | panic(err) | |
| 846 | + | } | |
| 847 | + | libs = append(libs, lib) | |
| 844 | 848 | } | |
| 845 | 849 | ||
| 846 | - | core.PuregoSafeRegister(&xDesktopAppInfoGLibType, lib, "g_desktop_app_info_get_type") | |
| 847 | - | ||
| 848 | - | core.PuregoSafeRegister(&xNewDesktopAppInfo, lib, "g_desktop_app_info_new") | |
| 849 | - | core.PuregoSafeRegister(&xNewDesktopAppInfoFromFilename, lib, "g_desktop_app_info_new_from_filename") | |
| 850 | - | core.PuregoSafeRegister(&xNewDesktopAppInfoFromKeyfile, lib, "g_desktop_app_info_new_from_keyfile") | |
| 851 | - | ||
| 852 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetActionName, lib, "g_desktop_app_info_get_action_name") | |
| 853 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetBoolean, lib, "g_desktop_app_info_get_boolean") | |
| 854 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetCategories, lib, "g_desktop_app_info_get_categories") | |
| 855 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetFilename, lib, "g_desktop_app_info_get_filename") | |
| 856 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetGenericName, lib, "g_desktop_app_info_get_generic_name") | |
| 857 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetIsHidden, lib, "g_desktop_app_info_get_is_hidden") | |
| 858 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetKeywords, lib, "g_desktop_app_info_get_keywords") | |
| 859 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetLocaleString, lib, "g_desktop_app_info_get_locale_string") | |
| 860 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetNodisplay, lib, "g_desktop_app_info_get_nodisplay") | |
| 861 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetShowIn, lib, "g_desktop_app_info_get_show_in") | |
| 862 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetStartupWmClass, lib, "g_desktop_app_info_get_startup_wm_class") | |
| 863 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetString, lib, "g_desktop_app_info_get_string") | |
| 864 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetStringList, lib, "g_desktop_app_info_get_string_list") | |
| 865 | - | core.PuregoSafeRegister(&xDesktopAppInfoHasKey, lib, "g_desktop_app_info_has_key") | |
| 866 | - | core.PuregoSafeRegister(&xDesktopAppInfoLaunchAction, lib, "g_desktop_app_info_launch_action") | |
| 867 | - | core.PuregoSafeRegister(&xDesktopAppInfoLaunchUrisAsManager, lib, "g_desktop_app_info_launch_uris_as_manager") | |
| 868 | - | core.PuregoSafeRegister(&xDesktopAppInfoLaunchUrisAsManagerWithFds, lib, "g_desktop_app_info_launch_uris_as_manager_with_fds") | |
| 869 | - | core.PuregoSafeRegister(&xDesktopAppInfoListActions, lib, "g_desktop_app_info_list_actions") | |
| 870 | - | ||
| 871 | - | core.PuregoSafeRegister(&xDesktopAppInfoGetImplementations, lib, "g_desktop_app_info_get_implementations") | |
| 872 | - | core.PuregoSafeRegister(&xDesktopAppInfoSearch, lib, "g_desktop_app_info_search") | |
| 873 | - | core.PuregoSafeRegister(&xDesktopAppInfoSetDesktopEnv, lib, "g_desktop_app_info_set_desktop_env") | |
| 874 | - | ||
| 875 | - | core.PuregoSafeRegister(&xDesktopAppInfoLookupGLibType, lib, "g_desktop_app_info_lookup_get_type") | |
| 876 | - | ||
| 877 | - | core.PuregoSafeRegister(&XGDesktopAppInfoLookupGetDefaultForUriScheme, lib, "g_desktop_app_info_lookup_get_default_for_uri_scheme") | |
| 850 | + | core.PuregoSafeRegister(&xDesktopAppInfoGLibType, libs, "g_desktop_app_info_get_type") | |
| 851 | + | ||
| 852 | + | core.PuregoSafeRegister(&xNewDesktopAppInfo, libs, "g_desktop_app_info_new") | |
| 853 | + | core.PuregoSafeRegister(&xNewDesktopAppInfoFromFilename, libs, "g_desktop_app_info_new_from_filename") | |
| 854 | + | core.PuregoSafeRegister(&xNewDesktopAppInfoFromKeyfile, libs, "g_desktop_app_info_new_from_keyfile") | |
| 855 | + | ||
| 856 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetActionName, libs, "g_desktop_app_info_get_action_name") | |
| 857 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetBoolean, libs, "g_desktop_app_info_get_boolean") | |
| 858 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetCategories, libs, "g_desktop_app_info_get_categories") | |
| 859 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetFilename, libs, "g_desktop_app_info_get_filename") | |
| 860 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetGenericName, libs, "g_desktop_app_info_get_generic_name") | |
| 861 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetIsHidden, libs, "g_desktop_app_info_get_is_hidden") | |
| 862 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetKeywords, libs, "g_desktop_app_info_get_keywords") | |
| 863 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetLocaleString, libs, "g_desktop_app_info_get_locale_string") | |
| 864 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetNodisplay, libs, "g_desktop_app_info_get_nodisplay") | |
| 865 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetShowIn, libs, "g_desktop_app_info_get_show_in") | |
| 866 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetStartupWmClass, libs, "g_desktop_app_info_get_startup_wm_class") | |
| 867 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetString, libs, "g_desktop_app_info_get_string") | |
| 868 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetStringList, libs, "g_desktop_app_info_get_string_list") | |
| 869 | + | core.PuregoSafeRegister(&xDesktopAppInfoHasKey, libs, "g_desktop_app_info_has_key") | |
| 870 | + | core.PuregoSafeRegister(&xDesktopAppInfoLaunchAction, libs, "g_desktop_app_info_launch_action") | |
| 871 | + | core.PuregoSafeRegister(&xDesktopAppInfoLaunchUrisAsManager, libs, "g_desktop_app_info_launch_uris_as_manager") | |
| 872 | + | core.PuregoSafeRegister(&xDesktopAppInfoLaunchUrisAsManagerWithFds, libs, "g_desktop_app_info_launch_uris_as_manager_with_fds") | |
| 873 | + | core.PuregoSafeRegister(&xDesktopAppInfoListActions, libs, "g_desktop_app_info_list_actions") | |
| 874 | + | ||
| 875 | + | core.PuregoSafeRegister(&xDesktopAppInfoGetImplementations, libs, "g_desktop_app_info_get_implementations") | |
| 876 | + | core.PuregoSafeRegister(&xDesktopAppInfoSearch, libs, "g_desktop_app_info_search") | |
| 877 | + | core.PuregoSafeRegister(&xDesktopAppInfoSetDesktopEnv, libs, "g_desktop_app_info_set_desktop_env") | |
| 878 | + | ||
| 879 | + | core.PuregoSafeRegister(&xDesktopAppInfoLookupGLibType, libs, "g_desktop_app_info_lookup_get_type") | |
| 880 | + | ||
| 881 | + | core.PuregoSafeRegister(&XGDesktopAppInfoLookupGetDefaultForUriScheme, libs, "g_desktop_app_info_lookup_get_default_for_uri_scheme") | |
| 878 | 882 | ||
| 879 | 883 | } | |
M v4/gio/gdrive.go +40 -36
| @@ -1294,41 +1294,45 @@ const ( | |||
| 1294 | 1294 | ||
| 1295 | 1295 | func init() { | |
| 1296 | 1296 | core.SetPackageName("GIO", "gio-2.0") | |
| 1297 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1298 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1299 | - | if err != nil { | |
| 1300 | - | panic(err) | |
| 1301 | - | } | |
| 1302 | - | ||
| 1303 | - | core.PuregoSafeRegister(&xDriveGLibType, lib, "g_drive_get_type") | |
| 1304 | - | ||
| 1305 | - | core.PuregoSafeRegister(&XGDriveCanEject, lib, "g_drive_can_eject") | |
| 1306 | - | core.PuregoSafeRegister(&XGDriveCanPollForMedia, lib, "g_drive_can_poll_for_media") | |
| 1307 | - | core.PuregoSafeRegister(&XGDriveCanStart, lib, "g_drive_can_start") | |
| 1308 | - | core.PuregoSafeRegister(&XGDriveCanStartDegraded, lib, "g_drive_can_start_degraded") | |
| 1309 | - | core.PuregoSafeRegister(&XGDriveCanStop, lib, "g_drive_can_stop") | |
| 1310 | - | core.PuregoSafeRegister(&XGDriveEject, lib, "g_drive_eject") | |
| 1311 | - | core.PuregoSafeRegister(&XGDriveEjectFinish, lib, "g_drive_eject_finish") | |
| 1312 | - | core.PuregoSafeRegister(&XGDriveEjectWithOperation, lib, "g_drive_eject_with_operation") | |
| 1313 | - | core.PuregoSafeRegister(&XGDriveEjectWithOperationFinish, lib, "g_drive_eject_with_operation_finish") | |
| 1314 | - | core.PuregoSafeRegister(&XGDriveEnumerateIdentifiers, lib, "g_drive_enumerate_identifiers") | |
| 1315 | - | core.PuregoSafeRegister(&XGDriveGetIcon, lib, "g_drive_get_icon") | |
| 1316 | - | core.PuregoSafeRegister(&XGDriveGetIdentifier, lib, "g_drive_get_identifier") | |
| 1317 | - | core.PuregoSafeRegister(&XGDriveGetName, lib, "g_drive_get_name") | |
| 1318 | - | core.PuregoSafeRegister(&XGDriveGetSortKey, lib, "g_drive_get_sort_key") | |
| 1319 | - | core.PuregoSafeRegister(&XGDriveGetStartStopType, lib, "g_drive_get_start_stop_type") | |
| 1320 | - | core.PuregoSafeRegister(&XGDriveGetSymbolicIcon, lib, "g_drive_get_symbolic_icon") | |
| 1321 | - | core.PuregoSafeRegister(&XGDriveGetVolumes, lib, "g_drive_get_volumes") | |
| 1322 | - | core.PuregoSafeRegister(&XGDriveHasMedia, lib, "g_drive_has_media") | |
| 1323 | - | core.PuregoSafeRegister(&XGDriveHasVolumes, lib, "g_drive_has_volumes") | |
| 1324 | - | core.PuregoSafeRegister(&XGDriveIsMediaCheckAutomatic, lib, "g_drive_is_media_check_automatic") | |
| 1325 | - | core.PuregoSafeRegister(&XGDriveIsMediaRemovable, lib, "g_drive_is_media_removable") | |
| 1326 | - | core.PuregoSafeRegister(&XGDriveIsRemovable, lib, "g_drive_is_removable") | |
| 1327 | - | core.PuregoSafeRegister(&XGDrivePollForMedia, lib, "g_drive_poll_for_media") | |
| 1328 | - | core.PuregoSafeRegister(&XGDrivePollForMediaFinish, lib, "g_drive_poll_for_media_finish") | |
| 1329 | - | core.PuregoSafeRegister(&XGDriveStart, lib, "g_drive_start") | |
| 1330 | - | core.PuregoSafeRegister(&XGDriveStartFinish, lib, "g_drive_start_finish") | |
| 1331 | - | core.PuregoSafeRegister(&XGDriveStop, lib, "g_drive_stop") | |
| 1332 | - | core.PuregoSafeRegister(&XGDriveStopFinish, lib, "g_drive_stop_finish") | |
| 1297 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1298 | + | var libs []uintptr | |
| 1299 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1300 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1301 | + | if err != nil { | |
| 1302 | + | panic(err) | |
| 1303 | + | } | |
| 1304 | + | libs = append(libs, lib) | |
| 1305 | + | } | |
| 1306 | + | ||
| 1307 | + | core.PuregoSafeRegister(&xDriveGLibType, libs, "g_drive_get_type") | |
| 1308 | + | ||
| 1309 | + | core.PuregoSafeRegister(&XGDriveCanEject, libs, "g_drive_can_eject") | |
| 1310 | + | core.PuregoSafeRegister(&XGDriveCanPollForMedia, libs, "g_drive_can_poll_for_media") | |
| 1311 | + | core.PuregoSafeRegister(&XGDriveCanStart, libs, "g_drive_can_start") | |
| 1312 | + | core.PuregoSafeRegister(&XGDriveCanStartDegraded, libs, "g_drive_can_start_degraded") | |
| 1313 | + | core.PuregoSafeRegister(&XGDriveCanStop, libs, "g_drive_can_stop") | |
| 1314 | + | core.PuregoSafeRegister(&XGDriveEject, libs, "g_drive_eject") | |
| 1315 | + | core.PuregoSafeRegister(&XGDriveEjectFinish, libs, "g_drive_eject_finish") | |
| 1316 | + | core.PuregoSafeRegister(&XGDriveEjectWithOperation, libs, "g_drive_eject_with_operation") | |
| 1317 | + | core.PuregoSafeRegister(&XGDriveEjectWithOperationFinish, libs, "g_drive_eject_with_operation_finish") | |
| 1318 | + | core.PuregoSafeRegister(&XGDriveEnumerateIdentifiers, libs, "g_drive_enumerate_identifiers") | |
| 1319 | + | core.PuregoSafeRegister(&XGDriveGetIcon, libs, "g_drive_get_icon") | |
| 1320 | + | core.PuregoSafeRegister(&XGDriveGetIdentifier, libs, "g_drive_get_identifier") | |
| 1321 | + | core.PuregoSafeRegister(&XGDriveGetName, libs, "g_drive_get_name") | |
| 1322 | + | core.PuregoSafeRegister(&XGDriveGetSortKey, libs, "g_drive_get_sort_key") | |
| 1323 | + | core.PuregoSafeRegister(&XGDriveGetStartStopType, libs, "g_drive_get_start_stop_type") | |
| 1324 | + | core.PuregoSafeRegister(&XGDriveGetSymbolicIcon, libs, "g_drive_get_symbolic_icon") | |
| 1325 | + | core.PuregoSafeRegister(&XGDriveGetVolumes, libs, "g_drive_get_volumes") | |
| 1326 | + | core.PuregoSafeRegister(&XGDriveHasMedia, libs, "g_drive_has_media") | |
| 1327 | + | core.PuregoSafeRegister(&XGDriveHasVolumes, libs, "g_drive_has_volumes") | |
| 1328 | + | core.PuregoSafeRegister(&XGDriveIsMediaCheckAutomatic, libs, "g_drive_is_media_check_automatic") | |
| 1329 | + | core.PuregoSafeRegister(&XGDriveIsMediaRemovable, libs, "g_drive_is_media_removable") | |
| 1330 | + | core.PuregoSafeRegister(&XGDriveIsRemovable, libs, "g_drive_is_removable") | |
| 1331 | + | core.PuregoSafeRegister(&XGDrivePollForMedia, libs, "g_drive_poll_for_media") | |
| 1332 | + | core.PuregoSafeRegister(&XGDrivePollForMediaFinish, libs, "g_drive_poll_for_media_finish") | |
| 1333 | + | core.PuregoSafeRegister(&XGDriveStart, libs, "g_drive_start") | |
| 1334 | + | core.PuregoSafeRegister(&XGDriveStartFinish, libs, "g_drive_start_finish") | |
| 1335 | + | core.PuregoSafeRegister(&XGDriveStop, libs, "g_drive_stop") | |
| 1336 | + | core.PuregoSafeRegister(&XGDriveStopFinish, libs, "g_drive_stop_finish") | |
| 1333 | 1337 | ||
| 1334 | 1338 | } | |
M v4/gio/gdtlsclientconnection.go +15 -11
| @@ -148,20 +148,24 @@ func DtlsClientConnectionNew(BaseSocketVar DatagramBased, ServerIdentityVar Sock | |||
| 148 | 148 | ||
| 149 | 149 | func init() { | |
| 150 | 150 | core.SetPackageName("GIO", "gio-2.0") | |
| 151 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 152 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 153 | - | if err != nil { | |
| 154 | - | panic(err) | |
| 151 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 152 | + | var libs []uintptr | |
| 153 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 154 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 155 | + | if err != nil { | |
| 156 | + | panic(err) | |
| 157 | + | } | |
| 158 | + | libs = append(libs, lib) | |
| 155 | 159 | } | |
| 156 | 160 | ||
| 157 | - | core.PuregoSafeRegister(&xDtlsClientConnectionNew, lib, "g_dtls_client_connection_new") | |
| 161 | + | core.PuregoSafeRegister(&xDtlsClientConnectionNew, libs, "g_dtls_client_connection_new") | |
| 158 | 162 | ||
| 159 | - | core.PuregoSafeRegister(&xDtlsClientConnectionGLibType, lib, "g_dtls_client_connection_get_type") | |
| 163 | + | core.PuregoSafeRegister(&xDtlsClientConnectionGLibType, libs, "g_dtls_client_connection_get_type") | |
| 160 | 164 | ||
| 161 | - | core.PuregoSafeRegister(&XGDtlsClientConnectionGetAcceptedCas, lib, "g_dtls_client_connection_get_accepted_cas") | |
| 162 | - | core.PuregoSafeRegister(&XGDtlsClientConnectionGetServerIdentity, lib, "g_dtls_client_connection_get_server_identity") | |
| 163 | - | core.PuregoSafeRegister(&XGDtlsClientConnectionGetValidationFlags, lib, "g_dtls_client_connection_get_validation_flags") | |
| 164 | - | core.PuregoSafeRegister(&XGDtlsClientConnectionSetServerIdentity, lib, "g_dtls_client_connection_set_server_identity") | |
| 165 | - | core.PuregoSafeRegister(&XGDtlsClientConnectionSetValidationFlags, lib, "g_dtls_client_connection_set_validation_flags") | |
| 165 | + | core.PuregoSafeRegister(&XGDtlsClientConnectionGetAcceptedCas, libs, "g_dtls_client_connection_get_accepted_cas") | |
| 166 | + | core.PuregoSafeRegister(&XGDtlsClientConnectionGetServerIdentity, libs, "g_dtls_client_connection_get_server_identity") | |
| 167 | + | core.PuregoSafeRegister(&XGDtlsClientConnectionGetValidationFlags, libs, "g_dtls_client_connection_get_validation_flags") | |
| 168 | + | core.PuregoSafeRegister(&XGDtlsClientConnectionSetServerIdentity, libs, "g_dtls_client_connection_set_server_identity") | |
| 169 | + | core.PuregoSafeRegister(&XGDtlsClientConnectionSetValidationFlags, libs, "g_dtls_client_connection_set_validation_flags") | |
| 166 | 170 | ||
| 167 | 171 | } | |
M v4/gio/gdtlsconnection.go +39 -35
| @@ -825,40 +825,44 @@ var XGDtlsConnectionShutdownFinish func(uintptr, uintptr, **glib.Error) bool | |||
| 825 | 825 | ||
| 826 | 826 | func init() { | |
| 827 | 827 | core.SetPackageName("GIO", "gio-2.0") | |
| 828 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 829 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 830 | - | if err != nil { | |
| 831 | - | panic(err) | |
| 832 | - | } | |
| 833 | - | ||
| 834 | - | core.PuregoSafeRegister(&xDtlsConnectionGLibType, lib, "g_dtls_connection_get_type") | |
| 835 | - | ||
| 836 | - | core.PuregoSafeRegister(&XGDtlsConnectionClose, lib, "g_dtls_connection_close") | |
| 837 | - | core.PuregoSafeRegister(&XGDtlsConnectionCloseAsync, lib, "g_dtls_connection_close_async") | |
| 838 | - | core.PuregoSafeRegister(&XGDtlsConnectionCloseFinish, lib, "g_dtls_connection_close_finish") | |
| 839 | - | core.PuregoSafeRegister(&XGDtlsConnectionEmitAcceptCertificate, lib, "g_dtls_connection_emit_accept_certificate") | |
| 840 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetCertificate, lib, "g_dtls_connection_get_certificate") | |
| 841 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetChannelBindingData, lib, "g_dtls_connection_get_channel_binding_data") | |
| 842 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetCiphersuiteName, lib, "g_dtls_connection_get_ciphersuite_name") | |
| 843 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetDatabase, lib, "g_dtls_connection_get_database") | |
| 844 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetInteraction, lib, "g_dtls_connection_get_interaction") | |
| 845 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetNegotiatedProtocol, lib, "g_dtls_connection_get_negotiated_protocol") | |
| 846 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetPeerCertificate, lib, "g_dtls_connection_get_peer_certificate") | |
| 847 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetPeerCertificateErrors, lib, "g_dtls_connection_get_peer_certificate_errors") | |
| 848 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetProtocolVersion, lib, "g_dtls_connection_get_protocol_version") | |
| 849 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetRehandshakeMode, lib, "g_dtls_connection_get_rehandshake_mode") | |
| 850 | - | core.PuregoSafeRegister(&XGDtlsConnectionGetRequireCloseNotify, lib, "g_dtls_connection_get_require_close_notify") | |
| 851 | - | core.PuregoSafeRegister(&XGDtlsConnectionHandshake, lib, "g_dtls_connection_handshake") | |
| 852 | - | core.PuregoSafeRegister(&XGDtlsConnectionHandshakeAsync, lib, "g_dtls_connection_handshake_async") | |
| 853 | - | core.PuregoSafeRegister(&XGDtlsConnectionHandshakeFinish, lib, "g_dtls_connection_handshake_finish") | |
| 854 | - | core.PuregoSafeRegister(&XGDtlsConnectionSetAdvertisedProtocols, lib, "g_dtls_connection_set_advertised_protocols") | |
| 855 | - | core.PuregoSafeRegister(&XGDtlsConnectionSetCertificate, lib, "g_dtls_connection_set_certificate") | |
| 856 | - | core.PuregoSafeRegister(&XGDtlsConnectionSetDatabase, lib, "g_dtls_connection_set_database") | |
| 857 | - | core.PuregoSafeRegister(&XGDtlsConnectionSetInteraction, lib, "g_dtls_connection_set_interaction") | |
| 858 | - | core.PuregoSafeRegister(&XGDtlsConnectionSetRehandshakeMode, lib, "g_dtls_connection_set_rehandshake_mode") | |
| 859 | - | core.PuregoSafeRegister(&XGDtlsConnectionSetRequireCloseNotify, lib, "g_dtls_connection_set_require_close_notify") | |
| 860 | - | core.PuregoSafeRegister(&XGDtlsConnectionShutdown, lib, "g_dtls_connection_shutdown") | |
| 861 | - | core.PuregoSafeRegister(&XGDtlsConnectionShutdownAsync, lib, "g_dtls_connection_shutdown_async") | |
| 862 | - | core.PuregoSafeRegister(&XGDtlsConnectionShutdownFinish, lib, "g_dtls_connection_shutdown_finish") | |
| 828 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 829 | + | var libs []uintptr | |
| 830 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 831 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 832 | + | if err != nil { | |
| 833 | + | panic(err) | |
| 834 | + | } | |
| 835 | + | libs = append(libs, lib) | |
| 836 | + | } | |
| 837 | + | ||
| 838 | + | core.PuregoSafeRegister(&xDtlsConnectionGLibType, libs, "g_dtls_connection_get_type") | |
| 839 | + | ||
| 840 | + | core.PuregoSafeRegister(&XGDtlsConnectionClose, libs, "g_dtls_connection_close") | |
| 841 | + | core.PuregoSafeRegister(&XGDtlsConnectionCloseAsync, libs, "g_dtls_connection_close_async") | |
| 842 | + | core.PuregoSafeRegister(&XGDtlsConnectionCloseFinish, libs, "g_dtls_connection_close_finish") | |
| 843 | + | core.PuregoSafeRegister(&XGDtlsConnectionEmitAcceptCertificate, libs, "g_dtls_connection_emit_accept_certificate") | |
| 844 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetCertificate, libs, "g_dtls_connection_get_certificate") | |
| 845 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetChannelBindingData, libs, "g_dtls_connection_get_channel_binding_data") | |
| 846 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetCiphersuiteName, libs, "g_dtls_connection_get_ciphersuite_name") | |
| 847 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetDatabase, libs, "g_dtls_connection_get_database") | |
| 848 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetInteraction, libs, "g_dtls_connection_get_interaction") | |
| 849 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetNegotiatedProtocol, libs, "g_dtls_connection_get_negotiated_protocol") | |
| 850 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetPeerCertificate, libs, "g_dtls_connection_get_peer_certificate") | |
| 851 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetPeerCertificateErrors, libs, "g_dtls_connection_get_peer_certificate_errors") | |
| 852 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetProtocolVersion, libs, "g_dtls_connection_get_protocol_version") | |
| 853 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetRehandshakeMode, libs, "g_dtls_connection_get_rehandshake_mode") | |
| 854 | + | core.PuregoSafeRegister(&XGDtlsConnectionGetRequireCloseNotify, libs, "g_dtls_connection_get_require_close_notify") | |
| 855 | + | core.PuregoSafeRegister(&XGDtlsConnectionHandshake, libs, "g_dtls_connection_handshake") | |
| 856 | + | core.PuregoSafeRegister(&XGDtlsConnectionHandshakeAsync, libs, "g_dtls_connection_handshake_async") | |
| 857 | + | core.PuregoSafeRegister(&XGDtlsConnectionHandshakeFinish, libs, "g_dtls_connection_handshake_finish") | |
| 858 | + | core.PuregoSafeRegister(&XGDtlsConnectionSetAdvertisedProtocols, libs, "g_dtls_connection_set_advertised_protocols") | |
| 859 | + | core.PuregoSafeRegister(&XGDtlsConnectionSetCertificate, libs, "g_dtls_connection_set_certificate") | |
| 860 | + | core.PuregoSafeRegister(&XGDtlsConnectionSetDatabase, libs, "g_dtls_connection_set_database") | |
| 861 | + | core.PuregoSafeRegister(&XGDtlsConnectionSetInteraction, libs, "g_dtls_connection_set_interaction") | |
| 862 | + | core.PuregoSafeRegister(&XGDtlsConnectionSetRehandshakeMode, libs, "g_dtls_connection_set_rehandshake_mode") | |
| 863 | + | core.PuregoSafeRegister(&XGDtlsConnectionSetRequireCloseNotify, libs, "g_dtls_connection_set_require_close_notify") | |
| 864 | + | core.PuregoSafeRegister(&XGDtlsConnectionShutdown, libs, "g_dtls_connection_shutdown") | |
| 865 | + | core.PuregoSafeRegister(&XGDtlsConnectionShutdownAsync, libs, "g_dtls_connection_shutdown_async") | |
| 866 | + | core.PuregoSafeRegister(&XGDtlsConnectionShutdownFinish, libs, "g_dtls_connection_shutdown_finish") | |
| 863 | 867 | ||
| 864 | 868 | } | |
M v4/gio/gdtlsserverconnection.go +10 -6
| @@ -73,14 +73,18 @@ func DtlsServerConnectionNew(BaseSocketVar DatagramBased, CertificateVar *TlsCer | |||
| 73 | 73 | ||
| 74 | 74 | func init() { | |
| 75 | 75 | core.SetPackageName("GIO", "gio-2.0") | |
| 76 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 77 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 78 | - | if err != nil { | |
| 79 | - | panic(err) | |
| 76 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 77 | + | var libs []uintptr | |
| 78 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 79 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 80 | + | if err != nil { | |
| 81 | + | panic(err) | |
| 82 | + | } | |
| 83 | + | libs = append(libs, lib) | |
| 80 | 84 | } | |
| 81 | 85 | ||
| 82 | - | core.PuregoSafeRegister(&xDtlsServerConnectionNew, lib, "g_dtls_server_connection_new") | |
| 86 | + | core.PuregoSafeRegister(&xDtlsServerConnectionNew, libs, "g_dtls_server_connection_new") | |
| 83 | 87 | ||
| 84 | - | core.PuregoSafeRegister(&xDtlsServerConnectionGLibType, lib, "g_dtls_server_connection_get_type") | |
| 88 | + | core.PuregoSafeRegister(&xDtlsServerConnectionGLibType, libs, "g_dtls_server_connection_get_type") | |
| 85 | 89 | ||
| 86 | 90 | } | |
M v4/gio/gemblem.go +13 -9
| @@ -160,18 +160,22 @@ func (x *Emblem) ToString() string { | |||
| 160 | 160 | ||
| 161 | 161 | func init() { | |
| 162 | 162 | core.SetPackageName("GIO", "gio-2.0") | |
| 163 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 164 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 165 | - | if err != nil { | |
| 166 | - | panic(err) | |
| 163 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 164 | + | var libs []uintptr | |
| 165 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 166 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 167 | + | if err != nil { | |
| 168 | + | panic(err) | |
| 169 | + | } | |
| 170 | + | libs = append(libs, lib) | |
| 167 | 171 | } | |
| 168 | 172 | ||
| 169 | - | core.PuregoSafeRegister(&xEmblemGLibType, lib, "g_emblem_get_type") | |
| 173 | + | core.PuregoSafeRegister(&xEmblemGLibType, libs, "g_emblem_get_type") | |
| 170 | 174 | ||
| 171 | - | core.PuregoSafeRegister(&xNewEmblem, lib, "g_emblem_new") | |
| 172 | - | core.PuregoSafeRegister(&xNewEmblemWithOrigin, lib, "g_emblem_new_with_origin") | |
| 175 | + | core.PuregoSafeRegister(&xNewEmblem, libs, "g_emblem_new") | |
| 176 | + | core.PuregoSafeRegister(&xNewEmblemWithOrigin, libs, "g_emblem_new_with_origin") | |
| 173 | 177 | ||
| 174 | - | core.PuregoSafeRegister(&xEmblemGetIcon, lib, "g_emblem_get_icon") | |
| 175 | - | core.PuregoSafeRegister(&xEmblemGetOrigin, lib, "g_emblem_get_origin") | |
| 178 | + | core.PuregoSafeRegister(&xEmblemGetIcon, libs, "g_emblem_get_icon") | |
| 179 | + | core.PuregoSafeRegister(&xEmblemGetOrigin, libs, "g_emblem_get_origin") | |
| 176 | 180 | ||
| 177 | 181 | } | |
M v4/gio/gemblemedicon.go +14 -10
| @@ -172,19 +172,23 @@ func (x *EmblemedIcon) ToString() string { | |||
| 172 | 172 | ||
| 173 | 173 | func init() { | |
| 174 | 174 | core.SetPackageName("GIO", "gio-2.0") | |
| 175 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 176 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 177 | - | if err != nil { | |
| 178 | - | panic(err) | |
| 175 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 176 | + | var libs []uintptr | |
| 177 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 178 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 179 | + | if err != nil { | |
| 180 | + | panic(err) | |
| 181 | + | } | |
| 182 | + | libs = append(libs, lib) | |
| 179 | 183 | } | |
| 180 | 184 | ||
| 181 | - | core.PuregoSafeRegister(&xEmblemedIconGLibType, lib, "g_emblemed_icon_get_type") | |
| 185 | + | core.PuregoSafeRegister(&xEmblemedIconGLibType, libs, "g_emblemed_icon_get_type") | |
| 182 | 186 | ||
| 183 | - | core.PuregoSafeRegister(&xNewEmblemedIcon, lib, "g_emblemed_icon_new") | |
| 187 | + | core.PuregoSafeRegister(&xNewEmblemedIcon, libs, "g_emblemed_icon_new") | |
| 184 | 188 | ||
| 185 | - | core.PuregoSafeRegister(&xEmblemedIconAddEmblem, lib, "g_emblemed_icon_add_emblem") | |
| 186 | - | core.PuregoSafeRegister(&xEmblemedIconClearEmblems, lib, "g_emblemed_icon_clear_emblems") | |
| 187 | - | core.PuregoSafeRegister(&xEmblemedIconGetEmblems, lib, "g_emblemed_icon_get_emblems") | |
| 188 | - | core.PuregoSafeRegister(&xEmblemedIconGetIcon, lib, "g_emblemed_icon_get_icon") | |
| 189 | + | core.PuregoSafeRegister(&xEmblemedIconAddEmblem, libs, "g_emblemed_icon_add_emblem") | |
| 190 | + | core.PuregoSafeRegister(&xEmblemedIconClearEmblems, libs, "g_emblemed_icon_clear_emblems") | |
| 191 | + | core.PuregoSafeRegister(&xEmblemedIconGetEmblems, libs, "g_emblemed_icon_get_emblems") | |
| 192 | + | core.PuregoSafeRegister(&xEmblemedIconGetIcon, libs, "g_emblemed_icon_get_icon") | |
| 189 | 193 | ||
| 190 | 194 | } | |
M v4/gio/gfile.go +155 -151
| @@ -6265,156 +6265,160 @@ func FileParseName(ParseNameVar string) *FileBase { | |||
| 6265 | 6265 | ||
| 6266 | 6266 | func init() { | |
| 6267 | 6267 | core.SetPackageName("GIO", "gio-2.0") | |
| 6268 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 6269 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 6270 | - | if err != nil { | |
| 6271 | - | panic(err) | |
| 6272 | - | } | |
| 6273 | - | ||
| 6274 | - | core.PuregoSafeRegister(&xFileNewBuildFilenamev, lib, "g_file_new_build_filenamev") | |
| 6275 | - | core.PuregoSafeRegister(&xFileNewForCommandlineArg, lib, "g_file_new_for_commandline_arg") | |
| 6276 | - | core.PuregoSafeRegister(&xFileNewForCommandlineArgAndCwd, lib, "g_file_new_for_commandline_arg_and_cwd") | |
| 6277 | - | core.PuregoSafeRegister(&xFileNewForPath, lib, "g_file_new_for_path") | |
| 6278 | - | core.PuregoSafeRegister(&xFileNewForUri, lib, "g_file_new_for_uri") | |
| 6279 | - | core.PuregoSafeRegister(&xFileNewTmp, lib, "g_file_new_tmp") | |
| 6280 | - | core.PuregoSafeRegister(&xFileNewTmpAsync, lib, "g_file_new_tmp_async") | |
| 6281 | - | core.PuregoSafeRegister(&xFileNewTmpDirAsync, lib, "g_file_new_tmp_dir_async") | |
| 6282 | - | core.PuregoSafeRegister(&xFileNewTmpDirFinish, lib, "g_file_new_tmp_dir_finish") | |
| 6283 | - | core.PuregoSafeRegister(&xFileNewTmpFinish, lib, "g_file_new_tmp_finish") | |
| 6284 | - | core.PuregoSafeRegister(&xFileParseName, lib, "g_file_parse_name") | |
| 6285 | - | ||
| 6286 | - | core.PuregoSafeRegister(&xFileGLibType, lib, "g_file_get_type") | |
| 6287 | - | ||
| 6288 | - | core.PuregoSafeRegister(&XGFileAppendTo, lib, "g_file_append_to") | |
| 6289 | - | core.PuregoSafeRegister(&XGFileAppendToAsync, lib, "g_file_append_to_async") | |
| 6290 | - | core.PuregoSafeRegister(&XGFileAppendToFinish, lib, "g_file_append_to_finish") | |
| 6291 | - | core.PuregoSafeRegister(&XGFileBuildAttributeListForCopy, lib, "g_file_build_attribute_list_for_copy") | |
| 6292 | - | core.PuregoSafeRegister(&XGFileCopy, lib, "g_file_copy") | |
| 6293 | - | core.PuregoSafeRegister(&XGFileCopyAsync, lib, "g_file_copy_async") | |
| 6294 | - | core.PuregoSafeRegister(&XGFileCopyAsyncWithClosures, lib, "g_file_copy_async_with_closures") | |
| 6295 | - | core.PuregoSafeRegister(&XGFileCopyAttributes, lib, "g_file_copy_attributes") | |
| 6296 | - | core.PuregoSafeRegister(&XGFileCopyFinish, lib, "g_file_copy_finish") | |
| 6297 | - | core.PuregoSafeRegister(&XGFileCreate, lib, "g_file_create") | |
| 6298 | - | core.PuregoSafeRegister(&XGFileCreateAsync, lib, "g_file_create_async") | |
| 6299 | - | core.PuregoSafeRegister(&XGFileCreateFinish, lib, "g_file_create_finish") | |
| 6300 | - | core.PuregoSafeRegister(&XGFileCreateReadwrite, lib, "g_file_create_readwrite") | |
| 6301 | - | core.PuregoSafeRegister(&XGFileCreateReadwriteAsync, lib, "g_file_create_readwrite_async") | |
| 6302 | - | core.PuregoSafeRegister(&XGFileCreateReadwriteFinish, lib, "g_file_create_readwrite_finish") | |
| 6303 | - | core.PuregoSafeRegister(&XGFileDelete, lib, "g_file_delete") | |
| 6304 | - | core.PuregoSafeRegister(&XGFileDeleteAsync, lib, "g_file_delete_async") | |
| 6305 | - | core.PuregoSafeRegister(&XGFileDeleteFinish, lib, "g_file_delete_finish") | |
| 6306 | - | core.PuregoSafeRegister(&XGFileDup, lib, "g_file_dup") | |
| 6307 | - | core.PuregoSafeRegister(&XGFileEjectMountable, lib, "g_file_eject_mountable") | |
| 6308 | - | core.PuregoSafeRegister(&XGFileEjectMountableFinish, lib, "g_file_eject_mountable_finish") | |
| 6309 | - | core.PuregoSafeRegister(&XGFileEjectMountableWithOperation, lib, "g_file_eject_mountable_with_operation") | |
| 6310 | - | core.PuregoSafeRegister(&XGFileEjectMountableWithOperationFinish, lib, "g_file_eject_mountable_with_operation_finish") | |
| 6311 | - | core.PuregoSafeRegister(&XGFileEnumerateChildren, lib, "g_file_enumerate_children") | |
| 6312 | - | core.PuregoSafeRegister(&XGFileEnumerateChildrenAsync, lib, "g_file_enumerate_children_async") | |
| 6313 | - | core.PuregoSafeRegister(&XGFileEnumerateChildrenFinish, lib, "g_file_enumerate_children_finish") | |
| 6314 | - | core.PuregoSafeRegister(&XGFileEqual, lib, "g_file_equal") | |
| 6315 | - | core.PuregoSafeRegister(&XGFileFindEnclosingMount, lib, "g_file_find_enclosing_mount") | |
| 6316 | - | core.PuregoSafeRegister(&XGFileFindEnclosingMountAsync, lib, "g_file_find_enclosing_mount_async") | |
| 6317 | - | core.PuregoSafeRegister(&XGFileFindEnclosingMountFinish, lib, "g_file_find_enclosing_mount_finish") | |
| 6318 | - | core.PuregoSafeRegister(&XGFileGetBasename, lib, "g_file_get_basename") | |
| 6319 | - | core.PuregoSafeRegister(&XGFileGetChild, lib, "g_file_get_child") | |
| 6320 | - | core.PuregoSafeRegister(&XGFileGetChildForDisplayName, lib, "g_file_get_child_for_display_name") | |
| 6321 | - | core.PuregoSafeRegister(&XGFileGetParent, lib, "g_file_get_parent") | |
| 6322 | - | core.PuregoSafeRegister(&XGFileGetParseName, lib, "g_file_get_parse_name") | |
| 6323 | - | core.PuregoSafeRegister(&XGFileGetPath, lib, "g_file_get_path") | |
| 6324 | - | core.PuregoSafeRegister(&XGFileGetRelativePath, lib, "g_file_get_relative_path") | |
| 6325 | - | core.PuregoSafeRegister(&XGFileGetUri, lib, "g_file_get_uri") | |
| 6326 | - | core.PuregoSafeRegister(&XGFileGetUriScheme, lib, "g_file_get_uri_scheme") | |
| 6327 | - | core.PuregoSafeRegister(&XGFileHasParent, lib, "g_file_has_parent") | |
| 6328 | - | core.PuregoSafeRegister(&XGFileHasPrefix, lib, "g_file_has_prefix") | |
| 6329 | - | core.PuregoSafeRegister(&XGFileHasUriScheme, lib, "g_file_has_uri_scheme") | |
| 6330 | - | core.PuregoSafeRegister(&XGFileHash, lib, "g_file_hash") | |
| 6331 | - | core.PuregoSafeRegister(&XGFileIsNative, lib, "g_file_is_native") | |
| 6332 | - | core.PuregoSafeRegister(&XGFileLoadBytes, lib, "g_file_load_bytes") | |
| 6333 | - | core.PuregoSafeRegister(&XGFileLoadBytesAsync, lib, "g_file_load_bytes_async") | |
| 6334 | - | core.PuregoSafeRegister(&XGFileLoadBytesFinish, lib, "g_file_load_bytes_finish") | |
| 6335 | - | core.PuregoSafeRegister(&XGFileLoadContents, lib, "g_file_load_contents") | |
| 6336 | - | core.PuregoSafeRegister(&XGFileLoadContentsAsync, lib, "g_file_load_contents_async") | |
| 6337 | - | core.PuregoSafeRegister(&XGFileLoadContentsFinish, lib, "g_file_load_contents_finish") | |
| 6338 | - | core.PuregoSafeRegister(&XGFileLoadPartialContentsAsync, lib, "g_file_load_partial_contents_async") | |
| 6339 | - | core.PuregoSafeRegister(&XGFileLoadPartialContentsFinish, lib, "g_file_load_partial_contents_finish") | |
| 6340 | - | core.PuregoSafeRegister(&XGFileMakeDirectory, lib, "g_file_make_directory") | |
| 6341 | - | core.PuregoSafeRegister(&XGFileMakeDirectoryAsync, lib, "g_file_make_directory_async") | |
| 6342 | - | core.PuregoSafeRegister(&XGFileMakeDirectoryFinish, lib, "g_file_make_directory_finish") | |
| 6343 | - | core.PuregoSafeRegister(&XGFileMakeDirectoryWithParents, lib, "g_file_make_directory_with_parents") | |
| 6344 | - | core.PuregoSafeRegister(&XGFileMakeSymbolicLink, lib, "g_file_make_symbolic_link") | |
| 6345 | - | core.PuregoSafeRegister(&XGFileMakeSymbolicLinkAsync, lib, "g_file_make_symbolic_link_async") | |
| 6346 | - | core.PuregoSafeRegister(&XGFileMakeSymbolicLinkFinish, lib, "g_file_make_symbolic_link_finish") | |
| 6347 | - | core.PuregoSafeRegister(&XGFileMeasureDiskUsage, lib, "g_file_measure_disk_usage") | |
| 6348 | - | core.PuregoSafeRegister(&XGFileMeasureDiskUsageAsync, lib, "g_file_measure_disk_usage_async") | |
| 6349 | - | core.PuregoSafeRegister(&XGFileMeasureDiskUsageFinish, lib, "g_file_measure_disk_usage_finish") | |
| 6350 | - | core.PuregoSafeRegister(&XGFileMonitor, lib, "g_file_monitor") | |
| 6351 | - | core.PuregoSafeRegister(&XGFileMonitorDirectory, lib, "g_file_monitor_directory") | |
| 6352 | - | core.PuregoSafeRegister(&XGFileMonitorFile, lib, "g_file_monitor_file") | |
| 6353 | - | core.PuregoSafeRegister(&XGFileMountEnclosingVolume, lib, "g_file_mount_enclosing_volume") | |
| 6354 | - | core.PuregoSafeRegister(&XGFileMountEnclosingVolumeFinish, lib, "g_file_mount_enclosing_volume_finish") | |
| 6355 | - | core.PuregoSafeRegister(&XGFileMountMountable, lib, "g_file_mount_mountable") | |
| 6356 | - | core.PuregoSafeRegister(&XGFileMountMountableFinish, lib, "g_file_mount_mountable_finish") | |
| 6357 | - | core.PuregoSafeRegister(&XGFileMove, lib, "g_file_move") | |
| 6358 | - | core.PuregoSafeRegister(&XGFileMoveAsync, lib, "g_file_move_async") | |
| 6359 | - | core.PuregoSafeRegister(&XGFileMoveAsyncWithClosures, lib, "g_file_move_async_with_closures") | |
| 6360 | - | core.PuregoSafeRegister(&XGFileMoveFinish, lib, "g_file_move_finish") | |
| 6361 | - | core.PuregoSafeRegister(&XGFileOpenReadwrite, lib, "g_file_open_readwrite") | |
| 6362 | - | core.PuregoSafeRegister(&XGFileOpenReadwriteAsync, lib, "g_file_open_readwrite_async") | |
| 6363 | - | core.PuregoSafeRegister(&XGFileOpenReadwriteFinish, lib, "g_file_open_readwrite_finish") | |
| 6364 | - | core.PuregoSafeRegister(&XGFilePeekPath, lib, "g_file_peek_path") | |
| 6365 | - | core.PuregoSafeRegister(&XGFilePollMountable, lib, "g_file_poll_mountable") | |
| 6366 | - | core.PuregoSafeRegister(&XGFilePollMountableFinish, lib, "g_file_poll_mountable_finish") | |
| 6367 | - | core.PuregoSafeRegister(&XGFileQueryDefaultHandler, lib, "g_file_query_default_handler") | |
| 6368 | - | core.PuregoSafeRegister(&XGFileQueryDefaultHandlerAsync, lib, "g_file_query_default_handler_async") | |
| 6369 | - | core.PuregoSafeRegister(&XGFileQueryDefaultHandlerFinish, lib, "g_file_query_default_handler_finish") | |
| 6370 | - | core.PuregoSafeRegister(&XGFileQueryExists, lib, "g_file_query_exists") | |
| 6371 | - | core.PuregoSafeRegister(&XGFileQueryFileType, lib, "g_file_query_file_type") | |
| 6372 | - | core.PuregoSafeRegister(&XGFileQueryFilesystemInfo, lib, "g_file_query_filesystem_info") | |
| 6373 | - | core.PuregoSafeRegister(&XGFileQueryFilesystemInfoAsync, lib, "g_file_query_filesystem_info_async") | |
| 6374 | - | core.PuregoSafeRegister(&XGFileQueryFilesystemInfoFinish, lib, "g_file_query_filesystem_info_finish") | |
| 6375 | - | core.PuregoSafeRegister(&XGFileQueryInfo, lib, "g_file_query_info") | |
| 6376 | - | core.PuregoSafeRegister(&XGFileQueryInfoAsync, lib, "g_file_query_info_async") | |
| 6377 | - | core.PuregoSafeRegister(&XGFileQueryInfoFinish, lib, "g_file_query_info_finish") | |
| 6378 | - | core.PuregoSafeRegister(&XGFileQuerySettableAttributes, lib, "g_file_query_settable_attributes") | |
| 6379 | - | core.PuregoSafeRegister(&XGFileQueryWritableNamespaces, lib, "g_file_query_writable_namespaces") | |
| 6380 | - | core.PuregoSafeRegister(&XGFileRead, lib, "g_file_read") | |
| 6381 | - | core.PuregoSafeRegister(&XGFileReadAsync, lib, "g_file_read_async") | |
| 6382 | - | core.PuregoSafeRegister(&XGFileReadFinish, lib, "g_file_read_finish") | |
| 6383 | - | core.PuregoSafeRegister(&XGFileReplace, lib, "g_file_replace") | |
| 6384 | - | core.PuregoSafeRegister(&XGFileReplaceAsync, lib, "g_file_replace_async") | |
| 6385 | - | core.PuregoSafeRegister(&XGFileReplaceContents, lib, "g_file_replace_contents") | |
| 6386 | - | core.PuregoSafeRegister(&XGFileReplaceContentsAsync, lib, "g_file_replace_contents_async") | |
| 6387 | - | core.PuregoSafeRegister(&XGFileReplaceContentsBytesAsync, lib, "g_file_replace_contents_bytes_async") | |
| 6388 | - | core.PuregoSafeRegister(&XGFileReplaceContentsFinish, lib, "g_file_replace_contents_finish") | |
| 6389 | - | core.PuregoSafeRegister(&XGFileReplaceFinish, lib, "g_file_replace_finish") | |
| 6390 | - | core.PuregoSafeRegister(&XGFileReplaceReadwrite, lib, "g_file_replace_readwrite") | |
| 6391 | - | core.PuregoSafeRegister(&XGFileReplaceReadwriteAsync, lib, "g_file_replace_readwrite_async") | |
| 6392 | - | core.PuregoSafeRegister(&XGFileReplaceReadwriteFinish, lib, "g_file_replace_readwrite_finish") | |
| 6393 | - | core.PuregoSafeRegister(&XGFileResolveRelativePath, lib, "g_file_resolve_relative_path") | |
| 6394 | - | core.PuregoSafeRegister(&XGFileSetAttribute, lib, "g_file_set_attribute") | |
| 6395 | - | core.PuregoSafeRegister(&XGFileSetAttributeByteString, lib, "g_file_set_attribute_byte_string") | |
| 6396 | - | core.PuregoSafeRegister(&XGFileSetAttributeInt32, lib, "g_file_set_attribute_int32") | |
| 6397 | - | core.PuregoSafeRegister(&XGFileSetAttributeInt64, lib, "g_file_set_attribute_int64") | |
| 6398 | - | core.PuregoSafeRegister(&XGFileSetAttributeString, lib, "g_file_set_attribute_string") | |
| 6399 | - | core.PuregoSafeRegister(&XGFileSetAttributeUint32, lib, "g_file_set_attribute_uint32") | |
| 6400 | - | core.PuregoSafeRegister(&XGFileSetAttributeUint64, lib, "g_file_set_attribute_uint64") | |
| 6401 | - | core.PuregoSafeRegister(&XGFileSetAttributesAsync, lib, "g_file_set_attributes_async") | |
| 6402 | - | core.PuregoSafeRegister(&XGFileSetAttributesFinish, lib, "g_file_set_attributes_finish") | |
| 6403 | - | core.PuregoSafeRegister(&XGFileSetAttributesFromInfo, lib, "g_file_set_attributes_from_info") | |
| 6404 | - | core.PuregoSafeRegister(&XGFileSetDisplayName, lib, "g_file_set_display_name") | |
| 6405 | - | core.PuregoSafeRegister(&XGFileSetDisplayNameAsync, lib, "g_file_set_display_name_async") | |
| 6406 | - | core.PuregoSafeRegister(&XGFileSetDisplayNameFinish, lib, "g_file_set_display_name_finish") | |
| 6407 | - | core.PuregoSafeRegister(&XGFileStartMountable, lib, "g_file_start_mountable") | |
| 6408 | - | core.PuregoSafeRegister(&XGFileStartMountableFinish, lib, "g_file_start_mountable_finish") | |
| 6409 | - | core.PuregoSafeRegister(&XGFileStopMountable, lib, "g_file_stop_mountable") | |
| 6410 | - | core.PuregoSafeRegister(&XGFileStopMountableFinish, lib, "g_file_stop_mountable_finish") | |
| 6411 | - | core.PuregoSafeRegister(&XGFileSupportsThreadContexts, lib, "g_file_supports_thread_contexts") | |
| 6412 | - | core.PuregoSafeRegister(&XGFileTrash, lib, "g_file_trash") | |
| 6413 | - | core.PuregoSafeRegister(&XGFileTrashAsync, lib, "g_file_trash_async") | |
| 6414 | - | core.PuregoSafeRegister(&XGFileTrashFinish, lib, "g_file_trash_finish") | |
| 6415 | - | core.PuregoSafeRegister(&XGFileUnmountMountable, lib, "g_file_unmount_mountable") | |
| 6416 | - | core.PuregoSafeRegister(&XGFileUnmountMountableFinish, lib, "g_file_unmount_mountable_finish") | |
| 6417 | - | core.PuregoSafeRegister(&XGFileUnmountMountableWithOperation, lib, "g_file_unmount_mountable_with_operation") | |
| 6418 | - | core.PuregoSafeRegister(&XGFileUnmountMountableWithOperationFinish, lib, "g_file_unmount_mountable_with_operation_finish") | |
| 6268 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 6269 | + | var libs []uintptr | |
| 6270 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 6271 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 6272 | + | if err != nil { | |
| 6273 | + | panic(err) | |
| 6274 | + | } | |
| 6275 | + | libs = append(libs, lib) | |
| 6276 | + | } | |
| 6277 | + | ||
| 6278 | + | core.PuregoSafeRegister(&xFileNewBuildFilenamev, libs, "g_file_new_build_filenamev") | |
| 6279 | + | core.PuregoSafeRegister(&xFileNewForCommandlineArg, libs, "g_file_new_for_commandline_arg") | |
| 6280 | + | core.PuregoSafeRegister(&xFileNewForCommandlineArgAndCwd, libs, "g_file_new_for_commandline_arg_and_cwd") | |
| 6281 | + | core.PuregoSafeRegister(&xFileNewForPath, libs, "g_file_new_for_path") | |
| 6282 | + | core.PuregoSafeRegister(&xFileNewForUri, libs, "g_file_new_for_uri") | |
| 6283 | + | core.PuregoSafeRegister(&xFileNewTmp, libs, "g_file_new_tmp") | |
| 6284 | + | core.PuregoSafeRegister(&xFileNewTmpAsync, libs, "g_file_new_tmp_async") | |
| 6285 | + | core.PuregoSafeRegister(&xFileNewTmpDirAsync, libs, "g_file_new_tmp_dir_async") | |
| 6286 | + | core.PuregoSafeRegister(&xFileNewTmpDirFinish, libs, "g_file_new_tmp_dir_finish") | |
| 6287 | + | core.PuregoSafeRegister(&xFileNewTmpFinish, libs, "g_file_new_tmp_finish") | |
| 6288 | + | core.PuregoSafeRegister(&xFileParseName, libs, "g_file_parse_name") | |
| 6289 | + | ||
| 6290 | + | core.PuregoSafeRegister(&xFileGLibType, libs, "g_file_get_type") | |
| 6291 | + | ||
| 6292 | + | core.PuregoSafeRegister(&XGFileAppendTo, libs, "g_file_append_to") | |
| 6293 | + | core.PuregoSafeRegister(&XGFileAppendToAsync, libs, "g_file_append_to_async") | |
| 6294 | + | core.PuregoSafeRegister(&XGFileAppendToFinish, libs, "g_file_append_to_finish") | |
| 6295 | + | core.PuregoSafeRegister(&XGFileBuildAttributeListForCopy, libs, "g_file_build_attribute_list_for_copy") | |
| 6296 | + | core.PuregoSafeRegister(&XGFileCopy, libs, "g_file_copy") | |
| 6297 | + | core.PuregoSafeRegister(&XGFileCopyAsync, libs, "g_file_copy_async") | |
| 6298 | + | core.PuregoSafeRegister(&XGFileCopyAsyncWithClosures, libs, "g_file_copy_async_with_closures") | |
| 6299 | + | core.PuregoSafeRegister(&XGFileCopyAttributes, libs, "g_file_copy_attributes") | |
| 6300 | + | core.PuregoSafeRegister(&XGFileCopyFinish, libs, "g_file_copy_finish") | |
| 6301 | + | core.PuregoSafeRegister(&XGFileCreate, libs, "g_file_create") | |
| 6302 | + | core.PuregoSafeRegister(&XGFileCreateAsync, libs, "g_file_create_async") | |
| 6303 | + | core.PuregoSafeRegister(&XGFileCreateFinish, libs, "g_file_create_finish") | |
| 6304 | + | core.PuregoSafeRegister(&XGFileCreateReadwrite, libs, "g_file_create_readwrite") | |
| 6305 | + | core.PuregoSafeRegister(&XGFileCreateReadwriteAsync, libs, "g_file_create_readwrite_async") | |
| 6306 | + | core.PuregoSafeRegister(&XGFileCreateReadwriteFinish, libs, "g_file_create_readwrite_finish") | |
| 6307 | + | core.PuregoSafeRegister(&XGFileDelete, libs, "g_file_delete") | |
| 6308 | + | core.PuregoSafeRegister(&XGFileDeleteAsync, libs, "g_file_delete_async") | |
| 6309 | + | core.PuregoSafeRegister(&XGFileDeleteFinish, libs, "g_file_delete_finish") | |
| 6310 | + | core.PuregoSafeRegister(&XGFileDup, libs, "g_file_dup") | |
| 6311 | + | core.PuregoSafeRegister(&XGFileEjectMountable, libs, "g_file_eject_mountable") | |
| 6312 | + | core.PuregoSafeRegister(&XGFileEjectMountableFinish, libs, "g_file_eject_mountable_finish") | |
| 6313 | + | core.PuregoSafeRegister(&XGFileEjectMountableWithOperation, libs, "g_file_eject_mountable_with_operation") | |
| 6314 | + | core.PuregoSafeRegister(&XGFileEjectMountableWithOperationFinish, libs, "g_file_eject_mountable_with_operation_finish") | |
| 6315 | + | core.PuregoSafeRegister(&XGFileEnumerateChildren, libs, "g_file_enumerate_children") | |
| 6316 | + | core.PuregoSafeRegister(&XGFileEnumerateChildrenAsync, libs, "g_file_enumerate_children_async") | |
| 6317 | + | core.PuregoSafeRegister(&XGFileEnumerateChildrenFinish, libs, "g_file_enumerate_children_finish") | |
| 6318 | + | core.PuregoSafeRegister(&XGFileEqual, libs, "g_file_equal") | |
| 6319 | + | core.PuregoSafeRegister(&XGFileFindEnclosingMount, libs, "g_file_find_enclosing_mount") | |
| 6320 | + | core.PuregoSafeRegister(&XGFileFindEnclosingMountAsync, libs, "g_file_find_enclosing_mount_async") | |
| 6321 | + | core.PuregoSafeRegister(&XGFileFindEnclosingMountFinish, libs, "g_file_find_enclosing_mount_finish") | |
| 6322 | + | core.PuregoSafeRegister(&XGFileGetBasename, libs, "g_file_get_basename") | |
| 6323 | + | core.PuregoSafeRegister(&XGFileGetChild, libs, "g_file_get_child") | |
| 6324 | + | core.PuregoSafeRegister(&XGFileGetChildForDisplayName, libs, "g_file_get_child_for_display_name") | |
| 6325 | + | core.PuregoSafeRegister(&XGFileGetParent, libs, "g_file_get_parent") | |
| 6326 | + | core.PuregoSafeRegister(&XGFileGetParseName, libs, "g_file_get_parse_name") | |
| 6327 | + | core.PuregoSafeRegister(&XGFileGetPath, libs, "g_file_get_path") | |
| 6328 | + | core.PuregoSafeRegister(&XGFileGetRelativePath, libs, "g_file_get_relative_path") | |
| 6329 | + | core.PuregoSafeRegister(&XGFileGetUri, libs, "g_file_get_uri") | |
| 6330 | + | core.PuregoSafeRegister(&XGFileGetUriScheme, libs, "g_file_get_uri_scheme") | |
| 6331 | + | core.PuregoSafeRegister(&XGFileHasParent, libs, "g_file_has_parent") | |
| 6332 | + | core.PuregoSafeRegister(&XGFileHasPrefix, libs, "g_file_has_prefix") | |
| 6333 | + | core.PuregoSafeRegister(&XGFileHasUriScheme, libs, "g_file_has_uri_scheme") | |
| 6334 | + | core.PuregoSafeRegister(&XGFileHash, libs, "g_file_hash") | |
| 6335 | + | core.PuregoSafeRegister(&XGFileIsNative, libs, "g_file_is_native") | |
| 6336 | + | core.PuregoSafeRegister(&XGFileLoadBytes, libs, "g_file_load_bytes") | |
| 6337 | + | core.PuregoSafeRegister(&XGFileLoadBytesAsync, libs, "g_file_load_bytes_async") | |
| 6338 | + | core.PuregoSafeRegister(&XGFileLoadBytesFinish, libs, "g_file_load_bytes_finish") | |
| 6339 | + | core.PuregoSafeRegister(&XGFileLoadContents, libs, "g_file_load_contents") | |
| 6340 | + | core.PuregoSafeRegister(&XGFileLoadContentsAsync, libs, "g_file_load_contents_async") | |
| 6341 | + | core.PuregoSafeRegister(&XGFileLoadContentsFinish, libs, "g_file_load_contents_finish") | |
| 6342 | + | core.PuregoSafeRegister(&XGFileLoadPartialContentsAsync, libs, "g_file_load_partial_contents_async") | |
| 6343 | + | core.PuregoSafeRegister(&XGFileLoadPartialContentsFinish, libs, "g_file_load_partial_contents_finish") | |
| 6344 | + | core.PuregoSafeRegister(&XGFileMakeDirectory, libs, "g_file_make_directory") | |
| 6345 | + | core.PuregoSafeRegister(&XGFileMakeDirectoryAsync, libs, "g_file_make_directory_async") | |
| 6346 | + | core.PuregoSafeRegister(&XGFileMakeDirectoryFinish, libs, "g_file_make_directory_finish") | |
| 6347 | + | core.PuregoSafeRegister(&XGFileMakeDirectoryWithParents, libs, "g_file_make_directory_with_parents") | |
| 6348 | + | core.PuregoSafeRegister(&XGFileMakeSymbolicLink, libs, "g_file_make_symbolic_link") | |
| 6349 | + | core.PuregoSafeRegister(&XGFileMakeSymbolicLinkAsync, libs, "g_file_make_symbolic_link_async") | |
| 6350 | + | core.PuregoSafeRegister(&XGFileMakeSymbolicLinkFinish, libs, "g_file_make_symbolic_link_finish") | |
| 6351 | + | core.PuregoSafeRegister(&XGFileMeasureDiskUsage, libs, "g_file_measure_disk_usage") | |
| 6352 | + | core.PuregoSafeRegister(&XGFileMeasureDiskUsageAsync, libs, "g_file_measure_disk_usage_async") | |
| 6353 | + | core.PuregoSafeRegister(&XGFileMeasureDiskUsageFinish, libs, "g_file_measure_disk_usage_finish") | |
| 6354 | + | core.PuregoSafeRegister(&XGFileMonitor, libs, "g_file_monitor") | |
| 6355 | + | core.PuregoSafeRegister(&XGFileMonitorDirectory, libs, "g_file_monitor_directory") | |
| 6356 | + | core.PuregoSafeRegister(&XGFileMonitorFile, libs, "g_file_monitor_file") | |
| 6357 | + | core.PuregoSafeRegister(&XGFileMountEnclosingVolume, libs, "g_file_mount_enclosing_volume") | |
| 6358 | + | core.PuregoSafeRegister(&XGFileMountEnclosingVolumeFinish, libs, "g_file_mount_enclosing_volume_finish") | |
| 6359 | + | core.PuregoSafeRegister(&XGFileMountMountable, libs, "g_file_mount_mountable") | |
| 6360 | + | core.PuregoSafeRegister(&XGFileMountMountableFinish, libs, "g_file_mount_mountable_finish") | |
| 6361 | + | core.PuregoSafeRegister(&XGFileMove, libs, "g_file_move") | |
| 6362 | + | core.PuregoSafeRegister(&XGFileMoveAsync, libs, "g_file_move_async") | |
| 6363 | + | core.PuregoSafeRegister(&XGFileMoveAsyncWithClosures, libs, "g_file_move_async_with_closures") | |
| 6364 | + | core.PuregoSafeRegister(&XGFileMoveFinish, libs, "g_file_move_finish") | |
| 6365 | + | core.PuregoSafeRegister(&XGFileOpenReadwrite, libs, "g_file_open_readwrite") | |
| 6366 | + | core.PuregoSafeRegister(&XGFileOpenReadwriteAsync, libs, "g_file_open_readwrite_async") | |
| 6367 | + | core.PuregoSafeRegister(&XGFileOpenReadwriteFinish, libs, "g_file_open_readwrite_finish") | |
| 6368 | + | core.PuregoSafeRegister(&XGFilePeekPath, libs, "g_file_peek_path") | |
| 6369 | + | core.PuregoSafeRegister(&XGFilePollMountable, libs, "g_file_poll_mountable") | |
| 6370 | + | core.PuregoSafeRegister(&XGFilePollMountableFinish, libs, "g_file_poll_mountable_finish") | |
| 6371 | + | core.PuregoSafeRegister(&XGFileQueryDefaultHandler, libs, "g_file_query_default_handler") | |
| 6372 | + | core.PuregoSafeRegister(&XGFileQueryDefaultHandlerAsync, libs, "g_file_query_default_handler_async") | |
| 6373 | + | core.PuregoSafeRegister(&XGFileQueryDefaultHandlerFinish, libs, "g_file_query_default_handler_finish") | |
| 6374 | + | core.PuregoSafeRegister(&XGFileQueryExists, libs, "g_file_query_exists") | |
| 6375 | + | core.PuregoSafeRegister(&XGFileQueryFileType, libs, "g_file_query_file_type") | |
| 6376 | + | core.PuregoSafeRegister(&XGFileQueryFilesystemInfo, libs, "g_file_query_filesystem_info") | |
| 6377 | + | core.PuregoSafeRegister(&XGFileQueryFilesystemInfoAsync, libs, "g_file_query_filesystem_info_async") | |
| 6378 | + | core.PuregoSafeRegister(&XGFileQueryFilesystemInfoFinish, libs, "g_file_query_filesystem_info_finish") | |
| 6379 | + | core.PuregoSafeRegister(&XGFileQueryInfo, libs, "g_file_query_info") | |
| 6380 | + | core.PuregoSafeRegister(&XGFileQueryInfoAsync, libs, "g_file_query_info_async") | |
| 6381 | + | core.PuregoSafeRegister(&XGFileQueryInfoFinish, libs, "g_file_query_info_finish") | |
| 6382 | + | core.PuregoSafeRegister(&XGFileQuerySettableAttributes, libs, "g_file_query_settable_attributes") | |
| 6383 | + | core.PuregoSafeRegister(&XGFileQueryWritableNamespaces, libs, "g_file_query_writable_namespaces") | |
| 6384 | + | core.PuregoSafeRegister(&XGFileRead, libs, "g_file_read") | |
| 6385 | + | core.PuregoSafeRegister(&XGFileReadAsync, libs, "g_file_read_async") | |
| 6386 | + | core.PuregoSafeRegister(&XGFileReadFinish, libs, "g_file_read_finish") | |
| 6387 | + | core.PuregoSafeRegister(&XGFileReplace, libs, "g_file_replace") | |
| 6388 | + | core.PuregoSafeRegister(&XGFileReplaceAsync, libs, "g_file_replace_async") | |
| 6389 | + | core.PuregoSafeRegister(&XGFileReplaceContents, libs, "g_file_replace_contents") | |
| 6390 | + | core.PuregoSafeRegister(&XGFileReplaceContentsAsync, libs, "g_file_replace_contents_async") | |
| 6391 | + | core.PuregoSafeRegister(&XGFileReplaceContentsBytesAsync, libs, "g_file_replace_contents_bytes_async") | |
| 6392 | + | core.PuregoSafeRegister(&XGFileReplaceContentsFinish, libs, "g_file_replace_contents_finish") | |
| 6393 | + | core.PuregoSafeRegister(&XGFileReplaceFinish, libs, "g_file_replace_finish") | |
| 6394 | + | core.PuregoSafeRegister(&XGFileReplaceReadwrite, libs, "g_file_replace_readwrite") | |
| 6395 | + | core.PuregoSafeRegister(&XGFileReplaceReadwriteAsync, libs, "g_file_replace_readwrite_async") | |
| 6396 | + | core.PuregoSafeRegister(&XGFileReplaceReadwriteFinish, libs, "g_file_replace_readwrite_finish") | |
| 6397 | + | core.PuregoSafeRegister(&XGFileResolveRelativePath, libs, "g_file_resolve_relative_path") | |
| 6398 | + | core.PuregoSafeRegister(&XGFileSetAttribute, libs, "g_file_set_attribute") | |
| 6399 | + | core.PuregoSafeRegister(&XGFileSetAttributeByteString, libs, "g_file_set_attribute_byte_string") | |
| 6400 | + | core.PuregoSafeRegister(&XGFileSetAttributeInt32, libs, "g_file_set_attribute_int32") | |
| 6401 | + | core.PuregoSafeRegister(&XGFileSetAttributeInt64, libs, "g_file_set_attribute_int64") | |
| 6402 | + | core.PuregoSafeRegister(&XGFileSetAttributeString, libs, "g_file_set_attribute_string") | |
| 6403 | + | core.PuregoSafeRegister(&XGFileSetAttributeUint32, libs, "g_file_set_attribute_uint32") | |
| 6404 | + | core.PuregoSafeRegister(&XGFileSetAttributeUint64, libs, "g_file_set_attribute_uint64") | |
| 6405 | + | core.PuregoSafeRegister(&XGFileSetAttributesAsync, libs, "g_file_set_attributes_async") | |
| 6406 | + | core.PuregoSafeRegister(&XGFileSetAttributesFinish, libs, "g_file_set_attributes_finish") | |
| 6407 | + | core.PuregoSafeRegister(&XGFileSetAttributesFromInfo, libs, "g_file_set_attributes_from_info") | |
| 6408 | + | core.PuregoSafeRegister(&XGFileSetDisplayName, libs, "g_file_set_display_name") | |
| 6409 | + | core.PuregoSafeRegister(&XGFileSetDisplayNameAsync, libs, "g_file_set_display_name_async") | |
| 6410 | + | core.PuregoSafeRegister(&XGFileSetDisplayNameFinish, libs, "g_file_set_display_name_finish") | |
| 6411 | + | core.PuregoSafeRegister(&XGFileStartMountable, libs, "g_file_start_mountable") | |
| 6412 | + | core.PuregoSafeRegister(&XGFileStartMountableFinish, libs, "g_file_start_mountable_finish") | |
| 6413 | + | core.PuregoSafeRegister(&XGFileStopMountable, libs, "g_file_stop_mountable") | |
| 6414 | + | core.PuregoSafeRegister(&XGFileStopMountableFinish, libs, "g_file_stop_mountable_finish") | |
| 6415 | + | core.PuregoSafeRegister(&XGFileSupportsThreadContexts, libs, "g_file_supports_thread_contexts") | |
| 6416 | + | core.PuregoSafeRegister(&XGFileTrash, libs, "g_file_trash") | |
| 6417 | + | core.PuregoSafeRegister(&XGFileTrashAsync, libs, "g_file_trash_async") | |
| 6418 | + | core.PuregoSafeRegister(&XGFileTrashFinish, libs, "g_file_trash_finish") | |
| 6419 | + | core.PuregoSafeRegister(&XGFileUnmountMountable, libs, "g_file_unmount_mountable") | |
| 6420 | + | core.PuregoSafeRegister(&XGFileUnmountMountableFinish, libs, "g_file_unmount_mountable_finish") | |
| 6421 | + | core.PuregoSafeRegister(&XGFileUnmountMountableWithOperation, libs, "g_file_unmount_mountable_with_operation") | |
| 6422 | + | core.PuregoSafeRegister(&XGFileUnmountMountableWithOperationFinish, libs, "g_file_unmount_mountable_with_operation_finish") | |
| 6419 | 6423 | ||
| 6420 | 6424 | } | |
M v4/gio/gfileattribute.go +15 -11
| @@ -103,20 +103,24 @@ func (x *FileAttributeInfoList) Unref() { | |||
| 103 | 103 | ||
| 104 | 104 | func init() { | |
| 105 | 105 | core.SetPackageName("GIO", "gio-2.0") | |
| 106 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 107 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 108 | - | if err != nil { | |
| 109 | - | panic(err) | |
| 106 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 107 | + | var libs []uintptr | |
| 108 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 109 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 110 | + | if err != nil { | |
| 111 | + | panic(err) | |
| 112 | + | } | |
| 113 | + | libs = append(libs, lib) | |
| 110 | 114 | } | |
| 111 | 115 | ||
| 112 | - | core.PuregoSafeRegister(&xFileAttributeInfoListGLibType, lib, "g_file_attribute_info_list_get_type") | |
| 116 | + | core.PuregoSafeRegister(&xFileAttributeInfoListGLibType, libs, "g_file_attribute_info_list_get_type") | |
| 113 | 117 | ||
| 114 | - | core.PuregoSafeRegister(&xNewFileAttributeInfoList, lib, "g_file_attribute_info_list_new") | |
| 118 | + | core.PuregoSafeRegister(&xNewFileAttributeInfoList, libs, "g_file_attribute_info_list_new") | |
| 115 | 119 | ||
| 116 | - | core.PuregoSafeRegister(&xFileAttributeInfoListAdd, lib, "g_file_attribute_info_list_add") | |
| 117 | - | core.PuregoSafeRegister(&xFileAttributeInfoListDup, lib, "g_file_attribute_info_list_dup") | |
| 118 | - | core.PuregoSafeRegister(&xFileAttributeInfoListLookup, lib, "g_file_attribute_info_list_lookup") | |
| 119 | - | core.PuregoSafeRegister(&xFileAttributeInfoListRef, lib, "g_file_attribute_info_list_ref") | |
| 120 | - | core.PuregoSafeRegister(&xFileAttributeInfoListUnref, lib, "g_file_attribute_info_list_unref") | |
| 120 | + | core.PuregoSafeRegister(&xFileAttributeInfoListAdd, libs, "g_file_attribute_info_list_add") | |
| 121 | + | core.PuregoSafeRegister(&xFileAttributeInfoListDup, libs, "g_file_attribute_info_list_dup") | |
| 122 | + | core.PuregoSafeRegister(&xFileAttributeInfoListLookup, libs, "g_file_attribute_info_list_lookup") | |
| 123 | + | core.PuregoSafeRegister(&xFileAttributeInfoListRef, libs, "g_file_attribute_info_list_ref") | |
| 124 | + | core.PuregoSafeRegister(&xFileAttributeInfoListUnref, libs, "g_file_attribute_info_list_unref") | |
| 121 | 125 | ||
| 122 | 126 | } | |
M v4/gio/gfiledescriptorbased.go +10 -6
| @@ -94,14 +94,18 @@ var XGFileDescriptorBasedGetFd func(uintptr) int | |||
| 94 | 94 | ||
| 95 | 95 | func init() { | |
| 96 | 96 | core.SetPackageName("GIO", "gio-2.0") | |
| 97 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 98 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 99 | - | if err != nil { | |
| 100 | - | panic(err) | |
| 97 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 98 | + | var libs []uintptr | |
| 99 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 100 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 101 | + | if err != nil { | |
| 102 | + | panic(err) | |
| 103 | + | } | |
| 104 | + | libs = append(libs, lib) | |
| 101 | 105 | } | |
| 102 | 106 | ||
| 103 | - | core.PuregoSafeRegister(&xFileDescriptorBasedGLibType, lib, "g_file_descriptor_based_get_type") | |
| 107 | + | core.PuregoSafeRegister(&xFileDescriptorBasedGLibType, libs, "g_file_descriptor_based_get_type") | |
| 104 | 108 | ||
| 105 | - | core.PuregoSafeRegister(&XGFileDescriptorBasedGetFd, lib, "g_file_descriptor_based_get_fd") | |
| 109 | + | core.PuregoSafeRegister(&XGFileDescriptorBasedGetFd, libs, "g_file_descriptor_based_get_fd") | |
| 106 | 110 | ||
| 107 | 111 | } | |
M v4/gio/gfileenumerator.go +24 -20
| @@ -728,25 +728,29 @@ func (c *FileEnumerator) SetGoPointer(ptr uintptr) { | |||
| 728 | 728 | ||
| 729 | 729 | func init() { | |
| 730 | 730 | core.SetPackageName("GIO", "gio-2.0") | |
| 731 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 732 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 733 | - | if err != nil { | |
| 734 | - | panic(err) | |
| 735 | - | } | |
| 736 | - | ||
| 737 | - | core.PuregoSafeRegister(&xFileEnumeratorGLibType, lib, "g_file_enumerator_get_type") | |
| 738 | - | ||
| 739 | - | core.PuregoSafeRegister(&xFileEnumeratorClose, lib, "g_file_enumerator_close") | |
| 740 | - | core.PuregoSafeRegister(&xFileEnumeratorCloseAsync, lib, "g_file_enumerator_close_async") | |
| 741 | - | core.PuregoSafeRegister(&xFileEnumeratorCloseFinish, lib, "g_file_enumerator_close_finish") | |
| 742 | - | core.PuregoSafeRegister(&xFileEnumeratorGetChild, lib, "g_file_enumerator_get_child") | |
| 743 | - | core.PuregoSafeRegister(&xFileEnumeratorGetContainer, lib, "g_file_enumerator_get_container") | |
| 744 | - | core.PuregoSafeRegister(&xFileEnumeratorHasPending, lib, "g_file_enumerator_has_pending") | |
| 745 | - | core.PuregoSafeRegister(&xFileEnumeratorIsClosed, lib, "g_file_enumerator_is_closed") | |
| 746 | - | core.PuregoSafeRegister(&xFileEnumeratorIterate, lib, "g_file_enumerator_iterate") | |
| 747 | - | core.PuregoSafeRegister(&xFileEnumeratorNextFile, lib, "g_file_enumerator_next_file") | |
| 748 | - | core.PuregoSafeRegister(&xFileEnumeratorNextFilesAsync, lib, "g_file_enumerator_next_files_async") | |
| 749 | - | core.PuregoSafeRegister(&xFileEnumeratorNextFilesFinish, lib, "g_file_enumerator_next_files_finish") | |
| 750 | - | core.PuregoSafeRegister(&xFileEnumeratorSetPending, lib, "g_file_enumerator_set_pending") | |
| 731 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 732 | + | var libs []uintptr | |
| 733 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 734 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 735 | + | if err != nil { | |
| 736 | + | panic(err) | |
| 737 | + | } | |
| 738 | + | libs = append(libs, lib) | |
| 739 | + | } | |
| 740 | + | ||
| 741 | + | core.PuregoSafeRegister(&xFileEnumeratorGLibType, libs, "g_file_enumerator_get_type") | |
| 742 | + | ||
| 743 | + | core.PuregoSafeRegister(&xFileEnumeratorClose, libs, "g_file_enumerator_close") | |
| 744 | + | core.PuregoSafeRegister(&xFileEnumeratorCloseAsync, libs, "g_file_enumerator_close_async") | |
| 745 | + | core.PuregoSafeRegister(&xFileEnumeratorCloseFinish, libs, "g_file_enumerator_close_finish") | |
| 746 | + | core.PuregoSafeRegister(&xFileEnumeratorGetChild, libs, "g_file_enumerator_get_child") | |
| 747 | + | core.PuregoSafeRegister(&xFileEnumeratorGetContainer, libs, "g_file_enumerator_get_container") | |
| 748 | + | core.PuregoSafeRegister(&xFileEnumeratorHasPending, libs, "g_file_enumerator_has_pending") | |
| 749 | + | core.PuregoSafeRegister(&xFileEnumeratorIsClosed, libs, "g_file_enumerator_is_closed") | |
| 750 | + | core.PuregoSafeRegister(&xFileEnumeratorIterate, libs, "g_file_enumerator_iterate") | |
| 751 | + | core.PuregoSafeRegister(&xFileEnumeratorNextFile, libs, "g_file_enumerator_next_file") | |
| 752 | + | core.PuregoSafeRegister(&xFileEnumeratorNextFilesAsync, libs, "g_file_enumerator_next_files_async") | |
| 753 | + | core.PuregoSafeRegister(&xFileEnumeratorNextFilesFinish, libs, "g_file_enumerator_next_files_finish") | |
| 754 | + | core.PuregoSafeRegister(&xFileEnumeratorSetPending, libs, "g_file_enumerator_set_pending") | |
| 751 | 755 | ||
| 752 | 756 | } | |
M v4/gio/gfileicon.go +11 -7
| @@ -181,16 +181,20 @@ func (x *FileIcon) LoadFinish(ResVar AsyncResult, TypeVar string) (*InputStream, | |||
| 181 | 181 | ||
| 182 | 182 | func init() { | |
| 183 | 183 | core.SetPackageName("GIO", "gio-2.0") | |
| 184 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 185 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 186 | - | if err != nil { | |
| 187 | - | panic(err) | |
| 184 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 185 | + | var libs []uintptr | |
| 186 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 187 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 188 | + | if err != nil { | |
| 189 | + | panic(err) | |
| 190 | + | } | |
| 191 | + | libs = append(libs, lib) | |
| 188 | 192 | } | |
| 189 | 193 | ||
| 190 | - | core.PuregoSafeRegister(&xFileIconGLibType, lib, "g_file_icon_get_type") | |
| 194 | + | core.PuregoSafeRegister(&xFileIconGLibType, libs, "g_file_icon_get_type") | |
| 191 | 195 | ||
| 192 | - | core.PuregoSafeRegister(&xNewFileIcon, lib, "g_file_icon_new") | |
| 196 | + | core.PuregoSafeRegister(&xNewFileIcon, libs, "g_file_icon_new") | |
| 193 | 197 | ||
| 194 | - | core.PuregoSafeRegister(&xFileIconGetFile, lib, "g_file_icon_get_file") | |
| 198 | + | core.PuregoSafeRegister(&xFileIconGetFile, libs, "g_file_icon_get_file") | |
| 195 | 199 | ||
| 196 | 200 | } | |
M v4/gio/gfileinfo.go +82 -78
| @@ -1600,85 +1600,89 @@ func (c *FileInfo) SetGoPointer(ptr uintptr) { | |||
| 1600 | 1600 | ||
| 1601 | 1601 | func init() { | |
| 1602 | 1602 | core.SetPackageName("GIO", "gio-2.0") | |
| 1603 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1604 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1605 | - | if err != nil { | |
| 1606 | - | panic(err) | |
| 1603 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1604 | + | var libs []uintptr | |
| 1605 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1606 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1607 | + | if err != nil { | |
| 1608 | + | panic(err) | |
| 1609 | + | } | |
| 1610 | + | libs = append(libs, lib) | |
| 1607 | 1611 | } | |
| 1608 | 1612 | ||
| 1609 | - | core.PuregoSafeRegister(&xFileInfoGLibType, lib, "g_file_info_get_type") | |
| 1610 | - | ||
| 1611 | - | core.PuregoSafeRegister(&xNewFileInfo, lib, "g_file_info_new") | |
| 1612 | - | ||
| 1613 | - | core.PuregoSafeRegister(&xFileInfoClearStatus, lib, "g_file_info_clear_status") | |
| 1614 | - | core.PuregoSafeRegister(&xFileInfoCopyInto, lib, "g_file_info_copy_into") | |
| 1615 | - | core.PuregoSafeRegister(&xFileInfoDup, lib, "g_file_info_dup") | |
| 1616 | - | core.PuregoSafeRegister(&xFileInfoGetAccessDateTime, lib, "g_file_info_get_access_date_time") | |
| 1617 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeAsString, lib, "g_file_info_get_attribute_as_string") | |
| 1618 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeBoolean, lib, "g_file_info_get_attribute_boolean") | |
| 1619 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeByteString, lib, "g_file_info_get_attribute_byte_string") | |
| 1620 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeData, lib, "g_file_info_get_attribute_data") | |
| 1621 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeFilePath, lib, "g_file_info_get_attribute_file_path") | |
| 1622 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeInt32, lib, "g_file_info_get_attribute_int32") | |
| 1623 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeInt64, lib, "g_file_info_get_attribute_int64") | |
| 1624 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeObject, lib, "g_file_info_get_attribute_object") | |
| 1625 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeStatus, lib, "g_file_info_get_attribute_status") | |
| 1626 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeString, lib, "g_file_info_get_attribute_string") | |
| 1627 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeStringv, lib, "g_file_info_get_attribute_stringv") | |
| 1628 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeType, lib, "g_file_info_get_attribute_type") | |
| 1629 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeUint32, lib, "g_file_info_get_attribute_uint32") | |
| 1630 | - | core.PuregoSafeRegister(&xFileInfoGetAttributeUint64, lib, "g_file_info_get_attribute_uint64") | |
| 1631 | - | core.PuregoSafeRegister(&xFileInfoGetContentType, lib, "g_file_info_get_content_type") | |
| 1632 | - | core.PuregoSafeRegister(&xFileInfoGetCreationDateTime, lib, "g_file_info_get_creation_date_time") | |
| 1633 | - | core.PuregoSafeRegister(&xFileInfoGetDeletionDate, lib, "g_file_info_get_deletion_date") | |
| 1634 | - | core.PuregoSafeRegister(&xFileInfoGetDisplayName, lib, "g_file_info_get_display_name") | |
| 1635 | - | core.PuregoSafeRegister(&xFileInfoGetEditName, lib, "g_file_info_get_edit_name") | |
| 1636 | - | core.PuregoSafeRegister(&xFileInfoGetEtag, lib, "g_file_info_get_etag") | |
| 1637 | - | core.PuregoSafeRegister(&xFileInfoGetFileType, lib, "g_file_info_get_file_type") | |
| 1638 | - | core.PuregoSafeRegister(&xFileInfoGetIcon, lib, "g_file_info_get_icon") | |
| 1639 | - | core.PuregoSafeRegister(&xFileInfoGetIsBackup, lib, "g_file_info_get_is_backup") | |
| 1640 | - | core.PuregoSafeRegister(&xFileInfoGetIsHidden, lib, "g_file_info_get_is_hidden") | |
| 1641 | - | core.PuregoSafeRegister(&xFileInfoGetIsSymlink, lib, "g_file_info_get_is_symlink") | |
| 1642 | - | core.PuregoSafeRegister(&xFileInfoGetModificationDateTime, lib, "g_file_info_get_modification_date_time") | |
| 1643 | - | core.PuregoSafeRegister(&xFileInfoGetModificationTime, lib, "g_file_info_get_modification_time") | |
| 1644 | - | core.PuregoSafeRegister(&xFileInfoGetName, lib, "g_file_info_get_name") | |
| 1645 | - | core.PuregoSafeRegister(&xFileInfoGetSize, lib, "g_file_info_get_size") | |
| 1646 | - | core.PuregoSafeRegister(&xFileInfoGetSortOrder, lib, "g_file_info_get_sort_order") | |
| 1647 | - | core.PuregoSafeRegister(&xFileInfoGetSymbolicIcon, lib, "g_file_info_get_symbolic_icon") | |
| 1648 | - | core.PuregoSafeRegister(&xFileInfoGetSymlinkTarget, lib, "g_file_info_get_symlink_target") | |
| 1649 | - | core.PuregoSafeRegister(&xFileInfoHasAttribute, lib, "g_file_info_has_attribute") | |
| 1650 | - | core.PuregoSafeRegister(&xFileInfoHasNamespace, lib, "g_file_info_has_namespace") | |
| 1651 | - | core.PuregoSafeRegister(&xFileInfoListAttributes, lib, "g_file_info_list_attributes") | |
| 1652 | - | core.PuregoSafeRegister(&xFileInfoRemoveAttribute, lib, "g_file_info_remove_attribute") | |
| 1653 | - | core.PuregoSafeRegister(&xFileInfoSetAccessDateTime, lib, "g_file_info_set_access_date_time") | |
| 1654 | - | core.PuregoSafeRegister(&xFileInfoSetAttribute, lib, "g_file_info_set_attribute") | |
| 1655 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeBoolean, lib, "g_file_info_set_attribute_boolean") | |
| 1656 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeByteString, lib, "g_file_info_set_attribute_byte_string") | |
| 1657 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeFilePath, lib, "g_file_info_set_attribute_file_path") | |
| 1658 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeInt32, lib, "g_file_info_set_attribute_int32") | |
| 1659 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeInt64, lib, "g_file_info_set_attribute_int64") | |
| 1660 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeMask, lib, "g_file_info_set_attribute_mask") | |
| 1661 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeObject, lib, "g_file_info_set_attribute_object") | |
| 1662 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeStatus, lib, "g_file_info_set_attribute_status") | |
| 1663 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeString, lib, "g_file_info_set_attribute_string") | |
| 1664 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeStringv, lib, "g_file_info_set_attribute_stringv") | |
| 1665 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeUint32, lib, "g_file_info_set_attribute_uint32") | |
| 1666 | - | core.PuregoSafeRegister(&xFileInfoSetAttributeUint64, lib, "g_file_info_set_attribute_uint64") | |
| 1667 | - | core.PuregoSafeRegister(&xFileInfoSetContentType, lib, "g_file_info_set_content_type") | |
| 1668 | - | core.PuregoSafeRegister(&xFileInfoSetCreationDateTime, lib, "g_file_info_set_creation_date_time") | |
| 1669 | - | core.PuregoSafeRegister(&xFileInfoSetDisplayName, lib, "g_file_info_set_display_name") | |
| 1670 | - | core.PuregoSafeRegister(&xFileInfoSetEditName, lib, "g_file_info_set_edit_name") | |
| 1671 | - | core.PuregoSafeRegister(&xFileInfoSetFileType, lib, "g_file_info_set_file_type") | |
| 1672 | - | core.PuregoSafeRegister(&xFileInfoSetIcon, lib, "g_file_info_set_icon") | |
| 1673 | - | core.PuregoSafeRegister(&xFileInfoSetIsHidden, lib, "g_file_info_set_is_hidden") | |
| 1674 | - | core.PuregoSafeRegister(&xFileInfoSetIsSymlink, lib, "g_file_info_set_is_symlink") | |
| 1675 | - | core.PuregoSafeRegister(&xFileInfoSetModificationDateTime, lib, "g_file_info_set_modification_date_time") | |
| 1676 | - | core.PuregoSafeRegister(&xFileInfoSetModificationTime, lib, "g_file_info_set_modification_time") | |
| 1677 | - | core.PuregoSafeRegister(&xFileInfoSetName, lib, "g_file_info_set_name") | |
| 1678 | - | core.PuregoSafeRegister(&xFileInfoSetSize, lib, "g_file_info_set_size") | |
| 1679 | - | core.PuregoSafeRegister(&xFileInfoSetSortOrder, lib, "g_file_info_set_sort_order") | |
| 1680 | - | core.PuregoSafeRegister(&xFileInfoSetSymbolicIcon, lib, "g_file_info_set_symbolic_icon") | |
| 1681 | - | core.PuregoSafeRegister(&xFileInfoSetSymlinkTarget, lib, "g_file_info_set_symlink_target") | |
| 1682 | - | core.PuregoSafeRegister(&xFileInfoUnsetAttributeMask, lib, "g_file_info_unset_attribute_mask") | |
| 1613 | + | core.PuregoSafeRegister(&xFileInfoGLibType, libs, "g_file_info_get_type") | |
| 1614 | + | ||
| 1615 | + | core.PuregoSafeRegister(&xNewFileInfo, libs, "g_file_info_new") | |
| 1616 | + | ||
| 1617 | + | core.PuregoSafeRegister(&xFileInfoClearStatus, libs, "g_file_info_clear_status") | |
| 1618 | + | core.PuregoSafeRegister(&xFileInfoCopyInto, libs, "g_file_info_copy_into") | |
| 1619 | + | core.PuregoSafeRegister(&xFileInfoDup, libs, "g_file_info_dup") | |
| 1620 | + | core.PuregoSafeRegister(&xFileInfoGetAccessDateTime, libs, "g_file_info_get_access_date_time") | |
| 1621 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeAsString, libs, "g_file_info_get_attribute_as_string") | |
| 1622 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeBoolean, libs, "g_file_info_get_attribute_boolean") | |
| 1623 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeByteString, libs, "g_file_info_get_attribute_byte_string") | |
| 1624 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeData, libs, "g_file_info_get_attribute_data") | |
| 1625 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeFilePath, libs, "g_file_info_get_attribute_file_path") | |
| 1626 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeInt32, libs, "g_file_info_get_attribute_int32") | |
| 1627 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeInt64, libs, "g_file_info_get_attribute_int64") | |
| 1628 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeObject, libs, "g_file_info_get_attribute_object") | |
| 1629 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeStatus, libs, "g_file_info_get_attribute_status") | |
| 1630 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeString, libs, "g_file_info_get_attribute_string") | |
| 1631 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeStringv, libs, "g_file_info_get_attribute_stringv") | |
| 1632 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeType, libs, "g_file_info_get_attribute_type") | |
| 1633 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeUint32, libs, "g_file_info_get_attribute_uint32") | |
| 1634 | + | core.PuregoSafeRegister(&xFileInfoGetAttributeUint64, libs, "g_file_info_get_attribute_uint64") | |
| 1635 | + | core.PuregoSafeRegister(&xFileInfoGetContentType, libs, "g_file_info_get_content_type") | |
| 1636 | + | core.PuregoSafeRegister(&xFileInfoGetCreationDateTime, libs, "g_file_info_get_creation_date_time") | |
| 1637 | + | core.PuregoSafeRegister(&xFileInfoGetDeletionDate, libs, "g_file_info_get_deletion_date") | |
| 1638 | + | core.PuregoSafeRegister(&xFileInfoGetDisplayName, libs, "g_file_info_get_display_name") | |
| 1639 | + | core.PuregoSafeRegister(&xFileInfoGetEditName, libs, "g_file_info_get_edit_name") | |
| 1640 | + | core.PuregoSafeRegister(&xFileInfoGetEtag, libs, "g_file_info_get_etag") | |
| 1641 | + | core.PuregoSafeRegister(&xFileInfoGetFileType, libs, "g_file_info_get_file_type") | |
| 1642 | + | core.PuregoSafeRegister(&xFileInfoGetIcon, libs, "g_file_info_get_icon") | |
| 1643 | + | core.PuregoSafeRegister(&xFileInfoGetIsBackup, libs, "g_file_info_get_is_backup") | |
| 1644 | + | core.PuregoSafeRegister(&xFileInfoGetIsHidden, libs, "g_file_info_get_is_hidden") | |
| 1645 | + | core.PuregoSafeRegister(&xFileInfoGetIsSymlink, libs, "g_file_info_get_is_symlink") | |
| 1646 | + | core.PuregoSafeRegister(&xFileInfoGetModificationDateTime, libs, "g_file_info_get_modification_date_time") | |
| 1647 | + | core.PuregoSafeRegister(&xFileInfoGetModificationTime, libs, "g_file_info_get_modification_time") | |
| 1648 | + | core.PuregoSafeRegister(&xFileInfoGetName, libs, "g_file_info_get_name") | |
| 1649 | + | core.PuregoSafeRegister(&xFileInfoGetSize, libs, "g_file_info_get_size") | |
| 1650 | + | core.PuregoSafeRegister(&xFileInfoGetSortOrder, libs, "g_file_info_get_sort_order") | |
| 1651 | + | core.PuregoSafeRegister(&xFileInfoGetSymbolicIcon, libs, "g_file_info_get_symbolic_icon") | |
| 1652 | + | core.PuregoSafeRegister(&xFileInfoGetSymlinkTarget, libs, "g_file_info_get_symlink_target") | |
| 1653 | + | core.PuregoSafeRegister(&xFileInfoHasAttribute, libs, "g_file_info_has_attribute") | |
| 1654 | + | core.PuregoSafeRegister(&xFileInfoHasNamespace, libs, "g_file_info_has_namespace") | |
| 1655 | + | core.PuregoSafeRegister(&xFileInfoListAttributes, libs, "g_file_info_list_attributes") | |
| 1656 | + | core.PuregoSafeRegister(&xFileInfoRemoveAttribute, libs, "g_file_info_remove_attribute") | |
| 1657 | + | core.PuregoSafeRegister(&xFileInfoSetAccessDateTime, libs, "g_file_info_set_access_date_time") | |
| 1658 | + | core.PuregoSafeRegister(&xFileInfoSetAttribute, libs, "g_file_info_set_attribute") | |
| 1659 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeBoolean, libs, "g_file_info_set_attribute_boolean") | |
| 1660 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeByteString, libs, "g_file_info_set_attribute_byte_string") | |
| 1661 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeFilePath, libs, "g_file_info_set_attribute_file_path") | |
| 1662 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeInt32, libs, "g_file_info_set_attribute_int32") | |
| 1663 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeInt64, libs, "g_file_info_set_attribute_int64") | |
| 1664 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeMask, libs, "g_file_info_set_attribute_mask") | |
| 1665 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeObject, libs, "g_file_info_set_attribute_object") | |
| 1666 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeStatus, libs, "g_file_info_set_attribute_status") | |
| 1667 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeString, libs, "g_file_info_set_attribute_string") | |
| 1668 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeStringv, libs, "g_file_info_set_attribute_stringv") | |
| 1669 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeUint32, libs, "g_file_info_set_attribute_uint32") | |
| 1670 | + | core.PuregoSafeRegister(&xFileInfoSetAttributeUint64, libs, "g_file_info_set_attribute_uint64") | |
| 1671 | + | core.PuregoSafeRegister(&xFileInfoSetContentType, libs, "g_file_info_set_content_type") | |
| 1672 | + | core.PuregoSafeRegister(&xFileInfoSetCreationDateTime, libs, "g_file_info_set_creation_date_time") | |
| 1673 | + | core.PuregoSafeRegister(&xFileInfoSetDisplayName, libs, "g_file_info_set_display_name") | |
| 1674 | + | core.PuregoSafeRegister(&xFileInfoSetEditName, libs, "g_file_info_set_edit_name") | |
| 1675 | + | core.PuregoSafeRegister(&xFileInfoSetFileType, libs, "g_file_info_set_file_type") | |
| 1676 | + | core.PuregoSafeRegister(&xFileInfoSetIcon, libs, "g_file_info_set_icon") | |
| 1677 | + | core.PuregoSafeRegister(&xFileInfoSetIsHidden, libs, "g_file_info_set_is_hidden") | |
| 1678 | + | core.PuregoSafeRegister(&xFileInfoSetIsSymlink, libs, "g_file_info_set_is_symlink") | |
| 1679 | + | core.PuregoSafeRegister(&xFileInfoSetModificationDateTime, libs, "g_file_info_set_modification_date_time") | |
| 1680 | + | core.PuregoSafeRegister(&xFileInfoSetModificationTime, libs, "g_file_info_set_modification_time") | |
| 1681 | + | core.PuregoSafeRegister(&xFileInfoSetName, libs, "g_file_info_set_name") | |
| 1682 | + | core.PuregoSafeRegister(&xFileInfoSetSize, libs, "g_file_info_set_size") | |
| 1683 | + | core.PuregoSafeRegister(&xFileInfoSetSortOrder, libs, "g_file_info_set_sort_order") | |
| 1684 | + | core.PuregoSafeRegister(&xFileInfoSetSymbolicIcon, libs, "g_file_info_set_symbolic_icon") | |
| 1685 | + | core.PuregoSafeRegister(&xFileInfoSetSymlinkTarget, libs, "g_file_info_set_symlink_target") | |
| 1686 | + | core.PuregoSafeRegister(&xFileInfoUnsetAttributeMask, libs, "g_file_info_unset_attribute_mask") | |
| 1683 | 1687 | ||
| 1684 | 1688 | } | |
M v4/gio/gfileinputstream.go +12 -8
| @@ -494,16 +494,20 @@ func (x *FileInputStream) Truncate(OffsetVar int64, CancellableVar *Cancellable) | |||
| 494 | 494 | ||
| 495 | 495 | func init() { | |
| 496 | 496 | core.SetPackageName("GIO", "gio-2.0") | |
| 497 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 498 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 499 | - | if err != nil { | |
| 500 | - | panic(err) | |
| 497 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 498 | + | var libs []uintptr | |
| 499 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 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) | |
| 501 | 505 | } | |
| 502 | 506 | ||
| 503 | - | core.PuregoSafeRegister(&xFileInputStreamGLibType, lib, "g_file_input_stream_get_type") | |
| 507 | + | core.PuregoSafeRegister(&xFileInputStreamGLibType, libs, "g_file_input_stream_get_type") | |
| 504 | 508 | ||
| 505 | - | core.PuregoSafeRegister(&xFileInputStreamQueryInfo, lib, "g_file_input_stream_query_info") | |
| 506 | - | core.PuregoSafeRegister(&xFileInputStreamQueryInfoAsync, lib, "g_file_input_stream_query_info_async") | |
| 507 | - | core.PuregoSafeRegister(&xFileInputStreamQueryInfoFinish, lib, "g_file_input_stream_query_info_finish") | |
| 509 | + | core.PuregoSafeRegister(&xFileInputStreamQueryInfo, libs, "g_file_input_stream_query_info") | |
| 510 | + | core.PuregoSafeRegister(&xFileInputStreamQueryInfoAsync, libs, "g_file_input_stream_query_info_async") | |
| 511 | + | core.PuregoSafeRegister(&xFileInputStreamQueryInfoFinish, libs, "g_file_input_stream_query_info_finish") | |
| 508 | 512 | ||
| 509 | 513 | } | |
M v4/gio/gfileiostream.go +13 -9
| @@ -598,17 +598,21 @@ func (x *FileIOStream) Truncate(OffsetVar int64, CancellableVar *Cancellable) (b | |||
| 598 | 598 | ||
| 599 | 599 | func init() { | |
| 600 | 600 | core.SetPackageName("GIO", "gio-2.0") | |
| 601 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 602 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 603 | - | if err != nil { | |
| 604 | - | panic(err) | |
| 601 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 602 | + | var libs []uintptr | |
| 603 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 604 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 605 | + | if err != nil { | |
| 606 | + | panic(err) | |
| 607 | + | } | |
| 608 | + | libs = append(libs, lib) | |
| 605 | 609 | } | |
| 606 | 610 | ||
| 607 | - | core.PuregoSafeRegister(&xFileIOStreamGLibType, lib, "g_file_io_stream_get_type") | |
| 611 | + | core.PuregoSafeRegister(&xFileIOStreamGLibType, libs, "g_file_io_stream_get_type") | |
| 608 | 612 | ||
| 609 | - | core.PuregoSafeRegister(&xFileIOStreamGetEtag, lib, "g_file_io_stream_get_etag") | |
| 610 | - | core.PuregoSafeRegister(&xFileIOStreamQueryInfo, lib, "g_file_io_stream_query_info") | |
| 611 | - | core.PuregoSafeRegister(&xFileIOStreamQueryInfoAsync, lib, "g_file_io_stream_query_info_async") | |
| 612 | - | core.PuregoSafeRegister(&xFileIOStreamQueryInfoFinish, lib, "g_file_io_stream_query_info_finish") | |
| 613 | + | core.PuregoSafeRegister(&xFileIOStreamGetEtag, libs, "g_file_io_stream_get_etag") | |
| 614 | + | core.PuregoSafeRegister(&xFileIOStreamQueryInfo, libs, "g_file_io_stream_query_info") | |
| 615 | + | core.PuregoSafeRegister(&xFileIOStreamQueryInfoAsync, libs, "g_file_io_stream_query_info_async") | |
| 616 | + | core.PuregoSafeRegister(&xFileIOStreamQueryInfoFinish, libs, "g_file_io_stream_query_info_finish") | |
| 613 | 617 | ||
| 614 | 618 | } | |
M v4/gio/gfilemonitor.go +13 -9
| @@ -337,17 +337,21 @@ func (x *FileMonitor) ConnectChanged(cb *func(FileMonitor, uintptr, uintptr, Fil | |||
| 337 | 337 | ||
| 338 | 338 | func init() { | |
| 339 | 339 | core.SetPackageName("GIO", "gio-2.0") | |
| 340 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 341 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 342 | - | if err != nil { | |
| 343 | - | panic(err) | |
| 340 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 341 | + | var libs []uintptr | |
| 342 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 343 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 344 | + | if err != nil { | |
| 345 | + | panic(err) | |
| 346 | + | } | |
| 347 | + | libs = append(libs, lib) | |
| 344 | 348 | } | |
| 345 | 349 | ||
| 346 | - | core.PuregoSafeRegister(&xFileMonitorGLibType, lib, "g_file_monitor_get_type") | |
| 350 | + | core.PuregoSafeRegister(&xFileMonitorGLibType, libs, "g_file_monitor_get_type") | |
| 347 | 351 | ||
| 348 | - | core.PuregoSafeRegister(&xFileMonitorCancel, lib, "g_file_monitor_cancel") | |
| 349 | - | core.PuregoSafeRegister(&xFileMonitorEmitEvent, lib, "g_file_monitor_emit_event") | |
| 350 | - | core.PuregoSafeRegister(&xFileMonitorIsCancelled, lib, "g_file_monitor_is_cancelled") | |
| 351 | - | core.PuregoSafeRegister(&xFileMonitorSetRateLimit, lib, "g_file_monitor_set_rate_limit") | |
| 352 | + | core.PuregoSafeRegister(&xFileMonitorCancel, libs, "g_file_monitor_cancel") | |
| 353 | + | core.PuregoSafeRegister(&xFileMonitorEmitEvent, libs, "g_file_monitor_emit_event") | |
| 354 | + | core.PuregoSafeRegister(&xFileMonitorIsCancelled, libs, "g_file_monitor_is_cancelled") | |
| 355 | + | core.PuregoSafeRegister(&xFileMonitorSetRateLimit, libs, "g_file_monitor_set_rate_limit") | |
| 352 | 356 | ||
| 353 | 357 | } | |
M v4/gio/gfilenamecompleter.go +13 -9
| @@ -218,18 +218,22 @@ func (x *FilenameCompleter) ConnectGotCompletionData(cb *func(FilenameCompleter) | |||
| 218 | 218 | ||
| 219 | 219 | func init() { | |
| 220 | 220 | core.SetPackageName("GIO", "gio-2.0") | |
| 221 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 222 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 223 | - | if err != nil { | |
| 224 | - | panic(err) | |
| 221 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 222 | + | var libs []uintptr | |
| 223 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 224 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 225 | + | if err != nil { | |
| 226 | + | panic(err) | |
| 227 | + | } | |
| 228 | + | libs = append(libs, lib) | |
| 225 | 229 | } | |
| 226 | 230 | ||
| 227 | - | core.PuregoSafeRegister(&xFilenameCompleterGLibType, lib, "g_filename_completer_get_type") | |
| 231 | + | core.PuregoSafeRegister(&xFilenameCompleterGLibType, libs, "g_filename_completer_get_type") | |
| 228 | 232 | ||
| 229 | - | core.PuregoSafeRegister(&xNewFilenameCompleter, lib, "g_filename_completer_new") | |
| 233 | + | core.PuregoSafeRegister(&xNewFilenameCompleter, libs, "g_filename_completer_new") | |
| 230 | 234 | ||
| 231 | - | core.PuregoSafeRegister(&xFilenameCompleterGetCompletionSuffix, lib, "g_filename_completer_get_completion_suffix") | |
| 232 | - | core.PuregoSafeRegister(&xFilenameCompleterGetCompletions, lib, "g_filename_completer_get_completions") | |
| 233 | - | core.PuregoSafeRegister(&xFilenameCompleterSetDirsOnly, lib, "g_filename_completer_set_dirs_only") | |
| 235 | + | core.PuregoSafeRegister(&xFilenameCompleterGetCompletionSuffix, libs, "g_filename_completer_get_completion_suffix") | |
| 236 | + | core.PuregoSafeRegister(&xFilenameCompleterGetCompletions, libs, "g_filename_completer_get_completions") | |
| 237 | + | core.PuregoSafeRegister(&xFilenameCompleterSetDirsOnly, libs, "g_filename_completer_set_dirs_only") | |
| 234 | 238 | ||
| 235 | 239 | } | |
M v4/gio/gfileoutputstream.go +13 -9
| @@ -593,17 +593,21 @@ func (x *FileOutputStream) Truncate(OffsetVar int64, CancellableVar *Cancellable | |||
| 593 | 593 | ||
| 594 | 594 | func init() { | |
| 595 | 595 | core.SetPackageName("GIO", "gio-2.0") | |
| 596 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 597 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 598 | - | if err != nil { | |
| 599 | - | panic(err) | |
| 596 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 597 | + | var libs []uintptr | |
| 598 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 599 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 600 | + | if err != nil { | |
| 601 | + | panic(err) | |
| 602 | + | } | |
| 603 | + | libs = append(libs, lib) | |
| 600 | 604 | } | |
| 601 | 605 | ||
| 602 | - | core.PuregoSafeRegister(&xFileOutputStreamGLibType, lib, "g_file_output_stream_get_type") | |
| 606 | + | core.PuregoSafeRegister(&xFileOutputStreamGLibType, libs, "g_file_output_stream_get_type") | |
| 603 | 607 | ||
| 604 | - | core.PuregoSafeRegister(&xFileOutputStreamGetEtag, lib, "g_file_output_stream_get_etag") | |
| 605 | - | core.PuregoSafeRegister(&xFileOutputStreamQueryInfo, lib, "g_file_output_stream_query_info") | |
| 606 | - | core.PuregoSafeRegister(&xFileOutputStreamQueryInfoAsync, lib, "g_file_output_stream_query_info_async") | |
| 607 | - | core.PuregoSafeRegister(&xFileOutputStreamQueryInfoFinish, lib, "g_file_output_stream_query_info_finish") | |
| 608 | + | core.PuregoSafeRegister(&xFileOutputStreamGetEtag, libs, "g_file_output_stream_get_etag") | |
| 609 | + | core.PuregoSafeRegister(&xFileOutputStreamQueryInfo, libs, "g_file_output_stream_query_info") | |
| 610 | + | core.PuregoSafeRegister(&xFileOutputStreamQueryInfoAsync, libs, "g_file_output_stream_query_info_async") | |
| 611 | + | core.PuregoSafeRegister(&xFileOutputStreamQueryInfoFinish, libs, "g_file_output_stream_query_info_finish") | |
| 608 | 612 | ||
| 609 | 613 | } | |
M v4/gio/gfilterinputstream.go +12 -8
| @@ -165,16 +165,20 @@ func (c *FilterInputStream) SetGoPointer(ptr uintptr) { | |||
| 165 | 165 | ||
| 166 | 166 | func init() { | |
| 167 | 167 | core.SetPackageName("GIO", "gio-2.0") | |
| 168 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 169 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 170 | - | if err != nil { | |
| 171 | - | panic(err) | |
| 168 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 169 | + | var libs []uintptr | |
| 170 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 171 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 172 | + | if err != nil { | |
| 173 | + | panic(err) | |
| 174 | + | } | |
| 175 | + | libs = append(libs, lib) | |
| 172 | 176 | } | |
| 173 | 177 | ||
| 174 | - | core.PuregoSafeRegister(&xFilterInputStreamGLibType, lib, "g_filter_input_stream_get_type") | |
| 178 | + | core.PuregoSafeRegister(&xFilterInputStreamGLibType, libs, "g_filter_input_stream_get_type") | |
| 175 | 179 | ||
| 176 | - | core.PuregoSafeRegister(&xFilterInputStreamGetBaseStream, lib, "g_filter_input_stream_get_base_stream") | |
| 177 | - | core.PuregoSafeRegister(&xFilterInputStreamGetCloseBaseStream, lib, "g_filter_input_stream_get_close_base_stream") | |
| 178 | - | core.PuregoSafeRegister(&xFilterInputStreamSetCloseBaseStream, lib, "g_filter_input_stream_set_close_base_stream") | |
| 180 | + | core.PuregoSafeRegister(&xFilterInputStreamGetBaseStream, libs, "g_filter_input_stream_get_base_stream") | |
| 181 | + | core.PuregoSafeRegister(&xFilterInputStreamGetCloseBaseStream, libs, "g_filter_input_stream_get_close_base_stream") | |
| 182 | + | core.PuregoSafeRegister(&xFilterInputStreamSetCloseBaseStream, libs, "g_filter_input_stream_set_close_base_stream") | |
| 179 | 183 | ||
| 180 | 184 | } | |
M v4/gio/gfilteroutputstream.go +12 -8
| @@ -165,16 +165,20 @@ func (c *FilterOutputStream) SetGoPointer(ptr uintptr) { | |||
| 165 | 165 | ||
| 166 | 166 | func init() { | |
| 167 | 167 | core.SetPackageName("GIO", "gio-2.0") | |
| 168 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 169 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 170 | - | if err != nil { | |
| 171 | - | panic(err) | |
| 168 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 169 | + | var libs []uintptr | |
| 170 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 171 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 172 | + | if err != nil { | |
| 173 | + | panic(err) | |
| 174 | + | } | |
| 175 | + | libs = append(libs, lib) | |
| 172 | 176 | } | |
| 173 | 177 | ||
| 174 | - | core.PuregoSafeRegister(&xFilterOutputStreamGLibType, lib, "g_filter_output_stream_get_type") | |
| 178 | + | core.PuregoSafeRegister(&xFilterOutputStreamGLibType, libs, "g_filter_output_stream_get_type") | |
| 175 | 179 | ||
| 176 | - | core.PuregoSafeRegister(&xFilterOutputStreamGetBaseStream, lib, "g_filter_output_stream_get_base_stream") | |
| 177 | - | core.PuregoSafeRegister(&xFilterOutputStreamGetCloseBaseStream, lib, "g_filter_output_stream_get_close_base_stream") | |
| 178 | - | core.PuregoSafeRegister(&xFilterOutputStreamSetCloseBaseStream, lib, "g_filter_output_stream_set_close_base_stream") | |
| 180 | + | core.PuregoSafeRegister(&xFilterOutputStreamGetBaseStream, libs, "g_filter_output_stream_get_base_stream") | |
| 181 | + | core.PuregoSafeRegister(&xFilterOutputStreamGetCloseBaseStream, libs, "g_filter_output_stream_get_close_base_stream") | |
| 182 | + | core.PuregoSafeRegister(&xFilterOutputStreamSetCloseBaseStream, libs, "g_filter_output_stream_set_close_base_stream") | |
| 179 | 183 | ||
| 180 | 184 | } | |
M v4/gio/gicon.go +15 -11
| @@ -333,20 +333,24 @@ func IconNewForString(StrVar string) (*IconBase, error) { | |||
| 333 | 333 | ||
| 334 | 334 | func init() { | |
| 335 | 335 | core.SetPackageName("GIO", "gio-2.0") | |
| 336 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 337 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 338 | - | if err != nil { | |
| 339 | - | panic(err) | |
| 336 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 337 | + | var libs []uintptr | |
| 338 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 339 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 340 | + | if err != nil { | |
| 341 | + | panic(err) | |
| 342 | + | } | |
| 343 | + | libs = append(libs, lib) | |
| 340 | 344 | } | |
| 341 | 345 | ||
| 342 | - | core.PuregoSafeRegister(&xIconDeserialize, lib, "g_icon_deserialize") | |
| 343 | - | core.PuregoSafeRegister(&xIconNewForString, lib, "g_icon_new_for_string") | |
| 346 | + | core.PuregoSafeRegister(&xIconDeserialize, libs, "g_icon_deserialize") | |
| 347 | + | core.PuregoSafeRegister(&xIconNewForString, libs, "g_icon_new_for_string") | |
| 344 | 348 | ||
| 345 | - | core.PuregoSafeRegister(&xIconGLibType, lib, "g_icon_get_type") | |
| 349 | + | core.PuregoSafeRegister(&xIconGLibType, libs, "g_icon_get_type") | |
| 346 | 350 | ||
| 347 | - | core.PuregoSafeRegister(&XGIconEqual, lib, "g_icon_equal") | |
| 348 | - | core.PuregoSafeRegister(&XGIconHash, lib, "g_icon_hash") | |
| 349 | - | core.PuregoSafeRegister(&XGIconSerialize, lib, "g_icon_serialize") | |
| 350 | - | core.PuregoSafeRegister(&XGIconToString, lib, "g_icon_to_string") | |
| 351 | + | core.PuregoSafeRegister(&XGIconEqual, libs, "g_icon_equal") | |
| 352 | + | core.PuregoSafeRegister(&XGIconHash, libs, "g_icon_hash") | |
| 353 | + | core.PuregoSafeRegister(&XGIconSerialize, libs, "g_icon_serialize") | |
| 354 | + | core.PuregoSafeRegister(&XGIconToString, libs, "g_icon_to_string") | |
| 351 | 355 | ||
| 352 | 356 | } | |
M v4/gio/ginetaddress.go +30 -26
| @@ -326,33 +326,37 @@ func (c *InetAddress) SetGoPointer(ptr uintptr) { | |||
| 326 | 326 | ||
| 327 | 327 | func init() { | |
| 328 | 328 | core.SetPackageName("GIO", "gio-2.0") | |
| 329 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 330 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 331 | - | if err != nil { | |
| 332 | - | panic(err) | |
| 329 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 330 | + | var libs []uintptr | |
| 331 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 332 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 333 | + | if err != nil { | |
| 334 | + | panic(err) | |
| 335 | + | } | |
| 336 | + | libs = append(libs, lib) | |
| 333 | 337 | } | |
| 334 | 338 | ||
| 335 | - | core.PuregoSafeRegister(&xInetAddressGLibType, lib, "g_inet_address_get_type") | |
| 336 | - | ||
| 337 | - | core.PuregoSafeRegister(&xNewInetAddressAny, lib, "g_inet_address_new_any") | |
| 338 | - | core.PuregoSafeRegister(&xNewInetAddressFromBytes, lib, "g_inet_address_new_from_bytes") | |
| 339 | - | core.PuregoSafeRegister(&xNewInetAddressFromString, lib, "g_inet_address_new_from_string") | |
| 340 | - | core.PuregoSafeRegister(&xNewInetAddressLoopback, lib, "g_inet_address_new_loopback") | |
| 341 | - | ||
| 342 | - | core.PuregoSafeRegister(&xInetAddressEqual, lib, "g_inet_address_equal") | |
| 343 | - | core.PuregoSafeRegister(&xInetAddressGetFamily, lib, "g_inet_address_get_family") | |
| 344 | - | core.PuregoSafeRegister(&xInetAddressGetIsAny, lib, "g_inet_address_get_is_any") | |
| 345 | - | core.PuregoSafeRegister(&xInetAddressGetIsLinkLocal, lib, "g_inet_address_get_is_link_local") | |
| 346 | - | core.PuregoSafeRegister(&xInetAddressGetIsLoopback, lib, "g_inet_address_get_is_loopback") | |
| 347 | - | core.PuregoSafeRegister(&xInetAddressGetIsMcGlobal, lib, "g_inet_address_get_is_mc_global") | |
| 348 | - | core.PuregoSafeRegister(&xInetAddressGetIsMcLinkLocal, lib, "g_inet_address_get_is_mc_link_local") | |
| 349 | - | core.PuregoSafeRegister(&xInetAddressGetIsMcNodeLocal, lib, "g_inet_address_get_is_mc_node_local") | |
| 350 | - | core.PuregoSafeRegister(&xInetAddressGetIsMcOrgLocal, lib, "g_inet_address_get_is_mc_org_local") | |
| 351 | - | core.PuregoSafeRegister(&xInetAddressGetIsMcSiteLocal, lib, "g_inet_address_get_is_mc_site_local") | |
| 352 | - | core.PuregoSafeRegister(&xInetAddressGetIsMulticast, lib, "g_inet_address_get_is_multicast") | |
| 353 | - | core.PuregoSafeRegister(&xInetAddressGetIsSiteLocal, lib, "g_inet_address_get_is_site_local") | |
| 354 | - | core.PuregoSafeRegister(&xInetAddressGetNativeSize, lib, "g_inet_address_get_native_size") | |
| 355 | - | core.PuregoSafeRegister(&xInetAddressToBytes, lib, "g_inet_address_to_bytes") | |
| 356 | - | core.PuregoSafeRegister(&xInetAddressToString, lib, "g_inet_address_to_string") | |
| 339 | + | core.PuregoSafeRegister(&xInetAddressGLibType, libs, "g_inet_address_get_type") | |
| 340 | + | ||
| 341 | + | core.PuregoSafeRegister(&xNewInetAddressAny, libs, "g_inet_address_new_any") | |
| 342 | + | core.PuregoSafeRegister(&xNewInetAddressFromBytes, libs, "g_inet_address_new_from_bytes") | |
| 343 | + | core.PuregoSafeRegister(&xNewInetAddressFromString, libs, "g_inet_address_new_from_string") | |
| 344 | + | core.PuregoSafeRegister(&xNewInetAddressLoopback, libs, "g_inet_address_new_loopback") | |
| 345 | + | ||
| 346 | + | core.PuregoSafeRegister(&xInetAddressEqual, libs, "g_inet_address_equal") | |
| 347 | + | core.PuregoSafeRegister(&xInetAddressGetFamily, libs, "g_inet_address_get_family") | |
| 348 | + | core.PuregoSafeRegister(&xInetAddressGetIsAny, libs, "g_inet_address_get_is_any") | |
| 349 | + | core.PuregoSafeRegister(&xInetAddressGetIsLinkLocal, libs, "g_inet_address_get_is_link_local") | |
| 350 | + | core.PuregoSafeRegister(&xInetAddressGetIsLoopback, libs, "g_inet_address_get_is_loopback") | |
| 351 | + | core.PuregoSafeRegister(&xInetAddressGetIsMcGlobal, libs, "g_inet_address_get_is_mc_global") | |
| 352 | + | core.PuregoSafeRegister(&xInetAddressGetIsMcLinkLocal, libs, "g_inet_address_get_is_mc_link_local") | |
| 353 | + | core.PuregoSafeRegister(&xInetAddressGetIsMcNodeLocal, libs, "g_inet_address_get_is_mc_node_local") | |
| 354 | + | core.PuregoSafeRegister(&xInetAddressGetIsMcOrgLocal, libs, "g_inet_address_get_is_mc_org_local") | |
| 355 | + | core.PuregoSafeRegister(&xInetAddressGetIsMcSiteLocal, libs, "g_inet_address_get_is_mc_site_local") | |
| 356 | + | core.PuregoSafeRegister(&xInetAddressGetIsMulticast, libs, "g_inet_address_get_is_multicast") | |
| 357 | + | core.PuregoSafeRegister(&xInetAddressGetIsSiteLocal, libs, "g_inet_address_get_is_site_local") | |
| 358 | + | core.PuregoSafeRegister(&xInetAddressGetNativeSize, libs, "g_inet_address_get_native_size") | |
| 359 | + | core.PuregoSafeRegister(&xInetAddressToBytes, libs, "g_inet_address_to_bytes") | |
| 360 | + | core.PuregoSafeRegister(&xInetAddressToString, libs, "g_inet_address_to_string") | |
| 357 | 361 | ||
| 358 | 362 | } | |
M v4/gio/ginetaddressmask.go +17 -13
| @@ -220,22 +220,26 @@ func (x *InetAddressMask) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 220 | 220 | ||
| 221 | 221 | func init() { | |
| 222 | 222 | core.SetPackageName("GIO", "gio-2.0") | |
| 223 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 224 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 225 | - | if err != nil { | |
| 226 | - | panic(err) | |
| 223 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 224 | + | var libs []uintptr | |
| 225 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 226 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 227 | + | if err != nil { | |
| 228 | + | panic(err) | |
| 229 | + | } | |
| 230 | + | libs = append(libs, lib) | |
| 227 | 231 | } | |
| 228 | 232 | ||
| 229 | - | core.PuregoSafeRegister(&xInetAddressMaskGLibType, lib, "g_inet_address_mask_get_type") | |
| 233 | + | core.PuregoSafeRegister(&xInetAddressMaskGLibType, libs, "g_inet_address_mask_get_type") | |
| 230 | 234 | ||
| 231 | - | core.PuregoSafeRegister(&xNewInetAddressMask, lib, "g_inet_address_mask_new") | |
| 232 | - | core.PuregoSafeRegister(&xNewInetAddressMaskFromString, lib, "g_inet_address_mask_new_from_string") | |
| 235 | + | core.PuregoSafeRegister(&xNewInetAddressMask, libs, "g_inet_address_mask_new") | |
| 236 | + | core.PuregoSafeRegister(&xNewInetAddressMaskFromString, libs, "g_inet_address_mask_new_from_string") | |
| 233 | 237 | ||
| 234 | - | core.PuregoSafeRegister(&xInetAddressMaskEqual, lib, "g_inet_address_mask_equal") | |
| 235 | - | core.PuregoSafeRegister(&xInetAddressMaskGetAddress, lib, "g_inet_address_mask_get_address") | |
| 236 | - | core.PuregoSafeRegister(&xInetAddressMaskGetFamily, lib, "g_inet_address_mask_get_family") | |
| 237 | - | core.PuregoSafeRegister(&xInetAddressMaskGetLength, lib, "g_inet_address_mask_get_length") | |
| 238 | - | core.PuregoSafeRegister(&xInetAddressMaskMatches, lib, "g_inet_address_mask_matches") | |
| 239 | - | core.PuregoSafeRegister(&xInetAddressMaskToString, lib, "g_inet_address_mask_to_string") | |
| 238 | + | core.PuregoSafeRegister(&xInetAddressMaskEqual, libs, "g_inet_address_mask_equal") | |
| 239 | + | core.PuregoSafeRegister(&xInetAddressMaskGetAddress, libs, "g_inet_address_mask_get_address") | |
| 240 | + | core.PuregoSafeRegister(&xInetAddressMaskGetFamily, libs, "g_inet_address_mask_get_family") | |
| 241 | + | core.PuregoSafeRegister(&xInetAddressMaskGetLength, libs, "g_inet_address_mask_get_length") | |
| 242 | + | core.PuregoSafeRegister(&xInetAddressMaskMatches, libs, "g_inet_address_mask_matches") | |
| 243 | + | core.PuregoSafeRegister(&xInetAddressMaskToString, libs, "g_inet_address_mask_to_string") | |
| 240 | 244 | ||
| 241 | 245 | } | |
M v4/gio/ginetsocketaddress.go +15 -11
| @@ -191,20 +191,24 @@ func (x *InetSocketAddress) ToString() string { | |||
| 191 | 191 | ||
| 192 | 192 | func init() { | |
| 193 | 193 | core.SetPackageName("GIO", "gio-2.0") | |
| 194 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 195 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 196 | - | if err != nil { | |
| 197 | - | panic(err) | |
| 194 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 195 | + | var libs []uintptr | |
| 196 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 197 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 198 | + | if err != nil { | |
| 199 | + | panic(err) | |
| 200 | + | } | |
| 201 | + | libs = append(libs, lib) | |
| 198 | 202 | } | |
| 199 | 203 | ||
| 200 | - | core.PuregoSafeRegister(&xInetSocketAddressGLibType, lib, "g_inet_socket_address_get_type") | |
| 204 | + | core.PuregoSafeRegister(&xInetSocketAddressGLibType, libs, "g_inet_socket_address_get_type") | |
| 201 | 205 | ||
| 202 | - | core.PuregoSafeRegister(&xNewInetSocketAddress, lib, "g_inet_socket_address_new") | |
| 203 | - | core.PuregoSafeRegister(&xNewInetSocketAddressFromString, lib, "g_inet_socket_address_new_from_string") | |
| 206 | + | core.PuregoSafeRegister(&xNewInetSocketAddress, libs, "g_inet_socket_address_new") | |
| 207 | + | core.PuregoSafeRegister(&xNewInetSocketAddressFromString, libs, "g_inet_socket_address_new_from_string") | |
| 204 | 208 | ||
| 205 | - | core.PuregoSafeRegister(&xInetSocketAddressGetAddress, lib, "g_inet_socket_address_get_address") | |
| 206 | - | core.PuregoSafeRegister(&xInetSocketAddressGetFlowinfo, lib, "g_inet_socket_address_get_flowinfo") | |
| 207 | - | core.PuregoSafeRegister(&xInetSocketAddressGetPort, lib, "g_inet_socket_address_get_port") | |
| 208 | - | core.PuregoSafeRegister(&xInetSocketAddressGetScopeId, lib, "g_inet_socket_address_get_scope_id") | |
| 209 | + | core.PuregoSafeRegister(&xInetSocketAddressGetAddress, libs, "g_inet_socket_address_get_address") | |
| 210 | + | core.PuregoSafeRegister(&xInetSocketAddressGetFlowinfo, libs, "g_inet_socket_address_get_flowinfo") | |
| 211 | + | core.PuregoSafeRegister(&xInetSocketAddressGetPort, libs, "g_inet_socket_address_get_port") | |
| 212 | + | core.PuregoSafeRegister(&xInetSocketAddressGetScopeId, libs, "g_inet_socket_address_get_scope_id") | |
| 209 | 213 | ||
| 210 | 214 | } | |
M v4/gio/ginitable.go +11 -7
| @@ -178,16 +178,20 @@ func InitableNewv(ObjectTypeVar types.GType, NParametersVar uint, ParametersVar | |||
| 178 | 178 | ||
| 179 | 179 | func init() { | |
| 180 | 180 | core.SetPackageName("GIO", "gio-2.0") | |
| 181 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 182 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 183 | - | if err != nil { | |
| 184 | - | panic(err) | |
| 181 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 182 | + | var libs []uintptr | |
| 183 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 184 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 185 | + | if err != nil { | |
| 186 | + | panic(err) | |
| 187 | + | } | |
| 188 | + | libs = append(libs, lib) | |
| 185 | 189 | } | |
| 186 | 190 | ||
| 187 | - | core.PuregoSafeRegister(&xInitableNewv, lib, "g_initable_newv") | |
| 191 | + | core.PuregoSafeRegister(&xInitableNewv, libs, "g_initable_newv") | |
| 188 | 192 | ||
| 189 | - | core.PuregoSafeRegister(&xInitableGLibType, lib, "g_initable_get_type") | |
| 193 | + | core.PuregoSafeRegister(&xInitableGLibType, libs, "g_initable_get_type") | |
| 190 | 194 | ||
| 191 | - | core.PuregoSafeRegister(&XGInitableInit, lib, "g_initable_init") | |
| 195 | + | core.PuregoSafeRegister(&XGInitableInit, libs, "g_initable_init") | |
| 192 | 196 | ||
| 193 | 197 | } | |
M v4/gio/ginputstream.go +31 -27
| @@ -834,32 +834,36 @@ func (c *InputStream) SetGoPointer(ptr uintptr) { | |||
| 834 | 834 | ||
| 835 | 835 | func init() { | |
| 836 | 836 | core.SetPackageName("GIO", "gio-2.0") | |
| 837 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 838 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 839 | - | if err != nil { | |
| 840 | - | panic(err) | |
| 841 | - | } | |
| 842 | - | ||
| 843 | - | core.PuregoSafeRegister(&xInputStreamGLibType, lib, "g_input_stream_get_type") | |
| 844 | - | ||
| 845 | - | core.PuregoSafeRegister(&xInputStreamClearPending, lib, "g_input_stream_clear_pending") | |
| 846 | - | core.PuregoSafeRegister(&xInputStreamClose, lib, "g_input_stream_close") | |
| 847 | - | core.PuregoSafeRegister(&xInputStreamCloseAsync, lib, "g_input_stream_close_async") | |
| 848 | - | core.PuregoSafeRegister(&xInputStreamCloseFinish, lib, "g_input_stream_close_finish") | |
| 849 | - | core.PuregoSafeRegister(&xInputStreamHasPending, lib, "g_input_stream_has_pending") | |
| 850 | - | core.PuregoSafeRegister(&xInputStreamIsClosed, lib, "g_input_stream_is_closed") | |
| 851 | - | core.PuregoSafeRegister(&xInputStreamRead, lib, "g_input_stream_read") | |
| 852 | - | core.PuregoSafeRegister(&xInputStreamReadAll, lib, "g_input_stream_read_all") | |
| 853 | - | core.PuregoSafeRegister(&xInputStreamReadAllAsync, lib, "g_input_stream_read_all_async") | |
| 854 | - | core.PuregoSafeRegister(&xInputStreamReadAllFinish, lib, "g_input_stream_read_all_finish") | |
| 855 | - | core.PuregoSafeRegister(&xInputStreamReadAsync, lib, "g_input_stream_read_async") | |
| 856 | - | core.PuregoSafeRegister(&xInputStreamReadBytes, lib, "g_input_stream_read_bytes") | |
| 857 | - | core.PuregoSafeRegister(&xInputStreamReadBytesAsync, lib, "g_input_stream_read_bytes_async") | |
| 858 | - | core.PuregoSafeRegister(&xInputStreamReadBytesFinish, lib, "g_input_stream_read_bytes_finish") | |
| 859 | - | core.PuregoSafeRegister(&xInputStreamReadFinish, lib, "g_input_stream_read_finish") | |
| 860 | - | core.PuregoSafeRegister(&xInputStreamSetPending, lib, "g_input_stream_set_pending") | |
| 861 | - | core.PuregoSafeRegister(&xInputStreamSkip, lib, "g_input_stream_skip") | |
| 862 | - | core.PuregoSafeRegister(&xInputStreamSkipAsync, lib, "g_input_stream_skip_async") | |
| 863 | - | core.PuregoSafeRegister(&xInputStreamSkipFinish, lib, "g_input_stream_skip_finish") | |
| 837 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 838 | + | var libs []uintptr | |
| 839 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 840 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 841 | + | if err != nil { | |
| 842 | + | panic(err) | |
| 843 | + | } | |
| 844 | + | libs = append(libs, lib) | |
| 845 | + | } | |
| 846 | + | ||
| 847 | + | core.PuregoSafeRegister(&xInputStreamGLibType, libs, "g_input_stream_get_type") | |
| 848 | + | ||
| 849 | + | core.PuregoSafeRegister(&xInputStreamClearPending, libs, "g_input_stream_clear_pending") | |
| 850 | + | core.PuregoSafeRegister(&xInputStreamClose, libs, "g_input_stream_close") | |
| 851 | + | core.PuregoSafeRegister(&xInputStreamCloseAsync, libs, "g_input_stream_close_async") | |
| 852 | + | core.PuregoSafeRegister(&xInputStreamCloseFinish, libs, "g_input_stream_close_finish") | |
| 853 | + | core.PuregoSafeRegister(&xInputStreamHasPending, libs, "g_input_stream_has_pending") | |
| 854 | + | core.PuregoSafeRegister(&xInputStreamIsClosed, libs, "g_input_stream_is_closed") | |
| 855 | + | core.PuregoSafeRegister(&xInputStreamRead, libs, "g_input_stream_read") | |
| 856 | + | core.PuregoSafeRegister(&xInputStreamReadAll, libs, "g_input_stream_read_all") | |
| 857 | + | core.PuregoSafeRegister(&xInputStreamReadAllAsync, libs, "g_input_stream_read_all_async") | |
| 858 | + | core.PuregoSafeRegister(&xInputStreamReadAllFinish, libs, "g_input_stream_read_all_finish") | |
| 859 | + | core.PuregoSafeRegister(&xInputStreamReadAsync, libs, "g_input_stream_read_async") | |
| 860 | + | core.PuregoSafeRegister(&xInputStreamReadBytes, libs, "g_input_stream_read_bytes") | |
| 861 | + | core.PuregoSafeRegister(&xInputStreamReadBytesAsync, libs, "g_input_stream_read_bytes_async") | |
| 862 | + | core.PuregoSafeRegister(&xInputStreamReadBytesFinish, libs, "g_input_stream_read_bytes_finish") | |
| 863 | + | core.PuregoSafeRegister(&xInputStreamReadFinish, libs, "g_input_stream_read_finish") | |
| 864 | + | core.PuregoSafeRegister(&xInputStreamSetPending, libs, "g_input_stream_set_pending") | |
| 865 | + | core.PuregoSafeRegister(&xInputStreamSkip, libs, "g_input_stream_skip") | |
| 866 | + | core.PuregoSafeRegister(&xInputStreamSkipAsync, libs, "g_input_stream_skip_async") | |
| 867 | + | core.PuregoSafeRegister(&xInputStreamSkipFinish, libs, "g_input_stream_skip_finish") | |
| 864 | 868 | ||
| 865 | 869 | } | |
M v4/gio/gioerror.go +11 -7
| @@ -55,14 +55,18 @@ func IoErrorQuark() glib.Quark { | |||
| 55 | 55 | ||
| 56 | 56 | func init() { | |
| 57 | 57 | core.SetPackageName("GIO", "gio-2.0") | |
| 58 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 59 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 60 | - | if err != nil { | |
| 61 | - | panic(err) | |
| 58 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 59 | + | var libs []uintptr | |
| 60 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 61 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 62 | + | if err != nil { | |
| 63 | + | panic(err) | |
| 64 | + | } | |
| 65 | + | libs = append(libs, lib) | |
| 62 | 66 | } | |
| 63 | 67 | ||
| 64 | - | core.PuregoSafeRegister(&xIoErrorFromErrno, lib, "g_io_error_from_errno") | |
| 65 | - | core.PuregoSafeRegister(&xIoErrorFromFileError, lib, "g_io_error_from_file_error") | |
| 66 | - | core.PuregoSafeRegister(&xIoErrorQuark, lib, "g_io_error_quark") | |
| 68 | + | core.PuregoSafeRegister(&xIoErrorFromErrno, libs, "g_io_error_from_errno") | |
| 69 | + | core.PuregoSafeRegister(&xIoErrorFromFileError, libs, "g_io_error_from_file_error") | |
| 70 | + | core.PuregoSafeRegister(&xIoErrorQuark, libs, "g_io_error_quark") | |
| 67 | 71 | ||
| 68 | 72 | } | |
M v4/gio/giomodule.go +22 -18
| @@ -313,30 +313,34 @@ func IOModuleQuery() []string { | |||
| 313 | 313 | ||
| 314 | 314 | func init() { | |
| 315 | 315 | core.SetPackageName("GIO", "gio-2.0") | |
| 316 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 317 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 318 | - | if err != nil { | |
| 319 | - | panic(err) | |
| 316 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 317 | + | var libs []uintptr | |
| 318 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 319 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 320 | + | if err != nil { | |
| 321 | + | panic(err) | |
| 322 | + | } | |
| 323 | + | libs = append(libs, lib) | |
| 320 | 324 | } | |
| 321 | 325 | ||
| 322 | - | core.PuregoSafeRegister(&xIoExtensionPointImplement, lib, "g_io_extension_point_implement") | |
| 323 | - | core.PuregoSafeRegister(&xIoExtensionPointLookup, lib, "g_io_extension_point_lookup") | |
| 324 | - | core.PuregoSafeRegister(&xIoExtensionPointRegister, lib, "g_io_extension_point_register") | |
| 325 | - | core.PuregoSafeRegister(&xIoModulesLoadAllInDirectory, lib, "g_io_modules_load_all_in_directory") | |
| 326 | - | core.PuregoSafeRegister(&xIoModulesLoadAllInDirectoryWithScope, lib, "g_io_modules_load_all_in_directory_with_scope") | |
| 327 | - | core.PuregoSafeRegister(&xIoModulesScanAllInDirectory, lib, "g_io_modules_scan_all_in_directory") | |
| 328 | - | core.PuregoSafeRegister(&xIoModulesScanAllInDirectoryWithScope, lib, "g_io_modules_scan_all_in_directory_with_scope") | |
| 326 | + | core.PuregoSafeRegister(&xIoExtensionPointImplement, libs, "g_io_extension_point_implement") | |
| 327 | + | core.PuregoSafeRegister(&xIoExtensionPointLookup, libs, "g_io_extension_point_lookup") | |
| 328 | + | core.PuregoSafeRegister(&xIoExtensionPointRegister, libs, "g_io_extension_point_register") | |
| 329 | + | core.PuregoSafeRegister(&xIoModulesLoadAllInDirectory, libs, "g_io_modules_load_all_in_directory") | |
| 330 | + | core.PuregoSafeRegister(&xIoModulesLoadAllInDirectoryWithScope, libs, "g_io_modules_load_all_in_directory_with_scope") | |
| 331 | + | core.PuregoSafeRegister(&xIoModulesScanAllInDirectory, libs, "g_io_modules_scan_all_in_directory") | |
| 332 | + | core.PuregoSafeRegister(&xIoModulesScanAllInDirectoryWithScope, libs, "g_io_modules_scan_all_in_directory_with_scope") | |
| 329 | 333 | ||
| 330 | - | core.PuregoSafeRegister(&xIOModuleScopeBlock, lib, "g_io_module_scope_block") | |
| 331 | - | core.PuregoSafeRegister(&xIOModuleScopeFree, lib, "g_io_module_scope_free") | |
| 334 | + | core.PuregoSafeRegister(&xIOModuleScopeBlock, libs, "g_io_module_scope_block") | |
| 335 | + | core.PuregoSafeRegister(&xIOModuleScopeFree, libs, "g_io_module_scope_free") | |
| 332 | 336 | ||
| 333 | - | core.PuregoSafeRegister(&xIOModuleGLibType, lib, "g_io_module_get_type") | |
| 337 | + | core.PuregoSafeRegister(&xIOModuleGLibType, libs, "g_io_module_get_type") | |
| 334 | 338 | ||
| 335 | - | core.PuregoSafeRegister(&xNewIOModule, lib, "g_io_module_new") | |
| 339 | + | core.PuregoSafeRegister(&xNewIOModule, libs, "g_io_module_new") | |
| 336 | 340 | ||
| 337 | - | core.PuregoSafeRegister(&xIOModuleLoad, lib, "g_io_module_load") | |
| 338 | - | core.PuregoSafeRegister(&xIOModuleUnload, lib, "g_io_module_unload") | |
| 341 | + | core.PuregoSafeRegister(&xIOModuleLoad, libs, "g_io_module_load") | |
| 342 | + | core.PuregoSafeRegister(&xIOModuleUnload, libs, "g_io_module_unload") | |
| 339 | 343 | ||
| 340 | - | core.PuregoSafeRegister(&xIOModuleQuery, lib, "g_io_module_query") | |
| 344 | + | core.PuregoSafeRegister(&xIOModuleQuery, libs, "g_io_module_query") | |
| 341 | 345 | ||
| 342 | 346 | } | |
M v4/gio/gioscheduler.go +10 -6
| @@ -37,13 +37,17 @@ func IoSchedulerPushJob(JobFuncVar *IOSchedulerJobFunc, UserDataVar uintptr, Not | |||
| 37 | 37 | ||
| 38 | 38 | func init() { | |
| 39 | 39 | core.SetPackageName("GIO", "gio-2.0") | |
| 40 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 41 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 42 | - | if err != nil { | |
| 43 | - | panic(err) | |
| 40 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 41 | + | var libs []uintptr | |
| 42 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 43 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 44 | + | if err != nil { | |
| 45 | + | panic(err) | |
| 46 | + | } | |
| 47 | + | libs = append(libs, lib) | |
| 44 | 48 | } | |
| 45 | 49 | ||
| 46 | - | core.PuregoSafeRegister(&xIoSchedulerCancelAllJobs, lib, "g_io_scheduler_cancel_all_jobs") | |
| 47 | - | core.PuregoSafeRegister(&xIoSchedulerPushJob, lib, "g_io_scheduler_push_job") | |
| 50 | + | core.PuregoSafeRegister(&xIoSchedulerCancelAllJobs, libs, "g_io_scheduler_cancel_all_jobs") | |
| 51 | + | core.PuregoSafeRegister(&xIoSchedulerPushJob, libs, "g_io_scheduler_push_job") | |
| 48 | 52 | ||
| 49 | 53 | } | |
M v4/gio/giostream.go +24 -20
| @@ -688,25 +688,29 @@ func IOStreamSpliceFinish(ResultVar AsyncResult) (bool, error) { | |||
| 688 | 688 | ||
| 689 | 689 | func init() { | |
| 690 | 690 | core.SetPackageName("GIO", "gio-2.0") | |
| 691 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 692 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 693 | - | if err != nil { | |
| 694 | - | panic(err) | |
| 695 | - | } | |
| 696 | - | ||
| 697 | - | core.PuregoSafeRegister(&xIOStreamGLibType, lib, "g_io_stream_get_type") | |
| 698 | - | ||
| 699 | - | core.PuregoSafeRegister(&xIOStreamClearPending, lib, "g_io_stream_clear_pending") | |
| 700 | - | core.PuregoSafeRegister(&xIOStreamClose, lib, "g_io_stream_close") | |
| 701 | - | core.PuregoSafeRegister(&xIOStreamCloseAsync, lib, "g_io_stream_close_async") | |
| 702 | - | core.PuregoSafeRegister(&xIOStreamCloseFinish, lib, "g_io_stream_close_finish") | |
| 703 | - | core.PuregoSafeRegister(&xIOStreamGetInputStream, lib, "g_io_stream_get_input_stream") | |
| 704 | - | core.PuregoSafeRegister(&xIOStreamGetOutputStream, lib, "g_io_stream_get_output_stream") | |
| 705 | - | core.PuregoSafeRegister(&xIOStreamHasPending, lib, "g_io_stream_has_pending") | |
| 706 | - | core.PuregoSafeRegister(&xIOStreamIsClosed, lib, "g_io_stream_is_closed") | |
| 707 | - | core.PuregoSafeRegister(&xIOStreamSetPending, lib, "g_io_stream_set_pending") | |
| 708 | - | core.PuregoSafeRegister(&xIOStreamSpliceAsync, lib, "g_io_stream_splice_async") | |
| 709 | - | ||
| 710 | - | core.PuregoSafeRegister(&xIOStreamSpliceFinish, lib, "g_io_stream_splice_finish") | |
| 691 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 692 | + | var libs []uintptr | |
| 693 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 694 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 695 | + | if err != nil { | |
| 696 | + | panic(err) | |
| 697 | + | } | |
| 698 | + | libs = append(libs, lib) | |
| 699 | + | } | |
| 700 | + | ||
| 701 | + | core.PuregoSafeRegister(&xIOStreamGLibType, libs, "g_io_stream_get_type") | |
| 702 | + | ||
| 703 | + | core.PuregoSafeRegister(&xIOStreamClearPending, libs, "g_io_stream_clear_pending") | |
| 704 | + | core.PuregoSafeRegister(&xIOStreamClose, libs, "g_io_stream_close") | |
| 705 | + | core.PuregoSafeRegister(&xIOStreamCloseAsync, libs, "g_io_stream_close_async") | |
| 706 | + | core.PuregoSafeRegister(&xIOStreamCloseFinish, libs, "g_io_stream_close_finish") | |
| 707 | + | core.PuregoSafeRegister(&xIOStreamGetInputStream, libs, "g_io_stream_get_input_stream") | |
| 708 | + | core.PuregoSafeRegister(&xIOStreamGetOutputStream, libs, "g_io_stream_get_output_stream") | |
| 709 | + | core.PuregoSafeRegister(&xIOStreamHasPending, libs, "g_io_stream_has_pending") | |
| 710 | + | core.PuregoSafeRegister(&xIOStreamIsClosed, libs, "g_io_stream_is_closed") | |
| 711 | + | core.PuregoSafeRegister(&xIOStreamSetPending, libs, "g_io_stream_set_pending") | |
| 712 | + | core.PuregoSafeRegister(&xIOStreamSpliceAsync, libs, "g_io_stream_splice_async") | |
| 713 | + | ||
| 714 | + | core.PuregoSafeRegister(&xIOStreamSpliceFinish, libs, "g_io_stream_splice_finish") | |
| 711 | 715 | ||
| 712 | 716 | } | |
M v4/gio/giotypes.go +47 -43
| @@ -993,61 +993,65 @@ func (x *SrvTarget) GetWeight() uint16 { | |||
| 993 | 993 | ||
| 994 | 994 | func init() { | |
| 995 | 995 | core.SetPackageName("GIO", "gio-2.0") | |
| 996 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 997 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 998 | - | if err != nil { | |
| 999 | - | panic(err) | |
| 996 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 997 | + | var libs []uintptr | |
| 998 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 999 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1000 | + | if err != nil { | |
| 1001 | + | panic(err) | |
| 1002 | + | } | |
| 1003 | + | libs = append(libs, lib) | |
| 1000 | 1004 | } | |
| 1001 | 1005 | ||
| 1002 | - | core.PuregoSafeRegister(&xFileAttributeMatcherGLibType, lib, "g_file_attribute_matcher_get_type") | |
| 1006 | + | core.PuregoSafeRegister(&xFileAttributeMatcherGLibType, libs, "g_file_attribute_matcher_get_type") | |
| 1003 | 1007 | ||
| 1004 | - | core.PuregoSafeRegister(&xNewFileAttributeMatcher, lib, "g_file_attribute_matcher_new") | |
| 1008 | + | core.PuregoSafeRegister(&xNewFileAttributeMatcher, libs, "g_file_attribute_matcher_new") | |
| 1005 | 1009 | ||
| 1006 | - | core.PuregoSafeRegister(&xFileAttributeMatcherEnumerateNamespace, lib, "g_file_attribute_matcher_enumerate_namespace") | |
| 1007 | - | core.PuregoSafeRegister(&xFileAttributeMatcherEnumerateNext, lib, "g_file_attribute_matcher_enumerate_next") | |
| 1008 | - | core.PuregoSafeRegister(&xFileAttributeMatcherMatches, lib, "g_file_attribute_matcher_matches") | |
| 1009 | - | core.PuregoSafeRegister(&xFileAttributeMatcherMatchesOnly, lib, "g_file_attribute_matcher_matches_only") | |
| 1010 | - | core.PuregoSafeRegister(&xFileAttributeMatcherRef, lib, "g_file_attribute_matcher_ref") | |
| 1011 | - | core.PuregoSafeRegister(&xFileAttributeMatcherSubtract, lib, "g_file_attribute_matcher_subtract") | |
| 1012 | - | core.PuregoSafeRegister(&xFileAttributeMatcherToString, lib, "g_file_attribute_matcher_to_string") | |
| 1013 | - | core.PuregoSafeRegister(&xFileAttributeMatcherUnref, lib, "g_file_attribute_matcher_unref") | |
| 1010 | + | core.PuregoSafeRegister(&xFileAttributeMatcherEnumerateNamespace, libs, "g_file_attribute_matcher_enumerate_namespace") | |
| 1011 | + | core.PuregoSafeRegister(&xFileAttributeMatcherEnumerateNext, libs, "g_file_attribute_matcher_enumerate_next") | |
| 1012 | + | core.PuregoSafeRegister(&xFileAttributeMatcherMatches, libs, "g_file_attribute_matcher_matches") | |
| 1013 | + | core.PuregoSafeRegister(&xFileAttributeMatcherMatchesOnly, libs, "g_file_attribute_matcher_matches_only") | |
| 1014 | + | core.PuregoSafeRegister(&xFileAttributeMatcherRef, libs, "g_file_attribute_matcher_ref") | |
| 1015 | + | core.PuregoSafeRegister(&xFileAttributeMatcherSubtract, libs, "g_file_attribute_matcher_subtract") | |
| 1016 | + | core.PuregoSafeRegister(&xFileAttributeMatcherToString, libs, "g_file_attribute_matcher_to_string") | |
| 1017 | + | core.PuregoSafeRegister(&xFileAttributeMatcherUnref, libs, "g_file_attribute_matcher_unref") | |
| 1014 | 1018 | ||
| 1015 | - | core.PuregoSafeRegister(&xIOExtensionGetName, lib, "g_io_extension_get_name") | |
| 1016 | - | core.PuregoSafeRegister(&xIOExtensionGetPriority, lib, "g_io_extension_get_priority") | |
| 1017 | - | core.PuregoSafeRegister(&xIOExtensionGetType, lib, "g_io_extension_get_type") | |
| 1018 | - | core.PuregoSafeRegister(&xIOExtensionRefClass, lib, "g_io_extension_ref_class") | |
| 1019 | + | core.PuregoSafeRegister(&xIOExtensionGetName, libs, "g_io_extension_get_name") | |
| 1020 | + | core.PuregoSafeRegister(&xIOExtensionGetPriority, libs, "g_io_extension_get_priority") | |
| 1021 | + | core.PuregoSafeRegister(&xIOExtensionGetType, libs, "g_io_extension_get_type") | |
| 1022 | + | core.PuregoSafeRegister(&xIOExtensionRefClass, libs, "g_io_extension_ref_class") | |
| 1019 | 1023 | ||
| 1020 | - | core.PuregoSafeRegister(&xIOExtensionPointGetExtensionByName, lib, "g_io_extension_point_get_extension_by_name") | |
| 1021 | - | core.PuregoSafeRegister(&xIOExtensionPointGetExtensions, lib, "g_io_extension_point_get_extensions") | |
| 1022 | - | core.PuregoSafeRegister(&xIOExtensionPointGetRequiredType, lib, "g_io_extension_point_get_required_type") | |
| 1023 | - | core.PuregoSafeRegister(&xIOExtensionPointSetRequiredType, lib, "g_io_extension_point_set_required_type") | |
| 1024 | + | core.PuregoSafeRegister(&xIOExtensionPointGetExtensionByName, libs, "g_io_extension_point_get_extension_by_name") | |
| 1025 | + | core.PuregoSafeRegister(&xIOExtensionPointGetExtensions, libs, "g_io_extension_point_get_extensions") | |
| 1026 | + | core.PuregoSafeRegister(&xIOExtensionPointGetRequiredType, libs, "g_io_extension_point_get_required_type") | |
| 1027 | + | core.PuregoSafeRegister(&xIOExtensionPointSetRequiredType, libs, "g_io_extension_point_set_required_type") | |
| 1024 | 1028 | ||
| 1025 | - | core.PuregoSafeRegister(&xIOSchedulerJobSendToMainloop, lib, "g_io_scheduler_job_send_to_mainloop") | |
| 1026 | - | core.PuregoSafeRegister(&xIOSchedulerJobSendToMainloopAsync, lib, "g_io_scheduler_job_send_to_mainloop_async") | |
| 1029 | + | core.PuregoSafeRegister(&xIOSchedulerJobSendToMainloop, libs, "g_io_scheduler_job_send_to_mainloop") | |
| 1030 | + | core.PuregoSafeRegister(&xIOSchedulerJobSendToMainloopAsync, libs, "g_io_scheduler_job_send_to_mainloop_async") | |
| 1027 | 1031 | ||
| 1028 | - | core.PuregoSafeRegister(&xResourceGLibType, lib, "g_resource_get_type") | |
| 1032 | + | core.PuregoSafeRegister(&xResourceGLibType, libs, "g_resource_get_type") | |
| 1029 | 1033 | ||
| 1030 | - | core.PuregoSafeRegister(&xNewResourceFromData, lib, "g_resource_new_from_data") | |
| 1034 | + | core.PuregoSafeRegister(&xNewResourceFromData, libs, "g_resource_new_from_data") | |
| 1031 | 1035 | ||
| 1032 | - | core.PuregoSafeRegister(&xResourceRegister, lib, "g_resources_register") | |
| 1033 | - | core.PuregoSafeRegister(&xResourceUnregister, lib, "g_resources_unregister") | |
| 1034 | - | core.PuregoSafeRegister(&xResourceEnumerateChildren, lib, "g_resource_enumerate_children") | |
| 1035 | - | core.PuregoSafeRegister(&xResourceGetInfo, lib, "g_resource_get_info") | |
| 1036 | - | core.PuregoSafeRegister(&xResourceHasChildren, lib, "g_resource_has_children") | |
| 1037 | - | core.PuregoSafeRegister(&xResourceLookupData, lib, "g_resource_lookup_data") | |
| 1038 | - | core.PuregoSafeRegister(&xResourceOpenStream, lib, "g_resource_open_stream") | |
| 1039 | - | core.PuregoSafeRegister(&xResourceRef, lib, "g_resource_ref") | |
| 1040 | - | core.PuregoSafeRegister(&xResourceUnref, lib, "g_resource_unref") | |
| 1036 | + | core.PuregoSafeRegister(&xResourceRegister, libs, "g_resources_register") | |
| 1037 | + | core.PuregoSafeRegister(&xResourceUnregister, libs, "g_resources_unregister") | |
| 1038 | + | core.PuregoSafeRegister(&xResourceEnumerateChildren, libs, "g_resource_enumerate_children") | |
| 1039 | + | core.PuregoSafeRegister(&xResourceGetInfo, libs, "g_resource_get_info") | |
| 1040 | + | core.PuregoSafeRegister(&xResourceHasChildren, libs, "g_resource_has_children") | |
| 1041 | + | core.PuregoSafeRegister(&xResourceLookupData, libs, "g_resource_lookup_data") | |
| 1042 | + | core.PuregoSafeRegister(&xResourceOpenStream, libs, "g_resource_open_stream") | |
| 1043 | + | core.PuregoSafeRegister(&xResourceRef, libs, "g_resource_ref") | |
| 1044 | + | core.PuregoSafeRegister(&xResourceUnref, libs, "g_resource_unref") | |
| 1041 | 1045 | ||
| 1042 | - | core.PuregoSafeRegister(&xSrvTargetGLibType, lib, "g_srv_target_get_type") | |
| 1046 | + | core.PuregoSafeRegister(&xSrvTargetGLibType, libs, "g_srv_target_get_type") | |
| 1043 | 1047 | ||
| 1044 | - | core.PuregoSafeRegister(&xNewSrvTarget, lib, "g_srv_target_new") | |
| 1048 | + | core.PuregoSafeRegister(&xNewSrvTarget, libs, "g_srv_target_new") | |
| 1045 | 1049 | ||
| 1046 | - | core.PuregoSafeRegister(&xSrvTargetCopy, lib, "g_srv_target_copy") | |
| 1047 | - | core.PuregoSafeRegister(&xSrvTargetFree, lib, "g_srv_target_free") | |
| 1048 | - | core.PuregoSafeRegister(&xSrvTargetGetHostname, lib, "g_srv_target_get_hostname") | |
| 1049 | - | core.PuregoSafeRegister(&xSrvTargetGetPort, lib, "g_srv_target_get_port") | |
| 1050 | - | core.PuregoSafeRegister(&xSrvTargetGetPriority, lib, "g_srv_target_get_priority") | |
| 1051 | - | core.PuregoSafeRegister(&xSrvTargetGetWeight, lib, "g_srv_target_get_weight") | |
| 1050 | + | core.PuregoSafeRegister(&xSrvTargetCopy, libs, "g_srv_target_copy") | |
| 1051 | + | core.PuregoSafeRegister(&xSrvTargetFree, libs, "g_srv_target_free") | |
| 1052 | + | core.PuregoSafeRegister(&xSrvTargetGetHostname, libs, "g_srv_target_get_hostname") | |
| 1053 | + | core.PuregoSafeRegister(&xSrvTargetGetPort, libs, "g_srv_target_get_port") | |
| 1054 | + | core.PuregoSafeRegister(&xSrvTargetGetPriority, libs, "g_srv_target_get_priority") | |
| 1055 | + | core.PuregoSafeRegister(&xSrvTargetGetWeight, libs, "g_srv_target_get_weight") | |
| 1052 | 1056 | ||
| 1053 | 1057 | } | |
M v4/gio/glistmodel.go +14 -10
| @@ -311,18 +311,22 @@ var XGListModelItemsChanged func(uintptr, uint, uint, uint) | |||
| 311 | 311 | ||
| 312 | 312 | func init() { | |
| 313 | 313 | core.SetPackageName("GIO", "gio-2.0") | |
| 314 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 315 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 316 | - | if err != nil { | |
| 317 | - | panic(err) | |
| 314 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 315 | + | var libs []uintptr | |
| 316 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 317 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 318 | + | if err != nil { | |
| 319 | + | panic(err) | |
| 320 | + | } | |
| 321 | + | libs = append(libs, lib) | |
| 318 | 322 | } | |
| 319 | 323 | ||
| 320 | - | core.PuregoSafeRegister(&xListModelGLibType, lib, "g_list_model_get_type") | |
| 324 | + | core.PuregoSafeRegister(&xListModelGLibType, libs, "g_list_model_get_type") | |
| 321 | 325 | ||
| 322 | - | core.PuregoSafeRegister(&XGListModelGetItem, lib, "g_list_model_get_item") | |
| 323 | - | core.PuregoSafeRegister(&XGListModelGetItemType, lib, "g_list_model_get_item_type") | |
| 324 | - | core.PuregoSafeRegister(&XGListModelGetNItems, lib, "g_list_model_get_n_items") | |
| 325 | - | core.PuregoSafeRegister(&XGListModelGetObject, lib, "g_list_model_get_object") | |
| 326 | - | core.PuregoSafeRegister(&XGListModelItemsChanged, lib, "g_list_model_items_changed") | |
| 326 | + | core.PuregoSafeRegister(&XGListModelGetItem, libs, "g_list_model_get_item") | |
| 327 | + | core.PuregoSafeRegister(&XGListModelGetItemType, libs, "g_list_model_get_item_type") | |
| 328 | + | core.PuregoSafeRegister(&XGListModelGetNItems, libs, "g_list_model_get_n_items") | |
| 329 | + | core.PuregoSafeRegister(&XGListModelGetObject, libs, "g_list_model_get_object") | |
| 330 | + | core.PuregoSafeRegister(&XGListModelItemsChanged, libs, "g_list_model_items_changed") | |
| 327 | 331 | ||
| 328 | 332 | } | |
M v4/gio/gliststore.go +20 -16
| @@ -306,25 +306,29 @@ func (x *ListStore) ItemsChanged(PositionVar uint, RemovedVar uint, AddedVar uin | |||
| 306 | 306 | ||
| 307 | 307 | func init() { | |
| 308 | 308 | core.SetPackageName("GIO", "gio-2.0") | |
| 309 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 310 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 311 | - | if err != nil { | |
| 312 | - | panic(err) | |
| 309 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 310 | + | var libs []uintptr | |
| 311 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 312 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 313 | + | if err != nil { | |
| 314 | + | panic(err) | |
| 315 | + | } | |
| 316 | + | libs = append(libs, lib) | |
| 313 | 317 | } | |
| 314 | 318 | ||
| 315 | - | core.PuregoSafeRegister(&xListStoreGLibType, lib, "g_list_store_get_type") | |
| 319 | + | core.PuregoSafeRegister(&xListStoreGLibType, libs, "g_list_store_get_type") | |
| 316 | 320 | ||
| 317 | - | core.PuregoSafeRegister(&xNewListStore, lib, "g_list_store_new") | |
| 321 | + | core.PuregoSafeRegister(&xNewListStore, libs, "g_list_store_new") | |
| 318 | 322 | ||
| 319 | - | core.PuregoSafeRegister(&xListStoreAppend, lib, "g_list_store_append") | |
| 320 | - | core.PuregoSafeRegister(&xListStoreFind, lib, "g_list_store_find") | |
| 321 | - | core.PuregoSafeRegister(&xListStoreFindWithEqualFunc, lib, "g_list_store_find_with_equal_func") | |
| 322 | - | core.PuregoSafeRegister(&xListStoreFindWithEqualFuncFull, lib, "g_list_store_find_with_equal_func_full") | |
| 323 | - | core.PuregoSafeRegister(&xListStoreInsert, lib, "g_list_store_insert") | |
| 324 | - | core.PuregoSafeRegister(&xListStoreInsertSorted, lib, "g_list_store_insert_sorted") | |
| 325 | - | core.PuregoSafeRegister(&xListStoreRemove, lib, "g_list_store_remove") | |
| 326 | - | core.PuregoSafeRegister(&xListStoreRemoveAll, lib, "g_list_store_remove_all") | |
| 327 | - | core.PuregoSafeRegister(&xListStoreSort, lib, "g_list_store_sort") | |
| 328 | - | core.PuregoSafeRegister(&xListStoreSplice, lib, "g_list_store_splice") | |
| 323 | + | core.PuregoSafeRegister(&xListStoreAppend, libs, "g_list_store_append") | |
| 324 | + | core.PuregoSafeRegister(&xListStoreFind, libs, "g_list_store_find") | |
| 325 | + | core.PuregoSafeRegister(&xListStoreFindWithEqualFunc, libs, "g_list_store_find_with_equal_func") | |
| 326 | + | core.PuregoSafeRegister(&xListStoreFindWithEqualFuncFull, libs, "g_list_store_find_with_equal_func_full") | |
| 327 | + | core.PuregoSafeRegister(&xListStoreInsert, libs, "g_list_store_insert") | |
| 328 | + | core.PuregoSafeRegister(&xListStoreInsertSorted, libs, "g_list_store_insert_sorted") | |
| 329 | + | core.PuregoSafeRegister(&xListStoreRemove, libs, "g_list_store_remove") | |
| 330 | + | core.PuregoSafeRegister(&xListStoreRemoveAll, libs, "g_list_store_remove_all") | |
| 331 | + | core.PuregoSafeRegister(&xListStoreSort, libs, "g_list_store_sort") | |
| 332 | + | core.PuregoSafeRegister(&xListStoreSplice, libs, "g_list_store_splice") | |
| 329 | 333 | ||
| 330 | 334 | } | |
M v4/gio/gloadableicon.go +12 -8
| @@ -208,16 +208,20 @@ var XGLoadableIconLoadFinish func(uintptr, uintptr, string, **glib.Error) uintpt | |||
| 208 | 208 | ||
| 209 | 209 | func init() { | |
| 210 | 210 | core.SetPackageName("GIO", "gio-2.0") | |
| 211 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 212 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 213 | - | if err != nil { | |
| 214 | - | panic(err) | |
| 211 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 212 | + | var libs []uintptr | |
| 213 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 214 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 215 | + | if err != nil { | |
| 216 | + | panic(err) | |
| 217 | + | } | |
| 218 | + | libs = append(libs, lib) | |
| 215 | 219 | } | |
| 216 | 220 | ||
| 217 | - | core.PuregoSafeRegister(&xLoadableIconGLibType, lib, "g_loadable_icon_get_type") | |
| 221 | + | core.PuregoSafeRegister(&xLoadableIconGLibType, libs, "g_loadable_icon_get_type") | |
| 218 | 222 | ||
| 219 | - | core.PuregoSafeRegister(&XGLoadableIconLoad, lib, "g_loadable_icon_load") | |
| 220 | - | core.PuregoSafeRegister(&XGLoadableIconLoadAsync, lib, "g_loadable_icon_load_async") | |
| 221 | - | core.PuregoSafeRegister(&XGLoadableIconLoadFinish, lib, "g_loadable_icon_load_finish") | |
| 223 | + | core.PuregoSafeRegister(&XGLoadableIconLoad, libs, "g_loadable_icon_load") | |
| 224 | + | core.PuregoSafeRegister(&XGLoadableIconLoadAsync, libs, "g_loadable_icon_load_async") | |
| 225 | + | core.PuregoSafeRegister(&XGLoadableIconLoadFinish, libs, "g_loadable_icon_load_finish") | |
| 222 | 226 | ||
| 223 | 227 | } | |
M v4/gio/gmemoryinputstream.go +14 -10
| @@ -393,19 +393,23 @@ func (x *MemoryInputStream) Truncate(OffsetVar int64, CancellableVar *Cancellabl | |||
| 393 | 393 | ||
| 394 | 394 | func init() { | |
| 395 | 395 | core.SetPackageName("GIO", "gio-2.0") | |
| 396 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 397 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 398 | - | if err != nil { | |
| 399 | - | panic(err) | |
| 396 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 397 | + | var libs []uintptr | |
| 398 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 399 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 400 | + | if err != nil { | |
| 401 | + | panic(err) | |
| 402 | + | } | |
| 403 | + | libs = append(libs, lib) | |
| 400 | 404 | } | |
| 401 | 405 | ||
| 402 | - | core.PuregoSafeRegister(&xMemoryInputStreamGLibType, lib, "g_memory_input_stream_get_type") | |
| 406 | + | core.PuregoSafeRegister(&xMemoryInputStreamGLibType, libs, "g_memory_input_stream_get_type") | |
| 403 | 407 | ||
| 404 | - | core.PuregoSafeRegister(&xNewMemoryInputStream, lib, "g_memory_input_stream_new") | |
| 405 | - | core.PuregoSafeRegister(&xNewMemoryInputStreamFromBytes, lib, "g_memory_input_stream_new_from_bytes") | |
| 406 | - | core.PuregoSafeRegister(&xNewMemoryInputStreamFromData, lib, "g_memory_input_stream_new_from_data") | |
| 408 | + | core.PuregoSafeRegister(&xNewMemoryInputStream, libs, "g_memory_input_stream_new") | |
| 409 | + | core.PuregoSafeRegister(&xNewMemoryInputStreamFromBytes, libs, "g_memory_input_stream_new_from_bytes") | |
| 410 | + | core.PuregoSafeRegister(&xNewMemoryInputStreamFromData, libs, "g_memory_input_stream_new_from_data") | |
| 407 | 411 | ||
| 408 | - | core.PuregoSafeRegister(&xMemoryInputStreamAddBytes, lib, "g_memory_input_stream_add_bytes") | |
| 409 | - | core.PuregoSafeRegister(&xMemoryInputStreamAddData, lib, "g_memory_input_stream_add_data") | |
| 412 | + | core.PuregoSafeRegister(&xMemoryInputStreamAddBytes, libs, "g_memory_input_stream_add_bytes") | |
| 413 | + | core.PuregoSafeRegister(&xMemoryInputStreamAddData, libs, "g_memory_input_stream_add_data") | |
| 410 | 414 | ||
| 411 | 415 | } | |
M v4/gio/gmemorymonitor.go +10 -6
| @@ -153,14 +153,18 @@ func MemoryMonitorDupDefault() *MemoryMonitorBase { | |||
| 153 | 153 | ||
| 154 | 154 | func init() { | |
| 155 | 155 | core.SetPackageName("GIO", "gio-2.0") | |
| 156 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 157 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 158 | - | if err != nil { | |
| 159 | - | panic(err) | |
| 156 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 157 | + | var libs []uintptr | |
| 158 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 159 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 160 | + | if err != nil { | |
| 161 | + | panic(err) | |
| 162 | + | } | |
| 163 | + | libs = append(libs, lib) | |
| 160 | 164 | } | |
| 161 | 165 | ||
| 162 | - | core.PuregoSafeRegister(&xMemoryMonitorDupDefault, lib, "g_memory_monitor_dup_default") | |
| 166 | + | core.PuregoSafeRegister(&xMemoryMonitorDupDefault, libs, "g_memory_monitor_dup_default") | |
| 163 | 167 | ||
| 164 | - | core.PuregoSafeRegister(&xMemoryMonitorGLibType, lib, "g_memory_monitor_get_type") | |
| 168 | + | core.PuregoSafeRegister(&xMemoryMonitorGLibType, libs, "g_memory_monitor_get_type") | |
| 165 | 169 | ||
| 166 | 170 | } | |
M v4/gio/gmemoryoutputstream.go +16 -12
| @@ -509,21 +509,25 @@ func (x *MemoryOutputStream) Truncate(OffsetVar int64, CancellableVar *Cancellab | |||
| 509 | 509 | ||
| 510 | 510 | func init() { | |
| 511 | 511 | core.SetPackageName("GIO", "gio-2.0") | |
| 512 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 513 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 514 | - | if err != nil { | |
| 515 | - | panic(err) | |
| 512 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 513 | + | var libs []uintptr | |
| 514 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 515 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 516 | + | if err != nil { | |
| 517 | + | panic(err) | |
| 518 | + | } | |
| 519 | + | libs = append(libs, lib) | |
| 516 | 520 | } | |
| 517 | 521 | ||
| 518 | - | core.PuregoSafeRegister(&xMemoryOutputStreamGLibType, lib, "g_memory_output_stream_get_type") | |
| 522 | + | core.PuregoSafeRegister(&xMemoryOutputStreamGLibType, libs, "g_memory_output_stream_get_type") | |
| 519 | 523 | ||
| 520 | - | core.PuregoSafeRegister(&xNewMemoryOutputStream, lib, "g_memory_output_stream_new") | |
| 521 | - | core.PuregoSafeRegister(&xNewMemoryOutputStreamResizable, lib, "g_memory_output_stream_new_resizable") | |
| 524 | + | core.PuregoSafeRegister(&xNewMemoryOutputStream, libs, "g_memory_output_stream_new") | |
| 525 | + | core.PuregoSafeRegister(&xNewMemoryOutputStreamResizable, libs, "g_memory_output_stream_new_resizable") | |
| 522 | 526 | ||
| 523 | - | core.PuregoSafeRegister(&xMemoryOutputStreamGetData, lib, "g_memory_output_stream_get_data") | |
| 524 | - | core.PuregoSafeRegister(&xMemoryOutputStreamGetDataSize, lib, "g_memory_output_stream_get_data_size") | |
| 525 | - | core.PuregoSafeRegister(&xMemoryOutputStreamGetSize, lib, "g_memory_output_stream_get_size") | |
| 526 | - | core.PuregoSafeRegister(&xMemoryOutputStreamStealAsBytes, lib, "g_memory_output_stream_steal_as_bytes") | |
| 527 | - | core.PuregoSafeRegister(&xMemoryOutputStreamStealData, lib, "g_memory_output_stream_steal_data") | |
| 527 | + | core.PuregoSafeRegister(&xMemoryOutputStreamGetData, libs, "g_memory_output_stream_get_data") | |
| 528 | + | core.PuregoSafeRegister(&xMemoryOutputStreamGetDataSize, libs, "g_memory_output_stream_get_data_size") | |
| 529 | + | core.PuregoSafeRegister(&xMemoryOutputStreamGetSize, libs, "g_memory_output_stream_get_size") | |
| 530 | + | core.PuregoSafeRegister(&xMemoryOutputStreamStealAsBytes, libs, "g_memory_output_stream_steal_as_bytes") | |
| 531 | + | core.PuregoSafeRegister(&xMemoryOutputStreamStealData, libs, "g_memory_output_stream_steal_data") | |
| 528 | 532 | ||
| 529 | 533 | } | |
M v4/gio/gmenu.go +48 -44
| @@ -691,51 +691,55 @@ func (c *MenuItem) SetGoPointer(ptr uintptr) { | |||
| 691 | 691 | ||
| 692 | 692 | func init() { | |
| 693 | 693 | core.SetPackageName("GIO", "gio-2.0") | |
| 694 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 695 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 696 | - | if err != nil { | |
| 697 | - | panic(err) | |
| 694 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 695 | + | var libs []uintptr | |
| 696 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 697 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 698 | + | if err != nil { | |
| 699 | + | panic(err) | |
| 700 | + | } | |
| 701 | + | libs = append(libs, lib) | |
| 698 | 702 | } | |
| 699 | 703 | ||
| 700 | - | core.PuregoSafeRegister(&xMenuGLibType, lib, "g_menu_get_type") | |
| 701 | - | ||
| 702 | - | core.PuregoSafeRegister(&xNewMenu, lib, "g_menu_new") | |
| 703 | - | ||
| 704 | - | core.PuregoSafeRegister(&xMenuAppend, lib, "g_menu_append") | |
| 705 | - | core.PuregoSafeRegister(&xMenuAppendItem, lib, "g_menu_append_item") | |
| 706 | - | core.PuregoSafeRegister(&xMenuAppendSection, lib, "g_menu_append_section") | |
| 707 | - | core.PuregoSafeRegister(&xMenuAppendSubmenu, lib, "g_menu_append_submenu") | |
| 708 | - | core.PuregoSafeRegister(&xMenuFreeze, lib, "g_menu_freeze") | |
| 709 | - | core.PuregoSafeRegister(&xMenuInsert, lib, "g_menu_insert") | |
| 710 | - | core.PuregoSafeRegister(&xMenuInsertItem, lib, "g_menu_insert_item") | |
| 711 | - | core.PuregoSafeRegister(&xMenuInsertSection, lib, "g_menu_insert_section") | |
| 712 | - | core.PuregoSafeRegister(&xMenuInsertSubmenu, lib, "g_menu_insert_submenu") | |
| 713 | - | core.PuregoSafeRegister(&xMenuPrepend, lib, "g_menu_prepend") | |
| 714 | - | core.PuregoSafeRegister(&xMenuPrependItem, lib, "g_menu_prepend_item") | |
| 715 | - | core.PuregoSafeRegister(&xMenuPrependSection, lib, "g_menu_prepend_section") | |
| 716 | - | core.PuregoSafeRegister(&xMenuPrependSubmenu, lib, "g_menu_prepend_submenu") | |
| 717 | - | core.PuregoSafeRegister(&xMenuRemove, lib, "g_menu_remove") | |
| 718 | - | core.PuregoSafeRegister(&xMenuRemoveAll, lib, "g_menu_remove_all") | |
| 719 | - | ||
| 720 | - | core.PuregoSafeRegister(&xMenuItemGLibType, lib, "g_menu_item_get_type") | |
| 721 | - | ||
| 722 | - | core.PuregoSafeRegister(&xNewMenuItem, lib, "g_menu_item_new") | |
| 723 | - | core.PuregoSafeRegister(&xNewMenuItemFromModel, lib, "g_menu_item_new_from_model") | |
| 724 | - | core.PuregoSafeRegister(&xNewMenuItemSection, lib, "g_menu_item_new_section") | |
| 725 | - | core.PuregoSafeRegister(&xNewMenuItemSubmenu, lib, "g_menu_item_new_submenu") | |
| 726 | - | ||
| 727 | - | core.PuregoSafeRegister(&xMenuItemGetAttribute, lib, "g_menu_item_get_attribute") | |
| 728 | - | core.PuregoSafeRegister(&xMenuItemGetAttributeValue, lib, "g_menu_item_get_attribute_value") | |
| 729 | - | core.PuregoSafeRegister(&xMenuItemGetLink, lib, "g_menu_item_get_link") | |
| 730 | - | core.PuregoSafeRegister(&xMenuItemSetActionAndTarget, lib, "g_menu_item_set_action_and_target") | |
| 731 | - | core.PuregoSafeRegister(&xMenuItemSetActionAndTargetValue, lib, "g_menu_item_set_action_and_target_value") | |
| 732 | - | core.PuregoSafeRegister(&xMenuItemSetAttribute, lib, "g_menu_item_set_attribute") | |
| 733 | - | core.PuregoSafeRegister(&xMenuItemSetAttributeValue, lib, "g_menu_item_set_attribute_value") | |
| 734 | - | core.PuregoSafeRegister(&xMenuItemSetDetailedAction, lib, "g_menu_item_set_detailed_action") | |
| 735 | - | core.PuregoSafeRegister(&xMenuItemSetIcon, lib, "g_menu_item_set_icon") | |
| 736 | - | core.PuregoSafeRegister(&xMenuItemSetLabel, lib, "g_menu_item_set_label") | |
| 737 | - | core.PuregoSafeRegister(&xMenuItemSetLink, lib, "g_menu_item_set_link") | |
| 738 | - | core.PuregoSafeRegister(&xMenuItemSetSection, lib, "g_menu_item_set_section") | |
| 739 | - | core.PuregoSafeRegister(&xMenuItemSetSubmenu, lib, "g_menu_item_set_submenu") | |
| 704 | + | core.PuregoSafeRegister(&xMenuGLibType, libs, "g_menu_get_type") | |
| 705 | + | ||
| 706 | + | core.PuregoSafeRegister(&xNewMenu, libs, "g_menu_new") | |
| 707 | + | ||
| 708 | + | core.PuregoSafeRegister(&xMenuAppend, libs, "g_menu_append") | |
| 709 | + | core.PuregoSafeRegister(&xMenuAppendItem, libs, "g_menu_append_item") | |
| 710 | + | core.PuregoSafeRegister(&xMenuAppendSection, libs, "g_menu_append_section") | |
| 711 | + | core.PuregoSafeRegister(&xMenuAppendSubmenu, libs, "g_menu_append_submenu") | |
| 712 | + | core.PuregoSafeRegister(&xMenuFreeze, libs, "g_menu_freeze") | |
| 713 | + | core.PuregoSafeRegister(&xMenuInsert, libs, "g_menu_insert") | |
| 714 | + | core.PuregoSafeRegister(&xMenuInsertItem, libs, "g_menu_insert_item") | |
| 715 | + | core.PuregoSafeRegister(&xMenuInsertSection, libs, "g_menu_insert_section") | |
| 716 | + | core.PuregoSafeRegister(&xMenuInsertSubmenu, libs, "g_menu_insert_submenu") | |
| 717 | + | core.PuregoSafeRegister(&xMenuPrepend, libs, "g_menu_prepend") | |
| 718 | + | core.PuregoSafeRegister(&xMenuPrependItem, libs, "g_menu_prepend_item") | |
| 719 | + | core.PuregoSafeRegister(&xMenuPrependSection, libs, "g_menu_prepend_section") | |
| 720 | + | core.PuregoSafeRegister(&xMenuPrependSubmenu, libs, "g_menu_prepend_submenu") | |
| 721 | + | core.PuregoSafeRegister(&xMenuRemove, libs, "g_menu_remove") | |
| 722 | + | core.PuregoSafeRegister(&xMenuRemoveAll, libs, "g_menu_remove_all") | |
| 723 | + | ||
| 724 | + | core.PuregoSafeRegister(&xMenuItemGLibType, libs, "g_menu_item_get_type") | |
| 725 | + | ||
| 726 | + | core.PuregoSafeRegister(&xNewMenuItem, libs, "g_menu_item_new") | |
| 727 | + | core.PuregoSafeRegister(&xNewMenuItemFromModel, libs, "g_menu_item_new_from_model") | |
| 728 | + | core.PuregoSafeRegister(&xNewMenuItemSection, libs, "g_menu_item_new_section") | |
| 729 | + | core.PuregoSafeRegister(&xNewMenuItemSubmenu, libs, "g_menu_item_new_submenu") | |
| 730 | + | ||
| 731 | + | core.PuregoSafeRegister(&xMenuItemGetAttribute, libs, "g_menu_item_get_attribute") | |
| 732 | + | core.PuregoSafeRegister(&xMenuItemGetAttributeValue, libs, "g_menu_item_get_attribute_value") | |
| 733 | + | core.PuregoSafeRegister(&xMenuItemGetLink, libs, "g_menu_item_get_link") | |
| 734 | + | core.PuregoSafeRegister(&xMenuItemSetActionAndTarget, libs, "g_menu_item_set_action_and_target") | |
| 735 | + | core.PuregoSafeRegister(&xMenuItemSetActionAndTargetValue, libs, "g_menu_item_set_action_and_target_value") | |
| 736 | + | core.PuregoSafeRegister(&xMenuItemSetAttribute, libs, "g_menu_item_set_attribute") | |
| 737 | + | core.PuregoSafeRegister(&xMenuItemSetAttributeValue, libs, "g_menu_item_set_attribute_value") | |
| 738 | + | core.PuregoSafeRegister(&xMenuItemSetDetailedAction, libs, "g_menu_item_set_detailed_action") | |
| 739 | + | core.PuregoSafeRegister(&xMenuItemSetIcon, libs, "g_menu_item_set_icon") | |
| 740 | + | core.PuregoSafeRegister(&xMenuItemSetLabel, libs, "g_menu_item_set_label") | |
| 741 | + | core.PuregoSafeRegister(&xMenuItemSetLink, libs, "g_menu_item_set_link") | |
| 742 | + | core.PuregoSafeRegister(&xMenuItemSetSection, libs, "g_menu_item_set_section") | |
| 743 | + | core.PuregoSafeRegister(&xMenuItemSetSubmenu, libs, "g_menu_item_set_submenu") | |
| 740 | 744 | ||
| 741 | 745 | } | |
M v4/gio/gmenumodel.go +27 -23
| @@ -906,35 +906,39 @@ func (x *MenuModel) ConnectItemsChanged(cb *func(MenuModel, int, int, int)) uint | |||
| 906 | 906 | ||
| 907 | 907 | func init() { | |
| 908 | 908 | core.SetPackageName("GIO", "gio-2.0") | |
| 909 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 910 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 911 | - | if err != nil { | |
| 912 | - | panic(err) | |
| 909 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 910 | + | var libs []uintptr | |
| 911 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 912 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 913 | + | if err != nil { | |
| 914 | + | panic(err) | |
| 915 | + | } | |
| 916 | + | libs = append(libs, lib) | |
| 913 | 917 | } | |
| 914 | 918 | ||
| 915 | - | core.PuregoSafeRegister(&xMenuAttributeIterGLibType, lib, "g_menu_attribute_iter_get_type") | |
| 919 | + | core.PuregoSafeRegister(&xMenuAttributeIterGLibType, libs, "g_menu_attribute_iter_get_type") | |
| 916 | 920 | ||
| 917 | - | core.PuregoSafeRegister(&xMenuAttributeIterGetName, lib, "g_menu_attribute_iter_get_name") | |
| 918 | - | core.PuregoSafeRegister(&xMenuAttributeIterGetNext, lib, "g_menu_attribute_iter_get_next") | |
| 919 | - | core.PuregoSafeRegister(&xMenuAttributeIterGetValue, lib, "g_menu_attribute_iter_get_value") | |
| 920 | - | core.PuregoSafeRegister(&xMenuAttributeIterNext, lib, "g_menu_attribute_iter_next") | |
| 921 | + | core.PuregoSafeRegister(&xMenuAttributeIterGetName, libs, "g_menu_attribute_iter_get_name") | |
| 922 | + | core.PuregoSafeRegister(&xMenuAttributeIterGetNext, libs, "g_menu_attribute_iter_get_next") | |
| 923 | + | core.PuregoSafeRegister(&xMenuAttributeIterGetValue, libs, "g_menu_attribute_iter_get_value") | |
| 924 | + | core.PuregoSafeRegister(&xMenuAttributeIterNext, libs, "g_menu_attribute_iter_next") | |
| 921 | 925 | ||
| 922 | - | core.PuregoSafeRegister(&xMenuLinkIterGLibType, lib, "g_menu_link_iter_get_type") | |
| 926 | + | core.PuregoSafeRegister(&xMenuLinkIterGLibType, libs, "g_menu_link_iter_get_type") | |
| 923 | 927 | ||
| 924 | - | core.PuregoSafeRegister(&xMenuLinkIterGetName, lib, "g_menu_link_iter_get_name") | |
| 925 | - | core.PuregoSafeRegister(&xMenuLinkIterGetNext, lib, "g_menu_link_iter_get_next") | |
| 926 | - | core.PuregoSafeRegister(&xMenuLinkIterGetValue, lib, "g_menu_link_iter_get_value") | |
| 927 | - | core.PuregoSafeRegister(&xMenuLinkIterNext, lib, "g_menu_link_iter_next") | |
| 928 | + | core.PuregoSafeRegister(&xMenuLinkIterGetName, libs, "g_menu_link_iter_get_name") | |
| 929 | + | core.PuregoSafeRegister(&xMenuLinkIterGetNext, libs, "g_menu_link_iter_get_next") | |
| 930 | + | core.PuregoSafeRegister(&xMenuLinkIterGetValue, libs, "g_menu_link_iter_get_value") | |
| 931 | + | core.PuregoSafeRegister(&xMenuLinkIterNext, libs, "g_menu_link_iter_next") | |
| 928 | 932 | ||
| 929 | - | core.PuregoSafeRegister(&xMenuModelGLibType, lib, "g_menu_model_get_type") | |
| 933 | + | core.PuregoSafeRegister(&xMenuModelGLibType, libs, "g_menu_model_get_type") | |
| 930 | 934 | ||
| 931 | - | core.PuregoSafeRegister(&xMenuModelGetItemAttribute, lib, "g_menu_model_get_item_attribute") | |
| 932 | - | core.PuregoSafeRegister(&xMenuModelGetItemAttributeValue, lib, "g_menu_model_get_item_attribute_value") | |
| 933 | - | core.PuregoSafeRegister(&xMenuModelGetItemLink, lib, "g_menu_model_get_item_link") | |
| 934 | - | core.PuregoSafeRegister(&xMenuModelGetNItems, lib, "g_menu_model_get_n_items") | |
| 935 | - | core.PuregoSafeRegister(&xMenuModelIsMutable, lib, "g_menu_model_is_mutable") | |
| 936 | - | core.PuregoSafeRegister(&xMenuModelItemsChanged, lib, "g_menu_model_items_changed") | |
| 937 | - | core.PuregoSafeRegister(&xMenuModelIterateItemAttributes, lib, "g_menu_model_iterate_item_attributes") | |
| 938 | - | core.PuregoSafeRegister(&xMenuModelIterateItemLinks, lib, "g_menu_model_iterate_item_links") | |
| 935 | + | core.PuregoSafeRegister(&xMenuModelGetItemAttribute, libs, "g_menu_model_get_item_attribute") | |
| 936 | + | core.PuregoSafeRegister(&xMenuModelGetItemAttributeValue, libs, "g_menu_model_get_item_attribute_value") | |
| 937 | + | core.PuregoSafeRegister(&xMenuModelGetItemLink, libs, "g_menu_model_get_item_link") | |
| 938 | + | core.PuregoSafeRegister(&xMenuModelGetNItems, libs, "g_menu_model_get_n_items") | |
| 939 | + | core.PuregoSafeRegister(&xMenuModelIsMutable, libs, "g_menu_model_is_mutable") | |
| 940 | + | core.PuregoSafeRegister(&xMenuModelItemsChanged, libs, "g_menu_model_items_changed") | |
| 941 | + | core.PuregoSafeRegister(&xMenuModelIterateItemAttributes, libs, "g_menu_model_iterate_item_attributes") | |
| 942 | + | core.PuregoSafeRegister(&xMenuModelIterateItemLinks, libs, "g_menu_model_iterate_item_links") | |
| 939 | 943 | ||
| 940 | 944 | } | |
M v4/gio/gmount.go +39 -35
| @@ -1270,40 +1270,44 @@ var XGMountUnshadow func(uintptr) | |||
| 1270 | 1270 | ||
| 1271 | 1271 | func init() { | |
| 1272 | 1272 | core.SetPackageName("GIO", "gio-2.0") | |
| 1273 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1274 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1275 | - | if err != nil { | |
| 1276 | - | panic(err) | |
| 1277 | - | } | |
| 1278 | - | ||
| 1279 | - | core.PuregoSafeRegister(&xMountGLibType, lib, "g_mount_get_type") | |
| 1280 | - | ||
| 1281 | - | core.PuregoSafeRegister(&XGMountCanEject, lib, "g_mount_can_eject") | |
| 1282 | - | core.PuregoSafeRegister(&XGMountCanUnmount, lib, "g_mount_can_unmount") | |
| 1283 | - | core.PuregoSafeRegister(&XGMountEject, lib, "g_mount_eject") | |
| 1284 | - | core.PuregoSafeRegister(&XGMountEjectFinish, lib, "g_mount_eject_finish") | |
| 1285 | - | core.PuregoSafeRegister(&XGMountEjectWithOperation, lib, "g_mount_eject_with_operation") | |
| 1286 | - | core.PuregoSafeRegister(&XGMountEjectWithOperationFinish, lib, "g_mount_eject_with_operation_finish") | |
| 1287 | - | core.PuregoSafeRegister(&XGMountGetDefaultLocation, lib, "g_mount_get_default_location") | |
| 1288 | - | core.PuregoSafeRegister(&XGMountGetDrive, lib, "g_mount_get_drive") | |
| 1289 | - | core.PuregoSafeRegister(&XGMountGetIcon, lib, "g_mount_get_icon") | |
| 1290 | - | core.PuregoSafeRegister(&XGMountGetName, lib, "g_mount_get_name") | |
| 1291 | - | core.PuregoSafeRegister(&XGMountGetRoot, lib, "g_mount_get_root") | |
| 1292 | - | core.PuregoSafeRegister(&XGMountGetSortKey, lib, "g_mount_get_sort_key") | |
| 1293 | - | core.PuregoSafeRegister(&XGMountGetSymbolicIcon, lib, "g_mount_get_symbolic_icon") | |
| 1294 | - | core.PuregoSafeRegister(&XGMountGetUuid, lib, "g_mount_get_uuid") | |
| 1295 | - | core.PuregoSafeRegister(&XGMountGetVolume, lib, "g_mount_get_volume") | |
| 1296 | - | core.PuregoSafeRegister(&XGMountGuessContentType, lib, "g_mount_guess_content_type") | |
| 1297 | - | core.PuregoSafeRegister(&XGMountGuessContentTypeFinish, lib, "g_mount_guess_content_type_finish") | |
| 1298 | - | core.PuregoSafeRegister(&XGMountGuessContentTypeSync, lib, "g_mount_guess_content_type_sync") | |
| 1299 | - | core.PuregoSafeRegister(&XGMountIsShadowed, lib, "g_mount_is_shadowed") | |
| 1300 | - | core.PuregoSafeRegister(&XGMountRemount, lib, "g_mount_remount") | |
| 1301 | - | core.PuregoSafeRegister(&XGMountRemountFinish, lib, "g_mount_remount_finish") | |
| 1302 | - | core.PuregoSafeRegister(&XGMountShadow, lib, "g_mount_shadow") | |
| 1303 | - | core.PuregoSafeRegister(&XGMountUnmount, lib, "g_mount_unmount") | |
| 1304 | - | core.PuregoSafeRegister(&XGMountUnmountFinish, lib, "g_mount_unmount_finish") | |
| 1305 | - | core.PuregoSafeRegister(&XGMountUnmountWithOperation, lib, "g_mount_unmount_with_operation") | |
| 1306 | - | core.PuregoSafeRegister(&XGMountUnmountWithOperationFinish, lib, "g_mount_unmount_with_operation_finish") | |
| 1307 | - | core.PuregoSafeRegister(&XGMountUnshadow, lib, "g_mount_unshadow") | |
| 1273 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1274 | + | var libs []uintptr | |
| 1275 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1276 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1277 | + | if err != nil { | |
| 1278 | + | panic(err) | |
| 1279 | + | } | |
| 1280 | + | libs = append(libs, lib) | |
| 1281 | + | } | |
| 1282 | + | ||
| 1283 | + | core.PuregoSafeRegister(&xMountGLibType, libs, "g_mount_get_type") | |
| 1284 | + | ||
| 1285 | + | core.PuregoSafeRegister(&XGMountCanEject, libs, "g_mount_can_eject") | |
| 1286 | + | core.PuregoSafeRegister(&XGMountCanUnmount, libs, "g_mount_can_unmount") | |
| 1287 | + | core.PuregoSafeRegister(&XGMountEject, libs, "g_mount_eject") | |
| 1288 | + | core.PuregoSafeRegister(&XGMountEjectFinish, libs, "g_mount_eject_finish") | |
| 1289 | + | core.PuregoSafeRegister(&XGMountEjectWithOperation, libs, "g_mount_eject_with_operation") | |
| 1290 | + | core.PuregoSafeRegister(&XGMountEjectWithOperationFinish, libs, "g_mount_eject_with_operation_finish") | |
| 1291 | + | core.PuregoSafeRegister(&XGMountGetDefaultLocation, libs, "g_mount_get_default_location") | |
| 1292 | + | core.PuregoSafeRegister(&XGMountGetDrive, libs, "g_mount_get_drive") | |
| 1293 | + | core.PuregoSafeRegister(&XGMountGetIcon, libs, "g_mount_get_icon") | |
| 1294 | + | core.PuregoSafeRegister(&XGMountGetName, libs, "g_mount_get_name") | |
| 1295 | + | core.PuregoSafeRegister(&XGMountGetRoot, libs, "g_mount_get_root") | |
| 1296 | + | core.PuregoSafeRegister(&XGMountGetSortKey, libs, "g_mount_get_sort_key") | |
| 1297 | + | core.PuregoSafeRegister(&XGMountGetSymbolicIcon, libs, "g_mount_get_symbolic_icon") | |
| 1298 | + | core.PuregoSafeRegister(&XGMountGetUuid, libs, "g_mount_get_uuid") | |
| 1299 | + | core.PuregoSafeRegister(&XGMountGetVolume, libs, "g_mount_get_volume") | |
| 1300 | + | core.PuregoSafeRegister(&XGMountGuessContentType, libs, "g_mount_guess_content_type") | |
| 1301 | + | core.PuregoSafeRegister(&XGMountGuessContentTypeFinish, libs, "g_mount_guess_content_type_finish") | |
| 1302 | + | core.PuregoSafeRegister(&XGMountGuessContentTypeSync, libs, "g_mount_guess_content_type_sync") | |
| 1303 | + | core.PuregoSafeRegister(&XGMountIsShadowed, libs, "g_mount_is_shadowed") | |
| 1304 | + | core.PuregoSafeRegister(&XGMountRemount, libs, "g_mount_remount") | |
| 1305 | + | core.PuregoSafeRegister(&XGMountRemountFinish, libs, "g_mount_remount_finish") | |
| 1306 | + | core.PuregoSafeRegister(&XGMountShadow, libs, "g_mount_shadow") | |
| 1307 | + | core.PuregoSafeRegister(&XGMountUnmount, libs, "g_mount_unmount") | |
| 1308 | + | core.PuregoSafeRegister(&XGMountUnmountFinish, libs, "g_mount_unmount_finish") | |
| 1309 | + | core.PuregoSafeRegister(&XGMountUnmountWithOperation, libs, "g_mount_unmount_with_operation") | |
| 1310 | + | core.PuregoSafeRegister(&XGMountUnmountWithOperationFinish, libs, "g_mount_unmount_with_operation_finish") | |
| 1311 | + | core.PuregoSafeRegister(&XGMountUnshadow, libs, "g_mount_unshadow") | |
| 1308 | 1312 | ||
| 1309 | 1313 | } | |
M v4/gio/gmountoperation.go +33 -29
| @@ -805,34 +805,38 @@ func (x *MountOperation) ConnectShowUnmountProgress(cb *func(MountOperation, str | |||
| 805 | 805 | ||
| 806 | 806 | func init() { | |
| 807 | 807 | core.SetPackageName("GIO", "gio-2.0") | |
| 808 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 809 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 810 | - | if err != nil { | |
| 811 | - | panic(err) | |
| 812 | - | } | |
| 813 | - | ||
| 814 | - | core.PuregoSafeRegister(&xMountOperationGLibType, lib, "g_mount_operation_get_type") | |
| 815 | - | ||
| 816 | - | core.PuregoSafeRegister(&xNewMountOperation, lib, "g_mount_operation_new") | |
| 817 | - | ||
| 818 | - | core.PuregoSafeRegister(&xMountOperationGetAnonymous, lib, "g_mount_operation_get_anonymous") | |
| 819 | - | core.PuregoSafeRegister(&xMountOperationGetChoice, lib, "g_mount_operation_get_choice") | |
| 820 | - | core.PuregoSafeRegister(&xMountOperationGetDomain, lib, "g_mount_operation_get_domain") | |
| 821 | - | core.PuregoSafeRegister(&xMountOperationGetIsTcryptHiddenVolume, lib, "g_mount_operation_get_is_tcrypt_hidden_volume") | |
| 822 | - | core.PuregoSafeRegister(&xMountOperationGetIsTcryptSystemVolume, lib, "g_mount_operation_get_is_tcrypt_system_volume") | |
| 823 | - | core.PuregoSafeRegister(&xMountOperationGetPassword, lib, "g_mount_operation_get_password") | |
| 824 | - | core.PuregoSafeRegister(&xMountOperationGetPasswordSave, lib, "g_mount_operation_get_password_save") | |
| 825 | - | core.PuregoSafeRegister(&xMountOperationGetPim, lib, "g_mount_operation_get_pim") | |
| 826 | - | core.PuregoSafeRegister(&xMountOperationGetUsername, lib, "g_mount_operation_get_username") | |
| 827 | - | core.PuregoSafeRegister(&xMountOperationReply, lib, "g_mount_operation_reply") | |
| 828 | - | core.PuregoSafeRegister(&xMountOperationSetAnonymous, lib, "g_mount_operation_set_anonymous") | |
| 829 | - | core.PuregoSafeRegister(&xMountOperationSetChoice, lib, "g_mount_operation_set_choice") | |
| 830 | - | core.PuregoSafeRegister(&xMountOperationSetDomain, lib, "g_mount_operation_set_domain") | |
| 831 | - | core.PuregoSafeRegister(&xMountOperationSetIsTcryptHiddenVolume, lib, "g_mount_operation_set_is_tcrypt_hidden_volume") | |
| 832 | - | core.PuregoSafeRegister(&xMountOperationSetIsTcryptSystemVolume, lib, "g_mount_operation_set_is_tcrypt_system_volume") | |
| 833 | - | core.PuregoSafeRegister(&xMountOperationSetPassword, lib, "g_mount_operation_set_password") | |
| 834 | - | core.PuregoSafeRegister(&xMountOperationSetPasswordSave, lib, "g_mount_operation_set_password_save") | |
| 835 | - | core.PuregoSafeRegister(&xMountOperationSetPim, lib, "g_mount_operation_set_pim") | |
| 836 | - | core.PuregoSafeRegister(&xMountOperationSetUsername, lib, "g_mount_operation_set_username") | |
| 808 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 809 | + | var libs []uintptr | |
| 810 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 811 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 812 | + | if err != nil { | |
| 813 | + | panic(err) | |
| 814 | + | } | |
| 815 | + | libs = append(libs, lib) | |
| 816 | + | } | |
| 817 | + | ||
| 818 | + | core.PuregoSafeRegister(&xMountOperationGLibType, libs, "g_mount_operation_get_type") | |
| 819 | + | ||
| 820 | + | core.PuregoSafeRegister(&xNewMountOperation, libs, "g_mount_operation_new") | |
| 821 | + | ||
| 822 | + | core.PuregoSafeRegister(&xMountOperationGetAnonymous, libs, "g_mount_operation_get_anonymous") | |
| 823 | + | core.PuregoSafeRegister(&xMountOperationGetChoice, libs, "g_mount_operation_get_choice") | |
| 824 | + | core.PuregoSafeRegister(&xMountOperationGetDomain, libs, "g_mount_operation_get_domain") | |
| 825 | + | core.PuregoSafeRegister(&xMountOperationGetIsTcryptHiddenVolume, libs, "g_mount_operation_get_is_tcrypt_hidden_volume") | |
| 826 | + | core.PuregoSafeRegister(&xMountOperationGetIsTcryptSystemVolume, libs, "g_mount_operation_get_is_tcrypt_system_volume") | |
| 827 | + | core.PuregoSafeRegister(&xMountOperationGetPassword, libs, "g_mount_operation_get_password") | |
| 828 | + | core.PuregoSafeRegister(&xMountOperationGetPasswordSave, libs, "g_mount_operation_get_password_save") | |
| 829 | + | core.PuregoSafeRegister(&xMountOperationGetPim, libs, "g_mount_operation_get_pim") | |
| 830 | + | core.PuregoSafeRegister(&xMountOperationGetUsername, libs, "g_mount_operation_get_username") | |
| 831 | + | core.PuregoSafeRegister(&xMountOperationReply, libs, "g_mount_operation_reply") | |
| 832 | + | core.PuregoSafeRegister(&xMountOperationSetAnonymous, libs, "g_mount_operation_set_anonymous") | |
| 833 | + | core.PuregoSafeRegister(&xMountOperationSetChoice, libs, "g_mount_operation_set_choice") | |
| 834 | + | core.PuregoSafeRegister(&xMountOperationSetDomain, libs, "g_mount_operation_set_domain") | |
| 835 | + | core.PuregoSafeRegister(&xMountOperationSetIsTcryptHiddenVolume, libs, "g_mount_operation_set_is_tcrypt_hidden_volume") | |
| 836 | + | core.PuregoSafeRegister(&xMountOperationSetIsTcryptSystemVolume, libs, "g_mount_operation_set_is_tcrypt_system_volume") | |
| 837 | + | core.PuregoSafeRegister(&xMountOperationSetPassword, libs, "g_mount_operation_set_password") | |
| 838 | + | core.PuregoSafeRegister(&xMountOperationSetPasswordSave, libs, "g_mount_operation_set_password_save") | |
| 839 | + | core.PuregoSafeRegister(&xMountOperationSetPim, libs, "g_mount_operation_set_pim") | |
| 840 | + | core.PuregoSafeRegister(&xMountOperationSetUsername, libs, "g_mount_operation_set_username") | |
| 837 | 841 | ||
| 838 | 842 | } | |
M v4/gio/gnativesocketaddress.go +10 -6
| @@ -124,14 +124,18 @@ func (x *NativeSocketAddress) ToString() string { | |||
| 124 | 124 | ||
| 125 | 125 | func init() { | |
| 126 | 126 | core.SetPackageName("GIO", "gio-2.0") | |
| 127 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 128 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 129 | - | if err != nil { | |
| 130 | - | panic(err) | |
| 127 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 128 | + | var libs []uintptr | |
| 129 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 130 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 131 | + | if err != nil { | |
| 132 | + | panic(err) | |
| 133 | + | } | |
| 134 | + | libs = append(libs, lib) | |
| 131 | 135 | } | |
| 132 | 136 | ||
| 133 | - | core.PuregoSafeRegister(&xNativeSocketAddressGLibType, lib, "g_native_socket_address_get_type") | |
| 137 | + | core.PuregoSafeRegister(&xNativeSocketAddressGLibType, libs, "g_native_socket_address_get_type") | |
| 134 | 138 | ||
| 135 | - | core.PuregoSafeRegister(&xNewNativeSocketAddress, lib, "g_native_socket_address_new") | |
| 139 | + | core.PuregoSafeRegister(&xNewNativeSocketAddress, libs, "g_native_socket_address_new") | |
| 136 | 140 | ||
| 137 | 141 | } | |
M v4/gio/gnetworkaddress.go +16 -12
| @@ -261,22 +261,26 @@ func NetworkAddressParseUri(UriVar string, DefaultPortVar uint16) (*NetworkAddre | |||
| 261 | 261 | ||
| 262 | 262 | func init() { | |
| 263 | 263 | core.SetPackageName("GIO", "gio-2.0") | |
| 264 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 265 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 266 | - | if err != nil { | |
| 267 | - | panic(err) | |
| 264 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 265 | + | var libs []uintptr | |
| 266 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 267 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 268 | + | if err != nil { | |
| 269 | + | panic(err) | |
| 270 | + | } | |
| 271 | + | libs = append(libs, lib) | |
| 268 | 272 | } | |
| 269 | 273 | ||
| 270 | - | core.PuregoSafeRegister(&xNetworkAddressGLibType, lib, "g_network_address_get_type") | |
| 274 | + | core.PuregoSafeRegister(&xNetworkAddressGLibType, libs, "g_network_address_get_type") | |
| 271 | 275 | ||
| 272 | - | core.PuregoSafeRegister(&xNewNetworkAddress, lib, "g_network_address_new") | |
| 273 | - | core.PuregoSafeRegister(&xNewNetworkAddressLoopback, lib, "g_network_address_new_loopback") | |
| 276 | + | core.PuregoSafeRegister(&xNewNetworkAddress, libs, "g_network_address_new") | |
| 277 | + | core.PuregoSafeRegister(&xNewNetworkAddressLoopback, libs, "g_network_address_new_loopback") | |
| 274 | 278 | ||
| 275 | - | core.PuregoSafeRegister(&xNetworkAddressGetHostname, lib, "g_network_address_get_hostname") | |
| 276 | - | core.PuregoSafeRegister(&xNetworkAddressGetPort, lib, "g_network_address_get_port") | |
| 277 | - | core.PuregoSafeRegister(&xNetworkAddressGetScheme, lib, "g_network_address_get_scheme") | |
| 279 | + | core.PuregoSafeRegister(&xNetworkAddressGetHostname, libs, "g_network_address_get_hostname") | |
| 280 | + | core.PuregoSafeRegister(&xNetworkAddressGetPort, libs, "g_network_address_get_port") | |
| 281 | + | core.PuregoSafeRegister(&xNetworkAddressGetScheme, libs, "g_network_address_get_scheme") | |
| 278 | 282 | ||
| 279 | - | core.PuregoSafeRegister(&xNetworkAddressParse, lib, "g_network_address_parse") | |
| 280 | - | core.PuregoSafeRegister(&xNetworkAddressParseUri, lib, "g_network_address_parse_uri") | |
| 283 | + | core.PuregoSafeRegister(&xNetworkAddressParse, libs, "g_network_address_parse") | |
| 284 | + | core.PuregoSafeRegister(&xNetworkAddressParseUri, libs, "g_network_address_parse_uri") | |
| 281 | 285 | ||
| 282 | 286 | } | |
M v4/gio/gnetworking.go +9 -5
| @@ -20,12 +20,16 @@ func NetworkingInit() { | |||
| 20 | 20 | ||
| 21 | 21 | func init() { | |
| 22 | 22 | core.SetPackageName("GIO", "gio-2.0") | |
| 23 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 24 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 25 | - | if err != nil { | |
| 26 | - | panic(err) | |
| 23 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 24 | + | var libs []uintptr | |
| 25 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 26 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 27 | + | if err != nil { | |
| 28 | + | panic(err) | |
| 29 | + | } | |
| 30 | + | libs = append(libs, lib) | |
| 27 | 31 | } | |
| 28 | 32 | ||
| 29 | - | core.PuregoSafeRegister(&xNetworkingInit, lib, "g_networking_init") | |
| 33 | + | core.PuregoSafeRegister(&xNetworkingInit, libs, "g_networking_init") | |
| 30 | 34 | ||
| 31 | 35 | } | |
M v4/gio/gnetworkmonitor.go +16 -12
| @@ -312,21 +312,25 @@ func NetworkMonitorGetDefault() *NetworkMonitorBase { | |||
| 312 | 312 | ||
| 313 | 313 | func init() { | |
| 314 | 314 | core.SetPackageName("GIO", "gio-2.0") | |
| 315 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 316 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 317 | - | if err != nil { | |
| 318 | - | panic(err) | |
| 315 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 316 | + | var libs []uintptr | |
| 317 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 318 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 319 | + | if err != nil { | |
| 320 | + | panic(err) | |
| 321 | + | } | |
| 322 | + | libs = append(libs, lib) | |
| 319 | 323 | } | |
| 320 | 324 | ||
| 321 | - | core.PuregoSafeRegister(&xNetworkMonitorGetDefault, lib, "g_network_monitor_get_default") | |
| 325 | + | core.PuregoSafeRegister(&xNetworkMonitorGetDefault, libs, "g_network_monitor_get_default") | |
| 322 | 326 | ||
| 323 | - | core.PuregoSafeRegister(&xNetworkMonitorGLibType, lib, "g_network_monitor_get_type") | |
| 327 | + | core.PuregoSafeRegister(&xNetworkMonitorGLibType, libs, "g_network_monitor_get_type") | |
| 324 | 328 | ||
| 325 | - | core.PuregoSafeRegister(&XGNetworkMonitorCanReach, lib, "g_network_monitor_can_reach") | |
| 326 | - | core.PuregoSafeRegister(&XGNetworkMonitorCanReachAsync, lib, "g_network_monitor_can_reach_async") | |
| 327 | - | core.PuregoSafeRegister(&XGNetworkMonitorCanReachFinish, lib, "g_network_monitor_can_reach_finish") | |
| 328 | - | core.PuregoSafeRegister(&XGNetworkMonitorGetConnectivity, lib, "g_network_monitor_get_connectivity") | |
| 329 | - | core.PuregoSafeRegister(&XGNetworkMonitorGetNetworkAvailable, lib, "g_network_monitor_get_network_available") | |
| 330 | - | core.PuregoSafeRegister(&XGNetworkMonitorGetNetworkMetered, lib, "g_network_monitor_get_network_metered") | |
| 329 | + | core.PuregoSafeRegister(&XGNetworkMonitorCanReach, libs, "g_network_monitor_can_reach") | |
| 330 | + | core.PuregoSafeRegister(&XGNetworkMonitorCanReachAsync, libs, "g_network_monitor_can_reach_async") | |
| 331 | + | core.PuregoSafeRegister(&XGNetworkMonitorCanReachFinish, libs, "g_network_monitor_can_reach_finish") | |
| 332 | + | core.PuregoSafeRegister(&XGNetworkMonitorGetConnectivity, libs, "g_network_monitor_get_connectivity") | |
| 333 | + | core.PuregoSafeRegister(&XGNetworkMonitorGetNetworkAvailable, libs, "g_network_monitor_get_network_available") | |
| 334 | + | core.PuregoSafeRegister(&XGNetworkMonitorGetNetworkMetered, libs, "g_network_monitor_get_network_metered") | |
| 331 | 335 | ||
| 332 | 336 | } | |
M v4/gio/gnetworkservice.go +15 -11
| @@ -180,20 +180,24 @@ func (x *NetworkService) ToString() string { | |||
| 180 | 180 | ||
| 181 | 181 | func init() { | |
| 182 | 182 | core.SetPackageName("GIO", "gio-2.0") | |
| 183 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 184 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 185 | - | if err != nil { | |
| 186 | - | panic(err) | |
| 183 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 184 | + | var libs []uintptr | |
| 185 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 186 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 187 | + | if err != nil { | |
| 188 | + | panic(err) | |
| 189 | + | } | |
| 190 | + | libs = append(libs, lib) | |
| 187 | 191 | } | |
| 188 | 192 | ||
| 189 | - | core.PuregoSafeRegister(&xNetworkServiceGLibType, lib, "g_network_service_get_type") | |
| 193 | + | core.PuregoSafeRegister(&xNetworkServiceGLibType, libs, "g_network_service_get_type") | |
| 190 | 194 | ||
| 191 | - | core.PuregoSafeRegister(&xNewNetworkService, lib, "g_network_service_new") | |
| 195 | + | core.PuregoSafeRegister(&xNewNetworkService, libs, "g_network_service_new") | |
| 192 | 196 | ||
| 193 | - | core.PuregoSafeRegister(&xNetworkServiceGetDomain, lib, "g_network_service_get_domain") | |
| 194 | - | core.PuregoSafeRegister(&xNetworkServiceGetProtocol, lib, "g_network_service_get_protocol") | |
| 195 | - | core.PuregoSafeRegister(&xNetworkServiceGetScheme, lib, "g_network_service_get_scheme") | |
| 196 | - | core.PuregoSafeRegister(&xNetworkServiceGetService, lib, "g_network_service_get_service") | |
| 197 | - | core.PuregoSafeRegister(&xNetworkServiceSetScheme, lib, "g_network_service_set_scheme") | |
| 197 | + | core.PuregoSafeRegister(&xNetworkServiceGetDomain, libs, "g_network_service_get_domain") | |
| 198 | + | core.PuregoSafeRegister(&xNetworkServiceGetProtocol, libs, "g_network_service_get_protocol") | |
| 199 | + | core.PuregoSafeRegister(&xNetworkServiceGetScheme, libs, "g_network_service_get_scheme") | |
| 200 | + | core.PuregoSafeRegister(&xNetworkServiceGetService, libs, "g_network_service_get_service") | |
| 201 | + | core.PuregoSafeRegister(&xNetworkServiceSetScheme, libs, "g_network_service_set_scheme") | |
| 198 | 202 | ||
| 199 | 203 | } | |
M v4/gio/gnotification.go +24 -20
| @@ -263,27 +263,31 @@ func (c *Notification) SetGoPointer(ptr uintptr) { | |||
| 263 | 263 | ||
| 264 | 264 | func init() { | |
| 265 | 265 | core.SetPackageName("GIO", "gio-2.0") | |
| 266 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 267 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 268 | - | if err != nil { | |
| 269 | - | panic(err) | |
| 266 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 267 | + | var libs []uintptr | |
| 268 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 269 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 270 | + | if err != nil { | |
| 271 | + | panic(err) | |
| 272 | + | } | |
| 273 | + | libs = append(libs, lib) | |
| 270 | 274 | } | |
| 271 | 275 | ||
| 272 | - | core.PuregoSafeRegister(&xNotificationGLibType, lib, "g_notification_get_type") | |
| 273 | - | ||
| 274 | - | core.PuregoSafeRegister(&xNewNotification, lib, "g_notification_new") | |
| 275 | - | ||
| 276 | - | core.PuregoSafeRegister(&xNotificationAddButton, lib, "g_notification_add_button") | |
| 277 | - | core.PuregoSafeRegister(&xNotificationAddButtonWithTarget, lib, "g_notification_add_button_with_target") | |
| 278 | - | core.PuregoSafeRegister(&xNotificationAddButtonWithTargetValue, lib, "g_notification_add_button_with_target_value") | |
| 279 | - | core.PuregoSafeRegister(&xNotificationSetBody, lib, "g_notification_set_body") | |
| 280 | - | core.PuregoSafeRegister(&xNotificationSetCategory, lib, "g_notification_set_category") | |
| 281 | - | core.PuregoSafeRegister(&xNotificationSetDefaultAction, lib, "g_notification_set_default_action") | |
| 282 | - | core.PuregoSafeRegister(&xNotificationSetDefaultActionAndTarget, lib, "g_notification_set_default_action_and_target") | |
| 283 | - | core.PuregoSafeRegister(&xNotificationSetDefaultActionAndTargetValue, lib, "g_notification_set_default_action_and_target_value") | |
| 284 | - | core.PuregoSafeRegister(&xNotificationSetIcon, lib, "g_notification_set_icon") | |
| 285 | - | core.PuregoSafeRegister(&xNotificationSetPriority, lib, "g_notification_set_priority") | |
| 286 | - | core.PuregoSafeRegister(&xNotificationSetTitle, lib, "g_notification_set_title") | |
| 287 | - | core.PuregoSafeRegister(&xNotificationSetUrgent, lib, "g_notification_set_urgent") | |
| 276 | + | core.PuregoSafeRegister(&xNotificationGLibType, libs, "g_notification_get_type") | |
| 277 | + | ||
| 278 | + | core.PuregoSafeRegister(&xNewNotification, libs, "g_notification_new") | |
| 279 | + | ||
| 280 | + | core.PuregoSafeRegister(&xNotificationAddButton, libs, "g_notification_add_button") | |
| 281 | + | core.PuregoSafeRegister(&xNotificationAddButtonWithTarget, libs, "g_notification_add_button_with_target") | |
| 282 | + | core.PuregoSafeRegister(&xNotificationAddButtonWithTargetValue, libs, "g_notification_add_button_with_target_value") | |
| 283 | + | core.PuregoSafeRegister(&xNotificationSetBody, libs, "g_notification_set_body") | |
| 284 | + | core.PuregoSafeRegister(&xNotificationSetCategory, libs, "g_notification_set_category") | |
| 285 | + | core.PuregoSafeRegister(&xNotificationSetDefaultAction, libs, "g_notification_set_default_action") | |
| 286 | + | core.PuregoSafeRegister(&xNotificationSetDefaultActionAndTarget, libs, "g_notification_set_default_action_and_target") | |
| 287 | + | core.PuregoSafeRegister(&xNotificationSetDefaultActionAndTargetValue, libs, "g_notification_set_default_action_and_target_value") | |
| 288 | + | core.PuregoSafeRegister(&xNotificationSetIcon, libs, "g_notification_set_icon") | |
| 289 | + | core.PuregoSafeRegister(&xNotificationSetPriority, libs, "g_notification_set_priority") | |
| 290 | + | core.PuregoSafeRegister(&xNotificationSetTitle, libs, "g_notification_set_title") | |
| 291 | + | core.PuregoSafeRegister(&xNotificationSetUrgent, libs, "g_notification_set_urgent") | |
| 288 | 292 | ||
| 289 | 293 | } | |
M v4/gio/goutputstream.go +43 -39
| @@ -1236,44 +1236,48 @@ func (c *OutputStream) SetGoPointer(ptr uintptr) { | |||
| 1236 | 1236 | ||
| 1237 | 1237 | func init() { | |
| 1238 | 1238 | core.SetPackageName("GIO", "gio-2.0") | |
| 1239 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1240 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1241 | - | if err != nil { | |
| 1242 | - | panic(err) | |
| 1243 | - | } | |
| 1244 | - | ||
| 1245 | - | core.PuregoSafeRegister(&xOutputStreamGLibType, lib, "g_output_stream_get_type") | |
| 1246 | - | ||
| 1247 | - | core.PuregoSafeRegister(&xOutputStreamClearPending, lib, "g_output_stream_clear_pending") | |
| 1248 | - | core.PuregoSafeRegister(&xOutputStreamClose, lib, "g_output_stream_close") | |
| 1249 | - | core.PuregoSafeRegister(&xOutputStreamCloseAsync, lib, "g_output_stream_close_async") | |
| 1250 | - | core.PuregoSafeRegister(&xOutputStreamCloseFinish, lib, "g_output_stream_close_finish") | |
| 1251 | - | core.PuregoSafeRegister(&xOutputStreamFlush, lib, "g_output_stream_flush") | |
| 1252 | - | core.PuregoSafeRegister(&xOutputStreamFlushAsync, lib, "g_output_stream_flush_async") | |
| 1253 | - | core.PuregoSafeRegister(&xOutputStreamFlushFinish, lib, "g_output_stream_flush_finish") | |
| 1254 | - | core.PuregoSafeRegister(&xOutputStreamHasPending, lib, "g_output_stream_has_pending") | |
| 1255 | - | core.PuregoSafeRegister(&xOutputStreamIsClosed, lib, "g_output_stream_is_closed") | |
| 1256 | - | core.PuregoSafeRegister(&xOutputStreamIsClosing, lib, "g_output_stream_is_closing") | |
| 1257 | - | core.PuregoSafeRegister(&xOutputStreamPrintf, lib, "g_output_stream_printf") | |
| 1258 | - | core.PuregoSafeRegister(&xOutputStreamSetPending, lib, "g_output_stream_set_pending") | |
| 1259 | - | core.PuregoSafeRegister(&xOutputStreamSplice, lib, "g_output_stream_splice") | |
| 1260 | - | core.PuregoSafeRegister(&xOutputStreamSpliceAsync, lib, "g_output_stream_splice_async") | |
| 1261 | - | core.PuregoSafeRegister(&xOutputStreamSpliceFinish, lib, "g_output_stream_splice_finish") | |
| 1262 | - | core.PuregoSafeRegister(&xOutputStreamVprintf, lib, "g_output_stream_vprintf") | |
| 1263 | - | core.PuregoSafeRegister(&xOutputStreamWrite, lib, "g_output_stream_write") | |
| 1264 | - | core.PuregoSafeRegister(&xOutputStreamWriteAll, lib, "g_output_stream_write_all") | |
| 1265 | - | core.PuregoSafeRegister(&xOutputStreamWriteAllAsync, lib, "g_output_stream_write_all_async") | |
| 1266 | - | core.PuregoSafeRegister(&xOutputStreamWriteAllFinish, lib, "g_output_stream_write_all_finish") | |
| 1267 | - | core.PuregoSafeRegister(&xOutputStreamWriteAsync, lib, "g_output_stream_write_async") | |
| 1268 | - | core.PuregoSafeRegister(&xOutputStreamWriteBytes, lib, "g_output_stream_write_bytes") | |
| 1269 | - | core.PuregoSafeRegister(&xOutputStreamWriteBytesAsync, lib, "g_output_stream_write_bytes_async") | |
| 1270 | - | core.PuregoSafeRegister(&xOutputStreamWriteBytesFinish, lib, "g_output_stream_write_bytes_finish") | |
| 1271 | - | core.PuregoSafeRegister(&xOutputStreamWriteFinish, lib, "g_output_stream_write_finish") | |
| 1272 | - | core.PuregoSafeRegister(&xOutputStreamWritev, lib, "g_output_stream_writev") | |
| 1273 | - | core.PuregoSafeRegister(&xOutputStreamWritevAll, lib, "g_output_stream_writev_all") | |
| 1274 | - | core.PuregoSafeRegister(&xOutputStreamWritevAllAsync, lib, "g_output_stream_writev_all_async") | |
| 1275 | - | core.PuregoSafeRegister(&xOutputStreamWritevAllFinish, lib, "g_output_stream_writev_all_finish") | |
| 1276 | - | core.PuregoSafeRegister(&xOutputStreamWritevAsync, lib, "g_output_stream_writev_async") | |
| 1277 | - | core.PuregoSafeRegister(&xOutputStreamWritevFinish, lib, "g_output_stream_writev_finish") | |
| 1239 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1240 | + | var libs []uintptr | |
| 1241 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1242 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1243 | + | if err != nil { | |
| 1244 | + | panic(err) | |
| 1245 | + | } | |
| 1246 | + | libs = append(libs, lib) | |
| 1247 | + | } | |
| 1248 | + | ||
| 1249 | + | core.PuregoSafeRegister(&xOutputStreamGLibType, libs, "g_output_stream_get_type") | |
| 1250 | + | ||
| 1251 | + | core.PuregoSafeRegister(&xOutputStreamClearPending, libs, "g_output_stream_clear_pending") | |
| 1252 | + | core.PuregoSafeRegister(&xOutputStreamClose, libs, "g_output_stream_close") | |
| 1253 | + | core.PuregoSafeRegister(&xOutputStreamCloseAsync, libs, "g_output_stream_close_async") | |
| 1254 | + | core.PuregoSafeRegister(&xOutputStreamCloseFinish, libs, "g_output_stream_close_finish") | |
| 1255 | + | core.PuregoSafeRegister(&xOutputStreamFlush, libs, "g_output_stream_flush") | |
| 1256 | + | core.PuregoSafeRegister(&xOutputStreamFlushAsync, libs, "g_output_stream_flush_async") | |
| 1257 | + | core.PuregoSafeRegister(&xOutputStreamFlushFinish, libs, "g_output_stream_flush_finish") | |
| 1258 | + | core.PuregoSafeRegister(&xOutputStreamHasPending, libs, "g_output_stream_has_pending") | |
| 1259 | + | core.PuregoSafeRegister(&xOutputStreamIsClosed, libs, "g_output_stream_is_closed") | |
| 1260 | + | core.PuregoSafeRegister(&xOutputStreamIsClosing, libs, "g_output_stream_is_closing") | |
| 1261 | + | core.PuregoSafeRegister(&xOutputStreamPrintf, libs, "g_output_stream_printf") | |
| 1262 | + | core.PuregoSafeRegister(&xOutputStreamSetPending, libs, "g_output_stream_set_pending") | |
| 1263 | + | core.PuregoSafeRegister(&xOutputStreamSplice, libs, "g_output_stream_splice") | |
| 1264 | + | core.PuregoSafeRegister(&xOutputStreamSpliceAsync, libs, "g_output_stream_splice_async") | |
| 1265 | + | core.PuregoSafeRegister(&xOutputStreamSpliceFinish, libs, "g_output_stream_splice_finish") | |
| 1266 | + | core.PuregoSafeRegister(&xOutputStreamVprintf, libs, "g_output_stream_vprintf") | |
| 1267 | + | core.PuregoSafeRegister(&xOutputStreamWrite, libs, "g_output_stream_write") | |
| 1268 | + | core.PuregoSafeRegister(&xOutputStreamWriteAll, libs, "g_output_stream_write_all") | |
| 1269 | + | core.PuregoSafeRegister(&xOutputStreamWriteAllAsync, libs, "g_output_stream_write_all_async") | |
| 1270 | + | core.PuregoSafeRegister(&xOutputStreamWriteAllFinish, libs, "g_output_stream_write_all_finish") | |
| 1271 | + | core.PuregoSafeRegister(&xOutputStreamWriteAsync, libs, "g_output_stream_write_async") | |
| 1272 | + | core.PuregoSafeRegister(&xOutputStreamWriteBytes, libs, "g_output_stream_write_bytes") | |
| 1273 | + | core.PuregoSafeRegister(&xOutputStreamWriteBytesAsync, libs, "g_output_stream_write_bytes_async") | |
| 1274 | + | core.PuregoSafeRegister(&xOutputStreamWriteBytesFinish, libs, "g_output_stream_write_bytes_finish") | |
| 1275 | + | core.PuregoSafeRegister(&xOutputStreamWriteFinish, libs, "g_output_stream_write_finish") | |
| 1276 | + | core.PuregoSafeRegister(&xOutputStreamWritev, libs, "g_output_stream_writev") | |
| 1277 | + | core.PuregoSafeRegister(&xOutputStreamWritevAll, libs, "g_output_stream_writev_all") | |
| 1278 | + | core.PuregoSafeRegister(&xOutputStreamWritevAllAsync, libs, "g_output_stream_writev_all_async") | |
| 1279 | + | core.PuregoSafeRegister(&xOutputStreamWritevAllFinish, libs, "g_output_stream_writev_all_finish") | |
| 1280 | + | core.PuregoSafeRegister(&xOutputStreamWritevAsync, libs, "g_output_stream_writev_async") | |
| 1281 | + | core.PuregoSafeRegister(&xOutputStreamWritevFinish, libs, "g_output_stream_writev_finish") | |
| 1278 | 1282 | ||
| 1279 | 1283 | } | |
M v4/gio/gpermission.go +20 -16
| @@ -388,23 +388,27 @@ func (c *Permission) SetGoPointer(ptr uintptr) { | |||
| 388 | 388 | ||
| 389 | 389 | func init() { | |
| 390 | 390 | core.SetPackageName("GIO", "gio-2.0") | |
| 391 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 392 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 393 | - | if err != nil { | |
| 394 | - | panic(err) | |
| 391 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 392 | + | var libs []uintptr | |
| 393 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 394 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 395 | + | if err != nil { | |
| 396 | + | panic(err) | |
| 397 | + | } | |
| 398 | + | libs = append(libs, lib) | |
| 395 | 399 | } | |
| 396 | 400 | ||
| 397 | - | core.PuregoSafeRegister(&xPermissionGLibType, lib, "g_permission_get_type") | |
| 398 | - | ||
| 399 | - | core.PuregoSafeRegister(&xPermissionAcquire, lib, "g_permission_acquire") | |
| 400 | - | core.PuregoSafeRegister(&xPermissionAcquireAsync, lib, "g_permission_acquire_async") | |
| 401 | - | core.PuregoSafeRegister(&xPermissionAcquireFinish, lib, "g_permission_acquire_finish") | |
| 402 | - | core.PuregoSafeRegister(&xPermissionGetAllowed, lib, "g_permission_get_allowed") | |
| 403 | - | core.PuregoSafeRegister(&xPermissionGetCanAcquire, lib, "g_permission_get_can_acquire") | |
| 404 | - | core.PuregoSafeRegister(&xPermissionGetCanRelease, lib, "g_permission_get_can_release") | |
| 405 | - | core.PuregoSafeRegister(&xPermissionImplUpdate, lib, "g_permission_impl_update") | |
| 406 | - | core.PuregoSafeRegister(&xPermissionRelease, lib, "g_permission_release") | |
| 407 | - | core.PuregoSafeRegister(&xPermissionReleaseAsync, lib, "g_permission_release_async") | |
| 408 | - | core.PuregoSafeRegister(&xPermissionReleaseFinish, lib, "g_permission_release_finish") | |
| 401 | + | core.PuregoSafeRegister(&xPermissionGLibType, libs, "g_permission_get_type") | |
| 402 | + | ||
| 403 | + | core.PuregoSafeRegister(&xPermissionAcquire, libs, "g_permission_acquire") | |
| 404 | + | core.PuregoSafeRegister(&xPermissionAcquireAsync, libs, "g_permission_acquire_async") | |
| 405 | + | core.PuregoSafeRegister(&xPermissionAcquireFinish, libs, "g_permission_acquire_finish") | |
| 406 | + | core.PuregoSafeRegister(&xPermissionGetAllowed, libs, "g_permission_get_allowed") | |
| 407 | + | core.PuregoSafeRegister(&xPermissionGetCanAcquire, libs, "g_permission_get_can_acquire") | |
| 408 | + | core.PuregoSafeRegister(&xPermissionGetCanRelease, libs, "g_permission_get_can_release") | |
| 409 | + | core.PuregoSafeRegister(&xPermissionImplUpdate, libs, "g_permission_impl_update") | |
| 410 | + | core.PuregoSafeRegister(&xPermissionRelease, libs, "g_permission_release") | |
| 411 | + | core.PuregoSafeRegister(&xPermissionReleaseAsync, libs, "g_permission_release_async") | |
| 412 | + | core.PuregoSafeRegister(&xPermissionReleaseFinish, libs, "g_permission_release_finish") | |
| 409 | 413 | ||
| 410 | 414 | } | |
M v4/gio/gpollableinputstream.go +13 -9
| @@ -261,17 +261,21 @@ var XGPollableInputStreamReadNonblocking func(uintptr, []byte, uint, uintptr, ** | |||
| 261 | 261 | ||
| 262 | 262 | func init() { | |
| 263 | 263 | core.SetPackageName("GIO", "gio-2.0") | |
| 264 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 265 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 266 | - | if err != nil { | |
| 267 | - | panic(err) | |
| 264 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 265 | + | var libs []uintptr | |
| 266 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 267 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 268 | + | if err != nil { | |
| 269 | + | panic(err) | |
| 270 | + | } | |
| 271 | + | libs = append(libs, lib) | |
| 268 | 272 | } | |
| 269 | 273 | ||
| 270 | - | core.PuregoSafeRegister(&xPollableInputStreamGLibType, lib, "g_pollable_input_stream_get_type") | |
| 274 | + | core.PuregoSafeRegister(&xPollableInputStreamGLibType, libs, "g_pollable_input_stream_get_type") | |
| 271 | 275 | ||
| 272 | - | core.PuregoSafeRegister(&XGPollableInputStreamCanPoll, lib, "g_pollable_input_stream_can_poll") | |
| 273 | - | core.PuregoSafeRegister(&XGPollableInputStreamCreateSource, lib, "g_pollable_input_stream_create_source") | |
| 274 | - | core.PuregoSafeRegister(&XGPollableInputStreamIsReadable, lib, "g_pollable_input_stream_is_readable") | |
| 275 | - | core.PuregoSafeRegister(&XGPollableInputStreamReadNonblocking, lib, "g_pollable_input_stream_read_nonblocking") | |
| 276 | + | core.PuregoSafeRegister(&XGPollableInputStreamCanPoll, libs, "g_pollable_input_stream_can_poll") | |
| 277 | + | core.PuregoSafeRegister(&XGPollableInputStreamCreateSource, libs, "g_pollable_input_stream_create_source") | |
| 278 | + | core.PuregoSafeRegister(&XGPollableInputStreamIsReadable, libs, "g_pollable_input_stream_is_readable") | |
| 279 | + | core.PuregoSafeRegister(&XGPollableInputStreamReadNonblocking, libs, "g_pollable_input_stream_read_nonblocking") | |
| 276 | 280 | ||
| 277 | 281 | } | |
M v4/gio/gpollableoutputstream.go +14 -10
| @@ -334,18 +334,22 @@ var XGPollableOutputStreamWritevNonblocking func(uintptr, []OutputVector, uint, | |||
| 334 | 334 | ||
| 335 | 335 | func init() { | |
| 336 | 336 | core.SetPackageName("GIO", "gio-2.0") | |
| 337 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 338 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 339 | - | if err != nil { | |
| 340 | - | panic(err) | |
| 337 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 338 | + | var libs []uintptr | |
| 339 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 340 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 341 | + | if err != nil { | |
| 342 | + | panic(err) | |
| 343 | + | } | |
| 344 | + | libs = append(libs, lib) | |
| 341 | 345 | } | |
| 342 | 346 | ||
| 343 | - | core.PuregoSafeRegister(&xPollableOutputStreamGLibType, lib, "g_pollable_output_stream_get_type") | |
| 347 | + | core.PuregoSafeRegister(&xPollableOutputStreamGLibType, libs, "g_pollable_output_stream_get_type") | |
| 344 | 348 | ||
| 345 | - | core.PuregoSafeRegister(&XGPollableOutputStreamCanPoll, lib, "g_pollable_output_stream_can_poll") | |
| 346 | - | core.PuregoSafeRegister(&XGPollableOutputStreamCreateSource, lib, "g_pollable_output_stream_create_source") | |
| 347 | - | core.PuregoSafeRegister(&XGPollableOutputStreamIsWritable, lib, "g_pollable_output_stream_is_writable") | |
| 348 | - | core.PuregoSafeRegister(&XGPollableOutputStreamWriteNonblocking, lib, "g_pollable_output_stream_write_nonblocking") | |
| 349 | - | core.PuregoSafeRegister(&XGPollableOutputStreamWritevNonblocking, lib, "g_pollable_output_stream_writev_nonblocking") | |
| 349 | + | core.PuregoSafeRegister(&XGPollableOutputStreamCanPoll, libs, "g_pollable_output_stream_can_poll") | |
| 350 | + | core.PuregoSafeRegister(&XGPollableOutputStreamCreateSource, libs, "g_pollable_output_stream_create_source") | |
| 351 | + | core.PuregoSafeRegister(&XGPollableOutputStreamIsWritable, libs, "g_pollable_output_stream_is_writable") | |
| 352 | + | core.PuregoSafeRegister(&XGPollableOutputStreamWriteNonblocking, libs, "g_pollable_output_stream_write_nonblocking") | |
| 353 | + | core.PuregoSafeRegister(&XGPollableOutputStreamWritevNonblocking, libs, "g_pollable_output_stream_writev_nonblocking") | |
| 350 | 354 | ||
| 351 | 355 | } | |
M v4/gio/gpollableutils.go +13 -9
| @@ -111,16 +111,20 @@ func PollableStreamWriteAll(StreamVar *OutputStream, BufferVar []byte, CountVar | |||
| 111 | 111 | ||
| 112 | 112 | func init() { | |
| 113 | 113 | core.SetPackageName("GIO", "gio-2.0") | |
| 114 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 115 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 116 | - | if err != nil { | |
| 117 | - | panic(err) | |
| 114 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 115 | + | var libs []uintptr | |
| 116 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 117 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 118 | + | if err != nil { | |
| 119 | + | panic(err) | |
| 120 | + | } | |
| 121 | + | libs = append(libs, lib) | |
| 118 | 122 | } | |
| 119 | 123 | ||
| 120 | - | core.PuregoSafeRegister(&xPollableSourceNew, lib, "g_pollable_source_new") | |
| 121 | - | core.PuregoSafeRegister(&xPollableSourceNewFull, lib, "g_pollable_source_new_full") | |
| 122 | - | core.PuregoSafeRegister(&xPollableStreamRead, lib, "g_pollable_stream_read") | |
| 123 | - | core.PuregoSafeRegister(&xPollableStreamWrite, lib, "g_pollable_stream_write") | |
| 124 | - | core.PuregoSafeRegister(&xPollableStreamWriteAll, lib, "g_pollable_stream_write_all") | |
| 124 | + | core.PuregoSafeRegister(&xPollableSourceNew, libs, "g_pollable_source_new") | |
| 125 | + | core.PuregoSafeRegister(&xPollableSourceNewFull, libs, "g_pollable_source_new_full") | |
| 126 | + | core.PuregoSafeRegister(&xPollableStreamRead, libs, "g_pollable_stream_read") | |
| 127 | + | core.PuregoSafeRegister(&xPollableStreamWrite, libs, "g_pollable_stream_write") | |
| 128 | + | core.PuregoSafeRegister(&xPollableStreamWriteAll, libs, "g_pollable_stream_write_all") | |
| 125 | 129 | ||
| 126 | 130 | } | |
M v4/gio/gpowerprofilemonitor.go +11 -7
| @@ -109,16 +109,20 @@ func PowerProfileMonitorDupDefault() *PowerProfileMonitorBase { | |||
| 109 | 109 | ||
| 110 | 110 | func init() { | |
| 111 | 111 | core.SetPackageName("GIO", "gio-2.0") | |
| 112 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 113 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 114 | - | if err != nil { | |
| 115 | - | panic(err) | |
| 112 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 113 | + | var libs []uintptr | |
| 114 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 115 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 116 | + | if err != nil { | |
| 117 | + | panic(err) | |
| 118 | + | } | |
| 119 | + | libs = append(libs, lib) | |
| 116 | 120 | } | |
| 117 | 121 | ||
| 118 | - | core.PuregoSafeRegister(&xPowerProfileMonitorDupDefault, lib, "g_power_profile_monitor_dup_default") | |
| 122 | + | core.PuregoSafeRegister(&xPowerProfileMonitorDupDefault, libs, "g_power_profile_monitor_dup_default") | |
| 119 | 123 | ||
| 120 | - | core.PuregoSafeRegister(&xPowerProfileMonitorGLibType, lib, "g_power_profile_monitor_get_type") | |
| 124 | + | core.PuregoSafeRegister(&xPowerProfileMonitorGLibType, libs, "g_power_profile_monitor_get_type") | |
| 121 | 125 | ||
| 122 | - | core.PuregoSafeRegister(&XGPowerProfileMonitorGetPowerSaverEnabled, lib, "g_power_profile_monitor_get_power_saver_enabled") | |
| 126 | + | core.PuregoSafeRegister(&XGPowerProfileMonitorGetPowerSaverEnabled, libs, "g_power_profile_monitor_get_power_saver_enabled") | |
| 123 | 127 | ||
| 124 | 128 | } | |
M v4/gio/gpropertyaction.go +10 -6
| @@ -230,14 +230,18 @@ func (x *PropertyAction) GetStateType() *glib.VariantType { | |||
| 230 | 230 | ||
| 231 | 231 | func init() { | |
| 232 | 232 | core.SetPackageName("GIO", "gio-2.0") | |
| 233 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 234 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 235 | - | if err != nil { | |
| 236 | - | panic(err) | |
| 233 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 234 | + | var libs []uintptr | |
| 235 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 236 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 237 | + | if err != nil { | |
| 238 | + | panic(err) | |
| 239 | + | } | |
| 240 | + | libs = append(libs, lib) | |
| 237 | 241 | } | |
| 238 | 242 | ||
| 239 | - | core.PuregoSafeRegister(&xPropertyActionGLibType, lib, "g_property_action_get_type") | |
| 243 | + | core.PuregoSafeRegister(&xPropertyActionGLibType, libs, "g_property_action_get_type") | |
| 240 | 244 | ||
| 241 | - | core.PuregoSafeRegister(&xNewPropertyAction, lib, "g_property_action_new") | |
| 245 | + | core.PuregoSafeRegister(&xNewPropertyAction, libs, "g_property_action_new") | |
| 242 | 246 | ||
| 243 | 247 | } | |
M v4/gio/gproxy.go +14 -10
| @@ -281,19 +281,23 @@ func ProxyGetDefaultForProtocol(ProtocolVar string) *ProxyBase { | |||
| 281 | 281 | ||
| 282 | 282 | func init() { | |
| 283 | 283 | core.SetPackageName("GIO", "gio-2.0") | |
| 284 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 285 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 286 | - | if err != nil { | |
| 287 | - | panic(err) | |
| 284 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 285 | + | var libs []uintptr | |
| 286 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 287 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 288 | + | if err != nil { | |
| 289 | + | panic(err) | |
| 290 | + | } | |
| 291 | + | libs = append(libs, lib) | |
| 288 | 292 | } | |
| 289 | 293 | ||
| 290 | - | core.PuregoSafeRegister(&xProxyGetDefaultForProtocol, lib, "g_proxy_get_default_for_protocol") | |
| 294 | + | core.PuregoSafeRegister(&xProxyGetDefaultForProtocol, libs, "g_proxy_get_default_for_protocol") | |
| 291 | 295 | ||
| 292 | - | core.PuregoSafeRegister(&xProxyGLibType, lib, "g_proxy_get_type") | |
| 296 | + | core.PuregoSafeRegister(&xProxyGLibType, libs, "g_proxy_get_type") | |
| 293 | 297 | ||
| 294 | - | core.PuregoSafeRegister(&XGProxyConnect, lib, "g_proxy_connect") | |
| 295 | - | core.PuregoSafeRegister(&XGProxyConnectAsync, lib, "g_proxy_connect_async") | |
| 296 | - | core.PuregoSafeRegister(&XGProxyConnectFinish, lib, "g_proxy_connect_finish") | |
| 297 | - | core.PuregoSafeRegister(&XGProxySupportsHostname, lib, "g_proxy_supports_hostname") | |
| 298 | + | core.PuregoSafeRegister(&XGProxyConnect, libs, "g_proxy_connect") | |
| 299 | + | core.PuregoSafeRegister(&XGProxyConnectAsync, libs, "g_proxy_connect_async") | |
| 300 | + | core.PuregoSafeRegister(&XGProxyConnectFinish, libs, "g_proxy_connect_finish") | |
| 301 | + | core.PuregoSafeRegister(&XGProxySupportsHostname, libs, "g_proxy_supports_hostname") | |
| 298 | 302 | ||
| 299 | 303 | } | |
M v4/gio/gproxyaddress.go +17 -13
| @@ -195,22 +195,26 @@ func (x *ProxyAddress) ToString() string { | |||
| 195 | 195 | ||
| 196 | 196 | func init() { | |
| 197 | 197 | core.SetPackageName("GIO", "gio-2.0") | |
| 198 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 199 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 200 | - | if err != nil { | |
| 201 | - | panic(err) | |
| 198 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 199 | + | var libs []uintptr | |
| 200 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 201 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 202 | + | if err != nil { | |
| 203 | + | panic(err) | |
| 204 | + | } | |
| 205 | + | libs = append(libs, lib) | |
| 202 | 206 | } | |
| 203 | 207 | ||
| 204 | - | core.PuregoSafeRegister(&xProxyAddressGLibType, lib, "g_proxy_address_get_type") | |
| 208 | + | core.PuregoSafeRegister(&xProxyAddressGLibType, libs, "g_proxy_address_get_type") | |
| 205 | 209 | ||
| 206 | - | core.PuregoSafeRegister(&xNewProxyAddress, lib, "g_proxy_address_new") | |
| 210 | + | core.PuregoSafeRegister(&xNewProxyAddress, libs, "g_proxy_address_new") | |
| 207 | 211 | ||
| 208 | - | core.PuregoSafeRegister(&xProxyAddressGetDestinationHostname, lib, "g_proxy_address_get_destination_hostname") | |
| 209 | - | core.PuregoSafeRegister(&xProxyAddressGetDestinationPort, lib, "g_proxy_address_get_destination_port") | |
| 210 | - | core.PuregoSafeRegister(&xProxyAddressGetDestinationProtocol, lib, "g_proxy_address_get_destination_protocol") | |
| 211 | - | core.PuregoSafeRegister(&xProxyAddressGetPassword, lib, "g_proxy_address_get_password") | |
| 212 | - | core.PuregoSafeRegister(&xProxyAddressGetProtocol, lib, "g_proxy_address_get_protocol") | |
| 213 | - | core.PuregoSafeRegister(&xProxyAddressGetUri, lib, "g_proxy_address_get_uri") | |
| 214 | - | core.PuregoSafeRegister(&xProxyAddressGetUsername, lib, "g_proxy_address_get_username") | |
| 212 | + | core.PuregoSafeRegister(&xProxyAddressGetDestinationHostname, libs, "g_proxy_address_get_destination_hostname") | |
| 213 | + | core.PuregoSafeRegister(&xProxyAddressGetDestinationPort, libs, "g_proxy_address_get_destination_port") | |
| 214 | + | core.PuregoSafeRegister(&xProxyAddressGetDestinationProtocol, libs, "g_proxy_address_get_destination_protocol") | |
| 215 | + | core.PuregoSafeRegister(&xProxyAddressGetPassword, libs, "g_proxy_address_get_password") | |
| 216 | + | core.PuregoSafeRegister(&xProxyAddressGetProtocol, libs, "g_proxy_address_get_protocol") | |
| 217 | + | core.PuregoSafeRegister(&xProxyAddressGetUri, libs, "g_proxy_address_get_uri") | |
| 218 | + | core.PuregoSafeRegister(&xProxyAddressGetUsername, libs, "g_proxy_address_get_username") | |
| 215 | 219 | ||
| 216 | 220 | } | |
M v4/gio/gproxyresolver.go +14 -10
| @@ -264,19 +264,23 @@ func ProxyResolverGetDefault() *ProxyResolverBase { | |||
| 264 | 264 | ||
| 265 | 265 | func init() { | |
| 266 | 266 | core.SetPackageName("GIO", "gio-2.0") | |
| 267 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 268 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 269 | - | if err != nil { | |
| 270 | - | panic(err) | |
| 267 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 268 | + | var libs []uintptr | |
| 269 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 270 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 271 | + | if err != nil { | |
| 272 | + | panic(err) | |
| 273 | + | } | |
| 274 | + | libs = append(libs, lib) | |
| 271 | 275 | } | |
| 272 | 276 | ||
| 273 | - | core.PuregoSafeRegister(&xProxyResolverGetDefault, lib, "g_proxy_resolver_get_default") | |
| 277 | + | core.PuregoSafeRegister(&xProxyResolverGetDefault, libs, "g_proxy_resolver_get_default") | |
| 274 | 278 | ||
| 275 | - | core.PuregoSafeRegister(&xProxyResolverGLibType, lib, "g_proxy_resolver_get_type") | |
| 279 | + | core.PuregoSafeRegister(&xProxyResolverGLibType, libs, "g_proxy_resolver_get_type") | |
| 276 | 280 | ||
| 277 | - | core.PuregoSafeRegister(&XGProxyResolverIsSupported, lib, "g_proxy_resolver_is_supported") | |
| 278 | - | core.PuregoSafeRegister(&XGProxyResolverLookup, lib, "g_proxy_resolver_lookup") | |
| 279 | - | core.PuregoSafeRegister(&XGProxyResolverLookupAsync, lib, "g_proxy_resolver_lookup_async") | |
| 280 | - | core.PuregoSafeRegister(&XGProxyResolverLookupFinish, lib, "g_proxy_resolver_lookup_finish") | |
| 281 | + | core.PuregoSafeRegister(&XGProxyResolverIsSupported, libs, "g_proxy_resolver_is_supported") | |
| 282 | + | core.PuregoSafeRegister(&XGProxyResolverLookup, libs, "g_proxy_resolver_lookup") | |
| 283 | + | core.PuregoSafeRegister(&XGProxyResolverLookupAsync, libs, "g_proxy_resolver_lookup_async") | |
| 284 | + | core.PuregoSafeRegister(&XGProxyResolverLookupFinish, libs, "g_proxy_resolver_lookup_finish") | |
| 281 | 285 | ||
| 282 | 286 | } | |
M v4/gio/gremoteactiongroup.go +11 -7
| @@ -160,15 +160,19 @@ var XGRemoteActionGroupChangeActionStateFull func(uintptr, string, *glib.Variant | |||
| 160 | 160 | ||
| 161 | 161 | func init() { | |
| 162 | 162 | core.SetPackageName("GIO", "gio-2.0") | |
| 163 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 164 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 165 | - | if err != nil { | |
| 166 | - | panic(err) | |
| 163 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 164 | + | var libs []uintptr | |
| 165 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 166 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 167 | + | if err != nil { | |
| 168 | + | panic(err) | |
| 169 | + | } | |
| 170 | + | libs = append(libs, lib) | |
| 167 | 171 | } | |
| 168 | 172 | ||
| 169 | - | core.PuregoSafeRegister(&xRemoteActionGroupGLibType, lib, "g_remote_action_group_get_type") | |
| 173 | + | core.PuregoSafeRegister(&xRemoteActionGroupGLibType, libs, "g_remote_action_group_get_type") | |
| 170 | 174 | ||
| 171 | - | core.PuregoSafeRegister(&XGRemoteActionGroupActivateActionFull, lib, "g_remote_action_group_activate_action_full") | |
| 172 | - | core.PuregoSafeRegister(&XGRemoteActionGroupChangeActionStateFull, lib, "g_remote_action_group_change_action_state_full") | |
| 175 | + | core.PuregoSafeRegister(&XGRemoteActionGroupActivateActionFull, libs, "g_remote_action_group_activate_action_full") | |
| 176 | + | core.PuregoSafeRegister(&XGRemoteActionGroupChangeActionStateFull, libs, "g_remote_action_group_change_action_state_full") | |
| 173 | 177 | ||
| 174 | 178 | } | |
M v4/gio/gresolver.go +38 -34
| @@ -892,39 +892,43 @@ func ResolverGetDefault() *Resolver { | |||
| 892 | 892 | ||
| 893 | 893 | func init() { | |
| 894 | 894 | core.SetPackageName("GIO", "gio-2.0") | |
| 895 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 896 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 897 | - | if err != nil { | |
| 898 | - | panic(err) | |
| 899 | - | } | |
| 900 | - | ||
| 901 | - | core.PuregoSafeRegister(&xResolverNameLookupFlagsGLibType, lib, "g_resolver_name_lookup_flags_get_type") | |
| 902 | - | ||
| 903 | - | core.PuregoSafeRegister(&xResolverErrorQuark, lib, "g_resolver_error_quark") | |
| 904 | - | ||
| 905 | - | core.PuregoSafeRegister(&xResolverGLibType, lib, "g_resolver_get_type") | |
| 906 | - | ||
| 907 | - | core.PuregoSafeRegister(&xResolverGetTimeout, lib, "g_resolver_get_timeout") | |
| 908 | - | core.PuregoSafeRegister(&xResolverLookupByAddress, lib, "g_resolver_lookup_by_address") | |
| 909 | - | core.PuregoSafeRegister(&xResolverLookupByAddressAsync, lib, "g_resolver_lookup_by_address_async") | |
| 910 | - | core.PuregoSafeRegister(&xResolverLookupByAddressFinish, lib, "g_resolver_lookup_by_address_finish") | |
| 911 | - | core.PuregoSafeRegister(&xResolverLookupByName, lib, "g_resolver_lookup_by_name") | |
| 912 | - | core.PuregoSafeRegister(&xResolverLookupByNameAsync, lib, "g_resolver_lookup_by_name_async") | |
| 913 | - | core.PuregoSafeRegister(&xResolverLookupByNameFinish, lib, "g_resolver_lookup_by_name_finish") | |
| 914 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlags, lib, "g_resolver_lookup_by_name_with_flags") | |
| 915 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsAsync, lib, "g_resolver_lookup_by_name_with_flags_async") | |
| 916 | - | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsFinish, lib, "g_resolver_lookup_by_name_with_flags_finish") | |
| 917 | - | core.PuregoSafeRegister(&xResolverLookupRecords, lib, "g_resolver_lookup_records") | |
| 918 | - | core.PuregoSafeRegister(&xResolverLookupRecordsAsync, lib, "g_resolver_lookup_records_async") | |
| 919 | - | core.PuregoSafeRegister(&xResolverLookupRecordsFinish, lib, "g_resolver_lookup_records_finish") | |
| 920 | - | core.PuregoSafeRegister(&xResolverLookupService, lib, "g_resolver_lookup_service") | |
| 921 | - | core.PuregoSafeRegister(&xResolverLookupServiceAsync, lib, "g_resolver_lookup_service_async") | |
| 922 | - | core.PuregoSafeRegister(&xResolverLookupServiceFinish, lib, "g_resolver_lookup_service_finish") | |
| 923 | - | core.PuregoSafeRegister(&xResolverSetDefault, lib, "g_resolver_set_default") | |
| 924 | - | core.PuregoSafeRegister(&xResolverSetTimeout, lib, "g_resolver_set_timeout") | |
| 925 | - | ||
| 926 | - | core.PuregoSafeRegister(&xResolverFreeAddresses, lib, "g_resolver_free_addresses") | |
| 927 | - | core.PuregoSafeRegister(&xResolverFreeTargets, lib, "g_resolver_free_targets") | |
| 928 | - | core.PuregoSafeRegister(&xResolverGetDefault, lib, "g_resolver_get_default") | |
| 895 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 896 | + | var libs []uintptr | |
| 897 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 898 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 899 | + | if err != nil { | |
| 900 | + | panic(err) | |
| 901 | + | } | |
| 902 | + | libs = append(libs, lib) | |
| 903 | + | } | |
| 904 | + | ||
| 905 | + | core.PuregoSafeRegister(&xResolverNameLookupFlagsGLibType, libs, "g_resolver_name_lookup_flags_get_type") | |
| 906 | + | ||
| 907 | + | core.PuregoSafeRegister(&xResolverErrorQuark, libs, "g_resolver_error_quark") | |
| 908 | + | ||
| 909 | + | core.PuregoSafeRegister(&xResolverGLibType, libs, "g_resolver_get_type") | |
| 910 | + | ||
| 911 | + | core.PuregoSafeRegister(&xResolverGetTimeout, libs, "g_resolver_get_timeout") | |
| 912 | + | core.PuregoSafeRegister(&xResolverLookupByAddress, libs, "g_resolver_lookup_by_address") | |
| 913 | + | core.PuregoSafeRegister(&xResolverLookupByAddressAsync, libs, "g_resolver_lookup_by_address_async") | |
| 914 | + | core.PuregoSafeRegister(&xResolverLookupByAddressFinish, libs, "g_resolver_lookup_by_address_finish") | |
| 915 | + | core.PuregoSafeRegister(&xResolverLookupByName, libs, "g_resolver_lookup_by_name") | |
| 916 | + | core.PuregoSafeRegister(&xResolverLookupByNameAsync, libs, "g_resolver_lookup_by_name_async") | |
| 917 | + | core.PuregoSafeRegister(&xResolverLookupByNameFinish, libs, "g_resolver_lookup_by_name_finish") | |
| 918 | + | core.PuregoSafeRegister(&xResolverLookupByNameWithFlags, libs, "g_resolver_lookup_by_name_with_flags") | |
| 919 | + | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsAsync, libs, "g_resolver_lookup_by_name_with_flags_async") | |
| 920 | + | core.PuregoSafeRegister(&xResolverLookupByNameWithFlagsFinish, libs, "g_resolver_lookup_by_name_with_flags_finish") | |
| 921 | + | core.PuregoSafeRegister(&xResolverLookupRecords, libs, "g_resolver_lookup_records") | |
| 922 | + | core.PuregoSafeRegister(&xResolverLookupRecordsAsync, libs, "g_resolver_lookup_records_async") | |
| 923 | + | core.PuregoSafeRegister(&xResolverLookupRecordsFinish, libs, "g_resolver_lookup_records_finish") | |
| 924 | + | core.PuregoSafeRegister(&xResolverLookupService, libs, "g_resolver_lookup_service") | |
| 925 | + | core.PuregoSafeRegister(&xResolverLookupServiceAsync, libs, "g_resolver_lookup_service_async") | |
| 926 | + | core.PuregoSafeRegister(&xResolverLookupServiceFinish, libs, "g_resolver_lookup_service_finish") | |
| 927 | + | core.PuregoSafeRegister(&xResolverSetDefault, libs, "g_resolver_set_default") | |
| 928 | + | core.PuregoSafeRegister(&xResolverSetTimeout, libs, "g_resolver_set_timeout") | |
| 929 | + | ||
| 930 | + | core.PuregoSafeRegister(&xResolverFreeAddresses, libs, "g_resolver_free_addresses") | |
| 931 | + | core.PuregoSafeRegister(&xResolverFreeTargets, libs, "g_resolver_free_targets") | |
| 932 | + | core.PuregoSafeRegister(&xResolverGetDefault, libs, "g_resolver_get_default") | |
| 929 | 933 | ||
| 930 | 934 | } | |
M v4/gio/gresource.go +21 -17
| @@ -227,24 +227,28 @@ func ResourcesUnregister(ResourceVar *Resource) { | |||
| 227 | 227 | ||
| 228 | 228 | func init() { | |
| 229 | 229 | core.SetPackageName("GIO", "gio-2.0") | |
| 230 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 231 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 232 | - | if err != nil { | |
| 233 | - | panic(err) | |
| 230 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 231 | + | var libs []uintptr | |
| 232 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 233 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 234 | + | if err != nil { | |
| 235 | + | panic(err) | |
| 236 | + | } | |
| 237 | + | libs = append(libs, lib) | |
| 234 | 238 | } | |
| 235 | 239 | ||
| 236 | - | core.PuregoSafeRegister(&xResourceErrorQuark, lib, "g_resource_error_quark") | |
| 237 | - | core.PuregoSafeRegister(&xResourceLoad, lib, "g_resource_load") | |
| 238 | - | core.PuregoSafeRegister(&xResourcesEnumerateChildren, lib, "g_resources_enumerate_children") | |
| 239 | - | core.PuregoSafeRegister(&xResourcesGetInfo, lib, "g_resources_get_info") | |
| 240 | - | core.PuregoSafeRegister(&xResourcesHasChildren, lib, "g_resources_has_children") | |
| 241 | - | core.PuregoSafeRegister(&xResourcesLookupData, lib, "g_resources_lookup_data") | |
| 242 | - | core.PuregoSafeRegister(&xResourcesOpenStream, lib, "g_resources_open_stream") | |
| 243 | - | core.PuregoSafeRegister(&xResourcesRegister, lib, "g_resources_register") | |
| 244 | - | core.PuregoSafeRegister(&xResourcesUnregister, lib, "g_resources_unregister") | |
| 245 | - | ||
| 246 | - | core.PuregoSafeRegister(&xStaticResourceFini, lib, "g_static_resource_fini") | |
| 247 | - | core.PuregoSafeRegister(&xStaticResourceGetResource, lib, "g_static_resource_get_resource") | |
| 248 | - | core.PuregoSafeRegister(&xStaticResourceInit, lib, "g_static_resource_init") | |
| 240 | + | core.PuregoSafeRegister(&xResourceErrorQuark, libs, "g_resource_error_quark") | |
| 241 | + | core.PuregoSafeRegister(&xResourceLoad, libs, "g_resource_load") | |
| 242 | + | core.PuregoSafeRegister(&xResourcesEnumerateChildren, libs, "g_resources_enumerate_children") | |
| 243 | + | core.PuregoSafeRegister(&xResourcesGetInfo, libs, "g_resources_get_info") | |
| 244 | + | core.PuregoSafeRegister(&xResourcesHasChildren, libs, "g_resources_has_children") | |
| 245 | + | core.PuregoSafeRegister(&xResourcesLookupData, libs, "g_resources_lookup_data") | |
| 246 | + | core.PuregoSafeRegister(&xResourcesOpenStream, libs, "g_resources_open_stream") | |
| 247 | + | core.PuregoSafeRegister(&xResourcesRegister, libs, "g_resources_register") | |
| 248 | + | core.PuregoSafeRegister(&xResourcesUnregister, libs, "g_resources_unregister") | |
| 249 | + | ||
| 250 | + | core.PuregoSafeRegister(&xStaticResourceFini, libs, "g_static_resource_fini") | |
| 251 | + | core.PuregoSafeRegister(&xStaticResourceGetResource, libs, "g_static_resource_get_resource") | |
| 252 | + | core.PuregoSafeRegister(&xStaticResourceInit, libs, "g_static_resource_init") | |
| 249 | 253 | ||
| 250 | 254 | } | |
M v4/gio/gseekable.go +14 -10
| @@ -277,18 +277,22 @@ var XGSeekableTruncate func(uintptr, int64, uintptr, **glib.Error) bool | |||
| 277 | 277 | ||
| 278 | 278 | func init() { | |
| 279 | 279 | core.SetPackageName("GIO", "gio-2.0") | |
| 280 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 281 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 282 | - | if err != nil { | |
| 283 | - | panic(err) | |
| 280 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 281 | + | var libs []uintptr | |
| 282 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 283 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 284 | + | if err != nil { | |
| 285 | + | panic(err) | |
| 286 | + | } | |
| 287 | + | libs = append(libs, lib) | |
| 284 | 288 | } | |
| 285 | 289 | ||
| 286 | - | core.PuregoSafeRegister(&xSeekableGLibType, lib, "g_seekable_get_type") | |
| 290 | + | core.PuregoSafeRegister(&xSeekableGLibType, libs, "g_seekable_get_type") | |
| 287 | 291 | ||
| 288 | - | core.PuregoSafeRegister(&XGSeekableCanSeek, lib, "g_seekable_can_seek") | |
| 289 | - | core.PuregoSafeRegister(&XGSeekableCanTruncate, lib, "g_seekable_can_truncate") | |
| 290 | - | core.PuregoSafeRegister(&XGSeekableSeek, lib, "g_seekable_seek") | |
| 291 | - | core.PuregoSafeRegister(&XGSeekableTell, lib, "g_seekable_tell") | |
| 292 | - | core.PuregoSafeRegister(&XGSeekableTruncate, lib, "g_seekable_truncate") | |
| 292 | + | core.PuregoSafeRegister(&XGSeekableCanSeek, libs, "g_seekable_can_seek") | |
| 293 | + | core.PuregoSafeRegister(&XGSeekableCanTruncate, libs, "g_seekable_can_truncate") | |
| 294 | + | core.PuregoSafeRegister(&XGSeekableSeek, libs, "g_seekable_seek") | |
| 295 | + | core.PuregoSafeRegister(&XGSeekableTell, libs, "g_seekable_tell") | |
| 296 | + | core.PuregoSafeRegister(&XGSeekableTruncate, libs, "g_seekable_truncate") | |
| 293 | 297 | ||
| 294 | 298 | } | |
M v4/gio/gsettings.go +66 -62
| @@ -1649,69 +1649,73 @@ func SettingsUnbind(ObjectVar *gobject.Object, PropertyVar string) { | |||
| 1649 | 1649 | ||
| 1650 | 1650 | func init() { | |
| 1651 | 1651 | core.SetPackageName("GIO", "gio-2.0") | |
| 1652 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1653 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1654 | - | if err != nil { | |
| 1655 | - | panic(err) | |
| 1652 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1653 | + | var libs []uintptr | |
| 1654 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1655 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1656 | + | if err != nil { | |
| 1657 | + | panic(err) | |
| 1658 | + | } | |
| 1659 | + | libs = append(libs, lib) | |
| 1656 | 1660 | } | |
| 1657 | 1661 | ||
| 1658 | - | core.PuregoSafeRegister(&xSettingsBindFlagsGLibType, lib, "g_settings_bind_flags_get_type") | |
| 1659 | - | ||
| 1660 | - | core.PuregoSafeRegister(&xSettingsGLibType, lib, "g_settings_get_type") | |
| 1661 | - | ||
| 1662 | - | core.PuregoSafeRegister(&xNewSettings, lib, "g_settings_new") | |
| 1663 | - | core.PuregoSafeRegister(&xNewSettingsFull, lib, "g_settings_new_full") | |
| 1664 | - | core.PuregoSafeRegister(&xNewSettingsWithBackend, lib, "g_settings_new_with_backend") | |
| 1665 | - | core.PuregoSafeRegister(&xNewSettingsWithBackendAndPath, lib, "g_settings_new_with_backend_and_path") | |
| 1666 | - | core.PuregoSafeRegister(&xNewSettingsWithPath, lib, "g_settings_new_with_path") | |
| 1667 | - | ||
| 1668 | - | core.PuregoSafeRegister(&xSettingsApply, lib, "g_settings_apply") | |
| 1669 | - | core.PuregoSafeRegister(&xSettingsBind, lib, "g_settings_bind") | |
| 1670 | - | core.PuregoSafeRegister(&xSettingsBindWithMapping, lib, "g_settings_bind_with_mapping") | |
| 1671 | - | core.PuregoSafeRegister(&xSettingsBindWithMappingClosures, lib, "g_settings_bind_with_mapping_closures") | |
| 1672 | - | core.PuregoSafeRegister(&xSettingsBindWritable, lib, "g_settings_bind_writable") | |
| 1673 | - | core.PuregoSafeRegister(&xSettingsCreateAction, lib, "g_settings_create_action") | |
| 1674 | - | core.PuregoSafeRegister(&xSettingsDelay, lib, "g_settings_delay") | |
| 1675 | - | core.PuregoSafeRegister(&xSettingsGet, lib, "g_settings_get") | |
| 1676 | - | core.PuregoSafeRegister(&xSettingsGetBoolean, lib, "g_settings_get_boolean") | |
| 1677 | - | core.PuregoSafeRegister(&xSettingsGetChild, lib, "g_settings_get_child") | |
| 1678 | - | core.PuregoSafeRegister(&xSettingsGetDefaultValue, lib, "g_settings_get_default_value") | |
| 1679 | - | core.PuregoSafeRegister(&xSettingsGetDouble, lib, "g_settings_get_double") | |
| 1680 | - | core.PuregoSafeRegister(&xSettingsGetEnum, lib, "g_settings_get_enum") | |
| 1681 | - | core.PuregoSafeRegister(&xSettingsGetFlags, lib, "g_settings_get_flags") | |
| 1682 | - | core.PuregoSafeRegister(&xSettingsGetHasUnapplied, lib, "g_settings_get_has_unapplied") | |
| 1683 | - | core.PuregoSafeRegister(&xSettingsGetInt, lib, "g_settings_get_int") | |
| 1684 | - | core.PuregoSafeRegister(&xSettingsGetInt64, lib, "g_settings_get_int64") | |
| 1685 | - | core.PuregoSafeRegister(&xSettingsGetMapped, lib, "g_settings_get_mapped") | |
| 1686 | - | core.PuregoSafeRegister(&xSettingsGetRange, lib, "g_settings_get_range") | |
| 1687 | - | core.PuregoSafeRegister(&xSettingsGetString, lib, "g_settings_get_string") | |
| 1688 | - | core.PuregoSafeRegister(&xSettingsGetStrv, lib, "g_settings_get_strv") | |
| 1689 | - | core.PuregoSafeRegister(&xSettingsGetUint, lib, "g_settings_get_uint") | |
| 1690 | - | core.PuregoSafeRegister(&xSettingsGetUint64, lib, "g_settings_get_uint64") | |
| 1691 | - | core.PuregoSafeRegister(&xSettingsGetUserValue, lib, "g_settings_get_user_value") | |
| 1692 | - | core.PuregoSafeRegister(&xSettingsGetValue, lib, "g_settings_get_value") | |
| 1693 | - | core.PuregoSafeRegister(&xSettingsIsWritable, lib, "g_settings_is_writable") | |
| 1694 | - | core.PuregoSafeRegister(&xSettingsListChildren, lib, "g_settings_list_children") | |
| 1695 | - | core.PuregoSafeRegister(&xSettingsListKeys, lib, "g_settings_list_keys") | |
| 1696 | - | core.PuregoSafeRegister(&xSettingsRangeCheck, lib, "g_settings_range_check") | |
| 1697 | - | core.PuregoSafeRegister(&xSettingsReset, lib, "g_settings_reset") | |
| 1698 | - | core.PuregoSafeRegister(&xSettingsRevert, lib, "g_settings_revert") | |
| 1699 | - | core.PuregoSafeRegister(&xSettingsSet, lib, "g_settings_set") | |
| 1700 | - | core.PuregoSafeRegister(&xSettingsSetBoolean, lib, "g_settings_set_boolean") | |
| 1701 | - | core.PuregoSafeRegister(&xSettingsSetDouble, lib, "g_settings_set_double") | |
| 1702 | - | core.PuregoSafeRegister(&xSettingsSetEnum, lib, "g_settings_set_enum") | |
| 1703 | - | core.PuregoSafeRegister(&xSettingsSetFlags, lib, "g_settings_set_flags") | |
| 1704 | - | core.PuregoSafeRegister(&xSettingsSetInt, lib, "g_settings_set_int") | |
| 1705 | - | core.PuregoSafeRegister(&xSettingsSetInt64, lib, "g_settings_set_int64") | |
| 1706 | - | core.PuregoSafeRegister(&xSettingsSetString, lib, "g_settings_set_string") | |
| 1707 | - | core.PuregoSafeRegister(&xSettingsSetStrv, lib, "g_settings_set_strv") | |
| 1708 | - | core.PuregoSafeRegister(&xSettingsSetUint, lib, "g_settings_set_uint") | |
| 1709 | - | core.PuregoSafeRegister(&xSettingsSetUint64, lib, "g_settings_set_uint64") | |
| 1710 | - | core.PuregoSafeRegister(&xSettingsSetValue, lib, "g_settings_set_value") | |
| 1711 | - | ||
| 1712 | - | core.PuregoSafeRegister(&xSettingsListRelocatableSchemas, lib, "g_settings_list_relocatable_schemas") | |
| 1713 | - | core.PuregoSafeRegister(&xSettingsListSchemas, lib, "g_settings_list_schemas") | |
| 1714 | - | core.PuregoSafeRegister(&xSettingsSync, lib, "g_settings_sync") | |
| 1715 | - | core.PuregoSafeRegister(&xSettingsUnbind, lib, "g_settings_unbind") | |
| 1662 | + | core.PuregoSafeRegister(&xSettingsBindFlagsGLibType, libs, "g_settings_bind_flags_get_type") | |
| 1663 | + | ||
| 1664 | + | core.PuregoSafeRegister(&xSettingsGLibType, libs, "g_settings_get_type") | |
| 1665 | + | ||
| 1666 | + | core.PuregoSafeRegister(&xNewSettings, libs, "g_settings_new") | |
| 1667 | + | core.PuregoSafeRegister(&xNewSettingsFull, libs, "g_settings_new_full") | |
| 1668 | + | core.PuregoSafeRegister(&xNewSettingsWithBackend, libs, "g_settings_new_with_backend") | |
| 1669 | + | core.PuregoSafeRegister(&xNewSettingsWithBackendAndPath, libs, "g_settings_new_with_backend_and_path") | |
| 1670 | + | core.PuregoSafeRegister(&xNewSettingsWithPath, libs, "g_settings_new_with_path") | |
| 1671 | + | ||
| 1672 | + | core.PuregoSafeRegister(&xSettingsApply, libs, "g_settings_apply") | |
| 1673 | + | core.PuregoSafeRegister(&xSettingsBind, libs, "g_settings_bind") | |
| 1674 | + | core.PuregoSafeRegister(&xSettingsBindWithMapping, libs, "g_settings_bind_with_mapping") | |
| 1675 | + | core.PuregoSafeRegister(&xSettingsBindWithMappingClosures, libs, "g_settings_bind_with_mapping_closures") | |
| 1676 | + | core.PuregoSafeRegister(&xSettingsBindWritable, libs, "g_settings_bind_writable") | |
| 1677 | + | core.PuregoSafeRegister(&xSettingsCreateAction, libs, "g_settings_create_action") | |
| 1678 | + | core.PuregoSafeRegister(&xSettingsDelay, libs, "g_settings_delay") | |
| 1679 | + | core.PuregoSafeRegister(&xSettingsGet, libs, "g_settings_get") | |
| 1680 | + | core.PuregoSafeRegister(&xSettingsGetBoolean, libs, "g_settings_get_boolean") | |
| 1681 | + | core.PuregoSafeRegister(&xSettingsGetChild, libs, "g_settings_get_child") | |
| 1682 | + | core.PuregoSafeRegister(&xSettingsGetDefaultValue, libs, "g_settings_get_default_value") | |
| 1683 | + | core.PuregoSafeRegister(&xSettingsGetDouble, libs, "g_settings_get_double") | |
| 1684 | + | core.PuregoSafeRegister(&xSettingsGetEnum, libs, "g_settings_get_enum") | |
| 1685 | + | core.PuregoSafeRegister(&xSettingsGetFlags, libs, "g_settings_get_flags") | |
| 1686 | + | core.PuregoSafeRegister(&xSettingsGetHasUnapplied, libs, "g_settings_get_has_unapplied") | |
| 1687 | + | core.PuregoSafeRegister(&xSettingsGetInt, libs, "g_settings_get_int") | |
| 1688 | + | core.PuregoSafeRegister(&xSettingsGetInt64, libs, "g_settings_get_int64") | |
| 1689 | + | core.PuregoSafeRegister(&xSettingsGetMapped, libs, "g_settings_get_mapped") | |
| 1690 | + | core.PuregoSafeRegister(&xSettingsGetRange, libs, "g_settings_get_range") | |
| 1691 | + | core.PuregoSafeRegister(&xSettingsGetString, libs, "g_settings_get_string") | |
| 1692 | + | core.PuregoSafeRegister(&xSettingsGetStrv, libs, "g_settings_get_strv") | |
| 1693 | + | core.PuregoSafeRegister(&xSettingsGetUint, libs, "g_settings_get_uint") | |
| 1694 | + | core.PuregoSafeRegister(&xSettingsGetUint64, libs, "g_settings_get_uint64") | |
| 1695 | + | core.PuregoSafeRegister(&xSettingsGetUserValue, libs, "g_settings_get_user_value") | |
| 1696 | + | core.PuregoSafeRegister(&xSettingsGetValue, libs, "g_settings_get_value") | |
| 1697 | + | core.PuregoSafeRegister(&xSettingsIsWritable, libs, "g_settings_is_writable") | |
| 1698 | + | core.PuregoSafeRegister(&xSettingsListChildren, libs, "g_settings_list_children") | |
| 1699 | + | core.PuregoSafeRegister(&xSettingsListKeys, libs, "g_settings_list_keys") | |
| 1700 | + | core.PuregoSafeRegister(&xSettingsRangeCheck, libs, "g_settings_range_check") | |
| 1701 | + | core.PuregoSafeRegister(&xSettingsReset, libs, "g_settings_reset") | |
| 1702 | + | core.PuregoSafeRegister(&xSettingsRevert, libs, "g_settings_revert") | |
| 1703 | + | core.PuregoSafeRegister(&xSettingsSet, libs, "g_settings_set") | |
| 1704 | + | core.PuregoSafeRegister(&xSettingsSetBoolean, libs, "g_settings_set_boolean") | |
| 1705 | + | core.PuregoSafeRegister(&xSettingsSetDouble, libs, "g_settings_set_double") | |
| 1706 | + | core.PuregoSafeRegister(&xSettingsSetEnum, libs, "g_settings_set_enum") | |
| 1707 | + | core.PuregoSafeRegister(&xSettingsSetFlags, libs, "g_settings_set_flags") | |
| 1708 | + | core.PuregoSafeRegister(&xSettingsSetInt, libs, "g_settings_set_int") | |
| 1709 | + | core.PuregoSafeRegister(&xSettingsSetInt64, libs, "g_settings_set_int64") | |
| 1710 | + | core.PuregoSafeRegister(&xSettingsSetString, libs, "g_settings_set_string") | |
| 1711 | + | core.PuregoSafeRegister(&xSettingsSetStrv, libs, "g_settings_set_strv") | |
| 1712 | + | core.PuregoSafeRegister(&xSettingsSetUint, libs, "g_settings_set_uint") | |
| 1713 | + | core.PuregoSafeRegister(&xSettingsSetUint64, libs, "g_settings_set_uint64") | |
| 1714 | + | core.PuregoSafeRegister(&xSettingsSetValue, libs, "g_settings_set_value") | |
| 1715 | + | ||
| 1716 | + | core.PuregoSafeRegister(&xSettingsListRelocatableSchemas, libs, "g_settings_list_relocatable_schemas") | |
| 1717 | + | core.PuregoSafeRegister(&xSettingsListSchemas, libs, "g_settings_list_schemas") | |
| 1718 | + | core.PuregoSafeRegister(&xSettingsSync, libs, "g_settings_sync") | |
| 1719 | + | core.PuregoSafeRegister(&xSettingsUnbind, libs, "g_settings_unbind") | |
| 1716 | 1720 | ||
| 1717 | 1721 | } | |
M v4/gio/gsettingsbackend.go +20 -16
| @@ -632,26 +632,30 @@ func SettingsBackendGetDefault() *SettingsBackend { | |||
| 632 | 632 | ||
| 633 | 633 | func init() { | |
| 634 | 634 | core.SetPackageName("GIO", "gio-2.0") | |
| 635 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 636 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 637 | - | if err != nil { | |
| 638 | - | panic(err) | |
| 635 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 636 | + | var libs []uintptr | |
| 637 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 638 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 639 | + | if err != nil { | |
| 640 | + | panic(err) | |
| 641 | + | } | |
| 642 | + | libs = append(libs, lib) | |
| 639 | 643 | } | |
| 640 | 644 | ||
| 641 | - | core.PuregoSafeRegister(&xKeyfileSettingsBackendNew, lib, "g_keyfile_settings_backend_new") | |
| 642 | - | core.PuregoSafeRegister(&xMemorySettingsBackendNew, lib, "g_memory_settings_backend_new") | |
| 643 | - | core.PuregoSafeRegister(&xNullSettingsBackendNew, lib, "g_null_settings_backend_new") | |
| 645 | + | core.PuregoSafeRegister(&xKeyfileSettingsBackendNew, libs, "g_keyfile_settings_backend_new") | |
| 646 | + | core.PuregoSafeRegister(&xMemorySettingsBackendNew, libs, "g_memory_settings_backend_new") | |
| 647 | + | core.PuregoSafeRegister(&xNullSettingsBackendNew, libs, "g_null_settings_backend_new") | |
| 644 | 648 | ||
| 645 | - | core.PuregoSafeRegister(&xSettingsBackendGLibType, lib, "g_settings_backend_get_type") | |
| 649 | + | core.PuregoSafeRegister(&xSettingsBackendGLibType, libs, "g_settings_backend_get_type") | |
| 646 | 650 | ||
| 647 | - | core.PuregoSafeRegister(&xSettingsBackendChanged, lib, "g_settings_backend_changed") | |
| 648 | - | core.PuregoSafeRegister(&xSettingsBackendChangedTree, lib, "g_settings_backend_changed_tree") | |
| 649 | - | core.PuregoSafeRegister(&xSettingsBackendKeysChanged, lib, "g_settings_backend_keys_changed") | |
| 650 | - | core.PuregoSafeRegister(&xSettingsBackendPathChanged, lib, "g_settings_backend_path_changed") | |
| 651 | - | core.PuregoSafeRegister(&xSettingsBackendPathWritableChanged, lib, "g_settings_backend_path_writable_changed") | |
| 652 | - | core.PuregoSafeRegister(&xSettingsBackendWritableChanged, lib, "g_settings_backend_writable_changed") | |
| 651 | + | core.PuregoSafeRegister(&xSettingsBackendChanged, libs, "g_settings_backend_changed") | |
| 652 | + | core.PuregoSafeRegister(&xSettingsBackendChangedTree, libs, "g_settings_backend_changed_tree") | |
| 653 | + | core.PuregoSafeRegister(&xSettingsBackendKeysChanged, libs, "g_settings_backend_keys_changed") | |
| 654 | + | core.PuregoSafeRegister(&xSettingsBackendPathChanged, libs, "g_settings_backend_path_changed") | |
| 655 | + | core.PuregoSafeRegister(&xSettingsBackendPathWritableChanged, libs, "g_settings_backend_path_writable_changed") | |
| 656 | + | core.PuregoSafeRegister(&xSettingsBackendWritableChanged, libs, "g_settings_backend_writable_changed") | |
| 653 | 657 | ||
| 654 | - | core.PuregoSafeRegister(&xSettingsBackendFlattenTree, lib, "g_settings_backend_flatten_tree") | |
| 655 | - | core.PuregoSafeRegister(&xSettingsBackendGetDefault, lib, "g_settings_backend_get_default") | |
| 658 | + | core.PuregoSafeRegister(&xSettingsBackendFlattenTree, libs, "g_settings_backend_flatten_tree") | |
| 659 | + | core.PuregoSafeRegister(&xSettingsBackendGetDefault, libs, "g_settings_backend_get_default") | |
| 656 | 660 | ||
| 657 | 661 | } | |
M v4/gio/gsettingsschema.go +34 -30
| @@ -514,44 +514,48 @@ func SettingsSchemaSourceGetDefault() *SettingsSchemaSource { | |||
| 514 | 514 | ||
| 515 | 515 | func init() { | |
| 516 | 516 | core.SetPackageName("GIO", "gio-2.0") | |
| 517 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 518 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 519 | - | if err != nil { | |
| 520 | - | panic(err) | |
| 517 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 518 | + | var libs []uintptr | |
| 519 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 520 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 521 | + | if err != nil { | |
| 522 | + | panic(err) | |
| 523 | + | } | |
| 524 | + | libs = append(libs, lib) | |
| 521 | 525 | } | |
| 522 | 526 | ||
| 523 | - | core.PuregoSafeRegister(&xSettingsSchemaSourceGetDefault, lib, "g_settings_schema_source_get_default") | |
| 527 | + | core.PuregoSafeRegister(&xSettingsSchemaSourceGetDefault, libs, "g_settings_schema_source_get_default") | |
| 524 | 528 | ||
| 525 | - | core.PuregoSafeRegister(&xSettingsSchemaGLibType, lib, "g_settings_schema_get_type") | |
| 529 | + | core.PuregoSafeRegister(&xSettingsSchemaGLibType, libs, "g_settings_schema_get_type") | |
| 526 | 530 | ||
| 527 | - | core.PuregoSafeRegister(&xSettingsSchemaGetId, lib, "g_settings_schema_get_id") | |
| 528 | - | core.PuregoSafeRegister(&xSettingsSchemaGetKey, lib, "g_settings_schema_get_key") | |
| 529 | - | core.PuregoSafeRegister(&xSettingsSchemaGetPath, lib, "g_settings_schema_get_path") | |
| 530 | - | core.PuregoSafeRegister(&xSettingsSchemaHasKey, lib, "g_settings_schema_has_key") | |
| 531 | - | core.PuregoSafeRegister(&xSettingsSchemaListChildren, lib, "g_settings_schema_list_children") | |
| 532 | - | core.PuregoSafeRegister(&xSettingsSchemaListKeys, lib, "g_settings_schema_list_keys") | |
| 533 | - | core.PuregoSafeRegister(&xSettingsSchemaRef, lib, "g_settings_schema_ref") | |
| 534 | - | core.PuregoSafeRegister(&xSettingsSchemaUnref, lib, "g_settings_schema_unref") | |
| 531 | + | core.PuregoSafeRegister(&xSettingsSchemaGetId, libs, "g_settings_schema_get_id") | |
| 532 | + | core.PuregoSafeRegister(&xSettingsSchemaGetKey, libs, "g_settings_schema_get_key") | |
| 533 | + | core.PuregoSafeRegister(&xSettingsSchemaGetPath, libs, "g_settings_schema_get_path") | |
| 534 | + | core.PuregoSafeRegister(&xSettingsSchemaHasKey, libs, "g_settings_schema_has_key") | |
| 535 | + | core.PuregoSafeRegister(&xSettingsSchemaListChildren, libs, "g_settings_schema_list_children") | |
| 536 | + | core.PuregoSafeRegister(&xSettingsSchemaListKeys, libs, "g_settings_schema_list_keys") | |
| 537 | + | core.PuregoSafeRegister(&xSettingsSchemaRef, libs, "g_settings_schema_ref") | |
| 538 | + | core.PuregoSafeRegister(&xSettingsSchemaUnref, libs, "g_settings_schema_unref") | |
| 535 | 539 | ||
| 536 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGLibType, lib, "g_settings_schema_key_get_type") | |
| 540 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGLibType, libs, "g_settings_schema_key_get_type") | |
| 537 | 541 | ||
| 538 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGetDefaultValue, lib, "g_settings_schema_key_get_default_value") | |
| 539 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGetDescription, lib, "g_settings_schema_key_get_description") | |
| 540 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGetName, lib, "g_settings_schema_key_get_name") | |
| 541 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGetRange, lib, "g_settings_schema_key_get_range") | |
| 542 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGetSummary, lib, "g_settings_schema_key_get_summary") | |
| 543 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyGetValueType, lib, "g_settings_schema_key_get_value_type") | |
| 544 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyRangeCheck, lib, "g_settings_schema_key_range_check") | |
| 545 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyRef, lib, "g_settings_schema_key_ref") | |
| 546 | - | core.PuregoSafeRegister(&xSettingsSchemaKeyUnref, lib, "g_settings_schema_key_unref") | |
| 542 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGetDefaultValue, libs, "g_settings_schema_key_get_default_value") | |
| 543 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGetDescription, libs, "g_settings_schema_key_get_description") | |
| 544 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGetName, libs, "g_settings_schema_key_get_name") | |
| 545 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGetRange, libs, "g_settings_schema_key_get_range") | |
| 546 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGetSummary, libs, "g_settings_schema_key_get_summary") | |
| 547 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyGetValueType, libs, "g_settings_schema_key_get_value_type") | |
| 548 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyRangeCheck, libs, "g_settings_schema_key_range_check") | |
| 549 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyRef, libs, "g_settings_schema_key_ref") | |
| 550 | + | core.PuregoSafeRegister(&xSettingsSchemaKeyUnref, libs, "g_settings_schema_key_unref") | |
| 547 | 551 | ||
| 548 | - | core.PuregoSafeRegister(&xSettingsSchemaSourceGLibType, lib, "g_settings_schema_source_get_type") | |
| 552 | + | core.PuregoSafeRegister(&xSettingsSchemaSourceGLibType, libs, "g_settings_schema_source_get_type") | |
| 549 | 553 | ||
| 550 | - | core.PuregoSafeRegister(&xNewSettingsSchemaSourceFromDirectory, lib, "g_settings_schema_source_new_from_directory") | |
| 554 | + | core.PuregoSafeRegister(&xNewSettingsSchemaSourceFromDirectory, libs, "g_settings_schema_source_new_from_directory") | |
| 551 | 555 | ||
| 552 | - | core.PuregoSafeRegister(&xSettingsSchemaSourceListSchemas, lib, "g_settings_schema_source_list_schemas") | |
| 553 | - | core.PuregoSafeRegister(&xSettingsSchemaSourceLookup, lib, "g_settings_schema_source_lookup") | |
| 554 | - | core.PuregoSafeRegister(&xSettingsSchemaSourceRef, lib, "g_settings_schema_source_ref") | |
| 555 | - | core.PuregoSafeRegister(&xSettingsSchemaSourceUnref, lib, "g_settings_schema_source_unref") | |
| 556 | + | core.PuregoSafeRegister(&xSettingsSchemaSourceListSchemas, libs, "g_settings_schema_source_list_schemas") | |
| 557 | + | core.PuregoSafeRegister(&xSettingsSchemaSourceLookup, libs, "g_settings_schema_source_lookup") | |
| 558 | + | core.PuregoSafeRegister(&xSettingsSchemaSourceRef, libs, "g_settings_schema_source_ref") | |
| 559 | + | core.PuregoSafeRegister(&xSettingsSchemaSourceUnref, libs, "g_settings_schema_source_unref") | |
| 556 | 560 | ||
| 557 | 561 | } | |
M v4/gio/gsimpleaction.go +14 -10
| @@ -332,19 +332,23 @@ func (x *SimpleAction) GetStateType() *glib.VariantType { | |||
| 332 | 332 | ||
| 333 | 333 | func init() { | |
| 334 | 334 | core.SetPackageName("GIO", "gio-2.0") | |
| 335 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 336 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 337 | - | if err != nil { | |
| 338 | - | panic(err) | |
| 335 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 336 | + | var libs []uintptr | |
| 337 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 338 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 339 | + | if err != nil { | |
| 340 | + | panic(err) | |
| 341 | + | } | |
| 342 | + | libs = append(libs, lib) | |
| 339 | 343 | } | |
| 340 | 344 | ||
| 341 | - | core.PuregoSafeRegister(&xSimpleActionGLibType, lib, "g_simple_action_get_type") | |
| 345 | + | core.PuregoSafeRegister(&xSimpleActionGLibType, libs, "g_simple_action_get_type") | |
| 342 | 346 | ||
| 343 | - | core.PuregoSafeRegister(&xNewSimpleAction, lib, "g_simple_action_new") | |
| 344 | - | core.PuregoSafeRegister(&xNewSimpleActionStateful, lib, "g_simple_action_new_stateful") | |
| 347 | + | core.PuregoSafeRegister(&xNewSimpleAction, libs, "g_simple_action_new") | |
| 348 | + | core.PuregoSafeRegister(&xNewSimpleActionStateful, libs, "g_simple_action_new_stateful") | |
| 345 | 349 | ||
| 346 | - | core.PuregoSafeRegister(&xSimpleActionSetEnabled, lib, "g_simple_action_set_enabled") | |
| 347 | - | core.PuregoSafeRegister(&xSimpleActionSetState, lib, "g_simple_action_set_state") | |
| 348 | - | core.PuregoSafeRegister(&xSimpleActionSetStateHint, lib, "g_simple_action_set_state_hint") | |
| 350 | + | core.PuregoSafeRegister(&xSimpleActionSetEnabled, libs, "g_simple_action_set_enabled") | |
| 351 | + | core.PuregoSafeRegister(&xSimpleActionSetState, libs, "g_simple_action_set_state") | |
| 352 | + | core.PuregoSafeRegister(&xSimpleActionSetStateHint, libs, "g_simple_action_set_state_hint") | |
| 349 | 353 | ||
| 350 | 354 | } | |
M v4/gio/gsimpleactiongroup.go +14 -10
| @@ -483,19 +483,23 @@ func (x *SimpleActionGroup) RemoveActionEntries(EntriesVar []ActionEntry, NEntri | |||
| 483 | 483 | ||
| 484 | 484 | func init() { | |
| 485 | 485 | core.SetPackageName("GIO", "gio-2.0") | |
| 486 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 487 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 488 | - | if err != nil { | |
| 489 | - | panic(err) | |
| 486 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 487 | + | var libs []uintptr | |
| 488 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 489 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 490 | + | if err != nil { | |
| 491 | + | panic(err) | |
| 492 | + | } | |
| 493 | + | libs = append(libs, lib) | |
| 490 | 494 | } | |
| 491 | 495 | ||
| 492 | - | core.PuregoSafeRegister(&xSimpleActionGroupGLibType, lib, "g_simple_action_group_get_type") | |
| 496 | + | core.PuregoSafeRegister(&xSimpleActionGroupGLibType, libs, "g_simple_action_group_get_type") | |
| 493 | 497 | ||
| 494 | - | core.PuregoSafeRegister(&xNewSimpleActionGroup, lib, "g_simple_action_group_new") | |
| 498 | + | core.PuregoSafeRegister(&xNewSimpleActionGroup, libs, "g_simple_action_group_new") | |
| 495 | 499 | ||
| 496 | - | core.PuregoSafeRegister(&xSimpleActionGroupAddEntries, lib, "g_simple_action_group_add_entries") | |
| 497 | - | core.PuregoSafeRegister(&xSimpleActionGroupInsert, lib, "g_simple_action_group_insert") | |
| 498 | - | core.PuregoSafeRegister(&xSimpleActionGroupLookup, lib, "g_simple_action_group_lookup") | |
| 499 | - | core.PuregoSafeRegister(&xSimpleActionGroupRemove, lib, "g_simple_action_group_remove") | |
| 500 | + | core.PuregoSafeRegister(&xSimpleActionGroupAddEntries, libs, "g_simple_action_group_add_entries") | |
| 501 | + | core.PuregoSafeRegister(&xSimpleActionGroupInsert, libs, "g_simple_action_group_insert") | |
| 502 | + | core.PuregoSafeRegister(&xSimpleActionGroupLookup, libs, "g_simple_action_group_lookup") | |
| 503 | + | core.PuregoSafeRegister(&xSimpleActionGroupRemove, libs, "g_simple_action_group_remove") | |
| 500 | 504 | ||
| 501 | 505 | } | |
M v4/gio/gsimpleasyncresult.go +38 -34
| @@ -600,41 +600,45 @@ func SimpleAsyncResultIsValid(ResultVar AsyncResult, SourceVar *gobject.Object, | |||
| 600 | 600 | ||
| 601 | 601 | func init() { | |
| 602 | 602 | core.SetPackageName("GIO", "gio-2.0") | |
| 603 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 604 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 605 | - | if err != nil { | |
| 606 | - | panic(err) | |
| 603 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 604 | + | var libs []uintptr | |
| 605 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 606 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 607 | + | if err != nil { | |
| 608 | + | panic(err) | |
| 609 | + | } | |
| 610 | + | libs = append(libs, lib) | |
| 607 | 611 | } | |
| 608 | 612 | ||
| 609 | - | core.PuregoSafeRegister(&xSimpleAsyncReportErrorInIdle, lib, "g_simple_async_report_error_in_idle") | |
| 610 | - | core.PuregoSafeRegister(&xSimpleAsyncReportGerrorInIdle, lib, "g_simple_async_report_gerror_in_idle") | |
| 611 | - | core.PuregoSafeRegister(&xSimpleAsyncReportTakeGerrorInIdle, lib, "g_simple_async_report_take_gerror_in_idle") | |
| 612 | - | ||
| 613 | - | core.PuregoSafeRegister(&xSimpleAsyncResultGLibType, lib, "g_simple_async_result_get_type") | |
| 614 | - | ||
| 615 | - | core.PuregoSafeRegister(&xNewSimpleAsyncResult, lib, "g_simple_async_result_new") | |
| 616 | - | core.PuregoSafeRegister(&xNewSimpleAsyncResultError, lib, "g_simple_async_result_new_error") | |
| 617 | - | core.PuregoSafeRegister(&xNewSimpleAsyncResultFromError, lib, "g_simple_async_result_new_from_error") | |
| 618 | - | core.PuregoSafeRegister(&xNewSimpleAsyncResultTakeError, lib, "g_simple_async_result_new_take_error") | |
| 619 | - | ||
| 620 | - | core.PuregoSafeRegister(&xSimpleAsyncResultComplete, lib, "g_simple_async_result_complete") | |
| 621 | - | core.PuregoSafeRegister(&xSimpleAsyncResultCompleteInIdle, lib, "g_simple_async_result_complete_in_idle") | |
| 622 | - | core.PuregoSafeRegister(&xSimpleAsyncResultGetOpResGboolean, lib, "g_simple_async_result_get_op_res_gboolean") | |
| 623 | - | core.PuregoSafeRegister(&xSimpleAsyncResultGetOpResGpointer, lib, "g_simple_async_result_get_op_res_gpointer") | |
| 624 | - | core.PuregoSafeRegister(&xSimpleAsyncResultGetOpResGssize, lib, "g_simple_async_result_get_op_res_gssize") | |
| 625 | - | core.PuregoSafeRegister(&xSimpleAsyncResultGetSourceTag, lib, "g_simple_async_result_get_source_tag") | |
| 626 | - | core.PuregoSafeRegister(&xSimpleAsyncResultPropagateError, lib, "g_simple_async_result_propagate_error") | |
| 627 | - | core.PuregoSafeRegister(&xSimpleAsyncResultRunInThread, lib, "g_simple_async_result_run_in_thread") | |
| 628 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetCheckCancellable, lib, "g_simple_async_result_set_check_cancellable") | |
| 629 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetError, lib, "g_simple_async_result_set_error") | |
| 630 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetErrorVa, lib, "g_simple_async_result_set_error_va") | |
| 631 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetFromError, lib, "g_simple_async_result_set_from_error") | |
| 632 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetHandleCancellation, lib, "g_simple_async_result_set_handle_cancellation") | |
| 633 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetOpResGboolean, lib, "g_simple_async_result_set_op_res_gboolean") | |
| 634 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetOpResGpointer, lib, "g_simple_async_result_set_op_res_gpointer") | |
| 635 | - | core.PuregoSafeRegister(&xSimpleAsyncResultSetOpResGssize, lib, "g_simple_async_result_set_op_res_gssize") | |
| 636 | - | core.PuregoSafeRegister(&xSimpleAsyncResultTakeError, lib, "g_simple_async_result_take_error") | |
| 637 | - | ||
| 638 | - | core.PuregoSafeRegister(&xSimpleAsyncResultIsValid, lib, "g_simple_async_result_is_valid") | |
| 613 | + | core.PuregoSafeRegister(&xSimpleAsyncReportErrorInIdle, libs, "g_simple_async_report_error_in_idle") | |
| 614 | + | core.PuregoSafeRegister(&xSimpleAsyncReportGerrorInIdle, libs, "g_simple_async_report_gerror_in_idle") | |
| 615 | + | core.PuregoSafeRegister(&xSimpleAsyncReportTakeGerrorInIdle, libs, "g_simple_async_report_take_gerror_in_idle") | |
| 616 | + | ||
| 617 | + | core.PuregoSafeRegister(&xSimpleAsyncResultGLibType, libs, "g_simple_async_result_get_type") | |
| 618 | + | ||
| 619 | + | core.PuregoSafeRegister(&xNewSimpleAsyncResult, libs, "g_simple_async_result_new") | |
| 620 | + | core.PuregoSafeRegister(&xNewSimpleAsyncResultError, libs, "g_simple_async_result_new_error") | |
| 621 | + | core.PuregoSafeRegister(&xNewSimpleAsyncResultFromError, libs, "g_simple_async_result_new_from_error") | |
| 622 | + | core.PuregoSafeRegister(&xNewSimpleAsyncResultTakeError, libs, "g_simple_async_result_new_take_error") | |
| 623 | + | ||
| 624 | + | core.PuregoSafeRegister(&xSimpleAsyncResultComplete, libs, "g_simple_async_result_complete") | |
| 625 | + | core.PuregoSafeRegister(&xSimpleAsyncResultCompleteInIdle, libs, "g_simple_async_result_complete_in_idle") | |
| 626 | + | core.PuregoSafeRegister(&xSimpleAsyncResultGetOpResGboolean, libs, "g_simple_async_result_get_op_res_gboolean") | |
| 627 | + | core.PuregoSafeRegister(&xSimpleAsyncResultGetOpResGpointer, libs, "g_simple_async_result_get_op_res_gpointer") | |
| 628 | + | core.PuregoSafeRegister(&xSimpleAsyncResultGetOpResGssize, libs, "g_simple_async_result_get_op_res_gssize") | |
| 629 | + | core.PuregoSafeRegister(&xSimpleAsyncResultGetSourceTag, libs, "g_simple_async_result_get_source_tag") | |
| 630 | + | core.PuregoSafeRegister(&xSimpleAsyncResultPropagateError, libs, "g_simple_async_result_propagate_error") | |
| 631 | + | core.PuregoSafeRegister(&xSimpleAsyncResultRunInThread, libs, "g_simple_async_result_run_in_thread") | |
| 632 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetCheckCancellable, libs, "g_simple_async_result_set_check_cancellable") | |
| 633 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetError, libs, "g_simple_async_result_set_error") | |
| 634 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetErrorVa, libs, "g_simple_async_result_set_error_va") | |
| 635 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetFromError, libs, "g_simple_async_result_set_from_error") | |
| 636 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetHandleCancellation, libs, "g_simple_async_result_set_handle_cancellation") | |
| 637 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetOpResGboolean, libs, "g_simple_async_result_set_op_res_gboolean") | |
| 638 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetOpResGpointer, libs, "g_simple_async_result_set_op_res_gpointer") | |
| 639 | + | core.PuregoSafeRegister(&xSimpleAsyncResultSetOpResGssize, libs, "g_simple_async_result_set_op_res_gssize") | |
| 640 | + | core.PuregoSafeRegister(&xSimpleAsyncResultTakeError, libs, "g_simple_async_result_take_error") | |
| 641 | + | ||
| 642 | + | core.PuregoSafeRegister(&xSimpleAsyncResultIsValid, libs, "g_simple_async_result_is_valid") | |
| 639 | 643 | ||
| 640 | 644 | } | |
M v4/gio/gsimpleiostream.go +10 -6
| @@ -63,14 +63,18 @@ func (c *SimpleIOStream) SetGoPointer(ptr uintptr) { | |||
| 63 | 63 | ||
| 64 | 64 | func init() { | |
| 65 | 65 | core.SetPackageName("GIO", "gio-2.0") | |
| 66 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 67 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 68 | - | if err != nil { | |
| 69 | - | panic(err) | |
| 66 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 67 | + | var libs []uintptr | |
| 68 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 69 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 70 | + | if err != nil { | |
| 71 | + | panic(err) | |
| 72 | + | } | |
| 73 | + | libs = append(libs, lib) | |
| 70 | 74 | } | |
| 71 | 75 | ||
| 72 | - | core.PuregoSafeRegister(&xSimpleIOStreamGLibType, lib, "g_simple_io_stream_get_type") | |
| 76 | + | core.PuregoSafeRegister(&xSimpleIOStreamGLibType, libs, "g_simple_io_stream_get_type") | |
| 73 | 77 | ||
| 74 | - | core.PuregoSafeRegister(&xNewSimpleIOStream, lib, "g_simple_io_stream_new") | |
| 78 | + | core.PuregoSafeRegister(&xNewSimpleIOStream, libs, "g_simple_io_stream_new") | |
| 75 | 79 | ||
| 76 | 80 | } | |
M v4/gio/gsimplepermission.go +10 -6
| @@ -59,14 +59,18 @@ func (c *SimplePermission) SetGoPointer(ptr uintptr) { | |||
| 59 | 59 | ||
| 60 | 60 | func init() { | |
| 61 | 61 | core.SetPackageName("GIO", "gio-2.0") | |
| 62 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 63 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 64 | - | if err != nil { | |
| 65 | - | panic(err) | |
| 62 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 63 | + | var libs []uintptr | |
| 64 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 65 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 66 | + | if err != nil { | |
| 67 | + | panic(err) | |
| 68 | + | } | |
| 69 | + | libs = append(libs, lib) | |
| 66 | 70 | } | |
| 67 | 71 | ||
| 68 | - | core.PuregoSafeRegister(&xSimplePermissionGLibType, lib, "g_simple_permission_get_type") | |
| 72 | + | core.PuregoSafeRegister(&xSimplePermissionGLibType, libs, "g_simple_permission_get_type") | |
| 69 | 73 | ||
| 70 | - | core.PuregoSafeRegister(&xNewSimplePermission, lib, "g_simple_permission_new") | |
| 74 | + | core.PuregoSafeRegister(&xNewSimplePermission, libs, "g_simple_permission_new") | |
| 71 | 75 | ||
| 72 | 76 | } | |
M v4/gio/gsimpleproxyresolver.go +13 -9
| @@ -311,18 +311,22 @@ func SimpleProxyResolverNew(DefaultProxyVar string, IgnoreHostsVar []string) *Pr | |||
| 311 | 311 | ||
| 312 | 312 | func init() { | |
| 313 | 313 | core.SetPackageName("GIO", "gio-2.0") | |
| 314 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 315 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 316 | - | if err != nil { | |
| 317 | - | panic(err) | |
| 314 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 315 | + | var libs []uintptr | |
| 316 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 317 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 318 | + | if err != nil { | |
| 319 | + | panic(err) | |
| 320 | + | } | |
| 321 | + | libs = append(libs, lib) | |
| 318 | 322 | } | |
| 319 | 323 | ||
| 320 | - | core.PuregoSafeRegister(&xSimpleProxyResolverGLibType, lib, "g_simple_proxy_resolver_get_type") | |
| 324 | + | core.PuregoSafeRegister(&xSimpleProxyResolverGLibType, libs, "g_simple_proxy_resolver_get_type") | |
| 321 | 325 | ||
| 322 | - | core.PuregoSafeRegister(&xSimpleProxyResolverSetDefaultProxy, lib, "g_simple_proxy_resolver_set_default_proxy") | |
| 323 | - | core.PuregoSafeRegister(&xSimpleProxyResolverSetIgnoreHosts, lib, "g_simple_proxy_resolver_set_ignore_hosts") | |
| 324 | - | core.PuregoSafeRegister(&xSimpleProxyResolverSetUriProxy, lib, "g_simple_proxy_resolver_set_uri_proxy") | |
| 326 | + | core.PuregoSafeRegister(&xSimpleProxyResolverSetDefaultProxy, libs, "g_simple_proxy_resolver_set_default_proxy") | |
| 327 | + | core.PuregoSafeRegister(&xSimpleProxyResolverSetIgnoreHosts, libs, "g_simple_proxy_resolver_set_ignore_hosts") | |
| 328 | + | core.PuregoSafeRegister(&xSimpleProxyResolverSetUriProxy, libs, "g_simple_proxy_resolver_set_uri_proxy") | |
| 325 | 329 | ||
| 326 | - | core.PuregoSafeRegister(&xSimpleProxyResolverNew, lib, "g_simple_proxy_resolver_new") | |
| 330 | + | core.PuregoSafeRegister(&xSimpleProxyResolverNew, libs, "g_simple_proxy_resolver_new") | |
| 327 | 331 | ||
| 328 | 332 | } | |
M v4/gio/gsocket.go +73 -69
| @@ -1794,74 +1794,78 @@ func (x *Socket) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 1794 | 1794 | ||
| 1795 | 1795 | func init() { | |
| 1796 | 1796 | core.SetPackageName("GIO", "gio-2.0") | |
| 1797 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1798 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1799 | - | if err != nil { | |
| 1800 | - | panic(err) | |
| 1801 | - | } | |
| 1802 | - | ||
| 1803 | - | core.PuregoSafeRegister(&xSocketGLibType, lib, "g_socket_get_type") | |
| 1804 | - | ||
| 1805 | - | core.PuregoSafeRegister(&xNewSocket, lib, "g_socket_new") | |
| 1806 | - | core.PuregoSafeRegister(&xNewSocketFromFd, lib, "g_socket_new_from_fd") | |
| 1807 | - | ||
| 1808 | - | core.PuregoSafeRegister(&xSocketAccept, lib, "g_socket_accept") | |
| 1809 | - | core.PuregoSafeRegister(&xSocketBind, lib, "g_socket_bind") | |
| 1810 | - | core.PuregoSafeRegister(&xSocketCheckConnectResult, lib, "g_socket_check_connect_result") | |
| 1811 | - | core.PuregoSafeRegister(&xSocketClose, lib, "g_socket_close") | |
| 1812 | - | core.PuregoSafeRegister(&xSocketConditionCheck, lib, "g_socket_condition_check") | |
| 1813 | - | core.PuregoSafeRegister(&xSocketConditionTimedWait, lib, "g_socket_condition_timed_wait") | |
| 1814 | - | core.PuregoSafeRegister(&xSocketConditionWait, lib, "g_socket_condition_wait") | |
| 1815 | - | core.PuregoSafeRegister(&xSocketConnect, lib, "g_socket_connect") | |
| 1816 | - | core.PuregoSafeRegister(&xSocketConnectionFactoryCreateConnection, lib, "g_socket_connection_factory_create_connection") | |
| 1817 | - | core.PuregoSafeRegister(&xSocketCreateSource, lib, "g_socket_create_source") | |
| 1818 | - | core.PuregoSafeRegister(&xSocketGetAvailableBytes, lib, "g_socket_get_available_bytes") | |
| 1819 | - | core.PuregoSafeRegister(&xSocketGetBlocking, lib, "g_socket_get_blocking") | |
| 1820 | - | core.PuregoSafeRegister(&xSocketGetBroadcast, lib, "g_socket_get_broadcast") | |
| 1821 | - | core.PuregoSafeRegister(&xSocketGetCredentials, lib, "g_socket_get_credentials") | |
| 1822 | - | core.PuregoSafeRegister(&xSocketGetFamily, lib, "g_socket_get_family") | |
| 1823 | - | core.PuregoSafeRegister(&xSocketGetFd, lib, "g_socket_get_fd") | |
| 1824 | - | core.PuregoSafeRegister(&xSocketGetKeepalive, lib, "g_socket_get_keepalive") | |
| 1825 | - | core.PuregoSafeRegister(&xSocketGetListenBacklog, lib, "g_socket_get_listen_backlog") | |
| 1826 | - | core.PuregoSafeRegister(&xSocketGetLocalAddress, lib, "g_socket_get_local_address") | |
| 1827 | - | core.PuregoSafeRegister(&xSocketGetMulticastLoopback, lib, "g_socket_get_multicast_loopback") | |
| 1828 | - | core.PuregoSafeRegister(&xSocketGetMulticastTtl, lib, "g_socket_get_multicast_ttl") | |
| 1829 | - | core.PuregoSafeRegister(&xSocketGetOption, lib, "g_socket_get_option") | |
| 1830 | - | core.PuregoSafeRegister(&xSocketGetProtocol, lib, "g_socket_get_protocol") | |
| 1831 | - | core.PuregoSafeRegister(&xSocketGetRemoteAddress, lib, "g_socket_get_remote_address") | |
| 1832 | - | core.PuregoSafeRegister(&xSocketGetSocketType, lib, "g_socket_get_socket_type") | |
| 1833 | - | core.PuregoSafeRegister(&xSocketGetTimeout, lib, "g_socket_get_timeout") | |
| 1834 | - | core.PuregoSafeRegister(&xSocketGetTtl, lib, "g_socket_get_ttl") | |
| 1835 | - | core.PuregoSafeRegister(&xSocketIsClosed, lib, "g_socket_is_closed") | |
| 1836 | - | core.PuregoSafeRegister(&xSocketIsConnected, lib, "g_socket_is_connected") | |
| 1837 | - | core.PuregoSafeRegister(&xSocketJoinMulticastGroup, lib, "g_socket_join_multicast_group") | |
| 1838 | - | core.PuregoSafeRegister(&xSocketJoinMulticastGroupSsm, lib, "g_socket_join_multicast_group_ssm") | |
| 1839 | - | core.PuregoSafeRegister(&xSocketLeaveMulticastGroup, lib, "g_socket_leave_multicast_group") | |
| 1840 | - | core.PuregoSafeRegister(&xSocketLeaveMulticastGroupSsm, lib, "g_socket_leave_multicast_group_ssm") | |
| 1841 | - | core.PuregoSafeRegister(&xSocketListen, lib, "g_socket_listen") | |
| 1842 | - | core.PuregoSafeRegister(&xSocketReceive, lib, "g_socket_receive") | |
| 1843 | - | core.PuregoSafeRegister(&xSocketReceiveBytes, lib, "g_socket_receive_bytes") | |
| 1844 | - | core.PuregoSafeRegister(&xSocketReceiveBytesFrom, lib, "g_socket_receive_bytes_from") | |
| 1845 | - | core.PuregoSafeRegister(&xSocketReceiveFrom, lib, "g_socket_receive_from") | |
| 1846 | - | core.PuregoSafeRegister(&xSocketReceiveMessage, lib, "g_socket_receive_message") | |
| 1847 | - | core.PuregoSafeRegister(&xSocketReceiveMessages, lib, "g_socket_receive_messages") | |
| 1848 | - | core.PuregoSafeRegister(&xSocketReceiveWithBlocking, lib, "g_socket_receive_with_blocking") | |
| 1849 | - | core.PuregoSafeRegister(&xSocketSend, lib, "g_socket_send") | |
| 1850 | - | core.PuregoSafeRegister(&xSocketSendMessage, lib, "g_socket_send_message") | |
| 1851 | - | core.PuregoSafeRegister(&xSocketSendMessageWithTimeout, lib, "g_socket_send_message_with_timeout") | |
| 1852 | - | core.PuregoSafeRegister(&xSocketSendMessages, lib, "g_socket_send_messages") | |
| 1853 | - | core.PuregoSafeRegister(&xSocketSendTo, lib, "g_socket_send_to") | |
| 1854 | - | core.PuregoSafeRegister(&xSocketSendWithBlocking, lib, "g_socket_send_with_blocking") | |
| 1855 | - | core.PuregoSafeRegister(&xSocketSetBlocking, lib, "g_socket_set_blocking") | |
| 1856 | - | core.PuregoSafeRegister(&xSocketSetBroadcast, lib, "g_socket_set_broadcast") | |
| 1857 | - | core.PuregoSafeRegister(&xSocketSetKeepalive, lib, "g_socket_set_keepalive") | |
| 1858 | - | core.PuregoSafeRegister(&xSocketSetListenBacklog, lib, "g_socket_set_listen_backlog") | |
| 1859 | - | core.PuregoSafeRegister(&xSocketSetMulticastLoopback, lib, "g_socket_set_multicast_loopback") | |
| 1860 | - | core.PuregoSafeRegister(&xSocketSetMulticastTtl, lib, "g_socket_set_multicast_ttl") | |
| 1861 | - | core.PuregoSafeRegister(&xSocketSetOption, lib, "g_socket_set_option") | |
| 1862 | - | core.PuregoSafeRegister(&xSocketSetTimeout, lib, "g_socket_set_timeout") | |
| 1863 | - | core.PuregoSafeRegister(&xSocketSetTtl, lib, "g_socket_set_ttl") | |
| 1864 | - | core.PuregoSafeRegister(&xSocketShutdown, lib, "g_socket_shutdown") | |
| 1865 | - | core.PuregoSafeRegister(&xSocketSpeaksIpv4, lib, "g_socket_speaks_ipv4") | |
| 1797 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1798 | + | var libs []uintptr | |
| 1799 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1800 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1801 | + | if err != nil { | |
| 1802 | + | panic(err) | |
| 1803 | + | } | |
| 1804 | + | libs = append(libs, lib) | |
| 1805 | + | } | |
| 1806 | + | ||
| 1807 | + | core.PuregoSafeRegister(&xSocketGLibType, libs, "g_socket_get_type") | |
| 1808 | + | ||
| 1809 | + | core.PuregoSafeRegister(&xNewSocket, libs, "g_socket_new") | |
| 1810 | + | core.PuregoSafeRegister(&xNewSocketFromFd, libs, "g_socket_new_from_fd") | |
| 1811 | + | ||
| 1812 | + | core.PuregoSafeRegister(&xSocketAccept, libs, "g_socket_accept") | |
| 1813 | + | core.PuregoSafeRegister(&xSocketBind, libs, "g_socket_bind") | |
| 1814 | + | core.PuregoSafeRegister(&xSocketCheckConnectResult, libs, "g_socket_check_connect_result") | |
| 1815 | + | core.PuregoSafeRegister(&xSocketClose, libs, "g_socket_close") | |
| 1816 | + | core.PuregoSafeRegister(&xSocketConditionCheck, libs, "g_socket_condition_check") | |
| 1817 | + | core.PuregoSafeRegister(&xSocketConditionTimedWait, libs, "g_socket_condition_timed_wait") | |
| 1818 | + | core.PuregoSafeRegister(&xSocketConditionWait, libs, "g_socket_condition_wait") | |
| 1819 | + | core.PuregoSafeRegister(&xSocketConnect, libs, "g_socket_connect") | |
| 1820 | + | core.PuregoSafeRegister(&xSocketConnectionFactoryCreateConnection, libs, "g_socket_connection_factory_create_connection") | |
| 1821 | + | core.PuregoSafeRegister(&xSocketCreateSource, libs, "g_socket_create_source") | |
| 1822 | + | core.PuregoSafeRegister(&xSocketGetAvailableBytes, libs, "g_socket_get_available_bytes") | |
| 1823 | + | core.PuregoSafeRegister(&xSocketGetBlocking, libs, "g_socket_get_blocking") | |
| 1824 | + | core.PuregoSafeRegister(&xSocketGetBroadcast, libs, "g_socket_get_broadcast") | |
| 1825 | + | core.PuregoSafeRegister(&xSocketGetCredentials, libs, "g_socket_get_credentials") | |
| 1826 | + | core.PuregoSafeRegister(&xSocketGetFamily, libs, "g_socket_get_family") | |
| 1827 | + | core.PuregoSafeRegister(&xSocketGetFd, libs, "g_socket_get_fd") | |
| 1828 | + | core.PuregoSafeRegister(&xSocketGetKeepalive, libs, "g_socket_get_keepalive") | |
| 1829 | + | core.PuregoSafeRegister(&xSocketGetListenBacklog, libs, "g_socket_get_listen_backlog") | |
| 1830 | + | core.PuregoSafeRegister(&xSocketGetLocalAddress, libs, "g_socket_get_local_address") | |
| 1831 | + | core.PuregoSafeRegister(&xSocketGetMulticastLoopback, libs, "g_socket_get_multicast_loopback") | |
| 1832 | + | core.PuregoSafeRegister(&xSocketGetMulticastTtl, libs, "g_socket_get_multicast_ttl") | |
| 1833 | + | core.PuregoSafeRegister(&xSocketGetOption, libs, "g_socket_get_option") | |
| 1834 | + | core.PuregoSafeRegister(&xSocketGetProtocol, libs, "g_socket_get_protocol") | |
| 1835 | + | core.PuregoSafeRegister(&xSocketGetRemoteAddress, libs, "g_socket_get_remote_address") | |
| 1836 | + | core.PuregoSafeRegister(&xSocketGetSocketType, libs, "g_socket_get_socket_type") | |
| 1837 | + | core.PuregoSafeRegister(&xSocketGetTimeout, libs, "g_socket_get_timeout") | |
| 1838 | + | core.PuregoSafeRegister(&xSocketGetTtl, libs, "g_socket_get_ttl") | |
| 1839 | + | core.PuregoSafeRegister(&xSocketIsClosed, libs, "g_socket_is_closed") | |
| 1840 | + | core.PuregoSafeRegister(&xSocketIsConnected, libs, "g_socket_is_connected") | |
| 1841 | + | core.PuregoSafeRegister(&xSocketJoinMulticastGroup, libs, "g_socket_join_multicast_group") | |
| 1842 | + | core.PuregoSafeRegister(&xSocketJoinMulticastGroupSsm, libs, "g_socket_join_multicast_group_ssm") | |
| 1843 | + | core.PuregoSafeRegister(&xSocketLeaveMulticastGroup, libs, "g_socket_leave_multicast_group") | |
| 1844 | + | core.PuregoSafeRegister(&xSocketLeaveMulticastGroupSsm, libs, "g_socket_leave_multicast_group_ssm") | |
| 1845 | + | core.PuregoSafeRegister(&xSocketListen, libs, "g_socket_listen") | |
| 1846 | + | core.PuregoSafeRegister(&xSocketReceive, libs, "g_socket_receive") | |
| 1847 | + | core.PuregoSafeRegister(&xSocketReceiveBytes, libs, "g_socket_receive_bytes") | |
| 1848 | + | core.PuregoSafeRegister(&xSocketReceiveBytesFrom, libs, "g_socket_receive_bytes_from") | |
| 1849 | + | core.PuregoSafeRegister(&xSocketReceiveFrom, libs, "g_socket_receive_from") | |
| 1850 | + | core.PuregoSafeRegister(&xSocketReceiveMessage, libs, "g_socket_receive_message") | |
| 1851 | + | core.PuregoSafeRegister(&xSocketReceiveMessages, libs, "g_socket_receive_messages") | |
| 1852 | + | core.PuregoSafeRegister(&xSocketReceiveWithBlocking, libs, "g_socket_receive_with_blocking") | |
| 1853 | + | core.PuregoSafeRegister(&xSocketSend, libs, "g_socket_send") | |
| 1854 | + | core.PuregoSafeRegister(&xSocketSendMessage, libs, "g_socket_send_message") | |
| 1855 | + | core.PuregoSafeRegister(&xSocketSendMessageWithTimeout, libs, "g_socket_send_message_with_timeout") | |
| 1856 | + | core.PuregoSafeRegister(&xSocketSendMessages, libs, "g_socket_send_messages") | |
| 1857 | + | core.PuregoSafeRegister(&xSocketSendTo, libs, "g_socket_send_to") | |
| 1858 | + | core.PuregoSafeRegister(&xSocketSendWithBlocking, libs, "g_socket_send_with_blocking") | |
| 1859 | + | core.PuregoSafeRegister(&xSocketSetBlocking, libs, "g_socket_set_blocking") | |
| 1860 | + | core.PuregoSafeRegister(&xSocketSetBroadcast, libs, "g_socket_set_broadcast") | |
| 1861 | + | core.PuregoSafeRegister(&xSocketSetKeepalive, libs, "g_socket_set_keepalive") | |
| 1862 | + | core.PuregoSafeRegister(&xSocketSetListenBacklog, libs, "g_socket_set_listen_backlog") | |
| 1863 | + | core.PuregoSafeRegister(&xSocketSetMulticastLoopback, libs, "g_socket_set_multicast_loopback") | |
| 1864 | + | core.PuregoSafeRegister(&xSocketSetMulticastTtl, libs, "g_socket_set_multicast_ttl") | |
| 1865 | + | core.PuregoSafeRegister(&xSocketSetOption, libs, "g_socket_set_option") | |
| 1866 | + | core.PuregoSafeRegister(&xSocketSetTimeout, libs, "g_socket_set_timeout") | |
| 1867 | + | core.PuregoSafeRegister(&xSocketSetTtl, libs, "g_socket_set_ttl") | |
| 1868 | + | core.PuregoSafeRegister(&xSocketShutdown, libs, "g_socket_shutdown") | |
| 1869 | + | core.PuregoSafeRegister(&xSocketSpeaksIpv4, libs, "g_socket_speaks_ipv4") | |
| 1866 | 1870 | ||
| 1867 | 1871 | } | |
M v4/gio/gsocketaddress.go +13 -9
| @@ -233,18 +233,22 @@ func (x *SocketAddress) ToString() string { | |||
| 233 | 233 | ||
| 234 | 234 | func init() { | |
| 235 | 235 | core.SetPackageName("GIO", "gio-2.0") | |
| 236 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 237 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 238 | - | if err != nil { | |
| 239 | - | panic(err) | |
| 236 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 237 | + | var libs []uintptr | |
| 238 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 239 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 240 | + | if err != nil { | |
| 241 | + | panic(err) | |
| 242 | + | } | |
| 243 | + | libs = append(libs, lib) | |
| 240 | 244 | } | |
| 241 | 245 | ||
| 242 | - | core.PuregoSafeRegister(&xSocketAddressGLibType, lib, "g_socket_address_get_type") | |
| 246 | + | core.PuregoSafeRegister(&xSocketAddressGLibType, libs, "g_socket_address_get_type") | |
| 243 | 247 | ||
| 244 | - | core.PuregoSafeRegister(&xNewSocketAddressFromNative, lib, "g_socket_address_new_from_native") | |
| 248 | + | core.PuregoSafeRegister(&xNewSocketAddressFromNative, libs, "g_socket_address_new_from_native") | |
| 245 | 249 | ||
| 246 | - | core.PuregoSafeRegister(&xSocketAddressGetFamily, lib, "g_socket_address_get_family") | |
| 247 | - | core.PuregoSafeRegister(&xSocketAddressGetNativeSize, lib, "g_socket_address_get_native_size") | |
| 248 | - | core.PuregoSafeRegister(&xSocketAddressToNative, lib, "g_socket_address_to_native") | |
| 250 | + | core.PuregoSafeRegister(&xSocketAddressGetFamily, libs, "g_socket_address_get_family") | |
| 251 | + | core.PuregoSafeRegister(&xSocketAddressGetNativeSize, libs, "g_socket_address_get_native_size") | |
| 252 | + | core.PuregoSafeRegister(&xSocketAddressToNative, libs, "g_socket_address_to_native") | |
| 249 | 253 | ||
| 250 | 254 | } | |
M v4/gio/gsocketaddressenumerator.go +12 -8
| @@ -238,16 +238,20 @@ func (c *SocketAddressEnumerator) SetGoPointer(ptr uintptr) { | |||
| 238 | 238 | ||
| 239 | 239 | func init() { | |
| 240 | 240 | core.SetPackageName("GIO", "gio-2.0") | |
| 241 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 242 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 243 | - | if err != nil { | |
| 244 | - | panic(err) | |
| 241 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 242 | + | var libs []uintptr | |
| 243 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 244 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 245 | + | if err != nil { | |
| 246 | + | panic(err) | |
| 247 | + | } | |
| 248 | + | libs = append(libs, lib) | |
| 245 | 249 | } | |
| 246 | 250 | ||
| 247 | - | core.PuregoSafeRegister(&xSocketAddressEnumeratorGLibType, lib, "g_socket_address_enumerator_get_type") | |
| 251 | + | core.PuregoSafeRegister(&xSocketAddressEnumeratorGLibType, libs, "g_socket_address_enumerator_get_type") | |
| 248 | 252 | ||
| 249 | - | core.PuregoSafeRegister(&xSocketAddressEnumeratorNext, lib, "g_socket_address_enumerator_next") | |
| 250 | - | core.PuregoSafeRegister(&xSocketAddressEnumeratorNextAsync, lib, "g_socket_address_enumerator_next_async") | |
| 251 | - | core.PuregoSafeRegister(&xSocketAddressEnumeratorNextFinish, lib, "g_socket_address_enumerator_next_finish") | |
| 253 | + | core.PuregoSafeRegister(&xSocketAddressEnumeratorNext, libs, "g_socket_address_enumerator_next") | |
| 254 | + | core.PuregoSafeRegister(&xSocketAddressEnumeratorNextAsync, libs, "g_socket_address_enumerator_next_async") | |
| 255 | + | core.PuregoSafeRegister(&xSocketAddressEnumeratorNextFinish, libs, "g_socket_address_enumerator_next_finish") | |
| 252 | 256 | ||
| 253 | 257 | } | |
M v4/gio/gsocketclient.go +45 -41
| @@ -870,46 +870,50 @@ func (x *SocketClient) ConnectEvent(cb *func(SocketClient, SocketClientEvent, ui | |||
| 870 | 870 | ||
| 871 | 871 | func init() { | |
| 872 | 872 | core.SetPackageName("GIO", "gio-2.0") | |
| 873 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 874 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 875 | - | if err != nil { | |
| 876 | - | panic(err) | |
| 877 | - | } | |
| 878 | - | ||
| 879 | - | core.PuregoSafeRegister(&xSocketClientGLibType, lib, "g_socket_client_get_type") | |
| 880 | - | ||
| 881 | - | core.PuregoSafeRegister(&xNewSocketClient, lib, "g_socket_client_new") | |
| 882 | - | ||
| 883 | - | core.PuregoSafeRegister(&xSocketClientAddApplicationProxy, lib, "g_socket_client_add_application_proxy") | |
| 884 | - | core.PuregoSafeRegister(&xSocketClientConnect, lib, "g_socket_client_connect") | |
| 885 | - | core.PuregoSafeRegister(&xSocketClientConnectAsync, lib, "g_socket_client_connect_async") | |
| 886 | - | core.PuregoSafeRegister(&xSocketClientConnectFinish, lib, "g_socket_client_connect_finish") | |
| 887 | - | core.PuregoSafeRegister(&xSocketClientConnectToHost, lib, "g_socket_client_connect_to_host") | |
| 888 | - | core.PuregoSafeRegister(&xSocketClientConnectToHostAsync, lib, "g_socket_client_connect_to_host_async") | |
| 889 | - | core.PuregoSafeRegister(&xSocketClientConnectToHostFinish, lib, "g_socket_client_connect_to_host_finish") | |
| 890 | - | core.PuregoSafeRegister(&xSocketClientConnectToService, lib, "g_socket_client_connect_to_service") | |
| 891 | - | core.PuregoSafeRegister(&xSocketClientConnectToServiceAsync, lib, "g_socket_client_connect_to_service_async") | |
| 892 | - | core.PuregoSafeRegister(&xSocketClientConnectToServiceFinish, lib, "g_socket_client_connect_to_service_finish") | |
| 893 | - | core.PuregoSafeRegister(&xSocketClientConnectToUri, lib, "g_socket_client_connect_to_uri") | |
| 894 | - | core.PuregoSafeRegister(&xSocketClientConnectToUriAsync, lib, "g_socket_client_connect_to_uri_async") | |
| 895 | - | core.PuregoSafeRegister(&xSocketClientConnectToUriFinish, lib, "g_socket_client_connect_to_uri_finish") | |
| 896 | - | core.PuregoSafeRegister(&xSocketClientGetEnableProxy, lib, "g_socket_client_get_enable_proxy") | |
| 897 | - | core.PuregoSafeRegister(&xSocketClientGetFamily, lib, "g_socket_client_get_family") | |
| 898 | - | core.PuregoSafeRegister(&xSocketClientGetLocalAddress, lib, "g_socket_client_get_local_address") | |
| 899 | - | core.PuregoSafeRegister(&xSocketClientGetProtocol, lib, "g_socket_client_get_protocol") | |
| 900 | - | core.PuregoSafeRegister(&xSocketClientGetProxyResolver, lib, "g_socket_client_get_proxy_resolver") | |
| 901 | - | core.PuregoSafeRegister(&xSocketClientGetSocketType, lib, "g_socket_client_get_socket_type") | |
| 902 | - | core.PuregoSafeRegister(&xSocketClientGetTimeout, lib, "g_socket_client_get_timeout") | |
| 903 | - | core.PuregoSafeRegister(&xSocketClientGetTls, lib, "g_socket_client_get_tls") | |
| 904 | - | core.PuregoSafeRegister(&xSocketClientGetTlsValidationFlags, lib, "g_socket_client_get_tls_validation_flags") | |
| 905 | - | core.PuregoSafeRegister(&xSocketClientSetEnableProxy, lib, "g_socket_client_set_enable_proxy") | |
| 906 | - | core.PuregoSafeRegister(&xSocketClientSetFamily, lib, "g_socket_client_set_family") | |
| 907 | - | core.PuregoSafeRegister(&xSocketClientSetLocalAddress, lib, "g_socket_client_set_local_address") | |
| 908 | - | core.PuregoSafeRegister(&xSocketClientSetProtocol, lib, "g_socket_client_set_protocol") | |
| 909 | - | core.PuregoSafeRegister(&xSocketClientSetProxyResolver, lib, "g_socket_client_set_proxy_resolver") | |
| 910 | - | core.PuregoSafeRegister(&xSocketClientSetSocketType, lib, "g_socket_client_set_socket_type") | |
| 911 | - | core.PuregoSafeRegister(&xSocketClientSetTimeout, lib, "g_socket_client_set_timeout") | |
| 912 | - | core.PuregoSafeRegister(&xSocketClientSetTls, lib, "g_socket_client_set_tls") | |
| 913 | - | core.PuregoSafeRegister(&xSocketClientSetTlsValidationFlags, lib, "g_socket_client_set_tls_validation_flags") | |
| 873 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 874 | + | var libs []uintptr | |
| 875 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 876 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 877 | + | if err != nil { | |
| 878 | + | panic(err) | |
| 879 | + | } | |
| 880 | + | libs = append(libs, lib) | |
| 881 | + | } | |
| 882 | + | ||
| 883 | + | core.PuregoSafeRegister(&xSocketClientGLibType, libs, "g_socket_client_get_type") | |
| 884 | + | ||
| 885 | + | core.PuregoSafeRegister(&xNewSocketClient, libs, "g_socket_client_new") | |
| 886 | + | ||
| 887 | + | core.PuregoSafeRegister(&xSocketClientAddApplicationProxy, libs, "g_socket_client_add_application_proxy") | |
| 888 | + | core.PuregoSafeRegister(&xSocketClientConnect, libs, "g_socket_client_connect") | |
| 889 | + | core.PuregoSafeRegister(&xSocketClientConnectAsync, libs, "g_socket_client_connect_async") | |
| 890 | + | core.PuregoSafeRegister(&xSocketClientConnectFinish, libs, "g_socket_client_connect_finish") | |
| 891 | + | core.PuregoSafeRegister(&xSocketClientConnectToHost, libs, "g_socket_client_connect_to_host") | |
| 892 | + | core.PuregoSafeRegister(&xSocketClientConnectToHostAsync, libs, "g_socket_client_connect_to_host_async") | |
| 893 | + | core.PuregoSafeRegister(&xSocketClientConnectToHostFinish, libs, "g_socket_client_connect_to_host_finish") | |
| 894 | + | core.PuregoSafeRegister(&xSocketClientConnectToService, libs, "g_socket_client_connect_to_service") | |
| 895 | + | core.PuregoSafeRegister(&xSocketClientConnectToServiceAsync, libs, "g_socket_client_connect_to_service_async") | |
| 896 | + | core.PuregoSafeRegister(&xSocketClientConnectToServiceFinish, libs, "g_socket_client_connect_to_service_finish") | |
| 897 | + | core.PuregoSafeRegister(&xSocketClientConnectToUri, libs, "g_socket_client_connect_to_uri") | |
| 898 | + | core.PuregoSafeRegister(&xSocketClientConnectToUriAsync, libs, "g_socket_client_connect_to_uri_async") | |
| 899 | + | core.PuregoSafeRegister(&xSocketClientConnectToUriFinish, libs, "g_socket_client_connect_to_uri_finish") | |
| 900 | + | core.PuregoSafeRegister(&xSocketClientGetEnableProxy, libs, "g_socket_client_get_enable_proxy") | |
| 901 | + | core.PuregoSafeRegister(&xSocketClientGetFamily, libs, "g_socket_client_get_family") | |
| 902 | + | core.PuregoSafeRegister(&xSocketClientGetLocalAddress, libs, "g_socket_client_get_local_address") | |
| 903 | + | core.PuregoSafeRegister(&xSocketClientGetProtocol, libs, "g_socket_client_get_protocol") | |
| 904 | + | core.PuregoSafeRegister(&xSocketClientGetProxyResolver, libs, "g_socket_client_get_proxy_resolver") | |
| 905 | + | core.PuregoSafeRegister(&xSocketClientGetSocketType, libs, "g_socket_client_get_socket_type") | |
| 906 | + | core.PuregoSafeRegister(&xSocketClientGetTimeout, libs, "g_socket_client_get_timeout") | |
| 907 | + | core.PuregoSafeRegister(&xSocketClientGetTls, libs, "g_socket_client_get_tls") | |
| 908 | + | core.PuregoSafeRegister(&xSocketClientGetTlsValidationFlags, libs, "g_socket_client_get_tls_validation_flags") | |
| 909 | + | core.PuregoSafeRegister(&xSocketClientSetEnableProxy, libs, "g_socket_client_set_enable_proxy") | |
| 910 | + | core.PuregoSafeRegister(&xSocketClientSetFamily, libs, "g_socket_client_set_family") | |
| 911 | + | core.PuregoSafeRegister(&xSocketClientSetLocalAddress, libs, "g_socket_client_set_local_address") | |
| 912 | + | core.PuregoSafeRegister(&xSocketClientSetProtocol, libs, "g_socket_client_set_protocol") | |
| 913 | + | core.PuregoSafeRegister(&xSocketClientSetProxyResolver, libs, "g_socket_client_set_proxy_resolver") | |
| 914 | + | core.PuregoSafeRegister(&xSocketClientSetSocketType, libs, "g_socket_client_set_socket_type") | |
| 915 | + | core.PuregoSafeRegister(&xSocketClientSetTimeout, libs, "g_socket_client_set_timeout") | |
| 916 | + | core.PuregoSafeRegister(&xSocketClientSetTls, libs, "g_socket_client_set_tls") | |
| 917 | + | core.PuregoSafeRegister(&xSocketClientSetTlsValidationFlags, libs, "g_socket_client_set_tls_validation_flags") | |
| 914 | 918 | ||
| 915 | 919 | } | |
M v4/gio/gsocketconnectable.go +12 -8
| @@ -269,16 +269,20 @@ var XGSocketConnectableToString func(uintptr) string | |||
| 269 | 269 | ||
| 270 | 270 | func init() { | |
| 271 | 271 | core.SetPackageName("GIO", "gio-2.0") | |
| 272 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 273 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 274 | - | if err != nil { | |
| 275 | - | panic(err) | |
| 272 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 273 | + | var libs []uintptr | |
| 274 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 275 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 276 | + | if err != nil { | |
| 277 | + | panic(err) | |
| 278 | + | } | |
| 279 | + | libs = append(libs, lib) | |
| 276 | 280 | } | |
| 277 | 281 | ||
| 278 | - | core.PuregoSafeRegister(&xSocketConnectableGLibType, lib, "g_socket_connectable_get_type") | |
| 282 | + | core.PuregoSafeRegister(&xSocketConnectableGLibType, libs, "g_socket_connectable_get_type") | |
| 279 | 283 | ||
| 280 | - | core.PuregoSafeRegister(&XGSocketConnectableEnumerate, lib, "g_socket_connectable_enumerate") | |
| 281 | - | core.PuregoSafeRegister(&XGSocketConnectableProxyEnumerate, lib, "g_socket_connectable_proxy_enumerate") | |
| 282 | - | core.PuregoSafeRegister(&XGSocketConnectableToString, lib, "g_socket_connectable_to_string") | |
| 284 | + | core.PuregoSafeRegister(&XGSocketConnectableEnumerate, libs, "g_socket_connectable_enumerate") | |
| 285 | + | core.PuregoSafeRegister(&XGSocketConnectableProxyEnumerate, libs, "g_socket_connectable_proxy_enumerate") | |
| 286 | + | core.PuregoSafeRegister(&XGSocketConnectableToString, libs, "g_socket_connectable_to_string") | |
| 283 | 287 | ||
| 284 | 288 | } | |
M v4/gio/gsocketconnection.go +18 -14
| @@ -373,23 +373,27 @@ func SocketConnectionFactoryRegisterType(GTypeVar types.GType, FamilyVar SocketF | |||
| 373 | 373 | ||
| 374 | 374 | func init() { | |
| 375 | 375 | core.SetPackageName("GIO", "gio-2.0") | |
| 376 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 377 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 378 | - | if err != nil { | |
| 379 | - | panic(err) | |
| 376 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 377 | + | var libs []uintptr | |
| 378 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 379 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 380 | + | if err != nil { | |
| 381 | + | panic(err) | |
| 382 | + | } | |
| 383 | + | libs = append(libs, lib) | |
| 380 | 384 | } | |
| 381 | 385 | ||
| 382 | - | core.PuregoSafeRegister(&xSocketConnectionGLibType, lib, "g_socket_connection_get_type") | |
| 386 | + | core.PuregoSafeRegister(&xSocketConnectionGLibType, libs, "g_socket_connection_get_type") | |
| 383 | 387 | ||
| 384 | - | core.PuregoSafeRegister(&xSocketConnectionConnect, lib, "g_socket_connection_connect") | |
| 385 | - | core.PuregoSafeRegister(&xSocketConnectionConnectAsync, lib, "g_socket_connection_connect_async") | |
| 386 | - | core.PuregoSafeRegister(&xSocketConnectionConnectFinish, lib, "g_socket_connection_connect_finish") | |
| 387 | - | core.PuregoSafeRegister(&xSocketConnectionGetLocalAddress, lib, "g_socket_connection_get_local_address") | |
| 388 | - | core.PuregoSafeRegister(&xSocketConnectionGetRemoteAddress, lib, "g_socket_connection_get_remote_address") | |
| 389 | - | core.PuregoSafeRegister(&xSocketConnectionGetSocket, lib, "g_socket_connection_get_socket") | |
| 390 | - | core.PuregoSafeRegister(&xSocketConnectionIsConnected, lib, "g_socket_connection_is_connected") | |
| 388 | + | core.PuregoSafeRegister(&xSocketConnectionConnect, libs, "g_socket_connection_connect") | |
| 389 | + | core.PuregoSafeRegister(&xSocketConnectionConnectAsync, libs, "g_socket_connection_connect_async") | |
| 390 | + | core.PuregoSafeRegister(&xSocketConnectionConnectFinish, libs, "g_socket_connection_connect_finish") | |
| 391 | + | core.PuregoSafeRegister(&xSocketConnectionGetLocalAddress, libs, "g_socket_connection_get_local_address") | |
| 392 | + | core.PuregoSafeRegister(&xSocketConnectionGetRemoteAddress, libs, "g_socket_connection_get_remote_address") | |
| 393 | + | core.PuregoSafeRegister(&xSocketConnectionGetSocket, libs, "g_socket_connection_get_socket") | |
| 394 | + | core.PuregoSafeRegister(&xSocketConnectionIsConnected, libs, "g_socket_connection_is_connected") | |
| 391 | 395 | ||
| 392 | - | core.PuregoSafeRegister(&xSocketConnectionFactoryLookupType, lib, "g_socket_connection_factory_lookup_type") | |
| 393 | - | core.PuregoSafeRegister(&xSocketConnectionFactoryRegisterType, lib, "g_socket_connection_factory_register_type") | |
| 396 | + | core.PuregoSafeRegister(&xSocketConnectionFactoryLookupType, libs, "g_socket_connection_factory_lookup_type") | |
| 397 | + | core.PuregoSafeRegister(&xSocketConnectionFactoryRegisterType, libs, "g_socket_connection_factory_register_type") | |
| 394 | 398 | ||
| 395 | 399 | } | |
M v4/gio/gsocketcontrolmessage.go +14 -10
| @@ -415,19 +415,23 @@ func SocketControlMessageDeserialize(LevelVar int, TypeVar int, SizeVar uint, Da | |||
| 415 | 415 | ||
| 416 | 416 | func init() { | |
| 417 | 417 | core.SetPackageName("GIO", "gio-2.0") | |
| 418 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 419 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 420 | - | if err != nil { | |
| 421 | - | panic(err) | |
| 418 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 419 | + | var libs []uintptr | |
| 420 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 421 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 422 | + | if err != nil { | |
| 423 | + | panic(err) | |
| 424 | + | } | |
| 425 | + | libs = append(libs, lib) | |
| 422 | 426 | } | |
| 423 | 427 | ||
| 424 | - | core.PuregoSafeRegister(&xSocketControlMessageGLibType, lib, "g_socket_control_message_get_type") | |
| 428 | + | core.PuregoSafeRegister(&xSocketControlMessageGLibType, libs, "g_socket_control_message_get_type") | |
| 425 | 429 | ||
| 426 | - | core.PuregoSafeRegister(&xSocketControlMessageGetLevel, lib, "g_socket_control_message_get_level") | |
| 427 | - | core.PuregoSafeRegister(&xSocketControlMessageGetMsgType, lib, "g_socket_control_message_get_msg_type") | |
| 428 | - | core.PuregoSafeRegister(&xSocketControlMessageGetSize, lib, "g_socket_control_message_get_size") | |
| 429 | - | core.PuregoSafeRegister(&xSocketControlMessageSerialize, lib, "g_socket_control_message_serialize") | |
| 430 | + | core.PuregoSafeRegister(&xSocketControlMessageGetLevel, libs, "g_socket_control_message_get_level") | |
| 431 | + | core.PuregoSafeRegister(&xSocketControlMessageGetMsgType, libs, "g_socket_control_message_get_msg_type") | |
| 432 | + | core.PuregoSafeRegister(&xSocketControlMessageGetSize, libs, "g_socket_control_message_get_size") | |
| 433 | + | core.PuregoSafeRegister(&xSocketControlMessageSerialize, libs, "g_socket_control_message_serialize") | |
| 430 | 434 | ||
| 431 | - | core.PuregoSafeRegister(&xSocketControlMessageDeserialize, lib, "g_socket_control_message_deserialize") | |
| 435 | + | core.PuregoSafeRegister(&xSocketControlMessageDeserialize, libs, "g_socket_control_message_deserialize") | |
| 432 | 436 | ||
| 433 | 437 | } | |
M v4/gio/gsocketlistener.go +26 -22
| @@ -558,27 +558,31 @@ func (x *SocketListener) ConnectEvent(cb *func(SocketListener, SocketListenerEve | |||
| 558 | 558 | ||
| 559 | 559 | func init() { | |
| 560 | 560 | core.SetPackageName("GIO", "gio-2.0") | |
| 561 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 562 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 563 | - | if err != nil { | |
| 564 | - | panic(err) | |
| 565 | - | } | |
| 566 | - | ||
| 567 | - | core.PuregoSafeRegister(&xSocketListenerGLibType, lib, "g_socket_listener_get_type") | |
| 568 | - | ||
| 569 | - | core.PuregoSafeRegister(&xNewSocketListener, lib, "g_socket_listener_new") | |
| 570 | - | ||
| 571 | - | core.PuregoSafeRegister(&xSocketListenerAccept, lib, "g_socket_listener_accept") | |
| 572 | - | core.PuregoSafeRegister(&xSocketListenerAcceptAsync, lib, "g_socket_listener_accept_async") | |
| 573 | - | core.PuregoSafeRegister(&xSocketListenerAcceptFinish, lib, "g_socket_listener_accept_finish") | |
| 574 | - | core.PuregoSafeRegister(&xSocketListenerAcceptSocket, lib, "g_socket_listener_accept_socket") | |
| 575 | - | core.PuregoSafeRegister(&xSocketListenerAcceptSocketAsync, lib, "g_socket_listener_accept_socket_async") | |
| 576 | - | core.PuregoSafeRegister(&xSocketListenerAcceptSocketFinish, lib, "g_socket_listener_accept_socket_finish") | |
| 577 | - | core.PuregoSafeRegister(&xSocketListenerAddAddress, lib, "g_socket_listener_add_address") | |
| 578 | - | core.PuregoSafeRegister(&xSocketListenerAddAnyInetPort, lib, "g_socket_listener_add_any_inet_port") | |
| 579 | - | core.PuregoSafeRegister(&xSocketListenerAddInetPort, lib, "g_socket_listener_add_inet_port") | |
| 580 | - | core.PuregoSafeRegister(&xSocketListenerAddSocket, lib, "g_socket_listener_add_socket") | |
| 581 | - | core.PuregoSafeRegister(&xSocketListenerClose, lib, "g_socket_listener_close") | |
| 582 | - | core.PuregoSafeRegister(&xSocketListenerSetBacklog, lib, "g_socket_listener_set_backlog") | |
| 561 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 562 | + | var libs []uintptr | |
| 563 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 564 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 565 | + | if err != nil { | |
| 566 | + | panic(err) | |
| 567 | + | } | |
| 568 | + | libs = append(libs, lib) | |
| 569 | + | } | |
| 570 | + | ||
| 571 | + | core.PuregoSafeRegister(&xSocketListenerGLibType, libs, "g_socket_listener_get_type") | |
| 572 | + | ||
| 573 | + | core.PuregoSafeRegister(&xNewSocketListener, libs, "g_socket_listener_new") | |
| 574 | + | ||
| 575 | + | core.PuregoSafeRegister(&xSocketListenerAccept, libs, "g_socket_listener_accept") | |
| 576 | + | core.PuregoSafeRegister(&xSocketListenerAcceptAsync, libs, "g_socket_listener_accept_async") | |
| 577 | + | core.PuregoSafeRegister(&xSocketListenerAcceptFinish, libs, "g_socket_listener_accept_finish") | |
| 578 | + | core.PuregoSafeRegister(&xSocketListenerAcceptSocket, libs, "g_socket_listener_accept_socket") | |
| 579 | + | core.PuregoSafeRegister(&xSocketListenerAcceptSocketAsync, libs, "g_socket_listener_accept_socket_async") | |
| 580 | + | core.PuregoSafeRegister(&xSocketListenerAcceptSocketFinish, libs, "g_socket_listener_accept_socket_finish") | |
| 581 | + | core.PuregoSafeRegister(&xSocketListenerAddAddress, libs, "g_socket_listener_add_address") | |
| 582 | + | core.PuregoSafeRegister(&xSocketListenerAddAnyInetPort, libs, "g_socket_listener_add_any_inet_port") | |
| 583 | + | core.PuregoSafeRegister(&xSocketListenerAddInetPort, libs, "g_socket_listener_add_inet_port") | |
| 584 | + | core.PuregoSafeRegister(&xSocketListenerAddSocket, libs, "g_socket_listener_add_socket") | |
| 585 | + | core.PuregoSafeRegister(&xSocketListenerClose, libs, "g_socket_listener_close") | |
| 586 | + | core.PuregoSafeRegister(&xSocketListenerSetBacklog, libs, "g_socket_listener_set_backlog") | |
| 583 | 587 | ||
| 584 | 588 | } | |
M v4/gio/gsocketservice.go +13 -9
| @@ -361,18 +361,22 @@ func (x *SocketService) ConnectIncoming(cb *func(SocketService, uintptr, uintptr | |||
| 361 | 361 | ||
| 362 | 362 | func init() { | |
| 363 | 363 | core.SetPackageName("GIO", "gio-2.0") | |
| 364 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 365 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 366 | - | if err != nil { | |
| 367 | - | panic(err) | |
| 364 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 365 | + | var libs []uintptr | |
| 366 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 367 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 368 | + | if err != nil { | |
| 369 | + | panic(err) | |
| 370 | + | } | |
| 371 | + | libs = append(libs, lib) | |
| 368 | 372 | } | |
| 369 | 373 | ||
| 370 | - | core.PuregoSafeRegister(&xSocketServiceGLibType, lib, "g_socket_service_get_type") | |
| 374 | + | core.PuregoSafeRegister(&xSocketServiceGLibType, libs, "g_socket_service_get_type") | |
| 371 | 375 | ||
| 372 | - | core.PuregoSafeRegister(&xNewSocketService, lib, "g_socket_service_new") | |
| 376 | + | core.PuregoSafeRegister(&xNewSocketService, libs, "g_socket_service_new") | |
| 373 | 377 | ||
| 374 | - | core.PuregoSafeRegister(&xSocketServiceIsActive, lib, "g_socket_service_is_active") | |
| 375 | - | core.PuregoSafeRegister(&xSocketServiceStart, lib, "g_socket_service_start") | |
| 376 | - | core.PuregoSafeRegister(&xSocketServiceStop, lib, "g_socket_service_stop") | |
| 378 | + | core.PuregoSafeRegister(&xSocketServiceIsActive, libs, "g_socket_service_is_active") | |
| 379 | + | core.PuregoSafeRegister(&xSocketServiceStart, libs, "g_socket_service_start") | |
| 380 | + | core.PuregoSafeRegister(&xSocketServiceStop, libs, "g_socket_service_stop") | |
| 377 | 381 | ||
| 378 | 382 | } | |
M v4/gio/gsrvtarget.go +9 -5
| @@ -18,12 +18,16 @@ func SrvTargetListSort(TargetsVar *glib.List) *glib.List { | |||
| 18 | 18 | ||
| 19 | 19 | func init() { | |
| 20 | 20 | core.SetPackageName("GIO", "gio-2.0") | |
| 21 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 22 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 23 | - | if err != nil { | |
| 24 | - | panic(err) | |
| 21 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 22 | + | var libs []uintptr | |
| 23 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 24 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 25 | + | if err != nil { | |
| 26 | + | panic(err) | |
| 27 | + | } | |
| 28 | + | libs = append(libs, lib) | |
| 25 | 29 | } | |
| 26 | 30 | ||
| 27 | - | core.PuregoSafeRegister(&xSrvTargetListSort, lib, "g_srv_target_list_sort") | |
| 31 | + | core.PuregoSafeRegister(&xSrvTargetListSort, libs, "g_srv_target_list_sort") | |
| 28 | 32 | ||
| 29 | 33 | } | |
M v4/gio/gsubprocess.go +37 -33
| @@ -602,40 +602,44 @@ func (x *Subprocess) Init(CancellableVar *Cancellable) (bool, error) { | |||
| 602 | 602 | ||
| 603 | 603 | func init() { | |
| 604 | 604 | core.SetPackageName("GIO", "gio-2.0") | |
| 605 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 606 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 607 | - | if err != nil { | |
| 608 | - | panic(err) | |
| 605 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 606 | + | var libs []uintptr | |
| 607 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 608 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 609 | + | if err != nil { | |
| 610 | + | panic(err) | |
| 611 | + | } | |
| 612 | + | libs = append(libs, lib) | |
| 609 | 613 | } | |
| 610 | 614 | ||
| 611 | - | core.PuregoSafeRegister(&xSubprocessGLibType, lib, "g_subprocess_get_type") | |
| 612 | - | ||
| 613 | - | core.PuregoSafeRegister(&xNewSubprocess, lib, "g_subprocess_new") | |
| 614 | - | core.PuregoSafeRegister(&xNewSubprocessv, lib, "g_subprocess_newv") | |
| 615 | - | ||
| 616 | - | core.PuregoSafeRegister(&xSubprocessCommunicate, lib, "g_subprocess_communicate") | |
| 617 | - | core.PuregoSafeRegister(&xSubprocessCommunicateAsync, lib, "g_subprocess_communicate_async") | |
| 618 | - | core.PuregoSafeRegister(&xSubprocessCommunicateFinish, lib, "g_subprocess_communicate_finish") | |
| 619 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8, lib, "g_subprocess_communicate_utf8") | |
| 620 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Async, lib, "g_subprocess_communicate_utf8_async") | |
| 621 | - | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Finish, lib, "g_subprocess_communicate_utf8_finish") | |
| 622 | - | core.PuregoSafeRegister(&xSubprocessForceExit, lib, "g_subprocess_force_exit") | |
| 623 | - | core.PuregoSafeRegister(&xSubprocessGetExitStatus, lib, "g_subprocess_get_exit_status") | |
| 624 | - | core.PuregoSafeRegister(&xSubprocessGetIdentifier, lib, "g_subprocess_get_identifier") | |
| 625 | - | core.PuregoSafeRegister(&xSubprocessGetIfExited, lib, "g_subprocess_get_if_exited") | |
| 626 | - | core.PuregoSafeRegister(&xSubprocessGetIfSignaled, lib, "g_subprocess_get_if_signaled") | |
| 627 | - | core.PuregoSafeRegister(&xSubprocessGetStatus, lib, "g_subprocess_get_status") | |
| 628 | - | core.PuregoSafeRegister(&xSubprocessGetStderrPipe, lib, "g_subprocess_get_stderr_pipe") | |
| 629 | - | core.PuregoSafeRegister(&xSubprocessGetStdinPipe, lib, "g_subprocess_get_stdin_pipe") | |
| 630 | - | core.PuregoSafeRegister(&xSubprocessGetStdoutPipe, lib, "g_subprocess_get_stdout_pipe") | |
| 631 | - | core.PuregoSafeRegister(&xSubprocessGetSuccessful, lib, "g_subprocess_get_successful") | |
| 632 | - | core.PuregoSafeRegister(&xSubprocessGetTermSig, lib, "g_subprocess_get_term_sig") | |
| 633 | - | core.PuregoSafeRegister(&xSubprocessSendSignal, lib, "g_subprocess_send_signal") | |
| 634 | - | core.PuregoSafeRegister(&xSubprocessWait, lib, "g_subprocess_wait") | |
| 635 | - | core.PuregoSafeRegister(&xSubprocessWaitAsync, lib, "g_subprocess_wait_async") | |
| 636 | - | core.PuregoSafeRegister(&xSubprocessWaitCheck, lib, "g_subprocess_wait_check") | |
| 637 | - | core.PuregoSafeRegister(&xSubprocessWaitCheckAsync, lib, "g_subprocess_wait_check_async") | |
| 638 | - | core.PuregoSafeRegister(&xSubprocessWaitCheckFinish, lib, "g_subprocess_wait_check_finish") | |
| 639 | - | core.PuregoSafeRegister(&xSubprocessWaitFinish, lib, "g_subprocess_wait_finish") | |
| 615 | + | core.PuregoSafeRegister(&xSubprocessGLibType, libs, "g_subprocess_get_type") | |
| 616 | + | ||
| 617 | + | core.PuregoSafeRegister(&xNewSubprocess, libs, "g_subprocess_new") | |
| 618 | + | core.PuregoSafeRegister(&xNewSubprocessv, libs, "g_subprocess_newv") | |
| 619 | + | ||
| 620 | + | core.PuregoSafeRegister(&xSubprocessCommunicate, libs, "g_subprocess_communicate") | |
| 621 | + | core.PuregoSafeRegister(&xSubprocessCommunicateAsync, libs, "g_subprocess_communicate_async") | |
| 622 | + | core.PuregoSafeRegister(&xSubprocessCommunicateFinish, libs, "g_subprocess_communicate_finish") | |
| 623 | + | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8, libs, "g_subprocess_communicate_utf8") | |
| 624 | + | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Async, libs, "g_subprocess_communicate_utf8_async") | |
| 625 | + | core.PuregoSafeRegister(&xSubprocessCommunicateUtf8Finish, libs, "g_subprocess_communicate_utf8_finish") | |
| 626 | + | core.PuregoSafeRegister(&xSubprocessForceExit, libs, "g_subprocess_force_exit") | |
| 627 | + | core.PuregoSafeRegister(&xSubprocessGetExitStatus, libs, "g_subprocess_get_exit_status") | |
| 628 | + | core.PuregoSafeRegister(&xSubprocessGetIdentifier, libs, "g_subprocess_get_identifier") | |
| 629 | + | core.PuregoSafeRegister(&xSubprocessGetIfExited, libs, "g_subprocess_get_if_exited") | |
| 630 | + | core.PuregoSafeRegister(&xSubprocessGetIfSignaled, libs, "g_subprocess_get_if_signaled") | |
| 631 | + | core.PuregoSafeRegister(&xSubprocessGetStatus, libs, "g_subprocess_get_status") | |
| 632 | + | core.PuregoSafeRegister(&xSubprocessGetStderrPipe, libs, "g_subprocess_get_stderr_pipe") | |
| 633 | + | core.PuregoSafeRegister(&xSubprocessGetStdinPipe, libs, "g_subprocess_get_stdin_pipe") | |
| 634 | + | core.PuregoSafeRegister(&xSubprocessGetStdoutPipe, libs, "g_subprocess_get_stdout_pipe") | |
| 635 | + | core.PuregoSafeRegister(&xSubprocessGetSuccessful, libs, "g_subprocess_get_successful") | |
| 636 | + | core.PuregoSafeRegister(&xSubprocessGetTermSig, libs, "g_subprocess_get_term_sig") | |
| 637 | + | core.PuregoSafeRegister(&xSubprocessSendSignal, libs, "g_subprocess_send_signal") | |
| 638 | + | core.PuregoSafeRegister(&xSubprocessWait, libs, "g_subprocess_wait") | |
| 639 | + | core.PuregoSafeRegister(&xSubprocessWaitAsync, libs, "g_subprocess_wait_async") | |
| 640 | + | core.PuregoSafeRegister(&xSubprocessWaitCheck, libs, "g_subprocess_wait_check") | |
| 641 | + | core.PuregoSafeRegister(&xSubprocessWaitCheckAsync, libs, "g_subprocess_wait_check_async") | |
| 642 | + | core.PuregoSafeRegister(&xSubprocessWaitCheckFinish, libs, "g_subprocess_wait_check_finish") | |
| 643 | + | core.PuregoSafeRegister(&xSubprocessWaitFinish, libs, "g_subprocess_wait_finish") | |
| 640 | 644 | ||
| 641 | 645 | } | |
M v4/gio/gsubprocesslauncher.go +29 -25
| @@ -396,32 +396,36 @@ func (c *SubprocessLauncher) SetGoPointer(ptr uintptr) { | |||
| 396 | 396 | ||
| 397 | 397 | func init() { | |
| 398 | 398 | core.SetPackageName("GIO", "gio-2.0") | |
| 399 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 400 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 401 | - | if err != nil { | |
| 402 | - | panic(err) | |
| 399 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 400 | + | var libs []uintptr | |
| 401 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 402 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 403 | + | if err != nil { | |
| 404 | + | panic(err) | |
| 405 | + | } | |
| 406 | + | libs = append(libs, lib) | |
| 403 | 407 | } | |
| 404 | 408 | ||
| 405 | - | core.PuregoSafeRegister(&xSubprocessLauncherGLibType, lib, "g_subprocess_launcher_get_type") | |
| 406 | - | ||
| 407 | - | core.PuregoSafeRegister(&xNewSubprocessLauncher, lib, "g_subprocess_launcher_new") | |
| 408 | - | ||
| 409 | - | core.PuregoSafeRegister(&xSubprocessLauncherClose, lib, "g_subprocess_launcher_close") | |
| 410 | - | core.PuregoSafeRegister(&xSubprocessLauncherGetenv, lib, "g_subprocess_launcher_getenv") | |
| 411 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetChildSetup, lib, "g_subprocess_launcher_set_child_setup") | |
| 412 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetCwd, lib, "g_subprocess_launcher_set_cwd") | |
| 413 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetEnviron, lib, "g_subprocess_launcher_set_environ") | |
| 414 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetFlags, lib, "g_subprocess_launcher_set_flags") | |
| 415 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetStderrFilePath, lib, "g_subprocess_launcher_set_stderr_file_path") | |
| 416 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetStdinFilePath, lib, "g_subprocess_launcher_set_stdin_file_path") | |
| 417 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetStdoutFilePath, lib, "g_subprocess_launcher_set_stdout_file_path") | |
| 418 | - | core.PuregoSafeRegister(&xSubprocessLauncherSetenv, lib, "g_subprocess_launcher_setenv") | |
| 419 | - | core.PuregoSafeRegister(&xSubprocessLauncherSpawn, lib, "g_subprocess_launcher_spawn") | |
| 420 | - | core.PuregoSafeRegister(&xSubprocessLauncherSpawnv, lib, "g_subprocess_launcher_spawnv") | |
| 421 | - | core.PuregoSafeRegister(&xSubprocessLauncherTakeFd, lib, "g_subprocess_launcher_take_fd") | |
| 422 | - | core.PuregoSafeRegister(&xSubprocessLauncherTakeStderrFd, lib, "g_subprocess_launcher_take_stderr_fd") | |
| 423 | - | core.PuregoSafeRegister(&xSubprocessLauncherTakeStdinFd, lib, "g_subprocess_launcher_take_stdin_fd") | |
| 424 | - | core.PuregoSafeRegister(&xSubprocessLauncherTakeStdoutFd, lib, "g_subprocess_launcher_take_stdout_fd") | |
| 425 | - | core.PuregoSafeRegister(&xSubprocessLauncherUnsetenv, lib, "g_subprocess_launcher_unsetenv") | |
| 409 | + | core.PuregoSafeRegister(&xSubprocessLauncherGLibType, libs, "g_subprocess_launcher_get_type") | |
| 410 | + | ||
| 411 | + | core.PuregoSafeRegister(&xNewSubprocessLauncher, libs, "g_subprocess_launcher_new") | |
| 412 | + | ||
| 413 | + | core.PuregoSafeRegister(&xSubprocessLauncherClose, libs, "g_subprocess_launcher_close") | |
| 414 | + | core.PuregoSafeRegister(&xSubprocessLauncherGetenv, libs, "g_subprocess_launcher_getenv") | |
| 415 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetChildSetup, libs, "g_subprocess_launcher_set_child_setup") | |
| 416 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetCwd, libs, "g_subprocess_launcher_set_cwd") | |
| 417 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetEnviron, libs, "g_subprocess_launcher_set_environ") | |
| 418 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetFlags, libs, "g_subprocess_launcher_set_flags") | |
| 419 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetStderrFilePath, libs, "g_subprocess_launcher_set_stderr_file_path") | |
| 420 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetStdinFilePath, libs, "g_subprocess_launcher_set_stdin_file_path") | |
| 421 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetStdoutFilePath, libs, "g_subprocess_launcher_set_stdout_file_path") | |
| 422 | + | core.PuregoSafeRegister(&xSubprocessLauncherSetenv, libs, "g_subprocess_launcher_setenv") | |
| 423 | + | core.PuregoSafeRegister(&xSubprocessLauncherSpawn, libs, "g_subprocess_launcher_spawn") | |
| 424 | + | core.PuregoSafeRegister(&xSubprocessLauncherSpawnv, libs, "g_subprocess_launcher_spawnv") | |
| 425 | + | core.PuregoSafeRegister(&xSubprocessLauncherTakeFd, libs, "g_subprocess_launcher_take_fd") | |
| 426 | + | core.PuregoSafeRegister(&xSubprocessLauncherTakeStderrFd, libs, "g_subprocess_launcher_take_stderr_fd") | |
| 427 | + | core.PuregoSafeRegister(&xSubprocessLauncherTakeStdinFd, libs, "g_subprocess_launcher_take_stdin_fd") | |
| 428 | + | core.PuregoSafeRegister(&xSubprocessLauncherTakeStdoutFd, libs, "g_subprocess_launcher_take_stdout_fd") | |
| 429 | + | core.PuregoSafeRegister(&xSubprocessLauncherUnsetenv, libs, "g_subprocess_launcher_unsetenv") | |
| 426 | 430 | ||
| 427 | 431 | } | |
M v4/gio/gtask.go +50 -46
| @@ -1294,53 +1294,57 @@ func TaskReportNewError(SourceObjectVar *gobject.Object, CallbackVar *AsyncReady | |||
| 1294 | 1294 | ||
| 1295 | 1295 | func init() { | |
| 1296 | 1296 | core.SetPackageName("GIO", "gio-2.0") | |
| 1297 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1298 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1299 | - | if err != nil { | |
| 1300 | - | panic(err) | |
| 1297 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1298 | + | var libs []uintptr | |
| 1299 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1300 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1301 | + | if err != nil { | |
| 1302 | + | panic(err) | |
| 1303 | + | } | |
| 1304 | + | libs = append(libs, lib) | |
| 1301 | 1305 | } | |
| 1302 | 1306 | ||
| 1303 | - | core.PuregoSafeRegister(&xTaskGLibType, lib, "g_task_get_type") | |
| 1304 | - | ||
| 1305 | - | core.PuregoSafeRegister(&xNewTask, lib, "g_task_new") | |
| 1306 | - | ||
| 1307 | - | core.PuregoSafeRegister(&xTaskAttachSource, lib, "g_task_attach_source") | |
| 1308 | - | core.PuregoSafeRegister(&xTaskGetCancellable, lib, "g_task_get_cancellable") | |
| 1309 | - | core.PuregoSafeRegister(&xTaskGetCheckCancellable, lib, "g_task_get_check_cancellable") | |
| 1310 | - | core.PuregoSafeRegister(&xTaskGetCompleted, lib, "g_task_get_completed") | |
| 1311 | - | core.PuregoSafeRegister(&xTaskGetContext, lib, "g_task_get_context") | |
| 1312 | - | core.PuregoSafeRegister(&xTaskGetName, lib, "g_task_get_name") | |
| 1313 | - | core.PuregoSafeRegister(&xTaskGetPriority, lib, "g_task_get_priority") | |
| 1314 | - | core.PuregoSafeRegister(&xTaskGetReturnOnCancel, lib, "g_task_get_return_on_cancel") | |
| 1315 | - | core.PuregoSafeRegister(&xTaskGetSourceObject, lib, "g_task_get_source_object") | |
| 1316 | - | core.PuregoSafeRegister(&xTaskGetSourceTag, lib, "g_task_get_source_tag") | |
| 1317 | - | core.PuregoSafeRegister(&xTaskGetTaskData, lib, "g_task_get_task_data") | |
| 1318 | - | core.PuregoSafeRegister(&xTaskHadError, lib, "g_task_had_error") | |
| 1319 | - | core.PuregoSafeRegister(&xTaskPropagateBoolean, lib, "g_task_propagate_boolean") | |
| 1320 | - | core.PuregoSafeRegister(&xTaskPropagateInt, lib, "g_task_propagate_int") | |
| 1321 | - | core.PuregoSafeRegister(&xTaskPropagatePointer, lib, "g_task_propagate_pointer") | |
| 1322 | - | core.PuregoSafeRegister(&xTaskPropagateValue, lib, "g_task_propagate_value") | |
| 1323 | - | core.PuregoSafeRegister(&xTaskReturnBoolean, lib, "g_task_return_boolean") | |
| 1324 | - | core.PuregoSafeRegister(&xTaskReturnError, lib, "g_task_return_error") | |
| 1325 | - | core.PuregoSafeRegister(&xTaskReturnErrorIfCancelled, lib, "g_task_return_error_if_cancelled") | |
| 1326 | - | core.PuregoSafeRegister(&xTaskReturnInt, lib, "g_task_return_int") | |
| 1327 | - | core.PuregoSafeRegister(&xTaskReturnNewError, lib, "g_task_return_new_error") | |
| 1328 | - | core.PuregoSafeRegister(&xTaskReturnNewErrorLiteral, lib, "g_task_return_new_error_literal") | |
| 1329 | - | core.PuregoSafeRegister(&xTaskReturnPointer, lib, "g_task_return_pointer") | |
| 1330 | - | core.PuregoSafeRegister(&xTaskReturnPrefixedError, lib, "g_task_return_prefixed_error") | |
| 1331 | - | core.PuregoSafeRegister(&xTaskReturnValue, lib, "g_task_return_value") | |
| 1332 | - | core.PuregoSafeRegister(&xTaskRunInThread, lib, "g_task_run_in_thread") | |
| 1333 | - | core.PuregoSafeRegister(&xTaskRunInThreadSync, lib, "g_task_run_in_thread_sync") | |
| 1334 | - | core.PuregoSafeRegister(&xTaskSetCheckCancellable, lib, "g_task_set_check_cancellable") | |
| 1335 | - | core.PuregoSafeRegister(&xTaskSetName, lib, "g_task_set_name") | |
| 1336 | - | core.PuregoSafeRegister(&xTaskSetPriority, lib, "g_task_set_priority") | |
| 1337 | - | core.PuregoSafeRegister(&xTaskSetReturnOnCancel, lib, "g_task_set_return_on_cancel") | |
| 1338 | - | core.PuregoSafeRegister(&xTaskSetSourceTag, lib, "g_task_set_source_tag") | |
| 1339 | - | core.PuregoSafeRegister(&xTaskSetStaticName, lib, "g_task_set_static_name") | |
| 1340 | - | core.PuregoSafeRegister(&xTaskSetTaskData, lib, "g_task_set_task_data") | |
| 1341 | - | ||
| 1342 | - | core.PuregoSafeRegister(&xTaskIsValid, lib, "g_task_is_valid") | |
| 1343 | - | core.PuregoSafeRegister(&xTaskReportError, lib, "g_task_report_error") | |
| 1344 | - | core.PuregoSafeRegister(&xTaskReportNewError, lib, "g_task_report_new_error") | |
| 1307 | + | core.PuregoSafeRegister(&xTaskGLibType, libs, "g_task_get_type") | |
| 1308 | + | ||
| 1309 | + | core.PuregoSafeRegister(&xNewTask, libs, "g_task_new") | |
| 1310 | + | ||
| 1311 | + | core.PuregoSafeRegister(&xTaskAttachSource, libs, "g_task_attach_source") | |
| 1312 | + | core.PuregoSafeRegister(&xTaskGetCancellable, libs, "g_task_get_cancellable") | |
| 1313 | + | core.PuregoSafeRegister(&xTaskGetCheckCancellable, libs, "g_task_get_check_cancellable") | |
| 1314 | + | core.PuregoSafeRegister(&xTaskGetCompleted, libs, "g_task_get_completed") | |
| 1315 | + | core.PuregoSafeRegister(&xTaskGetContext, libs, "g_task_get_context") | |
| 1316 | + | core.PuregoSafeRegister(&xTaskGetName, libs, "g_task_get_name") | |
| 1317 | + | core.PuregoSafeRegister(&xTaskGetPriority, libs, "g_task_get_priority") | |
| 1318 | + | core.PuregoSafeRegister(&xTaskGetReturnOnCancel, libs, "g_task_get_return_on_cancel") | |
| 1319 | + | core.PuregoSafeRegister(&xTaskGetSourceObject, libs, "g_task_get_source_object") | |
| 1320 | + | core.PuregoSafeRegister(&xTaskGetSourceTag, libs, "g_task_get_source_tag") | |
| 1321 | + | core.PuregoSafeRegister(&xTaskGetTaskData, libs, "g_task_get_task_data") | |
| 1322 | + | core.PuregoSafeRegister(&xTaskHadError, libs, "g_task_had_error") | |
| 1323 | + | core.PuregoSafeRegister(&xTaskPropagateBoolean, libs, "g_task_propagate_boolean") | |
| 1324 | + | core.PuregoSafeRegister(&xTaskPropagateInt, libs, "g_task_propagate_int") | |
| 1325 | + | core.PuregoSafeRegister(&xTaskPropagatePointer, libs, "g_task_propagate_pointer") | |
| 1326 | + | core.PuregoSafeRegister(&xTaskPropagateValue, libs, "g_task_propagate_value") | |
| 1327 | + | core.PuregoSafeRegister(&xTaskReturnBoolean, libs, "g_task_return_boolean") | |
| 1328 | + | core.PuregoSafeRegister(&xTaskReturnError, libs, "g_task_return_error") | |
| 1329 | + | core.PuregoSafeRegister(&xTaskReturnErrorIfCancelled, libs, "g_task_return_error_if_cancelled") | |
| 1330 | + | core.PuregoSafeRegister(&xTaskReturnInt, libs, "g_task_return_int") | |
| 1331 | + | core.PuregoSafeRegister(&xTaskReturnNewError, libs, "g_task_return_new_error") | |
| 1332 | + | core.PuregoSafeRegister(&xTaskReturnNewErrorLiteral, libs, "g_task_return_new_error_literal") | |
| 1333 | + | core.PuregoSafeRegister(&xTaskReturnPointer, libs, "g_task_return_pointer") | |
| 1334 | + | core.PuregoSafeRegister(&xTaskReturnPrefixedError, libs, "g_task_return_prefixed_error") | |
| 1335 | + | core.PuregoSafeRegister(&xTaskReturnValue, libs, "g_task_return_value") | |
| 1336 | + | core.PuregoSafeRegister(&xTaskRunInThread, libs, "g_task_run_in_thread") | |
| 1337 | + | core.PuregoSafeRegister(&xTaskRunInThreadSync, libs, "g_task_run_in_thread_sync") | |
| 1338 | + | core.PuregoSafeRegister(&xTaskSetCheckCancellable, libs, "g_task_set_check_cancellable") | |
| 1339 | + | core.PuregoSafeRegister(&xTaskSetName, libs, "g_task_set_name") | |
| 1340 | + | core.PuregoSafeRegister(&xTaskSetPriority, libs, "g_task_set_priority") | |
| 1341 | + | core.PuregoSafeRegister(&xTaskSetReturnOnCancel, libs, "g_task_set_return_on_cancel") | |
| 1342 | + | core.PuregoSafeRegister(&xTaskSetSourceTag, libs, "g_task_set_source_tag") | |
| 1343 | + | core.PuregoSafeRegister(&xTaskSetStaticName, libs, "g_task_set_static_name") | |
| 1344 | + | core.PuregoSafeRegister(&xTaskSetTaskData, libs, "g_task_set_task_data") | |
| 1345 | + | ||
| 1346 | + | core.PuregoSafeRegister(&xTaskIsValid, libs, "g_task_is_valid") | |
| 1347 | + | core.PuregoSafeRegister(&xTaskReportError, libs, "g_task_report_error") | |
| 1348 | + | core.PuregoSafeRegister(&xTaskReportNewError, libs, "g_task_report_new_error") | |
| 1345 | 1349 | ||
| 1346 | 1350 | } | |
M v4/gio/gtcpconnection.go +11 -7
| @@ -86,15 +86,19 @@ func (c *TcpConnection) SetGoPointer(ptr uintptr) { | |||
| 86 | 86 | ||
| 87 | 87 | func init() { | |
| 88 | 88 | core.SetPackageName("GIO", "gio-2.0") | |
| 89 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 90 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 91 | - | if err != nil { | |
| 92 | - | panic(err) | |
| 89 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 90 | + | var libs []uintptr | |
| 91 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 92 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 93 | + | if err != nil { | |
| 94 | + | panic(err) | |
| 95 | + | } | |
| 96 | + | libs = append(libs, lib) | |
| 93 | 97 | } | |
| 94 | 98 | ||
| 95 | - | core.PuregoSafeRegister(&xTcpConnectionGLibType, lib, "g_tcp_connection_get_type") | |
| 99 | + | core.PuregoSafeRegister(&xTcpConnectionGLibType, libs, "g_tcp_connection_get_type") | |
| 96 | 100 | ||
| 97 | - | core.PuregoSafeRegister(&xTcpConnectionGetGracefulDisconnect, lib, "g_tcp_connection_get_graceful_disconnect") | |
| 98 | - | core.PuregoSafeRegister(&xTcpConnectionSetGracefulDisconnect, lib, "g_tcp_connection_set_graceful_disconnect") | |
| 101 | + | core.PuregoSafeRegister(&xTcpConnectionGetGracefulDisconnect, libs, "g_tcp_connection_get_graceful_disconnect") | |
| 102 | + | core.PuregoSafeRegister(&xTcpConnectionSetGracefulDisconnect, libs, "g_tcp_connection_set_graceful_disconnect") | |
| 99 | 103 | ||
| 100 | 104 | } | |
M v4/gio/gtcpwrapperconnection.go +11 -7
| @@ -97,16 +97,20 @@ func (c *TcpWrapperConnection) SetGoPointer(ptr uintptr) { | |||
| 97 | 97 | ||
| 98 | 98 | func init() { | |
| 99 | 99 | core.SetPackageName("GIO", "gio-2.0") | |
| 100 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 101 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 102 | - | if err != nil { | |
| 103 | - | panic(err) | |
| 100 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 101 | + | var libs []uintptr | |
| 102 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 103 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 104 | + | if err != nil { | |
| 105 | + | panic(err) | |
| 106 | + | } | |
| 107 | + | libs = append(libs, lib) | |
| 104 | 108 | } | |
| 105 | 109 | ||
| 106 | - | core.PuregoSafeRegister(&xTcpWrapperConnectionGLibType, lib, "g_tcp_wrapper_connection_get_type") | |
| 110 | + | core.PuregoSafeRegister(&xTcpWrapperConnectionGLibType, libs, "g_tcp_wrapper_connection_get_type") | |
| 107 | 111 | ||
| 108 | - | core.PuregoSafeRegister(&xNewTcpWrapperConnection, lib, "g_tcp_wrapper_connection_new") | |
| 112 | + | core.PuregoSafeRegister(&xNewTcpWrapperConnection, libs, "g_tcp_wrapper_connection_new") | |
| 109 | 113 | ||
| 110 | - | core.PuregoSafeRegister(&xTcpWrapperConnectionGetBaseIoStream, lib, "g_tcp_wrapper_connection_get_base_io_stream") | |
| 114 | + | core.PuregoSafeRegister(&xTcpWrapperConnectionGetBaseIoStream, libs, "g_tcp_wrapper_connection_get_base_io_stream") | |
| 111 | 115 | ||
| 112 | 116 | } | |
M v4/gio/gtestdbus.go +17 -13
| @@ -221,23 +221,27 @@ func TestDBusUnset() { | |||
| 221 | 221 | ||
| 222 | 222 | func init() { | |
| 223 | 223 | core.SetPackageName("GIO", "gio-2.0") | |
| 224 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 225 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 226 | - | if err != nil { | |
| 227 | - | panic(err) | |
| 224 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 225 | + | var libs []uintptr | |
| 226 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 227 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 228 | + | if err != nil { | |
| 229 | + | panic(err) | |
| 230 | + | } | |
| 231 | + | libs = append(libs, lib) | |
| 228 | 232 | } | |
| 229 | 233 | ||
| 230 | - | core.PuregoSafeRegister(&xTestDBusGLibType, lib, "g_test_dbus_get_type") | |
| 234 | + | core.PuregoSafeRegister(&xTestDBusGLibType, libs, "g_test_dbus_get_type") | |
| 231 | 235 | ||
| 232 | - | core.PuregoSafeRegister(&xNewTestDBus, lib, "g_test_dbus_new") | |
| 236 | + | core.PuregoSafeRegister(&xNewTestDBus, libs, "g_test_dbus_new") | |
| 233 | 237 | ||
| 234 | - | core.PuregoSafeRegister(&xTestDBusAddServiceDir, lib, "g_test_dbus_add_service_dir") | |
| 235 | - | core.PuregoSafeRegister(&xTestDBusDown, lib, "g_test_dbus_down") | |
| 236 | - | core.PuregoSafeRegister(&xTestDBusGetBusAddress, lib, "g_test_dbus_get_bus_address") | |
| 237 | - | core.PuregoSafeRegister(&xTestDBusGetFlags, lib, "g_test_dbus_get_flags") | |
| 238 | - | core.PuregoSafeRegister(&xTestDBusStop, lib, "g_test_dbus_stop") | |
| 239 | - | core.PuregoSafeRegister(&xTestDBusUp, lib, "g_test_dbus_up") | |
| 238 | + | core.PuregoSafeRegister(&xTestDBusAddServiceDir, libs, "g_test_dbus_add_service_dir") | |
| 239 | + | core.PuregoSafeRegister(&xTestDBusDown, libs, "g_test_dbus_down") | |
| 240 | + | core.PuregoSafeRegister(&xTestDBusGetBusAddress, libs, "g_test_dbus_get_bus_address") | |
| 241 | + | core.PuregoSafeRegister(&xTestDBusGetFlags, libs, "g_test_dbus_get_flags") | |
| 242 | + | core.PuregoSafeRegister(&xTestDBusStop, libs, "g_test_dbus_stop") | |
| 243 | + | core.PuregoSafeRegister(&xTestDBusUp, libs, "g_test_dbus_up") | |
| 240 | 244 | ||
| 241 | - | core.PuregoSafeRegister(&xTestDBusUnset, lib, "g_test_dbus_unset") | |
| 245 | + | core.PuregoSafeRegister(&xTestDBusUnset, libs, "g_test_dbus_unset") | |
| 242 | 246 | ||
| 243 | 247 | } | |
M v4/gio/gthemedicon.go +15 -11
| @@ -201,20 +201,24 @@ func (x *ThemedIcon) ToString() string { | |||
| 201 | 201 | ||
| 202 | 202 | func init() { | |
| 203 | 203 | core.SetPackageName("GIO", "gio-2.0") | |
| 204 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 205 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 206 | - | if err != nil { | |
| 207 | - | panic(err) | |
| 204 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 205 | + | var libs []uintptr | |
| 206 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 207 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 208 | + | if err != nil { | |
| 209 | + | panic(err) | |
| 210 | + | } | |
| 211 | + | libs = append(libs, lib) | |
| 208 | 212 | } | |
| 209 | 213 | ||
| 210 | - | core.PuregoSafeRegister(&xThemedIconGLibType, lib, "g_themed_icon_get_type") | |
| 214 | + | core.PuregoSafeRegister(&xThemedIconGLibType, libs, "g_themed_icon_get_type") | |
| 211 | 215 | ||
| 212 | - | core.PuregoSafeRegister(&xNewThemedIcon, lib, "g_themed_icon_new") | |
| 213 | - | core.PuregoSafeRegister(&xNewThemedIconFromNames, lib, "g_themed_icon_new_from_names") | |
| 214 | - | core.PuregoSafeRegister(&xNewThemedIconWithDefaultFallbacks, lib, "g_themed_icon_new_with_default_fallbacks") | |
| 216 | + | core.PuregoSafeRegister(&xNewThemedIcon, libs, "g_themed_icon_new") | |
| 217 | + | core.PuregoSafeRegister(&xNewThemedIconFromNames, libs, "g_themed_icon_new_from_names") | |
| 218 | + | core.PuregoSafeRegister(&xNewThemedIconWithDefaultFallbacks, libs, "g_themed_icon_new_with_default_fallbacks") | |
| 215 | 219 | ||
| 216 | - | core.PuregoSafeRegister(&xThemedIconAppendName, lib, "g_themed_icon_append_name") | |
| 217 | - | core.PuregoSafeRegister(&xThemedIconGetNames, lib, "g_themed_icon_get_names") | |
| 218 | - | core.PuregoSafeRegister(&xThemedIconPrependName, lib, "g_themed_icon_prepend_name") | |
| 220 | + | core.PuregoSafeRegister(&xThemedIconAppendName, libs, "g_themed_icon_append_name") | |
| 221 | + | core.PuregoSafeRegister(&xThemedIconGetNames, libs, "g_themed_icon_get_names") | |
| 222 | + | core.PuregoSafeRegister(&xThemedIconPrependName, libs, "g_themed_icon_prepend_name") | |
| 219 | 223 | ||
| 220 | 224 | } | |
M v4/gio/gthreadedsocketservice.go +10 -6
| @@ -265,14 +265,18 @@ func (x *ThreadedSocketService) ConnectRun(cb *func(ThreadedSocketService, uintp | |||
| 265 | 265 | ||
| 266 | 266 | func init() { | |
| 267 | 267 | core.SetPackageName("GIO", "gio-2.0") | |
| 268 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 269 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 270 | - | if err != nil { | |
| 271 | - | panic(err) | |
| 268 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 269 | + | var libs []uintptr | |
| 270 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 271 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 272 | + | if err != nil { | |
| 273 | + | panic(err) | |
| 274 | + | } | |
| 275 | + | libs = append(libs, lib) | |
| 272 | 276 | } | |
| 273 | 277 | ||
| 274 | - | core.PuregoSafeRegister(&xThreadedSocketServiceGLibType, lib, "g_threaded_socket_service_get_type") | |
| 278 | + | core.PuregoSafeRegister(&xThreadedSocketServiceGLibType, libs, "g_threaded_socket_service_get_type") | |
| 275 | 279 | ||
| 276 | - | core.PuregoSafeRegister(&xNewThreadedSocketService, lib, "g_threaded_socket_service_new") | |
| 280 | + | core.PuregoSafeRegister(&xNewThreadedSocketService, libs, "g_threaded_socket_service_new") | |
| 277 | 281 | ||
| 278 | 282 | } | |
M v4/gio/gtlsbackend.go +20 -16
| @@ -436,25 +436,29 @@ func TlsBackendGetDefault() *TlsBackendBase { | |||
| 436 | 436 | ||
| 437 | 437 | func init() { | |
| 438 | 438 | core.SetPackageName("GIO", "gio-2.0") | |
| 439 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 440 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 441 | - | if err != nil { | |
| 442 | - | panic(err) | |
| 439 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 440 | + | var libs []uintptr | |
| 441 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 442 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 443 | + | if err != nil { | |
| 444 | + | panic(err) | |
| 445 | + | } | |
| 446 | + | libs = append(libs, lib) | |
| 443 | 447 | } | |
| 444 | 448 | ||
| 445 | - | core.PuregoSafeRegister(&xTlsBackendGetDefault, lib, "g_tls_backend_get_default") | |
| 449 | + | core.PuregoSafeRegister(&xTlsBackendGetDefault, libs, "g_tls_backend_get_default") | |
| 446 | 450 | ||
| 447 | - | core.PuregoSafeRegister(&xTlsBackendGLibType, lib, "g_tls_backend_get_type") | |
| 451 | + | core.PuregoSafeRegister(&xTlsBackendGLibType, libs, "g_tls_backend_get_type") | |
| 448 | 452 | ||
| 449 | - | core.PuregoSafeRegister(&XGTlsBackendGetCertificateType, lib, "g_tls_backend_get_certificate_type") | |
| 450 | - | core.PuregoSafeRegister(&XGTlsBackendGetClientConnectionType, lib, "g_tls_backend_get_client_connection_type") | |
| 451 | - | core.PuregoSafeRegister(&XGTlsBackendGetDefaultDatabase, lib, "g_tls_backend_get_default_database") | |
| 452 | - | core.PuregoSafeRegister(&XGTlsBackendGetDtlsClientConnectionType, lib, "g_tls_backend_get_dtls_client_connection_type") | |
| 453 | - | core.PuregoSafeRegister(&XGTlsBackendGetDtlsServerConnectionType, lib, "g_tls_backend_get_dtls_server_connection_type") | |
| 454 | - | core.PuregoSafeRegister(&XGTlsBackendGetFileDatabaseType, lib, "g_tls_backend_get_file_database_type") | |
| 455 | - | core.PuregoSafeRegister(&XGTlsBackendGetServerConnectionType, lib, "g_tls_backend_get_server_connection_type") | |
| 456 | - | core.PuregoSafeRegister(&XGTlsBackendSetDefaultDatabase, lib, "g_tls_backend_set_default_database") | |
| 457 | - | core.PuregoSafeRegister(&XGTlsBackendSupportsDtls, lib, "g_tls_backend_supports_dtls") | |
| 458 | - | core.PuregoSafeRegister(&XGTlsBackendSupportsTls, lib, "g_tls_backend_supports_tls") | |
| 453 | + | core.PuregoSafeRegister(&XGTlsBackendGetCertificateType, libs, "g_tls_backend_get_certificate_type") | |
| 454 | + | core.PuregoSafeRegister(&XGTlsBackendGetClientConnectionType, libs, "g_tls_backend_get_client_connection_type") | |
| 455 | + | core.PuregoSafeRegister(&XGTlsBackendGetDefaultDatabase, libs, "g_tls_backend_get_default_database") | |
| 456 | + | core.PuregoSafeRegister(&XGTlsBackendGetDtlsClientConnectionType, libs, "g_tls_backend_get_dtls_client_connection_type") | |
| 457 | + | core.PuregoSafeRegister(&XGTlsBackendGetDtlsServerConnectionType, libs, "g_tls_backend_get_dtls_server_connection_type") | |
| 458 | + | core.PuregoSafeRegister(&XGTlsBackendGetFileDatabaseType, libs, "g_tls_backend_get_file_database_type") | |
| 459 | + | core.PuregoSafeRegister(&XGTlsBackendGetServerConnectionType, libs, "g_tls_backend_get_server_connection_type") | |
| 460 | + | core.PuregoSafeRegister(&XGTlsBackendSetDefaultDatabase, libs, "g_tls_backend_set_default_database") | |
| 461 | + | core.PuregoSafeRegister(&XGTlsBackendSupportsDtls, libs, "g_tls_backend_supports_dtls") | |
| 462 | + | core.PuregoSafeRegister(&XGTlsBackendSupportsTls, libs, "g_tls_backend_supports_tls") | |
| 459 | 463 | ||
| 460 | 464 | } | |
M v4/gio/gtlscertificate.go +28 -24
| @@ -443,31 +443,35 @@ func TlsCertificateListNewFromFile(FileVar string) (*glib.List, error) { | |||
| 443 | 443 | ||
| 444 | 444 | func init() { | |
| 445 | 445 | core.SetPackageName("GIO", "gio-2.0") | |
| 446 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 447 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 448 | - | if err != nil { | |
| 449 | - | panic(err) | |
| 446 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 447 | + | var libs []uintptr | |
| 448 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 449 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 450 | + | if err != nil { | |
| 451 | + | panic(err) | |
| 452 | + | } | |
| 453 | + | libs = append(libs, lib) | |
| 450 | 454 | } | |
| 451 | 455 | ||
| 452 | - | core.PuregoSafeRegister(&xTlsCertificateGLibType, lib, "g_tls_certificate_get_type") | |
| 453 | - | ||
| 454 | - | core.PuregoSafeRegister(&xNewTlsCertificateFromFile, lib, "g_tls_certificate_new_from_file") | |
| 455 | - | core.PuregoSafeRegister(&xNewTlsCertificateFromFileWithPassword, lib, "g_tls_certificate_new_from_file_with_password") | |
| 456 | - | core.PuregoSafeRegister(&xNewTlsCertificateFromFiles, lib, "g_tls_certificate_new_from_files") | |
| 457 | - | core.PuregoSafeRegister(&xNewTlsCertificateFromPem, lib, "g_tls_certificate_new_from_pem") | |
| 458 | - | core.PuregoSafeRegister(&xNewTlsCertificateFromPkcs11Uris, lib, "g_tls_certificate_new_from_pkcs11_uris") | |
| 459 | - | core.PuregoSafeRegister(&xNewTlsCertificateFromPkcs12, lib, "g_tls_certificate_new_from_pkcs12") | |
| 460 | - | ||
| 461 | - | core.PuregoSafeRegister(&xTlsCertificateGetDnsNames, lib, "g_tls_certificate_get_dns_names") | |
| 462 | - | core.PuregoSafeRegister(&xTlsCertificateGetIpAddresses, lib, "g_tls_certificate_get_ip_addresses") | |
| 463 | - | core.PuregoSafeRegister(&xTlsCertificateGetIssuer, lib, "g_tls_certificate_get_issuer") | |
| 464 | - | core.PuregoSafeRegister(&xTlsCertificateGetIssuerName, lib, "g_tls_certificate_get_issuer_name") | |
| 465 | - | core.PuregoSafeRegister(&xTlsCertificateGetNotValidAfter, lib, "g_tls_certificate_get_not_valid_after") | |
| 466 | - | core.PuregoSafeRegister(&xTlsCertificateGetNotValidBefore, lib, "g_tls_certificate_get_not_valid_before") | |
| 467 | - | core.PuregoSafeRegister(&xTlsCertificateGetSubjectName, lib, "g_tls_certificate_get_subject_name") | |
| 468 | - | core.PuregoSafeRegister(&xTlsCertificateIsSame, lib, "g_tls_certificate_is_same") | |
| 469 | - | core.PuregoSafeRegister(&xTlsCertificateVerify, lib, "g_tls_certificate_verify") | |
| 470 | - | ||
| 471 | - | core.PuregoSafeRegister(&xTlsCertificateListNewFromFile, lib, "g_tls_certificate_list_new_from_file") | |
| 456 | + | core.PuregoSafeRegister(&xTlsCertificateGLibType, libs, "g_tls_certificate_get_type") | |
| 457 | + | ||
| 458 | + | core.PuregoSafeRegister(&xNewTlsCertificateFromFile, libs, "g_tls_certificate_new_from_file") | |
| 459 | + | core.PuregoSafeRegister(&xNewTlsCertificateFromFileWithPassword, libs, "g_tls_certificate_new_from_file_with_password") | |
| 460 | + | core.PuregoSafeRegister(&xNewTlsCertificateFromFiles, libs, "g_tls_certificate_new_from_files") | |
| 461 | + | core.PuregoSafeRegister(&xNewTlsCertificateFromPem, libs, "g_tls_certificate_new_from_pem") | |
| 462 | + | core.PuregoSafeRegister(&xNewTlsCertificateFromPkcs11Uris, libs, "g_tls_certificate_new_from_pkcs11_uris") | |
| 463 | + | core.PuregoSafeRegister(&xNewTlsCertificateFromPkcs12, libs, "g_tls_certificate_new_from_pkcs12") | |
| 464 | + | ||
| 465 | + | core.PuregoSafeRegister(&xTlsCertificateGetDnsNames, libs, "g_tls_certificate_get_dns_names") | |
| 466 | + | core.PuregoSafeRegister(&xTlsCertificateGetIpAddresses, libs, "g_tls_certificate_get_ip_addresses") | |
| 467 | + | core.PuregoSafeRegister(&xTlsCertificateGetIssuer, libs, "g_tls_certificate_get_issuer") | |
| 468 | + | core.PuregoSafeRegister(&xTlsCertificateGetIssuerName, libs, "g_tls_certificate_get_issuer_name") | |
| 469 | + | core.PuregoSafeRegister(&xTlsCertificateGetNotValidAfter, libs, "g_tls_certificate_get_not_valid_after") | |
| 470 | + | core.PuregoSafeRegister(&xTlsCertificateGetNotValidBefore, libs, "g_tls_certificate_get_not_valid_before") | |
| 471 | + | core.PuregoSafeRegister(&xTlsCertificateGetSubjectName, libs, "g_tls_certificate_get_subject_name") | |
| 472 | + | core.PuregoSafeRegister(&xTlsCertificateIsSame, libs, "g_tls_certificate_is_same") | |
| 473 | + | core.PuregoSafeRegister(&xTlsCertificateVerify, libs, "g_tls_certificate_verify") | |
| 474 | + | ||
| 475 | + | core.PuregoSafeRegister(&xTlsCertificateListNewFromFile, libs, "g_tls_certificate_list_new_from_file") | |
| 472 | 476 | ||
| 473 | 477 | } | |
M v4/gio/gtlsclientconnection.go +18 -14
| @@ -244,23 +244,27 @@ func TlsClientConnectionNew(BaseIoStreamVar *IOStream, ServerIdentityVar SocketC | |||
| 244 | 244 | ||
| 245 | 245 | func init() { | |
| 246 | 246 | core.SetPackageName("GIO", "gio-2.0") | |
| 247 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 248 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 249 | - | if err != nil { | |
| 250 | - | panic(err) | |
| 247 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 248 | + | var libs []uintptr | |
| 249 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 250 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 251 | + | if err != nil { | |
| 252 | + | panic(err) | |
| 253 | + | } | |
| 254 | + | libs = append(libs, lib) | |
| 251 | 255 | } | |
| 252 | 256 | ||
| 253 | - | core.PuregoSafeRegister(&xTlsClientConnectionNew, lib, "g_tls_client_connection_new") | |
| 257 | + | core.PuregoSafeRegister(&xTlsClientConnectionNew, libs, "g_tls_client_connection_new") | |
| 254 | 258 | ||
| 255 | - | core.PuregoSafeRegister(&xTlsClientConnectionGLibType, lib, "g_tls_client_connection_get_type") | |
| 259 | + | core.PuregoSafeRegister(&xTlsClientConnectionGLibType, libs, "g_tls_client_connection_get_type") | |
| 256 | 260 | ||
| 257 | - | core.PuregoSafeRegister(&XGTlsClientConnectionCopySessionState, lib, "g_tls_client_connection_copy_session_state") | |
| 258 | - | core.PuregoSafeRegister(&XGTlsClientConnectionGetAcceptedCas, lib, "g_tls_client_connection_get_accepted_cas") | |
| 259 | - | core.PuregoSafeRegister(&XGTlsClientConnectionGetServerIdentity, lib, "g_tls_client_connection_get_server_identity") | |
| 260 | - | core.PuregoSafeRegister(&XGTlsClientConnectionGetUseSsl3, lib, "g_tls_client_connection_get_use_ssl3") | |
| 261 | - | core.PuregoSafeRegister(&XGTlsClientConnectionGetValidationFlags, lib, "g_tls_client_connection_get_validation_flags") | |
| 262 | - | core.PuregoSafeRegister(&XGTlsClientConnectionSetServerIdentity, lib, "g_tls_client_connection_set_server_identity") | |
| 263 | - | core.PuregoSafeRegister(&XGTlsClientConnectionSetUseSsl3, lib, "g_tls_client_connection_set_use_ssl3") | |
| 264 | - | core.PuregoSafeRegister(&XGTlsClientConnectionSetValidationFlags, lib, "g_tls_client_connection_set_validation_flags") | |
| 261 | + | core.PuregoSafeRegister(&XGTlsClientConnectionCopySessionState, libs, "g_tls_client_connection_copy_session_state") | |
| 262 | + | core.PuregoSafeRegister(&XGTlsClientConnectionGetAcceptedCas, libs, "g_tls_client_connection_get_accepted_cas") | |
| 263 | + | core.PuregoSafeRegister(&XGTlsClientConnectionGetServerIdentity, libs, "g_tls_client_connection_get_server_identity") | |
| 264 | + | core.PuregoSafeRegister(&XGTlsClientConnectionGetUseSsl3, libs, "g_tls_client_connection_get_use_ssl3") | |
| 265 | + | core.PuregoSafeRegister(&XGTlsClientConnectionGetValidationFlags, libs, "g_tls_client_connection_get_validation_flags") | |
| 266 | + | core.PuregoSafeRegister(&XGTlsClientConnectionSetServerIdentity, libs, "g_tls_client_connection_set_server_identity") | |
| 267 | + | core.PuregoSafeRegister(&XGTlsClientConnectionSetUseSsl3, libs, "g_tls_client_connection_set_use_ssl3") | |
| 268 | + | core.PuregoSafeRegister(&XGTlsClientConnectionSetValidationFlags, libs, "g_tls_client_connection_set_validation_flags") | |
| 265 | 269 | ||
| 266 | 270 | } | |
M v4/gio/gtlsconnection.go +36 -32
| @@ -715,39 +715,43 @@ func (x *TlsConnection) ConnectAcceptCertificate(cb *func(TlsConnection, uintptr | |||
| 715 | 715 | ||
| 716 | 716 | func init() { | |
| 717 | 717 | core.SetPackageName("GIO", "gio-2.0") | |
| 718 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 719 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 720 | - | if err != nil { | |
| 721 | - | panic(err) | |
| 718 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 719 | + | var libs []uintptr | |
| 720 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 721 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 722 | + | if err != nil { | |
| 723 | + | panic(err) | |
| 724 | + | } | |
| 725 | + | libs = append(libs, lib) | |
| 722 | 726 | } | |
| 723 | 727 | ||
| 724 | - | core.PuregoSafeRegister(&xTlsChannelBindingErrorQuark, lib, "g_tls_channel_binding_error_quark") | |
| 725 | - | core.PuregoSafeRegister(&xTlsErrorQuark, lib, "g_tls_error_quark") | |
| 726 | - | ||
| 727 | - | core.PuregoSafeRegister(&xTlsConnectionGLibType, lib, "g_tls_connection_get_type") | |
| 728 | - | ||
| 729 | - | core.PuregoSafeRegister(&xTlsConnectionEmitAcceptCertificate, lib, "g_tls_connection_emit_accept_certificate") | |
| 730 | - | core.PuregoSafeRegister(&xTlsConnectionGetCertificate, lib, "g_tls_connection_get_certificate") | |
| 731 | - | core.PuregoSafeRegister(&xTlsConnectionGetChannelBindingData, lib, "g_tls_connection_get_channel_binding_data") | |
| 732 | - | core.PuregoSafeRegister(&xTlsConnectionGetCiphersuiteName, lib, "g_tls_connection_get_ciphersuite_name") | |
| 733 | - | core.PuregoSafeRegister(&xTlsConnectionGetDatabase, lib, "g_tls_connection_get_database") | |
| 734 | - | core.PuregoSafeRegister(&xTlsConnectionGetInteraction, lib, "g_tls_connection_get_interaction") | |
| 735 | - | core.PuregoSafeRegister(&xTlsConnectionGetNegotiatedProtocol, lib, "g_tls_connection_get_negotiated_protocol") | |
| 736 | - | core.PuregoSafeRegister(&xTlsConnectionGetPeerCertificate, lib, "g_tls_connection_get_peer_certificate") | |
| 737 | - | core.PuregoSafeRegister(&xTlsConnectionGetPeerCertificateErrors, lib, "g_tls_connection_get_peer_certificate_errors") | |
| 738 | - | core.PuregoSafeRegister(&xTlsConnectionGetProtocolVersion, lib, "g_tls_connection_get_protocol_version") | |
| 739 | - | core.PuregoSafeRegister(&xTlsConnectionGetRehandshakeMode, lib, "g_tls_connection_get_rehandshake_mode") | |
| 740 | - | core.PuregoSafeRegister(&xTlsConnectionGetRequireCloseNotify, lib, "g_tls_connection_get_require_close_notify") | |
| 741 | - | core.PuregoSafeRegister(&xTlsConnectionGetUseSystemCertdb, lib, "g_tls_connection_get_use_system_certdb") | |
| 742 | - | core.PuregoSafeRegister(&xTlsConnectionHandshake, lib, "g_tls_connection_handshake") | |
| 743 | - | core.PuregoSafeRegister(&xTlsConnectionHandshakeAsync, lib, "g_tls_connection_handshake_async") | |
| 744 | - | core.PuregoSafeRegister(&xTlsConnectionHandshakeFinish, lib, "g_tls_connection_handshake_finish") | |
| 745 | - | core.PuregoSafeRegister(&xTlsConnectionSetAdvertisedProtocols, lib, "g_tls_connection_set_advertised_protocols") | |
| 746 | - | core.PuregoSafeRegister(&xTlsConnectionSetCertificate, lib, "g_tls_connection_set_certificate") | |
| 747 | - | core.PuregoSafeRegister(&xTlsConnectionSetDatabase, lib, "g_tls_connection_set_database") | |
| 748 | - | core.PuregoSafeRegister(&xTlsConnectionSetInteraction, lib, "g_tls_connection_set_interaction") | |
| 749 | - | core.PuregoSafeRegister(&xTlsConnectionSetRehandshakeMode, lib, "g_tls_connection_set_rehandshake_mode") | |
| 750 | - | core.PuregoSafeRegister(&xTlsConnectionSetRequireCloseNotify, lib, "g_tls_connection_set_require_close_notify") | |
| 751 | - | core.PuregoSafeRegister(&xTlsConnectionSetUseSystemCertdb, lib, "g_tls_connection_set_use_system_certdb") | |
| 728 | + | core.PuregoSafeRegister(&xTlsChannelBindingErrorQuark, libs, "g_tls_channel_binding_error_quark") | |
| 729 | + | core.PuregoSafeRegister(&xTlsErrorQuark, libs, "g_tls_error_quark") | |
| 730 | + | ||
| 731 | + | core.PuregoSafeRegister(&xTlsConnectionGLibType, libs, "g_tls_connection_get_type") | |
| 732 | + | ||
| 733 | + | core.PuregoSafeRegister(&xTlsConnectionEmitAcceptCertificate, libs, "g_tls_connection_emit_accept_certificate") | |
| 734 | + | core.PuregoSafeRegister(&xTlsConnectionGetCertificate, libs, "g_tls_connection_get_certificate") | |
| 735 | + | core.PuregoSafeRegister(&xTlsConnectionGetChannelBindingData, libs, "g_tls_connection_get_channel_binding_data") | |
| 736 | + | core.PuregoSafeRegister(&xTlsConnectionGetCiphersuiteName, libs, "g_tls_connection_get_ciphersuite_name") | |
| 737 | + | core.PuregoSafeRegister(&xTlsConnectionGetDatabase, libs, "g_tls_connection_get_database") | |
| 738 | + | core.PuregoSafeRegister(&xTlsConnectionGetInteraction, libs, "g_tls_connection_get_interaction") | |
| 739 | + | core.PuregoSafeRegister(&xTlsConnectionGetNegotiatedProtocol, libs, "g_tls_connection_get_negotiated_protocol") | |
| 740 | + | core.PuregoSafeRegister(&xTlsConnectionGetPeerCertificate, libs, "g_tls_connection_get_peer_certificate") | |
| 741 | + | core.PuregoSafeRegister(&xTlsConnectionGetPeerCertificateErrors, libs, "g_tls_connection_get_peer_certificate_errors") | |
| 742 | + | core.PuregoSafeRegister(&xTlsConnectionGetProtocolVersion, libs, "g_tls_connection_get_protocol_version") | |
| 743 | + | core.PuregoSafeRegister(&xTlsConnectionGetRehandshakeMode, libs, "g_tls_connection_get_rehandshake_mode") | |
| 744 | + | core.PuregoSafeRegister(&xTlsConnectionGetRequireCloseNotify, libs, "g_tls_connection_get_require_close_notify") | |
| 745 | + | core.PuregoSafeRegister(&xTlsConnectionGetUseSystemCertdb, libs, "g_tls_connection_get_use_system_certdb") | |
| 746 | + | core.PuregoSafeRegister(&xTlsConnectionHandshake, libs, "g_tls_connection_handshake") | |
| 747 | + | core.PuregoSafeRegister(&xTlsConnectionHandshakeAsync, libs, "g_tls_connection_handshake_async") | |
| 748 | + | core.PuregoSafeRegister(&xTlsConnectionHandshakeFinish, libs, "g_tls_connection_handshake_finish") | |
| 749 | + | core.PuregoSafeRegister(&xTlsConnectionSetAdvertisedProtocols, libs, "g_tls_connection_set_advertised_protocols") | |
| 750 | + | core.PuregoSafeRegister(&xTlsConnectionSetCertificate, libs, "g_tls_connection_set_certificate") | |
| 751 | + | core.PuregoSafeRegister(&xTlsConnectionSetDatabase, libs, "g_tls_connection_set_database") | |
| 752 | + | core.PuregoSafeRegister(&xTlsConnectionSetInteraction, libs, "g_tls_connection_set_interaction") | |
| 753 | + | core.PuregoSafeRegister(&xTlsConnectionSetRehandshakeMode, libs, "g_tls_connection_set_rehandshake_mode") | |
| 754 | + | core.PuregoSafeRegister(&xTlsConnectionSetRequireCloseNotify, libs, "g_tls_connection_set_require_close_notify") | |
| 755 | + | core.PuregoSafeRegister(&xTlsConnectionSetUseSystemCertdb, libs, "g_tls_connection_set_use_system_certdb") | |
| 752 | 756 | ||
| 753 | 757 | } | |
M v4/gio/gtlsdatabase.go +25 -21
| @@ -834,26 +834,30 @@ func (c *TlsDatabase) SetGoPointer(ptr uintptr) { | |||
| 834 | 834 | ||
| 835 | 835 | func init() { | |
| 836 | 836 | core.SetPackageName("GIO", "gio-2.0") | |
| 837 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 838 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 839 | - | if err != nil { | |
| 840 | - | panic(err) | |
| 841 | - | } | |
| 842 | - | ||
| 843 | - | core.PuregoSafeRegister(&xTlsDatabaseGLibType, lib, "g_tls_database_get_type") | |
| 844 | - | ||
| 845 | - | core.PuregoSafeRegister(&xTlsDatabaseCreateCertificateHandle, lib, "g_tls_database_create_certificate_handle") | |
| 846 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateForHandle, lib, "g_tls_database_lookup_certificate_for_handle") | |
| 847 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateForHandleAsync, lib, "g_tls_database_lookup_certificate_for_handle_async") | |
| 848 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateForHandleFinish, lib, "g_tls_database_lookup_certificate_for_handle_finish") | |
| 849 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateIssuer, lib, "g_tls_database_lookup_certificate_issuer") | |
| 850 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateIssuerAsync, lib, "g_tls_database_lookup_certificate_issuer_async") | |
| 851 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateIssuerFinish, lib, "g_tls_database_lookup_certificate_issuer_finish") | |
| 852 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificatesIssuedBy, lib, "g_tls_database_lookup_certificates_issued_by") | |
| 853 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificatesIssuedByAsync, lib, "g_tls_database_lookup_certificates_issued_by_async") | |
| 854 | - | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificatesIssuedByFinish, lib, "g_tls_database_lookup_certificates_issued_by_finish") | |
| 855 | - | core.PuregoSafeRegister(&xTlsDatabaseVerifyChain, lib, "g_tls_database_verify_chain") | |
| 856 | - | core.PuregoSafeRegister(&xTlsDatabaseVerifyChainAsync, lib, "g_tls_database_verify_chain_async") | |
| 857 | - | core.PuregoSafeRegister(&xTlsDatabaseVerifyChainFinish, lib, "g_tls_database_verify_chain_finish") | |
| 837 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 838 | + | var libs []uintptr | |
| 839 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 840 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 841 | + | if err != nil { | |
| 842 | + | panic(err) | |
| 843 | + | } | |
| 844 | + | libs = append(libs, lib) | |
| 845 | + | } | |
| 846 | + | ||
| 847 | + | core.PuregoSafeRegister(&xTlsDatabaseGLibType, libs, "g_tls_database_get_type") | |
| 848 | + | ||
| 849 | + | core.PuregoSafeRegister(&xTlsDatabaseCreateCertificateHandle, libs, "g_tls_database_create_certificate_handle") | |
| 850 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateForHandle, libs, "g_tls_database_lookup_certificate_for_handle") | |
| 851 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateForHandleAsync, libs, "g_tls_database_lookup_certificate_for_handle_async") | |
| 852 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateForHandleFinish, libs, "g_tls_database_lookup_certificate_for_handle_finish") | |
| 853 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateIssuer, libs, "g_tls_database_lookup_certificate_issuer") | |
| 854 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateIssuerAsync, libs, "g_tls_database_lookup_certificate_issuer_async") | |
| 855 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificateIssuerFinish, libs, "g_tls_database_lookup_certificate_issuer_finish") | |
| 856 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificatesIssuedBy, libs, "g_tls_database_lookup_certificates_issued_by") | |
| 857 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificatesIssuedByAsync, libs, "g_tls_database_lookup_certificates_issued_by_async") | |
| 858 | + | core.PuregoSafeRegister(&xTlsDatabaseLookupCertificatesIssuedByFinish, libs, "g_tls_database_lookup_certificates_issued_by_finish") | |
| 859 | + | core.PuregoSafeRegister(&xTlsDatabaseVerifyChain, libs, "g_tls_database_verify_chain") | |
| 860 | + | core.PuregoSafeRegister(&xTlsDatabaseVerifyChainAsync, libs, "g_tls_database_verify_chain_async") | |
| 861 | + | core.PuregoSafeRegister(&xTlsDatabaseVerifyChainFinish, libs, "g_tls_database_verify_chain_finish") | |
| 858 | 862 | ||
| 859 | 863 | } | |
M v4/gio/gtlsfiledatabase.go +10 -6
| @@ -79,14 +79,18 @@ func TlsFileDatabaseNew(AnchorsVar string) (*TlsFileDatabaseBase, error) { | |||
| 79 | 79 | ||
| 80 | 80 | func init() { | |
| 81 | 81 | core.SetPackageName("GIO", "gio-2.0") | |
| 82 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 83 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 84 | - | if err != nil { | |
| 85 | - | panic(err) | |
| 82 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 83 | + | var libs []uintptr | |
| 84 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 85 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 86 | + | if err != nil { | |
| 87 | + | panic(err) | |
| 88 | + | } | |
| 89 | + | libs = append(libs, lib) | |
| 86 | 90 | } | |
| 87 | 91 | ||
| 88 | - | core.PuregoSafeRegister(&xTlsFileDatabaseNew, lib, "g_tls_file_database_new") | |
| 92 | + | core.PuregoSafeRegister(&xTlsFileDatabaseNew, libs, "g_tls_file_database_new") | |
| 89 | 93 | ||
| 90 | - | core.PuregoSafeRegister(&xTlsFileDatabaseGLibType, lib, "g_tls_file_database_get_type") | |
| 94 | + | core.PuregoSafeRegister(&xTlsFileDatabaseGLibType, libs, "g_tls_file_database_get_type") | |
| 91 | 95 | ||
| 92 | 96 | } | |
M v4/gio/gtlsinteraction.go +17 -13
| @@ -493,21 +493,25 @@ func (c *TlsInteraction) SetGoPointer(ptr uintptr) { | |||
| 493 | 493 | ||
| 494 | 494 | func init() { | |
| 495 | 495 | core.SetPackageName("GIO", "gio-2.0") | |
| 496 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 497 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 498 | - | if err != nil { | |
| 499 | - | panic(err) | |
| 496 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 497 | + | var libs []uintptr | |
| 498 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 499 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 500 | + | if err != nil { | |
| 501 | + | panic(err) | |
| 502 | + | } | |
| 503 | + | libs = append(libs, lib) | |
| 500 | 504 | } | |
| 501 | 505 | ||
| 502 | - | core.PuregoSafeRegister(&xTlsInteractionGLibType, lib, "g_tls_interaction_get_type") | |
| 506 | + | core.PuregoSafeRegister(&xTlsInteractionGLibType, libs, "g_tls_interaction_get_type") | |
| 503 | 507 | ||
| 504 | - | core.PuregoSafeRegister(&xTlsInteractionAskPassword, lib, "g_tls_interaction_ask_password") | |
| 505 | - | core.PuregoSafeRegister(&xTlsInteractionAskPasswordAsync, lib, "g_tls_interaction_ask_password_async") | |
| 506 | - | core.PuregoSafeRegister(&xTlsInteractionAskPasswordFinish, lib, "g_tls_interaction_ask_password_finish") | |
| 507 | - | core.PuregoSafeRegister(&xTlsInteractionInvokeAskPassword, lib, "g_tls_interaction_invoke_ask_password") | |
| 508 | - | core.PuregoSafeRegister(&xTlsInteractionInvokeRequestCertificate, lib, "g_tls_interaction_invoke_request_certificate") | |
| 509 | - | core.PuregoSafeRegister(&xTlsInteractionRequestCertificate, lib, "g_tls_interaction_request_certificate") | |
| 510 | - | core.PuregoSafeRegister(&xTlsInteractionRequestCertificateAsync, lib, "g_tls_interaction_request_certificate_async") | |
| 511 | - | core.PuregoSafeRegister(&xTlsInteractionRequestCertificateFinish, lib, "g_tls_interaction_request_certificate_finish") | |
| 508 | + | core.PuregoSafeRegister(&xTlsInteractionAskPassword, libs, "g_tls_interaction_ask_password") | |
| 509 | + | core.PuregoSafeRegister(&xTlsInteractionAskPasswordAsync, libs, "g_tls_interaction_ask_password_async") | |
| 510 | + | core.PuregoSafeRegister(&xTlsInteractionAskPasswordFinish, libs, "g_tls_interaction_ask_password_finish") | |
| 511 | + | core.PuregoSafeRegister(&xTlsInteractionInvokeAskPassword, libs, "g_tls_interaction_invoke_ask_password") | |
| 512 | + | core.PuregoSafeRegister(&xTlsInteractionInvokeRequestCertificate, libs, "g_tls_interaction_invoke_request_certificate") | |
| 513 | + | core.PuregoSafeRegister(&xTlsInteractionRequestCertificate, libs, "g_tls_interaction_request_certificate") | |
| 514 | + | core.PuregoSafeRegister(&xTlsInteractionRequestCertificateAsync, libs, "g_tls_interaction_request_certificate_async") | |
| 515 | + | core.PuregoSafeRegister(&xTlsInteractionRequestCertificateFinish, libs, "g_tls_interaction_request_certificate_finish") | |
| 512 | 516 | ||
| 513 | 517 | } | |
M v4/gio/gtlspassword.go +19 -15
| @@ -268,24 +268,28 @@ func (c *TlsPassword) SetGoPointer(ptr uintptr) { | |||
| 268 | 268 | ||
| 269 | 269 | func init() { | |
| 270 | 270 | core.SetPackageName("GIO", "gio-2.0") | |
| 271 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 272 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 273 | - | if err != nil { | |
| 274 | - | panic(err) | |
| 271 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 272 | + | var libs []uintptr | |
| 273 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 274 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 275 | + | if err != nil { | |
| 276 | + | panic(err) | |
| 277 | + | } | |
| 278 | + | libs = append(libs, lib) | |
| 275 | 279 | } | |
| 276 | 280 | ||
| 277 | - | core.PuregoSafeRegister(&xTlsPasswordGLibType, lib, "g_tls_password_get_type") | |
| 281 | + | core.PuregoSafeRegister(&xTlsPasswordGLibType, libs, "g_tls_password_get_type") | |
| 278 | 282 | ||
| 279 | - | core.PuregoSafeRegister(&xNewTlsPassword, lib, "g_tls_password_new") | |
| 283 | + | core.PuregoSafeRegister(&xNewTlsPassword, libs, "g_tls_password_new") | |
| 280 | 284 | ||
| 281 | - | core.PuregoSafeRegister(&xTlsPasswordGetDescription, lib, "g_tls_password_get_description") | |
| 282 | - | core.PuregoSafeRegister(&xTlsPasswordGetFlags, lib, "g_tls_password_get_flags") | |
| 283 | - | core.PuregoSafeRegister(&xTlsPasswordGetValue, lib, "g_tls_password_get_value") | |
| 284 | - | core.PuregoSafeRegister(&xTlsPasswordGetWarning, lib, "g_tls_password_get_warning") | |
| 285 | - | core.PuregoSafeRegister(&xTlsPasswordSetDescription, lib, "g_tls_password_set_description") | |
| 286 | - | core.PuregoSafeRegister(&xTlsPasswordSetFlags, lib, "g_tls_password_set_flags") | |
| 287 | - | core.PuregoSafeRegister(&xTlsPasswordSetValue, lib, "g_tls_password_set_value") | |
| 288 | - | core.PuregoSafeRegister(&xTlsPasswordSetValueFull, lib, "g_tls_password_set_value_full") | |
| 289 | - | core.PuregoSafeRegister(&xTlsPasswordSetWarning, lib, "g_tls_password_set_warning") | |
| 285 | + | core.PuregoSafeRegister(&xTlsPasswordGetDescription, libs, "g_tls_password_get_description") | |
| 286 | + | core.PuregoSafeRegister(&xTlsPasswordGetFlags, libs, "g_tls_password_get_flags") | |
| 287 | + | core.PuregoSafeRegister(&xTlsPasswordGetValue, libs, "g_tls_password_get_value") | |
| 288 | + | core.PuregoSafeRegister(&xTlsPasswordGetWarning, libs, "g_tls_password_get_warning") | |
| 289 | + | core.PuregoSafeRegister(&xTlsPasswordSetDescription, libs, "g_tls_password_set_description") | |
| 290 | + | core.PuregoSafeRegister(&xTlsPasswordSetFlags, libs, "g_tls_password_set_flags") | |
| 291 | + | core.PuregoSafeRegister(&xTlsPasswordSetValue, libs, "g_tls_password_set_value") | |
| 292 | + | core.PuregoSafeRegister(&xTlsPasswordSetValueFull, libs, "g_tls_password_set_value_full") | |
| 293 | + | core.PuregoSafeRegister(&xTlsPasswordSetWarning, libs, "g_tls_password_set_warning") | |
| 290 | 294 | ||
| 291 | 295 | } | |
M v4/gio/gtlsserverconnection.go +10 -6
| @@ -78,14 +78,18 @@ func TlsServerConnectionNew(BaseIoStreamVar *IOStream, CertificateVar *TlsCertif | |||
| 78 | 78 | ||
| 79 | 79 | func init() { | |
| 80 | 80 | core.SetPackageName("GIO", "gio-2.0") | |
| 81 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 82 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 83 | - | if err != nil { | |
| 84 | - | panic(err) | |
| 81 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 82 | + | var libs []uintptr | |
| 83 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 84 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 85 | + | if err != nil { | |
| 86 | + | panic(err) | |
| 87 | + | } | |
| 88 | + | libs = append(libs, lib) | |
| 85 | 89 | } | |
| 86 | 90 | ||
| 87 | - | core.PuregoSafeRegister(&xTlsServerConnectionNew, lib, "g_tls_server_connection_new") | |
| 91 | + | core.PuregoSafeRegister(&xTlsServerConnectionNew, libs, "g_tls_server_connection_new") | |
| 88 | 92 | ||
| 89 | - | core.PuregoSafeRegister(&xTlsServerConnectionGLibType, lib, "g_tls_server_connection_get_type") | |
| 93 | + | core.PuregoSafeRegister(&xTlsServerConnectionGLibType, libs, "g_tls_server_connection_get_type") | |
| 90 | 94 | ||
| 91 | 95 | } | |
M v4/gio/gunixconnection.go +17 -13
| @@ -247,21 +247,25 @@ func (c *UnixConnection) SetGoPointer(ptr uintptr) { | |||
| 247 | 247 | ||
| 248 | 248 | func init() { | |
| 249 | 249 | core.SetPackageName("GIO", "gio-2.0") | |
| 250 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 251 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 252 | - | if err != nil { | |
| 253 | - | panic(err) | |
| 250 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 251 | + | var libs []uintptr | |
| 252 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 253 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 254 | + | if err != nil { | |
| 255 | + | panic(err) | |
| 256 | + | } | |
| 257 | + | libs = append(libs, lib) | |
| 254 | 258 | } | |
| 255 | 259 | ||
| 256 | - | core.PuregoSafeRegister(&xUnixConnectionGLibType, lib, "g_unix_connection_get_type") | |
| 260 | + | core.PuregoSafeRegister(&xUnixConnectionGLibType, libs, "g_unix_connection_get_type") | |
| 257 | 261 | ||
| 258 | - | core.PuregoSafeRegister(&xUnixConnectionReceiveCredentials, lib, "g_unix_connection_receive_credentials") | |
| 259 | - | core.PuregoSafeRegister(&xUnixConnectionReceiveCredentialsAsync, lib, "g_unix_connection_receive_credentials_async") | |
| 260 | - | core.PuregoSafeRegister(&xUnixConnectionReceiveCredentialsFinish, lib, "g_unix_connection_receive_credentials_finish") | |
| 261 | - | core.PuregoSafeRegister(&xUnixConnectionReceiveFd, lib, "g_unix_connection_receive_fd") | |
| 262 | - | core.PuregoSafeRegister(&xUnixConnectionSendCredentials, lib, "g_unix_connection_send_credentials") | |
| 263 | - | core.PuregoSafeRegister(&xUnixConnectionSendCredentialsAsync, lib, "g_unix_connection_send_credentials_async") | |
| 264 | - | core.PuregoSafeRegister(&xUnixConnectionSendCredentialsFinish, lib, "g_unix_connection_send_credentials_finish") | |
| 265 | - | core.PuregoSafeRegister(&xUnixConnectionSendFd, lib, "g_unix_connection_send_fd") | |
| 262 | + | core.PuregoSafeRegister(&xUnixConnectionReceiveCredentials, libs, "g_unix_connection_receive_credentials") | |
| 263 | + | core.PuregoSafeRegister(&xUnixConnectionReceiveCredentialsAsync, libs, "g_unix_connection_receive_credentials_async") | |
| 264 | + | core.PuregoSafeRegister(&xUnixConnectionReceiveCredentialsFinish, libs, "g_unix_connection_receive_credentials_finish") | |
| 265 | + | core.PuregoSafeRegister(&xUnixConnectionReceiveFd, libs, "g_unix_connection_receive_fd") | |
| 266 | + | core.PuregoSafeRegister(&xUnixConnectionSendCredentials, libs, "g_unix_connection_send_credentials") | |
| 267 | + | core.PuregoSafeRegister(&xUnixConnectionSendCredentialsAsync, libs, "g_unix_connection_send_credentials_async") | |
| 268 | + | core.PuregoSafeRegister(&xUnixConnectionSendCredentialsFinish, libs, "g_unix_connection_send_credentials_finish") | |
| 269 | + | core.PuregoSafeRegister(&xUnixConnectionSendFd, libs, "g_unix_connection_send_fd") | |
| 266 | 270 | ||
| 267 | 271 | } | |
M v4/gio/gunixcredentialsmessage.go +13 -9
| @@ -186,19 +186,23 @@ func UnixCredentialsMessageIsSupported() bool { | |||
| 186 | 186 | ||
| 187 | 187 | func init() { | |
| 188 | 188 | core.SetPackageName("GIO", "gio-2.0") | |
| 189 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 190 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 191 | - | if err != nil { | |
| 192 | - | panic(err) | |
| 189 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 190 | + | var libs []uintptr | |
| 191 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 192 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 193 | + | if err != nil { | |
| 194 | + | panic(err) | |
| 195 | + | } | |
| 196 | + | libs = append(libs, lib) | |
| 193 | 197 | } | |
| 194 | 198 | ||
| 195 | - | core.PuregoSafeRegister(&xUnixCredentialsMessageGLibType, lib, "g_unix_credentials_message_get_type") | |
| 199 | + | core.PuregoSafeRegister(&xUnixCredentialsMessageGLibType, libs, "g_unix_credentials_message_get_type") | |
| 196 | 200 | ||
| 197 | - | core.PuregoSafeRegister(&xNewUnixCredentialsMessage, lib, "g_unix_credentials_message_new") | |
| 198 | - | core.PuregoSafeRegister(&xNewUnixCredentialsMessageWithCredentials, lib, "g_unix_credentials_message_new_with_credentials") | |
| 201 | + | core.PuregoSafeRegister(&xNewUnixCredentialsMessage, libs, "g_unix_credentials_message_new") | |
| 202 | + | core.PuregoSafeRegister(&xNewUnixCredentialsMessageWithCredentials, libs, "g_unix_credentials_message_new_with_credentials") | |
| 199 | 203 | ||
| 200 | - | core.PuregoSafeRegister(&xUnixCredentialsMessageGetCredentials, lib, "g_unix_credentials_message_get_credentials") | |
| 204 | + | core.PuregoSafeRegister(&xUnixCredentialsMessageGetCredentials, libs, "g_unix_credentials_message_get_credentials") | |
| 201 | 205 | ||
| 202 | - | core.PuregoSafeRegister(&xUnixCredentialsMessageIsSupported, lib, "g_unix_credentials_message_is_supported") | |
| 206 | + | core.PuregoSafeRegister(&xUnixCredentialsMessageIsSupported, libs, "g_unix_credentials_message_is_supported") | |
| 203 | 207 | ||
| 204 | 208 | } | |
M v4/gio/gunixfdlist.go +16 -12
| @@ -344,21 +344,25 @@ func (c *UnixFDList) SetGoPointer(ptr uintptr) { | |||
| 344 | 344 | ||
| 345 | 345 | func init() { | |
| 346 | 346 | core.SetPackageName("GIO", "gio-2.0") | |
| 347 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 348 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 349 | - | if err != nil { | |
| 350 | - | panic(err) | |
| 347 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 348 | + | var libs []uintptr | |
| 349 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 350 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 351 | + | if err != nil { | |
| 352 | + | panic(err) | |
| 353 | + | } | |
| 354 | + | libs = append(libs, lib) | |
| 351 | 355 | } | |
| 352 | 356 | ||
| 353 | - | core.PuregoSafeRegister(&xUnixFDListGLibType, lib, "g_unix_fd_list_get_type") | |
| 357 | + | core.PuregoSafeRegister(&xUnixFDListGLibType, libs, "g_unix_fd_list_get_type") | |
| 354 | 358 | ||
| 355 | - | core.PuregoSafeRegister(&xNewUnixFDList, lib, "g_unix_fd_list_new") | |
| 356 | - | core.PuregoSafeRegister(&xNewUnixFDListFromArray, lib, "g_unix_fd_list_new_from_array") | |
| 359 | + | core.PuregoSafeRegister(&xNewUnixFDList, libs, "g_unix_fd_list_new") | |
| 360 | + | core.PuregoSafeRegister(&xNewUnixFDListFromArray, libs, "g_unix_fd_list_new_from_array") | |
| 357 | 361 | ||
| 358 | - | core.PuregoSafeRegister(&xUnixFDListAppend, lib, "g_unix_fd_list_append") | |
| 359 | - | core.PuregoSafeRegister(&xUnixFDListGet, lib, "g_unix_fd_list_get") | |
| 360 | - | core.PuregoSafeRegister(&xUnixFDListGetLength, lib, "g_unix_fd_list_get_length") | |
| 361 | - | core.PuregoSafeRegister(&xUnixFDListPeekFds, lib, "g_unix_fd_list_peek_fds") | |
| 362 | - | core.PuregoSafeRegister(&xUnixFDListStealFds, lib, "g_unix_fd_list_steal_fds") | |
| 362 | + | core.PuregoSafeRegister(&xUnixFDListAppend, libs, "g_unix_fd_list_append") | |
| 363 | + | core.PuregoSafeRegister(&xUnixFDListGet, libs, "g_unix_fd_list_get") | |
| 364 | + | core.PuregoSafeRegister(&xUnixFDListGetLength, libs, "g_unix_fd_list_get_length") | |
| 365 | + | core.PuregoSafeRegister(&xUnixFDListPeekFds, libs, "g_unix_fd_list_peek_fds") | |
| 366 | + | core.PuregoSafeRegister(&xUnixFDListStealFds, libs, "g_unix_fd_list_steal_fds") | |
| 363 | 367 | ||
| 364 | 368 | } | |
M v4/gio/gunixfdmessage.go +14 -10
| @@ -220,19 +220,23 @@ func (c *UnixFDMessage) SetGoPointer(ptr uintptr) { | |||
| 220 | 220 | ||
| 221 | 221 | func init() { | |
| 222 | 222 | core.SetPackageName("GIO", "gio-2.0") | |
| 223 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 224 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 225 | - | if err != nil { | |
| 226 | - | panic(err) | |
| 223 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 224 | + | var libs []uintptr | |
| 225 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 226 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 227 | + | if err != nil { | |
| 228 | + | panic(err) | |
| 229 | + | } | |
| 230 | + | libs = append(libs, lib) | |
| 227 | 231 | } | |
| 228 | 232 | ||
| 229 | - | core.PuregoSafeRegister(&xUnixFDMessageGLibType, lib, "g_unix_fd_message_get_type") | |
| 233 | + | core.PuregoSafeRegister(&xUnixFDMessageGLibType, libs, "g_unix_fd_message_get_type") | |
| 230 | 234 | ||
| 231 | - | core.PuregoSafeRegister(&xNewUnixFDMessage, lib, "g_unix_fd_message_new") | |
| 232 | - | core.PuregoSafeRegister(&xNewUnixFDMessageWithFdList, lib, "g_unix_fd_message_new_with_fd_list") | |
| 235 | + | core.PuregoSafeRegister(&xNewUnixFDMessage, libs, "g_unix_fd_message_new") | |
| 236 | + | core.PuregoSafeRegister(&xNewUnixFDMessageWithFdList, libs, "g_unix_fd_message_new_with_fd_list") | |
| 233 | 237 | ||
| 234 | - | core.PuregoSafeRegister(&xUnixFDMessageAppendFd, lib, "g_unix_fd_message_append_fd") | |
| 235 | - | core.PuregoSafeRegister(&xUnixFDMessageGetFdList, lib, "g_unix_fd_message_get_fd_list") | |
| 236 | - | core.PuregoSafeRegister(&xUnixFDMessageStealFds, lib, "g_unix_fd_message_steal_fds") | |
| 238 | + | core.PuregoSafeRegister(&xUnixFDMessageAppendFd, libs, "g_unix_fd_message_append_fd") | |
| 239 | + | core.PuregoSafeRegister(&xUnixFDMessageGetFdList, libs, "g_unix_fd_message_get_fd_list") | |
| 240 | + | core.PuregoSafeRegister(&xUnixFDMessageStealFds, libs, "g_unix_fd_message_steal_fds") | |
| 237 | 241 | ||
| 238 | 242 | } | |
M v4/gio/gunixinputstream.go +13 -9
| @@ -312,18 +312,22 @@ func (x *UnixInputStream) ReadNonblocking(BufferVar []byte, CountVar uint, Cance | |||
| 312 | 312 | ||
| 313 | 313 | func init() { | |
| 314 | 314 | core.SetPackageName("GIO", "gio-2.0") | |
| 315 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 316 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 317 | - | if err != nil { | |
| 318 | - | panic(err) | |
| 315 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 316 | + | var libs []uintptr | |
| 317 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 318 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 319 | + | if err != nil { | |
| 320 | + | panic(err) | |
| 321 | + | } | |
| 322 | + | libs = append(libs, lib) | |
| 319 | 323 | } | |
| 320 | 324 | ||
| 321 | - | core.PuregoSafeRegister(&xUnixInputStreamGLibType, lib, "g_unix_input_stream_get_type") | |
| 325 | + | core.PuregoSafeRegister(&xUnixInputStreamGLibType, libs, "g_unix_input_stream_get_type") | |
| 322 | 326 | ||
| 323 | - | core.PuregoSafeRegister(&xNewUnixInputStream, lib, "g_unix_input_stream_new") | |
| 327 | + | core.PuregoSafeRegister(&xNewUnixInputStream, libs, "g_unix_input_stream_new") | |
| 324 | 328 | ||
| 325 | - | core.PuregoSafeRegister(&xUnixInputStreamGetCloseFd, lib, "g_unix_input_stream_get_close_fd") | |
| 326 | - | core.PuregoSafeRegister(&xUnixInputStreamGetFd, lib, "g_unix_input_stream_get_fd") | |
| 327 | - | core.PuregoSafeRegister(&xUnixInputStreamSetCloseFd, lib, "g_unix_input_stream_set_close_fd") | |
| 329 | + | core.PuregoSafeRegister(&xUnixInputStreamGetCloseFd, libs, "g_unix_input_stream_get_close_fd") | |
| 330 | + | core.PuregoSafeRegister(&xUnixInputStreamGetFd, libs, "g_unix_input_stream_get_fd") | |
| 331 | + | core.PuregoSafeRegister(&xUnixInputStreamSetCloseFd, libs, "g_unix_input_stream_set_close_fd") | |
| 328 | 332 | ||
| 329 | 333 | } | |
M v4/gio/gunixmounts.go +83 -79
| @@ -946,86 +946,90 @@ func UnixMountMonitorGet() *UnixMountMonitor { | |||
| 946 | 946 | ||
| 947 | 947 | func init() { | |
| 948 | 948 | core.SetPackageName("GIO", "gio-2.0") | |
| 949 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 950 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 951 | - | if err != nil { | |
| 952 | - | panic(err) | |
| 949 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 950 | + | var libs []uintptr | |
| 951 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 952 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 953 | + | if err != nil { | |
| 954 | + | panic(err) | |
| 955 | + | } | |
| 956 | + | libs = append(libs, lib) | |
| 953 | 957 | } | |
| 954 | 958 | ||
| 955 | - | core.PuregoSafeRegister(&xUnixIsMountPathSystemInternal, lib, "g_unix_is_mount_path_system_internal") | |
| 956 | - | core.PuregoSafeRegister(&xUnixIsSystemDevicePath, lib, "g_unix_is_system_device_path") | |
| 957 | - | core.PuregoSafeRegister(&xUnixIsSystemFsType, lib, "g_unix_is_system_fs_type") | |
| 958 | - | core.PuregoSafeRegister(&xUnixMountAt, lib, "g_unix_mount_at") | |
| 959 | - | core.PuregoSafeRegister(&xUnixMountCompare, lib, "g_unix_mount_compare") | |
| 960 | - | core.PuregoSafeRegister(&xUnixMountCopy, lib, "g_unix_mount_copy") | |
| 961 | - | core.PuregoSafeRegister(&xUnixMountEntriesChangedSince, lib, "g_unix_mount_entries_changed_since") | |
| 962 | - | core.PuregoSafeRegister(&xUnixMountEntriesGet, lib, "g_unix_mount_entries_get") | |
| 963 | - | core.PuregoSafeRegister(&xUnixMountEntriesGetFromFile, lib, "g_unix_mount_entries_get_from_file") | |
| 964 | - | core.PuregoSafeRegister(&xUnixMountEntryAt, lib, "g_unix_mount_entry_at") | |
| 965 | - | core.PuregoSafeRegister(&xUnixMountEntryFor, lib, "g_unix_mount_entry_for") | |
| 966 | - | core.PuregoSafeRegister(&xUnixMountFor, lib, "g_unix_mount_for") | |
| 967 | - | core.PuregoSafeRegister(&xUnixMountFree, lib, "g_unix_mount_free") | |
| 968 | - | core.PuregoSafeRegister(&xUnixMountGetDevicePath, lib, "g_unix_mount_get_device_path") | |
| 969 | - | core.PuregoSafeRegister(&xUnixMountGetFsType, lib, "g_unix_mount_get_fs_type") | |
| 970 | - | core.PuregoSafeRegister(&xUnixMountGetMountPath, lib, "g_unix_mount_get_mount_path") | |
| 971 | - | core.PuregoSafeRegister(&xUnixMountGetOptions, lib, "g_unix_mount_get_options") | |
| 972 | - | core.PuregoSafeRegister(&xUnixMountGetRootPath, lib, "g_unix_mount_get_root_path") | |
| 973 | - | core.PuregoSafeRegister(&xUnixMountGuessCanEject, lib, "g_unix_mount_guess_can_eject") | |
| 974 | - | core.PuregoSafeRegister(&xUnixMountGuessIcon, lib, "g_unix_mount_guess_icon") | |
| 975 | - | core.PuregoSafeRegister(&xUnixMountGuessName, lib, "g_unix_mount_guess_name") | |
| 976 | - | core.PuregoSafeRegister(&xUnixMountGuessShouldDisplay, lib, "g_unix_mount_guess_should_display") | |
| 977 | - | core.PuregoSafeRegister(&xUnixMountGuessSymbolicIcon, lib, "g_unix_mount_guess_symbolic_icon") | |
| 978 | - | core.PuregoSafeRegister(&xUnixMountIsReadonly, lib, "g_unix_mount_is_readonly") | |
| 979 | - | core.PuregoSafeRegister(&xUnixMountIsSystemInternal, lib, "g_unix_mount_is_system_internal") | |
| 980 | - | core.PuregoSafeRegister(&xUnixMountPointAt, lib, "g_unix_mount_point_at") | |
| 981 | - | core.PuregoSafeRegister(&xUnixMountPointsChangedSince, lib, "g_unix_mount_points_changed_since") | |
| 982 | - | core.PuregoSafeRegister(&xUnixMountPointsGet, lib, "g_unix_mount_points_get") | |
| 983 | - | core.PuregoSafeRegister(&xUnixMountPointsGetFromFile, lib, "g_unix_mount_points_get_from_file") | |
| 984 | - | core.PuregoSafeRegister(&xUnixMountsChangedSince, lib, "g_unix_mounts_changed_since") | |
| 985 | - | core.PuregoSafeRegister(&xUnixMountsGet, lib, "g_unix_mounts_get") | |
| 986 | - | core.PuregoSafeRegister(&xUnixMountsGetFromFile, lib, "g_unix_mounts_get_from_file") | |
| 987 | - | ||
| 988 | - | core.PuregoSafeRegister(&xUnixMountEntryGLibType, lib, "g_unix_mount_entry_get_type") | |
| 989 | - | ||
| 990 | - | core.PuregoSafeRegister(&xUnixMountEntryCompare, lib, "g_unix_mount_entry_compare") | |
| 991 | - | core.PuregoSafeRegister(&xUnixMountEntryCopy, lib, "g_unix_mount_entry_copy") | |
| 992 | - | core.PuregoSafeRegister(&xUnixMountEntryFree, lib, "g_unix_mount_entry_free") | |
| 993 | - | core.PuregoSafeRegister(&xUnixMountEntryGetDevicePath, lib, "g_unix_mount_entry_get_device_path") | |
| 994 | - | core.PuregoSafeRegister(&xUnixMountEntryGetFsType, lib, "g_unix_mount_entry_get_fs_type") | |
| 995 | - | core.PuregoSafeRegister(&xUnixMountEntryGetMountPath, lib, "g_unix_mount_entry_get_mount_path") | |
| 996 | - | core.PuregoSafeRegister(&xUnixMountEntryGetOptions, lib, "g_unix_mount_entry_get_options") | |
| 997 | - | core.PuregoSafeRegister(&xUnixMountEntryGetRootPath, lib, "g_unix_mount_entry_get_root_path") | |
| 998 | - | core.PuregoSafeRegister(&xUnixMountEntryGuessCanEject, lib, "g_unix_mount_entry_guess_can_eject") | |
| 999 | - | core.PuregoSafeRegister(&xUnixMountEntryGuessIcon, lib, "g_unix_mount_entry_guess_icon") | |
| 1000 | - | core.PuregoSafeRegister(&xUnixMountEntryGuessName, lib, "g_unix_mount_entry_guess_name") | |
| 1001 | - | core.PuregoSafeRegister(&xUnixMountEntryGuessShouldDisplay, lib, "g_unix_mount_entry_guess_should_display") | |
| 1002 | - | core.PuregoSafeRegister(&xUnixMountEntryGuessSymbolicIcon, lib, "g_unix_mount_entry_guess_symbolic_icon") | |
| 1003 | - | core.PuregoSafeRegister(&xUnixMountEntryIsReadonly, lib, "g_unix_mount_entry_is_readonly") | |
| 1004 | - | core.PuregoSafeRegister(&xUnixMountEntryIsSystemInternal, lib, "g_unix_mount_entry_is_system_internal") | |
| 1005 | - | ||
| 1006 | - | core.PuregoSafeRegister(&xUnixMountPointGLibType, lib, "g_unix_mount_point_get_type") | |
| 1007 | - | ||
| 1008 | - | core.PuregoSafeRegister(&xUnixMountPointCompare, lib, "g_unix_mount_point_compare") | |
| 1009 | - | core.PuregoSafeRegister(&xUnixMountPointCopy, lib, "g_unix_mount_point_copy") | |
| 1010 | - | core.PuregoSafeRegister(&xUnixMountPointFree, lib, "g_unix_mount_point_free") | |
| 1011 | - | core.PuregoSafeRegister(&xUnixMountPointGetDevicePath, lib, "g_unix_mount_point_get_device_path") | |
| 1012 | - | core.PuregoSafeRegister(&xUnixMountPointGetFsType, lib, "g_unix_mount_point_get_fs_type") | |
| 1013 | - | core.PuregoSafeRegister(&xUnixMountPointGetMountPath, lib, "g_unix_mount_point_get_mount_path") | |
| 1014 | - | core.PuregoSafeRegister(&xUnixMountPointGetOptions, lib, "g_unix_mount_point_get_options") | |
| 1015 | - | core.PuregoSafeRegister(&xUnixMountPointGuessCanEject, lib, "g_unix_mount_point_guess_can_eject") | |
| 1016 | - | core.PuregoSafeRegister(&xUnixMountPointGuessIcon, lib, "g_unix_mount_point_guess_icon") | |
| 1017 | - | core.PuregoSafeRegister(&xUnixMountPointGuessName, lib, "g_unix_mount_point_guess_name") | |
| 1018 | - | core.PuregoSafeRegister(&xUnixMountPointGuessSymbolicIcon, lib, "g_unix_mount_point_guess_symbolic_icon") | |
| 1019 | - | core.PuregoSafeRegister(&xUnixMountPointIsLoopback, lib, "g_unix_mount_point_is_loopback") | |
| 1020 | - | core.PuregoSafeRegister(&xUnixMountPointIsReadonly, lib, "g_unix_mount_point_is_readonly") | |
| 1021 | - | core.PuregoSafeRegister(&xUnixMountPointIsUserMountable, lib, "g_unix_mount_point_is_user_mountable") | |
| 1022 | - | ||
| 1023 | - | core.PuregoSafeRegister(&xUnixMountMonitorGLibType, lib, "g_unix_mount_monitor_get_type") | |
| 1024 | - | ||
| 1025 | - | core.PuregoSafeRegister(&xNewUnixMountMonitor, lib, "g_unix_mount_monitor_new") | |
| 1026 | - | ||
| 1027 | - | core.PuregoSafeRegister(&xUnixMountMonitorSetRateLimit, lib, "g_unix_mount_monitor_set_rate_limit") | |
| 1028 | - | ||
| 1029 | - | core.PuregoSafeRegister(&xUnixMountMonitorGet, lib, "g_unix_mount_monitor_get") | |
| 959 | + | core.PuregoSafeRegister(&xUnixIsMountPathSystemInternal, libs, "g_unix_is_mount_path_system_internal") | |
| 960 | + | core.PuregoSafeRegister(&xUnixIsSystemDevicePath, libs, "g_unix_is_system_device_path") | |
| 961 | + | core.PuregoSafeRegister(&xUnixIsSystemFsType, libs, "g_unix_is_system_fs_type") | |
| 962 | + | core.PuregoSafeRegister(&xUnixMountAt, libs, "g_unix_mount_at") | |
| 963 | + | core.PuregoSafeRegister(&xUnixMountCompare, libs, "g_unix_mount_compare") | |
| 964 | + | core.PuregoSafeRegister(&xUnixMountCopy, libs, "g_unix_mount_copy") | |
| 965 | + | core.PuregoSafeRegister(&xUnixMountEntriesChangedSince, libs, "g_unix_mount_entries_changed_since") | |
| 966 | + | core.PuregoSafeRegister(&xUnixMountEntriesGet, libs, "g_unix_mount_entries_get") | |
| 967 | + | core.PuregoSafeRegister(&xUnixMountEntriesGetFromFile, libs, "g_unix_mount_entries_get_from_file") | |
| 968 | + | core.PuregoSafeRegister(&xUnixMountEntryAt, libs, "g_unix_mount_entry_at") | |
| 969 | + | core.PuregoSafeRegister(&xUnixMountEntryFor, libs, "g_unix_mount_entry_for") | |
| 970 | + | core.PuregoSafeRegister(&xUnixMountFor, libs, "g_unix_mount_for") | |
| 971 | + | core.PuregoSafeRegister(&xUnixMountFree, libs, "g_unix_mount_free") | |
| 972 | + | core.PuregoSafeRegister(&xUnixMountGetDevicePath, libs, "g_unix_mount_get_device_path") | |
| 973 | + | core.PuregoSafeRegister(&xUnixMountGetFsType, libs, "g_unix_mount_get_fs_type") | |
| 974 | + | core.PuregoSafeRegister(&xUnixMountGetMountPath, libs, "g_unix_mount_get_mount_path") | |
| 975 | + | core.PuregoSafeRegister(&xUnixMountGetOptions, libs, "g_unix_mount_get_options") | |
| 976 | + | core.PuregoSafeRegister(&xUnixMountGetRootPath, libs, "g_unix_mount_get_root_path") | |
| 977 | + | core.PuregoSafeRegister(&xUnixMountGuessCanEject, libs, "g_unix_mount_guess_can_eject") | |
| 978 | + | core.PuregoSafeRegister(&xUnixMountGuessIcon, libs, "g_unix_mount_guess_icon") | |
| 979 | + | core.PuregoSafeRegister(&xUnixMountGuessName, libs, "g_unix_mount_guess_name") | |
| 980 | + | core.PuregoSafeRegister(&xUnixMountGuessShouldDisplay, libs, "g_unix_mount_guess_should_display") | |
| 981 | + | core.PuregoSafeRegister(&xUnixMountGuessSymbolicIcon, libs, "g_unix_mount_guess_symbolic_icon") | |
| 982 | + | core.PuregoSafeRegister(&xUnixMountIsReadonly, libs, "g_unix_mount_is_readonly") | |
| 983 | + | core.PuregoSafeRegister(&xUnixMountIsSystemInternal, libs, "g_unix_mount_is_system_internal") | |
| 984 | + | core.PuregoSafeRegister(&xUnixMountPointAt, libs, "g_unix_mount_point_at") | |
| 985 | + | core.PuregoSafeRegister(&xUnixMountPointsChangedSince, libs, "g_unix_mount_points_changed_since") | |
| 986 | + | core.PuregoSafeRegister(&xUnixMountPointsGet, libs, "g_unix_mount_points_get") | |
| 987 | + | core.PuregoSafeRegister(&xUnixMountPointsGetFromFile, libs, "g_unix_mount_points_get_from_file") | |
| 988 | + | core.PuregoSafeRegister(&xUnixMountsChangedSince, libs, "g_unix_mounts_changed_since") | |
| 989 | + | core.PuregoSafeRegister(&xUnixMountsGet, libs, "g_unix_mounts_get") | |
| 990 | + | core.PuregoSafeRegister(&xUnixMountsGetFromFile, libs, "g_unix_mounts_get_from_file") | |
| 991 | + | ||
| 992 | + | core.PuregoSafeRegister(&xUnixMountEntryGLibType, libs, "g_unix_mount_entry_get_type") | |
| 993 | + | ||
| 994 | + | core.PuregoSafeRegister(&xUnixMountEntryCompare, libs, "g_unix_mount_entry_compare") | |
| 995 | + | core.PuregoSafeRegister(&xUnixMountEntryCopy, libs, "g_unix_mount_entry_copy") | |
| 996 | + | core.PuregoSafeRegister(&xUnixMountEntryFree, libs, "g_unix_mount_entry_free") | |
| 997 | + | core.PuregoSafeRegister(&xUnixMountEntryGetDevicePath, libs, "g_unix_mount_entry_get_device_path") | |
| 998 | + | core.PuregoSafeRegister(&xUnixMountEntryGetFsType, libs, "g_unix_mount_entry_get_fs_type") | |
| 999 | + | core.PuregoSafeRegister(&xUnixMountEntryGetMountPath, libs, "g_unix_mount_entry_get_mount_path") | |
| 1000 | + | core.PuregoSafeRegister(&xUnixMountEntryGetOptions, libs, "g_unix_mount_entry_get_options") | |
| 1001 | + | core.PuregoSafeRegister(&xUnixMountEntryGetRootPath, libs, "g_unix_mount_entry_get_root_path") | |
| 1002 | + | core.PuregoSafeRegister(&xUnixMountEntryGuessCanEject, libs, "g_unix_mount_entry_guess_can_eject") | |
| 1003 | + | core.PuregoSafeRegister(&xUnixMountEntryGuessIcon, libs, "g_unix_mount_entry_guess_icon") | |
| 1004 | + | core.PuregoSafeRegister(&xUnixMountEntryGuessName, libs, "g_unix_mount_entry_guess_name") | |
| 1005 | + | core.PuregoSafeRegister(&xUnixMountEntryGuessShouldDisplay, libs, "g_unix_mount_entry_guess_should_display") | |
| 1006 | + | core.PuregoSafeRegister(&xUnixMountEntryGuessSymbolicIcon, libs, "g_unix_mount_entry_guess_symbolic_icon") | |
| 1007 | + | core.PuregoSafeRegister(&xUnixMountEntryIsReadonly, libs, "g_unix_mount_entry_is_readonly") | |
| 1008 | + | core.PuregoSafeRegister(&xUnixMountEntryIsSystemInternal, libs, "g_unix_mount_entry_is_system_internal") | |
| 1009 | + | ||
| 1010 | + | core.PuregoSafeRegister(&xUnixMountPointGLibType, libs, "g_unix_mount_point_get_type") | |
| 1011 | + | ||
| 1012 | + | core.PuregoSafeRegister(&xUnixMountPointCompare, libs, "g_unix_mount_point_compare") | |
| 1013 | + | core.PuregoSafeRegister(&xUnixMountPointCopy, libs, "g_unix_mount_point_copy") | |
| 1014 | + | core.PuregoSafeRegister(&xUnixMountPointFree, libs, "g_unix_mount_point_free") | |
| 1015 | + | core.PuregoSafeRegister(&xUnixMountPointGetDevicePath, libs, "g_unix_mount_point_get_device_path") | |
| 1016 | + | core.PuregoSafeRegister(&xUnixMountPointGetFsType, libs, "g_unix_mount_point_get_fs_type") | |
| 1017 | + | core.PuregoSafeRegister(&xUnixMountPointGetMountPath, libs, "g_unix_mount_point_get_mount_path") | |
| 1018 | + | core.PuregoSafeRegister(&xUnixMountPointGetOptions, libs, "g_unix_mount_point_get_options") | |
| 1019 | + | core.PuregoSafeRegister(&xUnixMountPointGuessCanEject, libs, "g_unix_mount_point_guess_can_eject") | |
| 1020 | + | core.PuregoSafeRegister(&xUnixMountPointGuessIcon, libs, "g_unix_mount_point_guess_icon") | |
| 1021 | + | core.PuregoSafeRegister(&xUnixMountPointGuessName, libs, "g_unix_mount_point_guess_name") | |
| 1022 | + | core.PuregoSafeRegister(&xUnixMountPointGuessSymbolicIcon, libs, "g_unix_mount_point_guess_symbolic_icon") | |
| 1023 | + | core.PuregoSafeRegister(&xUnixMountPointIsLoopback, libs, "g_unix_mount_point_is_loopback") | |
| 1024 | + | core.PuregoSafeRegister(&xUnixMountPointIsReadonly, libs, "g_unix_mount_point_is_readonly") | |
| 1025 | + | core.PuregoSafeRegister(&xUnixMountPointIsUserMountable, libs, "g_unix_mount_point_is_user_mountable") | |
| 1026 | + | ||
| 1027 | + | core.PuregoSafeRegister(&xUnixMountMonitorGLibType, libs, "g_unix_mount_monitor_get_type") | |
| 1028 | + | ||
| 1029 | + | core.PuregoSafeRegister(&xNewUnixMountMonitor, libs, "g_unix_mount_monitor_new") | |
| 1030 | + | ||
| 1031 | + | core.PuregoSafeRegister(&xUnixMountMonitorSetRateLimit, libs, "g_unix_mount_monitor_set_rate_limit") | |
| 1032 | + | ||
| 1033 | + | core.PuregoSafeRegister(&xUnixMountMonitorGet, libs, "g_unix_mount_monitor_get") | |
| 1030 | 1034 | ||
| 1031 | 1035 | } | |
M v4/gio/gunixoutputstream.go +13 -9
| @@ -346,18 +346,22 @@ func (x *UnixOutputStream) WritevNonblocking(VectorsVar []OutputVector, NVectors | |||
| 346 | 346 | ||
| 347 | 347 | func init() { | |
| 348 | 348 | core.SetPackageName("GIO", "gio-2.0") | |
| 349 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 350 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 351 | - | if err != nil { | |
| 352 | - | panic(err) | |
| 349 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 350 | + | var libs []uintptr | |
| 351 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 352 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 353 | + | if err != nil { | |
| 354 | + | panic(err) | |
| 355 | + | } | |
| 356 | + | libs = append(libs, lib) | |
| 353 | 357 | } | |
| 354 | 358 | ||
| 355 | - | core.PuregoSafeRegister(&xUnixOutputStreamGLibType, lib, "g_unix_output_stream_get_type") | |
| 359 | + | core.PuregoSafeRegister(&xUnixOutputStreamGLibType, libs, "g_unix_output_stream_get_type") | |
| 356 | 360 | ||
| 357 | - | core.PuregoSafeRegister(&xNewUnixOutputStream, lib, "g_unix_output_stream_new") | |
| 361 | + | core.PuregoSafeRegister(&xNewUnixOutputStream, libs, "g_unix_output_stream_new") | |
| 358 | 362 | ||
| 359 | - | core.PuregoSafeRegister(&xUnixOutputStreamGetCloseFd, lib, "g_unix_output_stream_get_close_fd") | |
| 360 | - | core.PuregoSafeRegister(&xUnixOutputStreamGetFd, lib, "g_unix_output_stream_get_fd") | |
| 361 | - | core.PuregoSafeRegister(&xUnixOutputStreamSetCloseFd, lib, "g_unix_output_stream_set_close_fd") | |
| 363 | + | core.PuregoSafeRegister(&xUnixOutputStreamGetCloseFd, libs, "g_unix_output_stream_get_close_fd") | |
| 364 | + | core.PuregoSafeRegister(&xUnixOutputStreamGetFd, libs, "g_unix_output_stream_get_fd") | |
| 365 | + | core.PuregoSafeRegister(&xUnixOutputStreamSetCloseFd, libs, "g_unix_output_stream_set_close_fd") | |
| 362 | 366 | ||
| 363 | 367 | } | |
M v4/gio/gunixsocketaddress.go +17 -13
| @@ -257,23 +257,27 @@ func UnixSocketAddressAbstractNamesSupported() bool { | |||
| 257 | 257 | ||
| 258 | 258 | func init() { | |
| 259 | 259 | core.SetPackageName("GIO", "gio-2.0") | |
| 260 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 261 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 262 | - | if err != nil { | |
| 263 | - | panic(err) | |
| 260 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 261 | + | var libs []uintptr | |
| 262 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 263 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 264 | + | if err != nil { | |
| 265 | + | panic(err) | |
| 266 | + | } | |
| 267 | + | libs = append(libs, lib) | |
| 264 | 268 | } | |
| 265 | 269 | ||
| 266 | - | core.PuregoSafeRegister(&xUnixSocketAddressGLibType, lib, "g_unix_socket_address_get_type") | |
| 270 | + | core.PuregoSafeRegister(&xUnixSocketAddressGLibType, libs, "g_unix_socket_address_get_type") | |
| 267 | 271 | ||
| 268 | - | core.PuregoSafeRegister(&xNewUnixSocketAddress, lib, "g_unix_socket_address_new") | |
| 269 | - | core.PuregoSafeRegister(&xNewUnixSocketAddressAbstract, lib, "g_unix_socket_address_new_abstract") | |
| 270 | - | core.PuregoSafeRegister(&xNewUnixSocketAddressWithType, lib, "g_unix_socket_address_new_with_type") | |
| 272 | + | core.PuregoSafeRegister(&xNewUnixSocketAddress, libs, "g_unix_socket_address_new") | |
| 273 | + | core.PuregoSafeRegister(&xNewUnixSocketAddressAbstract, libs, "g_unix_socket_address_new_abstract") | |
| 274 | + | core.PuregoSafeRegister(&xNewUnixSocketAddressWithType, libs, "g_unix_socket_address_new_with_type") | |
| 271 | 275 | ||
| 272 | - | core.PuregoSafeRegister(&xUnixSocketAddressGetAddressType, lib, "g_unix_socket_address_get_address_type") | |
| 273 | - | core.PuregoSafeRegister(&xUnixSocketAddressGetIsAbstract, lib, "g_unix_socket_address_get_is_abstract") | |
| 274 | - | core.PuregoSafeRegister(&xUnixSocketAddressGetPath, lib, "g_unix_socket_address_get_path") | |
| 275 | - | core.PuregoSafeRegister(&xUnixSocketAddressGetPathLen, lib, "g_unix_socket_address_get_path_len") | |
| 276 | + | core.PuregoSafeRegister(&xUnixSocketAddressGetAddressType, libs, "g_unix_socket_address_get_address_type") | |
| 277 | + | core.PuregoSafeRegister(&xUnixSocketAddressGetIsAbstract, libs, "g_unix_socket_address_get_is_abstract") | |
| 278 | + | core.PuregoSafeRegister(&xUnixSocketAddressGetPath, libs, "g_unix_socket_address_get_path") | |
| 279 | + | core.PuregoSafeRegister(&xUnixSocketAddressGetPathLen, libs, "g_unix_socket_address_get_path_len") | |
| 276 | 280 | ||
| 277 | - | core.PuregoSafeRegister(&xUnixSocketAddressAbstractNamesSupported, lib, "g_unix_socket_address_abstract_names_supported") | |
| 281 | + | core.PuregoSafeRegister(&xUnixSocketAddressAbstractNamesSupported, libs, "g_unix_socket_address_abstract_names_supported") | |
| 278 | 282 | ||
| 279 | 283 | } | |
M v4/gio/gvfs.go +18 -14
| @@ -675,23 +675,27 @@ func VfsGetLocal() *Vfs { | |||
| 675 | 675 | ||
| 676 | 676 | func init() { | |
| 677 | 677 | core.SetPackageName("GIO", "gio-2.0") | |
| 678 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 679 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 680 | - | if err != nil { | |
| 681 | - | panic(err) | |
| 678 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 679 | + | var libs []uintptr | |
| 680 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 681 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 682 | + | if err != nil { | |
| 683 | + | panic(err) | |
| 684 | + | } | |
| 685 | + | libs = append(libs, lib) | |
| 682 | 686 | } | |
| 683 | 687 | ||
| 684 | - | core.PuregoSafeRegister(&xVfsGLibType, lib, "g_vfs_get_type") | |
| 688 | + | core.PuregoSafeRegister(&xVfsGLibType, libs, "g_vfs_get_type") | |
| 685 | 689 | ||
| 686 | - | core.PuregoSafeRegister(&xVfsGetFileForPath, lib, "g_vfs_get_file_for_path") | |
| 687 | - | core.PuregoSafeRegister(&xVfsGetFileForUri, lib, "g_vfs_get_file_for_uri") | |
| 688 | - | core.PuregoSafeRegister(&xVfsGetSupportedUriSchemes, lib, "g_vfs_get_supported_uri_schemes") | |
| 689 | - | core.PuregoSafeRegister(&xVfsIsActive, lib, "g_vfs_is_active") | |
| 690 | - | core.PuregoSafeRegister(&xVfsParseName, lib, "g_vfs_parse_name") | |
| 691 | - | core.PuregoSafeRegister(&xVfsRegisterUriScheme, lib, "g_vfs_register_uri_scheme") | |
| 692 | - | core.PuregoSafeRegister(&xVfsUnregisterUriScheme, lib, "g_vfs_unregister_uri_scheme") | |
| 690 | + | core.PuregoSafeRegister(&xVfsGetFileForPath, libs, "g_vfs_get_file_for_path") | |
| 691 | + | core.PuregoSafeRegister(&xVfsGetFileForUri, libs, "g_vfs_get_file_for_uri") | |
| 692 | + | core.PuregoSafeRegister(&xVfsGetSupportedUriSchemes, libs, "g_vfs_get_supported_uri_schemes") | |
| 693 | + | core.PuregoSafeRegister(&xVfsIsActive, libs, "g_vfs_is_active") | |
| 694 | + | core.PuregoSafeRegister(&xVfsParseName, libs, "g_vfs_parse_name") | |
| 695 | + | core.PuregoSafeRegister(&xVfsRegisterUriScheme, libs, "g_vfs_register_uri_scheme") | |
| 696 | + | core.PuregoSafeRegister(&xVfsUnregisterUriScheme, libs, "g_vfs_unregister_uri_scheme") | |
| 693 | 697 | ||
| 694 | - | core.PuregoSafeRegister(&xVfsGetDefault, lib, "g_vfs_get_default") | |
| 695 | - | core.PuregoSafeRegister(&xVfsGetLocal, lib, "g_vfs_get_local") | |
| 698 | + | core.PuregoSafeRegister(&xVfsGetDefault, libs, "g_vfs_get_default") | |
| 699 | + | core.PuregoSafeRegister(&xVfsGetLocal, libs, "g_vfs_get_local") | |
| 696 | 700 | ||
| 697 | 701 | } | |
M v4/gio/gvolume.go +31 -27
| @@ -1028,32 +1028,36 @@ const ( | |||
| 1028 | 1028 | ||
| 1029 | 1029 | func init() { | |
| 1030 | 1030 | core.SetPackageName("GIO", "gio-2.0") | |
| 1031 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1032 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1033 | - | if err != nil { | |
| 1034 | - | panic(err) | |
| 1035 | - | } | |
| 1036 | - | ||
| 1037 | - | core.PuregoSafeRegister(&xVolumeGLibType, lib, "g_volume_get_type") | |
| 1038 | - | ||
| 1039 | - | core.PuregoSafeRegister(&XGVolumeCanEject, lib, "g_volume_can_eject") | |
| 1040 | - | core.PuregoSafeRegister(&XGVolumeCanMount, lib, "g_volume_can_mount") | |
| 1041 | - | core.PuregoSafeRegister(&XGVolumeEject, lib, "g_volume_eject") | |
| 1042 | - | core.PuregoSafeRegister(&XGVolumeEjectFinish, lib, "g_volume_eject_finish") | |
| 1043 | - | core.PuregoSafeRegister(&XGVolumeEjectWithOperation, lib, "g_volume_eject_with_operation") | |
| 1044 | - | core.PuregoSafeRegister(&XGVolumeEjectWithOperationFinish, lib, "g_volume_eject_with_operation_finish") | |
| 1045 | - | core.PuregoSafeRegister(&XGVolumeEnumerateIdentifiers, lib, "g_volume_enumerate_identifiers") | |
| 1046 | - | core.PuregoSafeRegister(&XGVolumeGetActivationRoot, lib, "g_volume_get_activation_root") | |
| 1047 | - | core.PuregoSafeRegister(&XGVolumeGetDrive, lib, "g_volume_get_drive") | |
| 1048 | - | core.PuregoSafeRegister(&XGVolumeGetIcon, lib, "g_volume_get_icon") | |
| 1049 | - | core.PuregoSafeRegister(&XGVolumeGetIdentifier, lib, "g_volume_get_identifier") | |
| 1050 | - | core.PuregoSafeRegister(&XGVolumeGetMount, lib, "g_volume_get_mount") | |
| 1051 | - | core.PuregoSafeRegister(&XGVolumeGetName, lib, "g_volume_get_name") | |
| 1052 | - | core.PuregoSafeRegister(&XGVolumeGetSortKey, lib, "g_volume_get_sort_key") | |
| 1053 | - | core.PuregoSafeRegister(&XGVolumeGetSymbolicIcon, lib, "g_volume_get_symbolic_icon") | |
| 1054 | - | core.PuregoSafeRegister(&XGVolumeGetUuid, lib, "g_volume_get_uuid") | |
| 1055 | - | core.PuregoSafeRegister(&XGVolumeMount, lib, "g_volume_mount") | |
| 1056 | - | core.PuregoSafeRegister(&XGVolumeMountFinish, lib, "g_volume_mount_finish") | |
| 1057 | - | core.PuregoSafeRegister(&XGVolumeShouldAutomount, lib, "g_volume_should_automount") | |
| 1031 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1032 | + | var libs []uintptr | |
| 1033 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1034 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1035 | + | if err != nil { | |
| 1036 | + | panic(err) | |
| 1037 | + | } | |
| 1038 | + | libs = append(libs, lib) | |
| 1039 | + | } | |
| 1040 | + | ||
| 1041 | + | core.PuregoSafeRegister(&xVolumeGLibType, libs, "g_volume_get_type") | |
| 1042 | + | ||
| 1043 | + | core.PuregoSafeRegister(&XGVolumeCanEject, libs, "g_volume_can_eject") | |
| 1044 | + | core.PuregoSafeRegister(&XGVolumeCanMount, libs, "g_volume_can_mount") | |
| 1045 | + | core.PuregoSafeRegister(&XGVolumeEject, libs, "g_volume_eject") | |
| 1046 | + | core.PuregoSafeRegister(&XGVolumeEjectFinish, libs, "g_volume_eject_finish") | |
| 1047 | + | core.PuregoSafeRegister(&XGVolumeEjectWithOperation, libs, "g_volume_eject_with_operation") | |
| 1048 | + | core.PuregoSafeRegister(&XGVolumeEjectWithOperationFinish, libs, "g_volume_eject_with_operation_finish") | |
| 1049 | + | core.PuregoSafeRegister(&XGVolumeEnumerateIdentifiers, libs, "g_volume_enumerate_identifiers") | |
| 1050 | + | core.PuregoSafeRegister(&XGVolumeGetActivationRoot, libs, "g_volume_get_activation_root") | |
| 1051 | + | core.PuregoSafeRegister(&XGVolumeGetDrive, libs, "g_volume_get_drive") | |
| 1052 | + | core.PuregoSafeRegister(&XGVolumeGetIcon, libs, "g_volume_get_icon") | |
| 1053 | + | core.PuregoSafeRegister(&XGVolumeGetIdentifier, libs, "g_volume_get_identifier") | |
| 1054 | + | core.PuregoSafeRegister(&XGVolumeGetMount, libs, "g_volume_get_mount") | |
| 1055 | + | core.PuregoSafeRegister(&XGVolumeGetName, libs, "g_volume_get_name") | |
| 1056 | + | core.PuregoSafeRegister(&XGVolumeGetSortKey, libs, "g_volume_get_sort_key") | |
| 1057 | + | core.PuregoSafeRegister(&XGVolumeGetSymbolicIcon, libs, "g_volume_get_symbolic_icon") | |
| 1058 | + | core.PuregoSafeRegister(&XGVolumeGetUuid, libs, "g_volume_get_uuid") | |
| 1059 | + | core.PuregoSafeRegister(&XGVolumeMount, libs, "g_volume_mount") | |
| 1060 | + | core.PuregoSafeRegister(&XGVolumeMountFinish, libs, "g_volume_mount_finish") | |
| 1061 | + | core.PuregoSafeRegister(&XGVolumeShouldAutomount, libs, "g_volume_should_automount") | |
| 1058 | 1062 | ||
| 1059 | 1063 | } | |
M v4/gio/gvolumemonitor.go +16 -12
| @@ -1093,21 +1093,25 @@ func VolumeMonitorGet() *VolumeMonitor { | |||
| 1093 | 1093 | ||
| 1094 | 1094 | func init() { | |
| 1095 | 1095 | core.SetPackageName("GIO", "gio-2.0") | |
| 1096 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 1097 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1098 | - | if err != nil { | |
| 1099 | - | panic(err) | |
| 1096 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 1097 | + | var libs []uintptr | |
| 1098 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 1099 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 1100 | + | if err != nil { | |
| 1101 | + | panic(err) | |
| 1102 | + | } | |
| 1103 | + | libs = append(libs, lib) | |
| 1100 | 1104 | } | |
| 1101 | 1105 | ||
| 1102 | - | core.PuregoSafeRegister(&xVolumeMonitorGLibType, lib, "g_volume_monitor_get_type") | |
| 1106 | + | core.PuregoSafeRegister(&xVolumeMonitorGLibType, libs, "g_volume_monitor_get_type") | |
| 1103 | 1107 | ||
| 1104 | - | core.PuregoSafeRegister(&xVolumeMonitorGetConnectedDrives, lib, "g_volume_monitor_get_connected_drives") | |
| 1105 | - | core.PuregoSafeRegister(&xVolumeMonitorGetMountForUuid, lib, "g_volume_monitor_get_mount_for_uuid") | |
| 1106 | - | core.PuregoSafeRegister(&xVolumeMonitorGetMounts, lib, "g_volume_monitor_get_mounts") | |
| 1107 | - | core.PuregoSafeRegister(&xVolumeMonitorGetVolumeForUuid, lib, "g_volume_monitor_get_volume_for_uuid") | |
| 1108 | - | core.PuregoSafeRegister(&xVolumeMonitorGetVolumes, lib, "g_volume_monitor_get_volumes") | |
| 1108 | + | core.PuregoSafeRegister(&xVolumeMonitorGetConnectedDrives, libs, "g_volume_monitor_get_connected_drives") | |
| 1109 | + | core.PuregoSafeRegister(&xVolumeMonitorGetMountForUuid, libs, "g_volume_monitor_get_mount_for_uuid") | |
| 1110 | + | core.PuregoSafeRegister(&xVolumeMonitorGetMounts, libs, "g_volume_monitor_get_mounts") | |
| 1111 | + | core.PuregoSafeRegister(&xVolumeMonitorGetVolumeForUuid, libs, "g_volume_monitor_get_volume_for_uuid") | |
| 1112 | + | core.PuregoSafeRegister(&xVolumeMonitorGetVolumes, libs, "g_volume_monitor_get_volumes") | |
| 1109 | 1113 | ||
| 1110 | - | core.PuregoSafeRegister(&xVolumeMonitorAdoptOrphanMount, lib, "g_volume_monitor_adopt_orphan_mount") | |
| 1111 | - | core.PuregoSafeRegister(&xVolumeMonitorGet, lib, "g_volume_monitor_get") | |
| 1114 | + | core.PuregoSafeRegister(&xVolumeMonitorAdoptOrphanMount, libs, "g_volume_monitor_adopt_orphan_mount") | |
| 1115 | + | core.PuregoSafeRegister(&xVolumeMonitorGet, libs, "g_volume_monitor_get") | |
| 1112 | 1116 | ||
| 1113 | 1117 | } | |
M v4/gio/gzlibcompressor.go +12 -8
| @@ -216,17 +216,21 @@ func (x *ZlibCompressor) Reset() { | |||
| 216 | 216 | ||
| 217 | 217 | func init() { | |
| 218 | 218 | core.SetPackageName("GIO", "gio-2.0") | |
| 219 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 220 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 221 | - | if err != nil { | |
| 222 | - | panic(err) | |
| 219 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 220 | + | var libs []uintptr | |
| 221 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 222 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 223 | + | if err != nil { | |
| 224 | + | panic(err) | |
| 225 | + | } | |
| 226 | + | libs = append(libs, lib) | |
| 223 | 227 | } | |
| 224 | 228 | ||
| 225 | - | core.PuregoSafeRegister(&xZlibCompressorGLibType, lib, "g_zlib_compressor_get_type") | |
| 229 | + | core.PuregoSafeRegister(&xZlibCompressorGLibType, libs, "g_zlib_compressor_get_type") | |
| 226 | 230 | ||
| 227 | - | core.PuregoSafeRegister(&xNewZlibCompressor, lib, "g_zlib_compressor_new") | |
| 231 | + | core.PuregoSafeRegister(&xNewZlibCompressor, libs, "g_zlib_compressor_new") | |
| 228 | 232 | ||
| 229 | - | core.PuregoSafeRegister(&xZlibCompressorGetFileInfo, lib, "g_zlib_compressor_get_file_info") | |
| 230 | - | core.PuregoSafeRegister(&xZlibCompressorSetFileInfo, lib, "g_zlib_compressor_set_file_info") | |
| 233 | + | core.PuregoSafeRegister(&xZlibCompressorGetFileInfo, libs, "g_zlib_compressor_get_file_info") | |
| 234 | + | core.PuregoSafeRegister(&xZlibCompressorSetFileInfo, libs, "g_zlib_compressor_set_file_info") | |
| 231 | 235 | ||
| 232 | 236 | } | |
M v4/gio/gzlibdecompressor.go +11 -7
| @@ -204,16 +204,20 @@ func (x *ZlibDecompressor) Reset() { | |||
| 204 | 204 | ||
| 205 | 205 | func init() { | |
| 206 | 206 | core.SetPackageName("GIO", "gio-2.0") | |
| 207 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 208 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 209 | - | if err != nil { | |
| 210 | - | panic(err) | |
| 207 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 208 | + | var libs []uintptr | |
| 209 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 210 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 211 | + | if err != nil { | |
| 212 | + | panic(err) | |
| 213 | + | } | |
| 214 | + | libs = append(libs, lib) | |
| 211 | 215 | } | |
| 212 | 216 | ||
| 213 | - | core.PuregoSafeRegister(&xZlibDecompressorGLibType, lib, "g_zlib_decompressor_get_type") | |
| 217 | + | core.PuregoSafeRegister(&xZlibDecompressorGLibType, libs, "g_zlib_decompressor_get_type") | |
| 214 | 218 | ||
| 215 | - | core.PuregoSafeRegister(&xNewZlibDecompressor, lib, "g_zlib_decompressor_new") | |
| 219 | + | core.PuregoSafeRegister(&xNewZlibDecompressor, libs, "g_zlib_decompressor_new") | |
| 216 | 220 | ||
| 217 | - | core.PuregoSafeRegister(&xZlibDecompressorGetFileInfo, lib, "g_zlib_decompressor_get_file_info") | |
| 221 | + | core.PuregoSafeRegister(&xZlibDecompressorGetFileInfo, libs, "g_zlib_decompressor_get_file_info") | |
| 218 | 222 | ||
| 219 | 223 | } | |
M v4/gio/main.go +9 -5
| @@ -17,12 +17,16 @@ func DbusErrorQuark() glib.Quark { | |||
| 17 | 17 | ||
| 18 | 18 | func init() { | |
| 19 | 19 | core.SetPackageName("GIO", "gio-2.0") | |
| 20 | - | core.SetSharedLibrary("GIO", "libgio-2.0.so.0") | |
| 21 | - | lib, err := purego.Dlopen(core.GetPath("GIO"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 22 | - | if err != nil { | |
| 23 | - | panic(err) | |
| 20 | + | core.SetSharedLibraries("GIO", []string{"libgio-2.0.so.0"}) | |
| 21 | + | var libs []uintptr | |
| 22 | + | for _, libPath := range core.GetPaths("GIO") { | |
| 23 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 24 | + | if err != nil { | |
| 25 | + | panic(err) | |
| 26 | + | } | |
| 27 | + | libs = append(libs, lib) | |
| 24 | 28 | } | |
| 25 | 29 | ||
| 26 | - | core.PuregoSafeRegister(&xDbusErrorQuark, lib, "g_dbus_error_quark") | |
| 30 | + | core.PuregoSafeRegister(&xDbusErrorQuark, libs, "g_dbus_error_quark") | |
| 27 | 31 | ||
| 28 | 32 | } | |
M v4/glib/gallocator.go +26 -22
| @@ -167,29 +167,33 @@ func SlistPushAllocator(AllocatorVar *Allocator) { | |||
| 167 | 167 | ||
| 168 | 168 | func init() { | |
| 169 | 169 | core.SetPackageName("GLIB", "glib-2.0") | |
| 170 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 171 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 172 | - | if err != nil { | |
| 173 | - | panic(err) | |
| 170 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 171 | + | var libs []uintptr | |
| 172 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 173 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 174 | + | if err != nil { | |
| 175 | + | panic(err) | |
| 176 | + | } | |
| 177 | + | libs = append(libs, lib) | |
| 174 | 178 | } | |
| 175 | 179 | ||
| 176 | - | core.PuregoSafeRegister(&xBlowChunks, lib, "g_blow_chunks") | |
| 177 | - | core.PuregoSafeRegister(&xListPopAllocator, lib, "g_list_pop_allocator") | |
| 178 | - | core.PuregoSafeRegister(&xListPushAllocator, lib, "g_list_push_allocator") | |
| 179 | - | core.PuregoSafeRegister(&xMemChunkInfo, lib, "g_mem_chunk_info") | |
| 180 | - | core.PuregoSafeRegister(&xNodePopAllocator, lib, "g_node_pop_allocator") | |
| 181 | - | core.PuregoSafeRegister(&xNodePushAllocator, lib, "g_node_push_allocator") | |
| 182 | - | core.PuregoSafeRegister(&xSlistPopAllocator, lib, "g_slist_pop_allocator") | |
| 183 | - | core.PuregoSafeRegister(&xSlistPushAllocator, lib, "g_slist_push_allocator") | |
| 184 | - | ||
| 185 | - | core.PuregoSafeRegister(&xAllocatorFree, lib, "g_allocator_free") | |
| 186 | - | ||
| 187 | - | core.PuregoSafeRegister(&xMemChunkAlloc, lib, "g_mem_chunk_alloc") | |
| 188 | - | core.PuregoSafeRegister(&xMemChunkAlloc0, lib, "g_mem_chunk_alloc0") | |
| 189 | - | core.PuregoSafeRegister(&xMemChunkClean, lib, "g_mem_chunk_clean") | |
| 190 | - | core.PuregoSafeRegister(&xMemChunkDestroy, lib, "g_mem_chunk_destroy") | |
| 191 | - | core.PuregoSafeRegister(&xMemChunkFree, lib, "g_mem_chunk_free") | |
| 192 | - | core.PuregoSafeRegister(&xMemChunkPrint, lib, "g_mem_chunk_print") | |
| 193 | - | core.PuregoSafeRegister(&xMemChunkReset, lib, "g_mem_chunk_reset") | |
| 180 | + | core.PuregoSafeRegister(&xBlowChunks, libs, "g_blow_chunks") | |
| 181 | + | core.PuregoSafeRegister(&xListPopAllocator, libs, "g_list_pop_allocator") | |
| 182 | + | core.PuregoSafeRegister(&xListPushAllocator, libs, "g_list_push_allocator") | |
| 183 | + | core.PuregoSafeRegister(&xMemChunkInfo, libs, "g_mem_chunk_info") | |
| 184 | + | core.PuregoSafeRegister(&xNodePopAllocator, libs, "g_node_pop_allocator") | |
| 185 | + | core.PuregoSafeRegister(&xNodePushAllocator, libs, "g_node_push_allocator") | |
| 186 | + | core.PuregoSafeRegister(&xSlistPopAllocator, libs, "g_slist_pop_allocator") | |
| 187 | + | core.PuregoSafeRegister(&xSlistPushAllocator, libs, "g_slist_push_allocator") | |
| 188 | + | ||
| 189 | + | core.PuregoSafeRegister(&xAllocatorFree, libs, "g_allocator_free") | |
| 190 | + | ||
| 191 | + | core.PuregoSafeRegister(&xMemChunkAlloc, libs, "g_mem_chunk_alloc") | |
| 192 | + | core.PuregoSafeRegister(&xMemChunkAlloc0, libs, "g_mem_chunk_alloc0") | |
| 193 | + | core.PuregoSafeRegister(&xMemChunkClean, libs, "g_mem_chunk_clean") | |
| 194 | + | core.PuregoSafeRegister(&xMemChunkDestroy, libs, "g_mem_chunk_destroy") | |
| 195 | + | core.PuregoSafeRegister(&xMemChunkFree, libs, "g_mem_chunk_free") | |
| 196 | + | core.PuregoSafeRegister(&xMemChunkPrint, libs, "g_mem_chunk_print") | |
| 197 | + | core.PuregoSafeRegister(&xMemChunkReset, libs, "g_mem_chunk_reset") | |
| 194 | 198 | ||
| 195 | 199 | } | |
M v4/glib/garray.go +57 -53
| @@ -715,60 +715,64 @@ func PtrArrayNewTakeNullTerminated(DataVar []uintptr, ElementFreeFuncVar *Destro | |||
| 715 | 715 | ||
| 716 | 716 | func init() { | |
| 717 | 717 | core.SetPackageName("GLIB", "glib-2.0") | |
| 718 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 719 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 720 | - | if err != nil { | |
| 721 | - | panic(err) | |
| 718 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 719 | + | var libs []uintptr | |
| 720 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 721 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 722 | + | if err != nil { | |
| 723 | + | panic(err) | |
| 724 | + | } | |
| 725 | + | libs = append(libs, lib) | |
| 722 | 726 | } | |
| 723 | 727 | ||
| 724 | - | core.PuregoSafeRegister(&xArrayNewTake, lib, "g_array_new_take") | |
| 725 | - | core.PuregoSafeRegister(&xArrayNewTakeZeroTerminated, lib, "g_array_new_take_zero_terminated") | |
| 726 | - | core.PuregoSafeRegister(&xByteArrayAppend, lib, "g_byte_array_append") | |
| 727 | - | core.PuregoSafeRegister(&xByteArrayFree, lib, "g_byte_array_free") | |
| 728 | - | core.PuregoSafeRegister(&xByteArrayFreeToBytes, lib, "g_byte_array_free_to_bytes") | |
| 729 | - | core.PuregoSafeRegister(&xByteArrayNew, lib, "g_byte_array_new") | |
| 730 | - | core.PuregoSafeRegister(&xByteArrayNewTake, lib, "g_byte_array_new_take") | |
| 731 | - | core.PuregoSafeRegister(&xByteArrayPrepend, lib, "g_byte_array_prepend") | |
| 732 | - | core.PuregoSafeRegister(&xByteArrayRef, lib, "g_byte_array_ref") | |
| 733 | - | core.PuregoSafeRegister(&xByteArrayRemoveIndex, lib, "g_byte_array_remove_index") | |
| 734 | - | core.PuregoSafeRegister(&xByteArrayRemoveIndexFast, lib, "g_byte_array_remove_index_fast") | |
| 735 | - | core.PuregoSafeRegister(&xByteArrayRemoveRange, lib, "g_byte_array_remove_range") | |
| 736 | - | core.PuregoSafeRegister(&xByteArraySetSize, lib, "g_byte_array_set_size") | |
| 737 | - | core.PuregoSafeRegister(&xByteArraySizedNew, lib, "g_byte_array_sized_new") | |
| 738 | - | core.PuregoSafeRegister(&xByteArraySort, lib, "g_byte_array_sort") | |
| 739 | - | core.PuregoSafeRegister(&xByteArraySortWithData, lib, "g_byte_array_sort_with_data") | |
| 740 | - | core.PuregoSafeRegister(&xByteArraySteal, lib, "g_byte_array_steal") | |
| 741 | - | core.PuregoSafeRegister(&xByteArrayUnref, lib, "g_byte_array_unref") | |
| 742 | - | core.PuregoSafeRegister(&xPtrArrayFind, lib, "g_ptr_array_find") | |
| 743 | - | core.PuregoSafeRegister(&xPtrArrayFindWithEqualFunc, lib, "g_ptr_array_find_with_equal_func") | |
| 744 | - | core.PuregoSafeRegister(&xPtrArrayNewFromArray, lib, "g_ptr_array_new_from_array") | |
| 745 | - | core.PuregoSafeRegister(&xPtrArrayNewFromNullTerminatedArray, lib, "g_ptr_array_new_from_null_terminated_array") | |
| 746 | - | core.PuregoSafeRegister(&xPtrArrayNewTake, lib, "g_ptr_array_new_take") | |
| 747 | - | core.PuregoSafeRegister(&xPtrArrayNewTakeNullTerminated, lib, "g_ptr_array_new_take_null_terminated") | |
| 748 | - | ||
| 749 | - | core.PuregoSafeRegister(&xArrayGLibType, lib, "g_array_get_type") | |
| 750 | - | ||
| 751 | - | core.PuregoSafeRegister(&xByteArrayGLibType, lib, "g_byte_array_get_type") | |
| 752 | - | ||
| 753 | - | core.PuregoSafeRegister(&xBytesGLibType, lib, "g_bytes_get_type") | |
| 754 | - | ||
| 755 | - | core.PuregoSafeRegister(&xNewBytes, lib, "g_bytes_new") | |
| 756 | - | core.PuregoSafeRegister(&xNewBytesStatic, lib, "g_bytes_new_static") | |
| 757 | - | core.PuregoSafeRegister(&xNewBytesTake, lib, "g_bytes_new_take") | |
| 758 | - | core.PuregoSafeRegister(&xNewBytesWithFreeFunc, lib, "g_bytes_new_with_free_func") | |
| 759 | - | ||
| 760 | - | core.PuregoSafeRegister(&xBytesCompare, lib, "g_bytes_compare") | |
| 761 | - | core.PuregoSafeRegister(&xBytesEqual, lib, "g_bytes_equal") | |
| 762 | - | core.PuregoSafeRegister(&xBytesGetData, lib, "g_bytes_get_data") | |
| 763 | - | core.PuregoSafeRegister(&xBytesGetRegion, lib, "g_bytes_get_region") | |
| 764 | - | core.PuregoSafeRegister(&xBytesGetSize, lib, "g_bytes_get_size") | |
| 765 | - | core.PuregoSafeRegister(&xBytesHash, lib, "g_bytes_hash") | |
| 766 | - | core.PuregoSafeRegister(&xBytesNewFromBytes, lib, "g_bytes_new_from_bytes") | |
| 767 | - | core.PuregoSafeRegister(&xBytesRef, lib, "g_bytes_ref") | |
| 768 | - | core.PuregoSafeRegister(&xBytesUnref, lib, "g_bytes_unref") | |
| 769 | - | core.PuregoSafeRegister(&xBytesUnrefToArray, lib, "g_bytes_unref_to_array") | |
| 770 | - | core.PuregoSafeRegister(&xBytesUnrefToData, lib, "g_bytes_unref_to_data") | |
| 771 | - | ||
| 772 | - | core.PuregoSafeRegister(&xPtrArrayGLibType, lib, "g_ptr_array_get_type") | |
| 728 | + | core.PuregoSafeRegister(&xArrayNewTake, libs, "g_array_new_take") | |
| 729 | + | core.PuregoSafeRegister(&xArrayNewTakeZeroTerminated, libs, "g_array_new_take_zero_terminated") | |
| 730 | + | core.PuregoSafeRegister(&xByteArrayAppend, libs, "g_byte_array_append") | |
| 731 | + | core.PuregoSafeRegister(&xByteArrayFree, libs, "g_byte_array_free") | |
| 732 | + | core.PuregoSafeRegister(&xByteArrayFreeToBytes, libs, "g_byte_array_free_to_bytes") | |
| 733 | + | core.PuregoSafeRegister(&xByteArrayNew, libs, "g_byte_array_new") | |
| 734 | + | core.PuregoSafeRegister(&xByteArrayNewTake, libs, "g_byte_array_new_take") | |
| 735 | + | core.PuregoSafeRegister(&xByteArrayPrepend, libs, "g_byte_array_prepend") | |
| 736 | + | core.PuregoSafeRegister(&xByteArrayRef, libs, "g_byte_array_ref") | |
| 737 | + | core.PuregoSafeRegister(&xByteArrayRemoveIndex, libs, "g_byte_array_remove_index") | |
| 738 | + | core.PuregoSafeRegister(&xByteArrayRemoveIndexFast, libs, "g_byte_array_remove_index_fast") | |
| 739 | + | core.PuregoSafeRegister(&xByteArrayRemoveRange, libs, "g_byte_array_remove_range") | |
| 740 | + | core.PuregoSafeRegister(&xByteArraySetSize, libs, "g_byte_array_set_size") | |
| 741 | + | core.PuregoSafeRegister(&xByteArraySizedNew, libs, "g_byte_array_sized_new") | |
| 742 | + | core.PuregoSafeRegister(&xByteArraySort, libs, "g_byte_array_sort") | |
| 743 | + | core.PuregoSafeRegister(&xByteArraySortWithData, libs, "g_byte_array_sort_with_data") | |
| 744 | + | core.PuregoSafeRegister(&xByteArraySteal, libs, "g_byte_array_steal") | |
| 745 | + | core.PuregoSafeRegister(&xByteArrayUnref, libs, "g_byte_array_unref") | |
| 746 | + | core.PuregoSafeRegister(&xPtrArrayFind, libs, "g_ptr_array_find") | |
| 747 | + | core.PuregoSafeRegister(&xPtrArrayFindWithEqualFunc, libs, "g_ptr_array_find_with_equal_func") | |
| 748 | + | core.PuregoSafeRegister(&xPtrArrayNewFromArray, libs, "g_ptr_array_new_from_array") | |
| 749 | + | core.PuregoSafeRegister(&xPtrArrayNewFromNullTerminatedArray, libs, "g_ptr_array_new_from_null_terminated_array") | |
| 750 | + | core.PuregoSafeRegister(&xPtrArrayNewTake, libs, "g_ptr_array_new_take") | |
| 751 | + | core.PuregoSafeRegister(&xPtrArrayNewTakeNullTerminated, libs, "g_ptr_array_new_take_null_terminated") | |
| 752 | + | ||
| 753 | + | core.PuregoSafeRegister(&xArrayGLibType, libs, "g_array_get_type") | |
| 754 | + | ||
| 755 | + | core.PuregoSafeRegister(&xByteArrayGLibType, libs, "g_byte_array_get_type") | |
| 756 | + | ||
| 757 | + | core.PuregoSafeRegister(&xBytesGLibType, libs, "g_bytes_get_type") | |
| 758 | + | ||
| 759 | + | core.PuregoSafeRegister(&xNewBytes, libs, "g_bytes_new") | |
| 760 | + | core.PuregoSafeRegister(&xNewBytesStatic, libs, "g_bytes_new_static") | |
| 761 | + | core.PuregoSafeRegister(&xNewBytesTake, libs, "g_bytes_new_take") | |
| 762 | + | core.PuregoSafeRegister(&xNewBytesWithFreeFunc, libs, "g_bytes_new_with_free_func") | |
| 763 | + | ||
| 764 | + | core.PuregoSafeRegister(&xBytesCompare, libs, "g_bytes_compare") | |
| 765 | + | core.PuregoSafeRegister(&xBytesEqual, libs, "g_bytes_equal") | |
| 766 | + | core.PuregoSafeRegister(&xBytesGetData, libs, "g_bytes_get_data") | |
| 767 | + | core.PuregoSafeRegister(&xBytesGetRegion, libs, "g_bytes_get_region") | |
| 768 | + | core.PuregoSafeRegister(&xBytesGetSize, libs, "g_bytes_get_size") | |
| 769 | + | core.PuregoSafeRegister(&xBytesHash, libs, "g_bytes_hash") | |
| 770 | + | core.PuregoSafeRegister(&xBytesNewFromBytes, libs, "g_bytes_new_from_bytes") | |
| 771 | + | core.PuregoSafeRegister(&xBytesRef, libs, "g_bytes_ref") | |
| 772 | + | core.PuregoSafeRegister(&xBytesUnref, libs, "g_bytes_unref") | |
| 773 | + | core.PuregoSafeRegister(&xBytesUnrefToArray, libs, "g_bytes_unref_to_array") | |
| 774 | + | core.PuregoSafeRegister(&xBytesUnrefToData, libs, "g_bytes_unref_to_data") | |
| 775 | + | ||
| 776 | + | core.PuregoSafeRegister(&xPtrArrayGLibType, libs, "g_ptr_array_get_type") | |
| 773 | 777 | ||
| 774 | 778 | } | |
M v4/glib/gasyncqueue.go +37 -33
| @@ -413,40 +413,44 @@ func AsyncQueueNewFull(ItemFreeFuncVar *DestroyNotify) *AsyncQueue { | |||
| 413 | 413 | ||
| 414 | 414 | func init() { | |
| 415 | 415 | core.SetPackageName("GLIB", "glib-2.0") | |
| 416 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 417 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 418 | - | if err != nil { | |
| 419 | - | panic(err) | |
| 416 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 417 | + | var libs []uintptr | |
| 418 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 419 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 420 | + | if err != nil { | |
| 421 | + | panic(err) | |
| 422 | + | } | |
| 423 | + | libs = append(libs, lib) | |
| 420 | 424 | } | |
| 421 | 425 | ||
| 422 | - | core.PuregoSafeRegister(&xAsyncQueueNew, lib, "g_async_queue_new") | |
| 423 | - | core.PuregoSafeRegister(&xAsyncQueueNewFull, lib, "g_async_queue_new_full") | |
| 424 | - | ||
| 425 | - | core.PuregoSafeRegister(&xAsyncQueueLength, lib, "g_async_queue_length") | |
| 426 | - | core.PuregoSafeRegister(&xAsyncQueueLengthUnlocked, lib, "g_async_queue_length_unlocked") | |
| 427 | - | core.PuregoSafeRegister(&xAsyncQueueLock, lib, "g_async_queue_lock") | |
| 428 | - | core.PuregoSafeRegister(&xAsyncQueuePop, lib, "g_async_queue_pop") | |
| 429 | - | core.PuregoSafeRegister(&xAsyncQueuePopUnlocked, lib, "g_async_queue_pop_unlocked") | |
| 430 | - | core.PuregoSafeRegister(&xAsyncQueuePush, lib, "g_async_queue_push") | |
| 431 | - | core.PuregoSafeRegister(&xAsyncQueuePushFront, lib, "g_async_queue_push_front") | |
| 432 | - | core.PuregoSafeRegister(&xAsyncQueuePushFrontUnlocked, lib, "g_async_queue_push_front_unlocked") | |
| 433 | - | core.PuregoSafeRegister(&xAsyncQueuePushSorted, lib, "g_async_queue_push_sorted") | |
| 434 | - | core.PuregoSafeRegister(&xAsyncQueuePushSortedUnlocked, lib, "g_async_queue_push_sorted_unlocked") | |
| 435 | - | core.PuregoSafeRegister(&xAsyncQueuePushUnlocked, lib, "g_async_queue_push_unlocked") | |
| 436 | - | core.PuregoSafeRegister(&xAsyncQueueRef, lib, "g_async_queue_ref") | |
| 437 | - | core.PuregoSafeRegister(&xAsyncQueueRefUnlocked, lib, "g_async_queue_ref_unlocked") | |
| 438 | - | core.PuregoSafeRegister(&xAsyncQueueRemove, lib, "g_async_queue_remove") | |
| 439 | - | core.PuregoSafeRegister(&xAsyncQueueRemoveUnlocked, lib, "g_async_queue_remove_unlocked") | |
| 440 | - | core.PuregoSafeRegister(&xAsyncQueueSort, lib, "g_async_queue_sort") | |
| 441 | - | core.PuregoSafeRegister(&xAsyncQueueSortUnlocked, lib, "g_async_queue_sort_unlocked") | |
| 442 | - | core.PuregoSafeRegister(&xAsyncQueueTimedPop, lib, "g_async_queue_timed_pop") | |
| 443 | - | core.PuregoSafeRegister(&xAsyncQueueTimedPopUnlocked, lib, "g_async_queue_timed_pop_unlocked") | |
| 444 | - | core.PuregoSafeRegister(&xAsyncQueueTimeoutPop, lib, "g_async_queue_timeout_pop") | |
| 445 | - | core.PuregoSafeRegister(&xAsyncQueueTimeoutPopUnlocked, lib, "g_async_queue_timeout_pop_unlocked") | |
| 446 | - | core.PuregoSafeRegister(&xAsyncQueueTryPop, lib, "g_async_queue_try_pop") | |
| 447 | - | core.PuregoSafeRegister(&xAsyncQueueTryPopUnlocked, lib, "g_async_queue_try_pop_unlocked") | |
| 448 | - | core.PuregoSafeRegister(&xAsyncQueueUnlock, lib, "g_async_queue_unlock") | |
| 449 | - | core.PuregoSafeRegister(&xAsyncQueueUnref, lib, "g_async_queue_unref") | |
| 450 | - | core.PuregoSafeRegister(&xAsyncQueueUnrefAndUnlock, lib, "g_async_queue_unref_and_unlock") | |
| 426 | + | core.PuregoSafeRegister(&xAsyncQueueNew, libs, "g_async_queue_new") | |
| 427 | + | core.PuregoSafeRegister(&xAsyncQueueNewFull, libs, "g_async_queue_new_full") | |
| 428 | + | ||
| 429 | + | core.PuregoSafeRegister(&xAsyncQueueLength, libs, "g_async_queue_length") | |
| 430 | + | core.PuregoSafeRegister(&xAsyncQueueLengthUnlocked, libs, "g_async_queue_length_unlocked") | |
| 431 | + | core.PuregoSafeRegister(&xAsyncQueueLock, libs, "g_async_queue_lock") | |
| 432 | + | core.PuregoSafeRegister(&xAsyncQueuePop, libs, "g_async_queue_pop") | |
| 433 | + | core.PuregoSafeRegister(&xAsyncQueuePopUnlocked, libs, "g_async_queue_pop_unlocked") | |
| 434 | + | core.PuregoSafeRegister(&xAsyncQueuePush, libs, "g_async_queue_push") | |
| 435 | + | core.PuregoSafeRegister(&xAsyncQueuePushFront, libs, "g_async_queue_push_front") | |
| 436 | + | core.PuregoSafeRegister(&xAsyncQueuePushFrontUnlocked, libs, "g_async_queue_push_front_unlocked") | |
| 437 | + | core.PuregoSafeRegister(&xAsyncQueuePushSorted, libs, "g_async_queue_push_sorted") | |
| 438 | + | core.PuregoSafeRegister(&xAsyncQueuePushSortedUnlocked, libs, "g_async_queue_push_sorted_unlocked") | |
| 439 | + | core.PuregoSafeRegister(&xAsyncQueuePushUnlocked, libs, "g_async_queue_push_unlocked") | |
| 440 | + | core.PuregoSafeRegister(&xAsyncQueueRef, libs, "g_async_queue_ref") | |
| 441 | + | core.PuregoSafeRegister(&xAsyncQueueRefUnlocked, libs, "g_async_queue_ref_unlocked") | |
| 442 | + | core.PuregoSafeRegister(&xAsyncQueueRemove, libs, "g_async_queue_remove") | |
| 443 | + | core.PuregoSafeRegister(&xAsyncQueueRemoveUnlocked, libs, "g_async_queue_remove_unlocked") | |
| 444 | + | core.PuregoSafeRegister(&xAsyncQueueSort, libs, "g_async_queue_sort") | |
| 445 | + | core.PuregoSafeRegister(&xAsyncQueueSortUnlocked, libs, "g_async_queue_sort_unlocked") | |
| 446 | + | core.PuregoSafeRegister(&xAsyncQueueTimedPop, libs, "g_async_queue_timed_pop") | |
| 447 | + | core.PuregoSafeRegister(&xAsyncQueueTimedPopUnlocked, libs, "g_async_queue_timed_pop_unlocked") | |
| 448 | + | core.PuregoSafeRegister(&xAsyncQueueTimeoutPop, libs, "g_async_queue_timeout_pop") | |
| 449 | + | core.PuregoSafeRegister(&xAsyncQueueTimeoutPopUnlocked, libs, "g_async_queue_timeout_pop_unlocked") | |
| 450 | + | core.PuregoSafeRegister(&xAsyncQueueTryPop, libs, "g_async_queue_try_pop") | |
| 451 | + | core.PuregoSafeRegister(&xAsyncQueueTryPopUnlocked, libs, "g_async_queue_try_pop_unlocked") | |
| 452 | + | core.PuregoSafeRegister(&xAsyncQueueUnlock, libs, "g_async_queue_unlock") | |
| 453 | + | core.PuregoSafeRegister(&xAsyncQueueUnref, libs, "g_async_queue_unref") | |
| 454 | + | core.PuregoSafeRegister(&xAsyncQueueUnrefAndUnlock, libs, "g_async_queue_unref_and_unlock") | |
| 451 | 455 | ||
| 452 | 456 | } | |
M v4/glib/gatomic.go +29 -25
| @@ -385,32 +385,36 @@ func AtomicPointerXor(AtomicVar uintptr, ValVar uint) uintptr { | |||
| 385 | 385 | ||
| 386 | 386 | func init() { | |
| 387 | 387 | core.SetPackageName("GLIB", "glib-2.0") | |
| 388 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 389 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 390 | - | if err != nil { | |
| 391 | - | panic(err) | |
| 388 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 389 | + | var libs []uintptr | |
| 390 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 391 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 392 | + | if err != nil { | |
| 393 | + | panic(err) | |
| 394 | + | } | |
| 395 | + | libs = append(libs, lib) | |
| 392 | 396 | } | |
| 393 | 397 | ||
| 394 | - | core.PuregoSafeRegister(&xAtomicIntAdd, lib, "g_atomic_int_add") | |
| 395 | - | core.PuregoSafeRegister(&xAtomicIntAnd, lib, "g_atomic_int_and") | |
| 396 | - | core.PuregoSafeRegister(&xAtomicIntCompareAndExchange, lib, "g_atomic_int_compare_and_exchange") | |
| 397 | - | core.PuregoSafeRegister(&xAtomicIntCompareAndExchangeFull, lib, "g_atomic_int_compare_and_exchange_full") | |
| 398 | - | core.PuregoSafeRegister(&xAtomicIntDecAndTest, lib, "g_atomic_int_dec_and_test") | |
| 399 | - | core.PuregoSafeRegister(&xAtomicIntExchange, lib, "g_atomic_int_exchange") | |
| 400 | - | core.PuregoSafeRegister(&xAtomicIntExchangeAndAdd, lib, "g_atomic_int_exchange_and_add") | |
| 401 | - | core.PuregoSafeRegister(&xAtomicIntGet, lib, "g_atomic_int_get") | |
| 402 | - | core.PuregoSafeRegister(&xAtomicIntInc, lib, "g_atomic_int_inc") | |
| 403 | - | core.PuregoSafeRegister(&xAtomicIntOr, lib, "g_atomic_int_or") | |
| 404 | - | core.PuregoSafeRegister(&xAtomicIntSet, lib, "g_atomic_int_set") | |
| 405 | - | core.PuregoSafeRegister(&xAtomicIntXor, lib, "g_atomic_int_xor") | |
| 406 | - | core.PuregoSafeRegister(&xAtomicPointerAdd, lib, "g_atomic_pointer_add") | |
| 407 | - | core.PuregoSafeRegister(&xAtomicPointerAnd, lib, "g_atomic_pointer_and") | |
| 408 | - | core.PuregoSafeRegister(&xAtomicPointerCompareAndExchange, lib, "g_atomic_pointer_compare_and_exchange") | |
| 409 | - | core.PuregoSafeRegister(&xAtomicPointerCompareAndExchangeFull, lib, "g_atomic_pointer_compare_and_exchange_full") | |
| 410 | - | core.PuregoSafeRegister(&xAtomicPointerExchange, lib, "g_atomic_pointer_exchange") | |
| 411 | - | core.PuregoSafeRegister(&xAtomicPointerGet, lib, "g_atomic_pointer_get") | |
| 412 | - | core.PuregoSafeRegister(&xAtomicPointerOr, lib, "g_atomic_pointer_or") | |
| 413 | - | core.PuregoSafeRegister(&xAtomicPointerSet, lib, "g_atomic_pointer_set") | |
| 414 | - | core.PuregoSafeRegister(&xAtomicPointerXor, lib, "g_atomic_pointer_xor") | |
| 398 | + | core.PuregoSafeRegister(&xAtomicIntAdd, libs, "g_atomic_int_add") | |
| 399 | + | core.PuregoSafeRegister(&xAtomicIntAnd, libs, "g_atomic_int_and") | |
| 400 | + | core.PuregoSafeRegister(&xAtomicIntCompareAndExchange, libs, "g_atomic_int_compare_and_exchange") | |
| 401 | + | core.PuregoSafeRegister(&xAtomicIntCompareAndExchangeFull, libs, "g_atomic_int_compare_and_exchange_full") | |
| 402 | + | core.PuregoSafeRegister(&xAtomicIntDecAndTest, libs, "g_atomic_int_dec_and_test") | |
| 403 | + | core.PuregoSafeRegister(&xAtomicIntExchange, libs, "g_atomic_int_exchange") | |
| 404 | + | core.PuregoSafeRegister(&xAtomicIntExchangeAndAdd, libs, "g_atomic_int_exchange_and_add") | |
| 405 | + | core.PuregoSafeRegister(&xAtomicIntGet, libs, "g_atomic_int_get") | |
| 406 | + | core.PuregoSafeRegister(&xAtomicIntInc, libs, "g_atomic_int_inc") | |
| 407 | + | core.PuregoSafeRegister(&xAtomicIntOr, libs, "g_atomic_int_or") | |
| 408 | + | core.PuregoSafeRegister(&xAtomicIntSet, libs, "g_atomic_int_set") | |
| 409 | + | core.PuregoSafeRegister(&xAtomicIntXor, libs, "g_atomic_int_xor") | |
| 410 | + | core.PuregoSafeRegister(&xAtomicPointerAdd, libs, "g_atomic_pointer_add") | |
| 411 | + | core.PuregoSafeRegister(&xAtomicPointerAnd, libs, "g_atomic_pointer_and") | |
| 412 | + | core.PuregoSafeRegister(&xAtomicPointerCompareAndExchange, libs, "g_atomic_pointer_compare_and_exchange") | |
| 413 | + | core.PuregoSafeRegister(&xAtomicPointerCompareAndExchangeFull, libs, "g_atomic_pointer_compare_and_exchange_full") | |
| 414 | + | core.PuregoSafeRegister(&xAtomicPointerExchange, libs, "g_atomic_pointer_exchange") | |
| 415 | + | core.PuregoSafeRegister(&xAtomicPointerGet, libs, "g_atomic_pointer_get") | |
| 416 | + | core.PuregoSafeRegister(&xAtomicPointerOr, libs, "g_atomic_pointer_or") | |
| 417 | + | core.PuregoSafeRegister(&xAtomicPointerSet, libs, "g_atomic_pointer_set") | |
| 418 | + | core.PuregoSafeRegister(&xAtomicPointerXor, libs, "g_atomic_pointer_xor") | |
| 415 | 419 | ||
| 416 | 420 | } | |
M v4/glib/gbacktrace.go +10 -6
| @@ -87,13 +87,17 @@ func OnErrorStackTrace(PrgNameVar string) { | |||
| 87 | 87 | ||
| 88 | 88 | func init() { | |
| 89 | 89 | core.SetPackageName("GLIB", "glib-2.0") | |
| 90 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 91 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 92 | - | if err != nil { | |
| 93 | - | panic(err) | |
| 90 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 91 | + | var libs []uintptr | |
| 92 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 93 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 94 | + | if err != nil { | |
| 95 | + | panic(err) | |
| 96 | + | } | |
| 97 | + | libs = append(libs, lib) | |
| 94 | 98 | } | |
| 95 | 99 | ||
| 96 | - | core.PuregoSafeRegister(&xOnErrorQuery, lib, "g_on_error_query") | |
| 97 | - | core.PuregoSafeRegister(&xOnErrorStackTrace, lib, "g_on_error_stack_trace") | |
| 100 | + | core.PuregoSafeRegister(&xOnErrorQuery, libs, "g_on_error_query") | |
| 101 | + | core.PuregoSafeRegister(&xOnErrorStackTrace, libs, "g_on_error_stack_trace") | |
| 98 | 102 | ||
| 99 | 103 | } | |
M v4/glib/gbase64.go +14 -10
| @@ -97,17 +97,21 @@ func Base64EncodeStep(InVar []byte, LenVar uint, BreakLinesVar bool, OutVar []by | |||
| 97 | 97 | ||
| 98 | 98 | func init() { | |
| 99 | 99 | core.SetPackageName("GLIB", "glib-2.0") | |
| 100 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 101 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 102 | - | if err != nil { | |
| 103 | - | panic(err) | |
| 100 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 101 | + | var libs []uintptr | |
| 102 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 103 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 104 | + | if err != nil { | |
| 105 | + | panic(err) | |
| 106 | + | } | |
| 107 | + | libs = append(libs, lib) | |
| 104 | 108 | } | |
| 105 | 109 | ||
| 106 | - | core.PuregoSafeRegister(&xBase64Decode, lib, "g_base64_decode") | |
| 107 | - | core.PuregoSafeRegister(&xBase64DecodeInplace, lib, "g_base64_decode_inplace") | |
| 108 | - | core.PuregoSafeRegister(&xBase64DecodeStep, lib, "g_base64_decode_step") | |
| 109 | - | core.PuregoSafeRegister(&xBase64Encode, lib, "g_base64_encode") | |
| 110 | - | core.PuregoSafeRegister(&xBase64EncodeClose, lib, "g_base64_encode_close") | |
| 111 | - | core.PuregoSafeRegister(&xBase64EncodeStep, lib, "g_base64_encode_step") | |
| 110 | + | core.PuregoSafeRegister(&xBase64Decode, libs, "g_base64_decode") | |
| 111 | + | core.PuregoSafeRegister(&xBase64DecodeInplace, libs, "g_base64_decode_inplace") | |
| 112 | + | core.PuregoSafeRegister(&xBase64DecodeStep, libs, "g_base64_decode_step") | |
| 113 | + | core.PuregoSafeRegister(&xBase64Encode, libs, "g_base64_encode") | |
| 114 | + | core.PuregoSafeRegister(&xBase64EncodeClose, libs, "g_base64_encode_close") | |
| 115 | + | core.PuregoSafeRegister(&xBase64EncodeStep, libs, "g_base64_encode_step") | |
| 112 | 116 | ||
| 113 | 117 | } | |
M v4/glib/gbitlock.go +17 -13
| @@ -153,20 +153,24 @@ func PointerBitUnlockAndSet(AddressVar uintptr, LockBitVar uint, PtrVar uintptr, | |||
| 153 | 153 | ||
| 154 | 154 | func init() { | |
| 155 | 155 | core.SetPackageName("GLIB", "glib-2.0") | |
| 156 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 157 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 158 | - | if err != nil { | |
| 159 | - | panic(err) | |
| 156 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 157 | + | var libs []uintptr | |
| 158 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 159 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 160 | + | if err != nil { | |
| 161 | + | panic(err) | |
| 162 | + | } | |
| 163 | + | libs = append(libs, lib) | |
| 160 | 164 | } | |
| 161 | 165 | ||
| 162 | - | core.PuregoSafeRegister(&xBitLock, lib, "g_bit_lock") | |
| 163 | - | core.PuregoSafeRegister(&xBitTrylock, lib, "g_bit_trylock") | |
| 164 | - | core.PuregoSafeRegister(&xBitUnlock, lib, "g_bit_unlock") | |
| 165 | - | core.PuregoSafeRegister(&xPointerBitLock, lib, "g_pointer_bit_lock") | |
| 166 | - | core.PuregoSafeRegister(&xPointerBitLockAndGet, lib, "g_pointer_bit_lock_and_get") | |
| 167 | - | core.PuregoSafeRegister(&xPointerBitLockMaskPtr, lib, "g_pointer_bit_lock_mask_ptr") | |
| 168 | - | core.PuregoSafeRegister(&xPointerBitTrylock, lib, "g_pointer_bit_trylock") | |
| 169 | - | core.PuregoSafeRegister(&xPointerBitUnlock, lib, "g_pointer_bit_unlock") | |
| 170 | - | core.PuregoSafeRegister(&xPointerBitUnlockAndSet, lib, "g_pointer_bit_unlock_and_set") | |
| 166 | + | core.PuregoSafeRegister(&xBitLock, libs, "g_bit_lock") | |
| 167 | + | core.PuregoSafeRegister(&xBitTrylock, libs, "g_bit_trylock") | |
| 168 | + | core.PuregoSafeRegister(&xBitUnlock, libs, "g_bit_unlock") | |
| 169 | + | core.PuregoSafeRegister(&xPointerBitLock, libs, "g_pointer_bit_lock") | |
| 170 | + | core.PuregoSafeRegister(&xPointerBitLockAndGet, libs, "g_pointer_bit_lock_and_get") | |
| 171 | + | core.PuregoSafeRegister(&xPointerBitLockMaskPtr, libs, "g_pointer_bit_lock_mask_ptr") | |
| 172 | + | core.PuregoSafeRegister(&xPointerBitTrylock, libs, "g_pointer_bit_trylock") | |
| 173 | + | core.PuregoSafeRegister(&xPointerBitUnlock, libs, "g_pointer_bit_unlock") | |
| 174 | + | core.PuregoSafeRegister(&xPointerBitUnlockAndSet, libs, "g_pointer_bit_unlock_and_set") | |
| 171 | 175 | ||
| 172 | 176 | } | |
M v4/glib/gbookmarkfile.go +59 -55
| @@ -905,62 +905,66 @@ const ( | |||
| 905 | 905 | ||
| 906 | 906 | func init() { | |
| 907 | 907 | core.SetPackageName("GLIB", "glib-2.0") | |
| 908 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 909 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 910 | - | if err != nil { | |
| 911 | - | panic(err) | |
| 908 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 909 | + | var libs []uintptr | |
| 910 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 911 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 912 | + | if err != nil { | |
| 913 | + | panic(err) | |
| 914 | + | } | |
| 915 | + | libs = append(libs, lib) | |
| 912 | 916 | } | |
| 913 | 917 | ||
| 914 | - | core.PuregoSafeRegister(&xBookmarkFileGLibType, lib, "g_bookmark_file_get_type") | |
| 915 | - | ||
| 916 | - | core.PuregoSafeRegister(&xNewBookmarkFile, lib, "g_bookmark_file_new") | |
| 917 | - | ||
| 918 | - | core.PuregoSafeRegister(&xBookmarkFileAddApplication, lib, "g_bookmark_file_add_application") | |
| 919 | - | core.PuregoSafeRegister(&xBookmarkFileAddGroup, lib, "g_bookmark_file_add_group") | |
| 920 | - | core.PuregoSafeRegister(&xBookmarkFileCopy, lib, "g_bookmark_file_copy") | |
| 921 | - | core.PuregoSafeRegister(&xBookmarkFileFree, lib, "g_bookmark_file_free") | |
| 922 | - | core.PuregoSafeRegister(&xBookmarkFileGetAdded, lib, "g_bookmark_file_get_added") | |
| 923 | - | core.PuregoSafeRegister(&xBookmarkFileGetAddedDateTime, lib, "g_bookmark_file_get_added_date_time") | |
| 924 | - | core.PuregoSafeRegister(&xBookmarkFileGetAppInfo, lib, "g_bookmark_file_get_app_info") | |
| 925 | - | core.PuregoSafeRegister(&xBookmarkFileGetApplicationInfo, lib, "g_bookmark_file_get_application_info") | |
| 926 | - | core.PuregoSafeRegister(&xBookmarkFileGetApplications, lib, "g_bookmark_file_get_applications") | |
| 927 | - | core.PuregoSafeRegister(&xBookmarkFileGetDescription, lib, "g_bookmark_file_get_description") | |
| 928 | - | core.PuregoSafeRegister(&xBookmarkFileGetGroups, lib, "g_bookmark_file_get_groups") | |
| 929 | - | core.PuregoSafeRegister(&xBookmarkFileGetIcon, lib, "g_bookmark_file_get_icon") | |
| 930 | - | core.PuregoSafeRegister(&xBookmarkFileGetIsPrivate, lib, "g_bookmark_file_get_is_private") | |
| 931 | - | core.PuregoSafeRegister(&xBookmarkFileGetMimeType, lib, "g_bookmark_file_get_mime_type") | |
| 932 | - | core.PuregoSafeRegister(&xBookmarkFileGetModified, lib, "g_bookmark_file_get_modified") | |
| 933 | - | core.PuregoSafeRegister(&xBookmarkFileGetModifiedDateTime, lib, "g_bookmark_file_get_modified_date_time") | |
| 934 | - | core.PuregoSafeRegister(&xBookmarkFileGetSize, lib, "g_bookmark_file_get_size") | |
| 935 | - | core.PuregoSafeRegister(&xBookmarkFileGetTitle, lib, "g_bookmark_file_get_title") | |
| 936 | - | core.PuregoSafeRegister(&xBookmarkFileGetUris, lib, "g_bookmark_file_get_uris") | |
| 937 | - | core.PuregoSafeRegister(&xBookmarkFileGetVisited, lib, "g_bookmark_file_get_visited") | |
| 938 | - | core.PuregoSafeRegister(&xBookmarkFileGetVisitedDateTime, lib, "g_bookmark_file_get_visited_date_time") | |
| 939 | - | core.PuregoSafeRegister(&xBookmarkFileHasApplication, lib, "g_bookmark_file_has_application") | |
| 940 | - | core.PuregoSafeRegister(&xBookmarkFileHasGroup, lib, "g_bookmark_file_has_group") | |
| 941 | - | core.PuregoSafeRegister(&xBookmarkFileHasItem, lib, "g_bookmark_file_has_item") | |
| 942 | - | core.PuregoSafeRegister(&xBookmarkFileLoadFromData, lib, "g_bookmark_file_load_from_data") | |
| 943 | - | core.PuregoSafeRegister(&xBookmarkFileLoadFromDataDirs, lib, "g_bookmark_file_load_from_data_dirs") | |
| 944 | - | core.PuregoSafeRegister(&xBookmarkFileLoadFromFile, lib, "g_bookmark_file_load_from_file") | |
| 945 | - | core.PuregoSafeRegister(&xBookmarkFileMoveItem, lib, "g_bookmark_file_move_item") | |
| 946 | - | core.PuregoSafeRegister(&xBookmarkFileRemoveApplication, lib, "g_bookmark_file_remove_application") | |
| 947 | - | core.PuregoSafeRegister(&xBookmarkFileRemoveGroup, lib, "g_bookmark_file_remove_group") | |
| 948 | - | core.PuregoSafeRegister(&xBookmarkFileRemoveItem, lib, "g_bookmark_file_remove_item") | |
| 949 | - | core.PuregoSafeRegister(&xBookmarkFileSetAdded, lib, "g_bookmark_file_set_added") | |
| 950 | - | core.PuregoSafeRegister(&xBookmarkFileSetAddedDateTime, lib, "g_bookmark_file_set_added_date_time") | |
| 951 | - | core.PuregoSafeRegister(&xBookmarkFileSetAppInfo, lib, "g_bookmark_file_set_app_info") | |
| 952 | - | core.PuregoSafeRegister(&xBookmarkFileSetApplicationInfo, lib, "g_bookmark_file_set_application_info") | |
| 953 | - | core.PuregoSafeRegister(&xBookmarkFileSetDescription, lib, "g_bookmark_file_set_description") | |
| 954 | - | core.PuregoSafeRegister(&xBookmarkFileSetGroups, lib, "g_bookmark_file_set_groups") | |
| 955 | - | core.PuregoSafeRegister(&xBookmarkFileSetIcon, lib, "g_bookmark_file_set_icon") | |
| 956 | - | core.PuregoSafeRegister(&xBookmarkFileSetIsPrivate, lib, "g_bookmark_file_set_is_private") | |
| 957 | - | core.PuregoSafeRegister(&xBookmarkFileSetMimeType, lib, "g_bookmark_file_set_mime_type") | |
| 958 | - | core.PuregoSafeRegister(&xBookmarkFileSetModified, lib, "g_bookmark_file_set_modified") | |
| 959 | - | core.PuregoSafeRegister(&xBookmarkFileSetModifiedDateTime, lib, "g_bookmark_file_set_modified_date_time") | |
| 960 | - | core.PuregoSafeRegister(&xBookmarkFileSetTitle, lib, "g_bookmark_file_set_title") | |
| 961 | - | core.PuregoSafeRegister(&xBookmarkFileSetVisited, lib, "g_bookmark_file_set_visited") | |
| 962 | - | core.PuregoSafeRegister(&xBookmarkFileSetVisitedDateTime, lib, "g_bookmark_file_set_visited_date_time") | |
| 963 | - | core.PuregoSafeRegister(&xBookmarkFileToData, lib, "g_bookmark_file_to_data") | |
| 964 | - | core.PuregoSafeRegister(&xBookmarkFileToFile, lib, "g_bookmark_file_to_file") | |
| 918 | + | core.PuregoSafeRegister(&xBookmarkFileGLibType, libs, "g_bookmark_file_get_type") | |
| 919 | + | ||
| 920 | + | core.PuregoSafeRegister(&xNewBookmarkFile, libs, "g_bookmark_file_new") | |
| 921 | + | ||
| 922 | + | core.PuregoSafeRegister(&xBookmarkFileAddApplication, libs, "g_bookmark_file_add_application") | |
| 923 | + | core.PuregoSafeRegister(&xBookmarkFileAddGroup, libs, "g_bookmark_file_add_group") | |
| 924 | + | core.PuregoSafeRegister(&xBookmarkFileCopy, libs, "g_bookmark_file_copy") | |
| 925 | + | core.PuregoSafeRegister(&xBookmarkFileFree, libs, "g_bookmark_file_free") | |
| 926 | + | core.PuregoSafeRegister(&xBookmarkFileGetAdded, libs, "g_bookmark_file_get_added") | |
| 927 | + | core.PuregoSafeRegister(&xBookmarkFileGetAddedDateTime, libs, "g_bookmark_file_get_added_date_time") | |
| 928 | + | core.PuregoSafeRegister(&xBookmarkFileGetAppInfo, libs, "g_bookmark_file_get_app_info") | |
| 929 | + | core.PuregoSafeRegister(&xBookmarkFileGetApplicationInfo, libs, "g_bookmark_file_get_application_info") | |
| 930 | + | core.PuregoSafeRegister(&xBookmarkFileGetApplications, libs, "g_bookmark_file_get_applications") | |
| 931 | + | core.PuregoSafeRegister(&xBookmarkFileGetDescription, libs, "g_bookmark_file_get_description") | |
| 932 | + | core.PuregoSafeRegister(&xBookmarkFileGetGroups, libs, "g_bookmark_file_get_groups") | |
| 933 | + | core.PuregoSafeRegister(&xBookmarkFileGetIcon, libs, "g_bookmark_file_get_icon") | |
| 934 | + | core.PuregoSafeRegister(&xBookmarkFileGetIsPrivate, libs, "g_bookmark_file_get_is_private") | |
| 935 | + | core.PuregoSafeRegister(&xBookmarkFileGetMimeType, libs, "g_bookmark_file_get_mime_type") | |
| 936 | + | core.PuregoSafeRegister(&xBookmarkFileGetModified, libs, "g_bookmark_file_get_modified") | |
| 937 | + | core.PuregoSafeRegister(&xBookmarkFileGetModifiedDateTime, libs, "g_bookmark_file_get_modified_date_time") | |
| 938 | + | core.PuregoSafeRegister(&xBookmarkFileGetSize, libs, "g_bookmark_file_get_size") | |
| 939 | + | core.PuregoSafeRegister(&xBookmarkFileGetTitle, libs, "g_bookmark_file_get_title") | |
| 940 | + | core.PuregoSafeRegister(&xBookmarkFileGetUris, libs, "g_bookmark_file_get_uris") | |
| 941 | + | core.PuregoSafeRegister(&xBookmarkFileGetVisited, libs, "g_bookmark_file_get_visited") | |
| 942 | + | core.PuregoSafeRegister(&xBookmarkFileGetVisitedDateTime, libs, "g_bookmark_file_get_visited_date_time") | |
| 943 | + | core.PuregoSafeRegister(&xBookmarkFileHasApplication, libs, "g_bookmark_file_has_application") | |
| 944 | + | core.PuregoSafeRegister(&xBookmarkFileHasGroup, libs, "g_bookmark_file_has_group") | |
| 945 | + | core.PuregoSafeRegister(&xBookmarkFileHasItem, libs, "g_bookmark_file_has_item") | |
| 946 | + | core.PuregoSafeRegister(&xBookmarkFileLoadFromData, libs, "g_bookmark_file_load_from_data") | |
| 947 | + | core.PuregoSafeRegister(&xBookmarkFileLoadFromDataDirs, libs, "g_bookmark_file_load_from_data_dirs") | |
| 948 | + | core.PuregoSafeRegister(&xBookmarkFileLoadFromFile, libs, "g_bookmark_file_load_from_file") | |
| 949 | + | core.PuregoSafeRegister(&xBookmarkFileMoveItem, libs, "g_bookmark_file_move_item") | |
| 950 | + | core.PuregoSafeRegister(&xBookmarkFileRemoveApplication, libs, "g_bookmark_file_remove_application") | |
| 951 | + | core.PuregoSafeRegister(&xBookmarkFileRemoveGroup, libs, "g_bookmark_file_remove_group") | |
| 952 | + | core.PuregoSafeRegister(&xBookmarkFileRemoveItem, libs, "g_bookmark_file_remove_item") | |
| 953 | + | core.PuregoSafeRegister(&xBookmarkFileSetAdded, libs, "g_bookmark_file_set_added") | |
| 954 | + | core.PuregoSafeRegister(&xBookmarkFileSetAddedDateTime, libs, "g_bookmark_file_set_added_date_time") | |
| 955 | + | core.PuregoSafeRegister(&xBookmarkFileSetAppInfo, libs, "g_bookmark_file_set_app_info") | |
| 956 | + | core.PuregoSafeRegister(&xBookmarkFileSetApplicationInfo, libs, "g_bookmark_file_set_application_info") | |
| 957 | + | core.PuregoSafeRegister(&xBookmarkFileSetDescription, libs, "g_bookmark_file_set_description") | |
| 958 | + | core.PuregoSafeRegister(&xBookmarkFileSetGroups, libs, "g_bookmark_file_set_groups") | |
| 959 | + | core.PuregoSafeRegister(&xBookmarkFileSetIcon, libs, "g_bookmark_file_set_icon") | |
| 960 | + | core.PuregoSafeRegister(&xBookmarkFileSetIsPrivate, libs, "g_bookmark_file_set_is_private") | |
| 961 | + | core.PuregoSafeRegister(&xBookmarkFileSetMimeType, libs, "g_bookmark_file_set_mime_type") | |
| 962 | + | core.PuregoSafeRegister(&xBookmarkFileSetModified, libs, "g_bookmark_file_set_modified") | |
| 963 | + | core.PuregoSafeRegister(&xBookmarkFileSetModifiedDateTime, libs, "g_bookmark_file_set_modified_date_time") | |
| 964 | + | core.PuregoSafeRegister(&xBookmarkFileSetTitle, libs, "g_bookmark_file_set_title") | |
| 965 | + | core.PuregoSafeRegister(&xBookmarkFileSetVisited, libs, "g_bookmark_file_set_visited") | |
| 966 | + | core.PuregoSafeRegister(&xBookmarkFileSetVisitedDateTime, libs, "g_bookmark_file_set_visited_date_time") | |
| 967 | + | core.PuregoSafeRegister(&xBookmarkFileToData, libs, "g_bookmark_file_to_data") | |
| 968 | + | core.PuregoSafeRegister(&xBookmarkFileToFile, libs, "g_bookmark_file_to_file") | |
| 965 | 969 | ||
| 966 | 970 | } | |
M v4/glib/gcache.go +13 -9
| @@ -106,16 +106,20 @@ func (x *Cache) ValueForeach(FuncVar *HFunc, UserDataVar uintptr) { | |||
| 106 | 106 | ||
| 107 | 107 | func init() { | |
| 108 | 108 | core.SetPackageName("GLIB", "glib-2.0") | |
| 109 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 110 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 111 | - | if err != nil { | |
| 112 | - | panic(err) | |
| 109 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 110 | + | var libs []uintptr | |
| 111 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 112 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 113 | + | if err != nil { | |
| 114 | + | panic(err) | |
| 115 | + | } | |
| 116 | + | libs = append(libs, lib) | |
| 113 | 117 | } | |
| 114 | 118 | ||
| 115 | - | core.PuregoSafeRegister(&xCacheDestroy, lib, "g_cache_destroy") | |
| 116 | - | core.PuregoSafeRegister(&xCacheInsert, lib, "g_cache_insert") | |
| 117 | - | core.PuregoSafeRegister(&xCacheKeyForeach, lib, "g_cache_key_foreach") | |
| 118 | - | core.PuregoSafeRegister(&xCacheRemove, lib, "g_cache_remove") | |
| 119 | - | core.PuregoSafeRegister(&xCacheValueForeach, lib, "g_cache_value_foreach") | |
| 119 | + | core.PuregoSafeRegister(&xCacheDestroy, libs, "g_cache_destroy") | |
| 120 | + | core.PuregoSafeRegister(&xCacheInsert, libs, "g_cache_insert") | |
| 121 | + | core.PuregoSafeRegister(&xCacheKeyForeach, libs, "g_cache_key_foreach") | |
| 122 | + | core.PuregoSafeRegister(&xCacheRemove, libs, "g_cache_remove") | |
| 123 | + | core.PuregoSafeRegister(&xCacheValueForeach, libs, "g_cache_value_foreach") | |
| 120 | 124 | ||
| 121 | 125 | } | |
M v4/glib/gcharset.go +14 -10
| @@ -131,17 +131,21 @@ func GetLocaleVariants(LocaleVar string) []string { | |||
| 131 | 131 | ||
| 132 | 132 | func init() { | |
| 133 | 133 | core.SetPackageName("GLIB", "glib-2.0") | |
| 134 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 135 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 136 | - | if err != nil { | |
| 137 | - | panic(err) | |
| 134 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 135 | + | var libs []uintptr | |
| 136 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 137 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 138 | + | if err != nil { | |
| 139 | + | panic(err) | |
| 140 | + | } | |
| 141 | + | libs = append(libs, lib) | |
| 138 | 142 | } | |
| 139 | 143 | ||
| 140 | - | core.PuregoSafeRegister(&xGetCharset, lib, "g_get_charset") | |
| 141 | - | core.PuregoSafeRegister(&xGetCodeset, lib, "g_get_codeset") | |
| 142 | - | core.PuregoSafeRegister(&xGetConsoleCharset, lib, "g_get_console_charset") | |
| 143 | - | core.PuregoSafeRegister(&xGetLanguageNames, lib, "g_get_language_names") | |
| 144 | - | core.PuregoSafeRegister(&xGetLanguageNamesWithCategory, lib, "g_get_language_names_with_category") | |
| 145 | - | core.PuregoSafeRegister(&xGetLocaleVariants, lib, "g_get_locale_variants") | |
| 144 | + | core.PuregoSafeRegister(&xGetCharset, libs, "g_get_charset") | |
| 145 | + | core.PuregoSafeRegister(&xGetCodeset, libs, "g_get_codeset") | |
| 146 | + | core.PuregoSafeRegister(&xGetConsoleCharset, libs, "g_get_console_charset") | |
| 147 | + | core.PuregoSafeRegister(&xGetLanguageNames, libs, "g_get_language_names") | |
| 148 | + | core.PuregoSafeRegister(&xGetLanguageNamesWithCategory, libs, "g_get_language_names_with_category") | |
| 149 | + | core.PuregoSafeRegister(&xGetLocaleVariants, libs, "g_get_locale_variants") | |
| 146 | 150 | ||
| 147 | 151 | } | |
M v4/glib/gchecksum.go +20 -16
| @@ -197,26 +197,30 @@ func ComputeChecksumForString(ChecksumTypeVar ChecksumType, StrVar string, Lengt | |||
| 197 | 197 | ||
| 198 | 198 | func init() { | |
| 199 | 199 | core.SetPackageName("GLIB", "glib-2.0") | |
| 200 | - | core.SetSharedLibrary("GLIB", "libgobject-2.0.so.0,libglib-2.0.so.0") | |
| 201 | - | lib, err := purego.Dlopen(core.GetPath("GLIB"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 202 | - | if err != nil { | |
| 203 | - | panic(err) | |
| 200 | + | core.SetSharedLibraries("GLIB", []string{"libgobject-2.0.so.0", "libglib-2.0.so.0"}) | |
| 201 | + | var libs []uintptr | |
| 202 | + | for _, libPath := range core.GetPaths("GLIB") { | |
| 203 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 204 | + | if err != nil { | |
| 205 | + | panic(err) | |
| 206 | + | } | |
| 207 | + | libs = append(libs, lib) | |
| 204 | 208 | } | |
| 205 | 209 | ||
| 206 | - | core.PuregoSafeRegister(&xChecksumTypeGetLength, lib, "g_checksum_type_get_length") | |
| 207 | - | core.PuregoSafeRegister(&xComputeChecksumForBytes, lib, "g_compute_checksum_for_bytes") | |
| 208 | - | core.PuregoSafeRegister(&xComputeChecksumForData, lib, "g_compute_checksum_for_data") | |
| 209 | - | core.PuregoSafeRegister(&xComputeChecksumForString, lib, "g_compute_checksum_for_string") | |
| 210 | + | core.PuregoSafeRegister(&xChecksumTypeGetLength, libs, "g_checksum_type_get_length") | |
| 211 | + | core.PuregoSafeRegister(&xComputeChecksumForBytes, libs, "g_compute_checksum_for_bytes") | |
| 212 | + | core.PuregoSafeRegister(&xComputeChecksumForData, libs, "g_compute_checksum_for_data") | |
| 213 | + | core.PuregoSafeRegister(&xComputeChecksumForString, libs, "g_compute_checksum_for_string") | |
| 210 | 214 | ||
| 211 | - | core.PuregoSafeRegister(&xChecksumGLibType, lib, "g_checksum_get_type") | |
| 215 | + | core.PuregoSafeRegister(&xChecksumGLibType, libs, "g_checksum_get_type") | |
| 212 | 216 | ||
| 213 | - | core.PuregoSafeRegister(&xNewChecksum, lib, "g_checksum_new") | |
| 217 | + | core.PuregoSafeRegister(&xNewChecksum, libs, "g_checksum_new") | |
| 214 | 218 | ||
| 215 | - | core.PuregoSafeRegister(&xChecksumCopy, lib, "g_checksum_copy") | |
| 216 | - | core.PuregoSafeRegister(&xChecksumFree, lib, "g_checksum_free") | |
| 217 | - | core.PuregoSafeRegister(&xChecksumGetDigest, lib, "g_checksum_get_digest") | |
| 218 | - | core.PuregoSafeRegister(&xChecksumGetString, lib, "g_checksum_get_string") | |
| 219 | - | core.PuregoSafeRegister(&xChecksumReset, lib, "g_checksum_reset") | |
| 220 | - | core.PuregoSafeRegister(&xChecksumUpdate, lib, "g_checksum_update") | |
| 219 | + | core.PuregoSafeRegister(&xChecksumCopy, libs, "g_checksum_copy") | |
| 220 | + | core.PuregoSafeRegister(&xChecksumFree, libs, "g_checksum_free") | |
| 221 | + | core.PuregoSafeRegister(&xChecksumGetDigest, libs, "g_checksum_get_digest") | |
| 222 | + | core.PuregoSafeRegister(&xChecksumGetString, libs, "g_checksum_get_string") | |
| 223 | + | core.PuregoSafeRegister(&xChecksumReset, libs, "g_checksum_reset") | |
| 224 | + | core.PuregoSafeRegister(&xChecksumUpdate, libs, "g_checksum_update") | |
| 221 | 225 | ||
| 222 | 226 | } | |
M v4/glib/gcompletion.go +15 -11 collapsed to keep the page light
M v4/glib/gconvert.go +26 -22 collapsed to keep the page light
M v4/glib/gdataset.go +26 -22 collapsed to keep the page light
M v4/glib/gdate.go +61 -57 collapsed to keep the page light
M v4/glib/gdatetime.go +64 -60 collapsed to keep the page light
M v4/glib/gdir.go +15 -11 collapsed to keep the page light
M v4/glib/genviron.go +16 -12 collapsed to keep the page light
M v4/glib/gerror.go +27 -23 collapsed to keep the page light
M v4/glib/gfileutils.go +33 -29 collapsed to keep the page light
M v4/glib/ggettext.go +14 -10 collapsed to keep the page light
M v4/glib/ghash.go +51 -47 collapsed to keep the page light
M v4/glib/ghmac.go +19 -15 collapsed to keep the page light
M v4/glib/ghook.go +24 -20 collapsed to keep the page light
M v4/glib/ghostutils.go +13 -9 collapsed to keep the page light
M v4/glib/giochannel.go +51 -47 collapsed to keep the page light
M v4/glib/gkeyfile.go +60 -56 collapsed to keep the page light
M v4/glib/glib-types.go +10 -6 collapsed to keep the page light
M v4/glib/glib-unix.go +19 -15 collapsed to keep the page light
M v4/glib/glist.go +9 -5 collapsed to keep the page light
M v4/glib/gmain.go +114 -110 collapsed to keep the page light
M v4/glib/gmappedfile.go +17 -13 collapsed to keep the page light
M v4/glib/gmarkup.go +28 -24 collapsed to keep the page light
M v4/glib/gmem.go +30 -26 collapsed to keep the page light
M v4/glib/gmessages.go +42 -38 collapsed to keep the page light
M v4/glib/gnode.go +33 -29 collapsed to keep the page light
M v4/glib/goption.go +41 -37 collapsed to keep the page light
M v4/glib/gpathbuf.go +22 -18 collapsed to keep the page light
M v4/glib/gpattern.go +18 -14 collapsed to keep the page light
M v4/glib/gpoll.go +10 -6 collapsed to keep the page light
M v4/glib/gprimes.go +9 -5 collapsed to keep the page light
M v4/glib/gprintf.go +15 -11 collapsed to keep the page light
M v4/glib/gqsort.go +10 -6 collapsed to keep the page light
M v4/glib/gquark.go +14 -10 collapsed to keep the page light
M v4/glib/gqueue.go +50 -46 collapsed to keep the page light
M v4/glib/grand.go +28 -24 collapsed to keep the page light
M v4/glib/grcbox.go +22 -18 collapsed to keep the page light
M v4/glib/grefcount.go +16 -12 collapsed to keep the page light
M v4/glib/grefstring.go +15 -11 collapsed to keep the page light
M v4/glib/gregex.go +55 -51 collapsed to keep the page light
M v4/glib/grel.go +19 -15 collapsed to keep the page light
M v4/glib/gscanner.go +28 -24 collapsed to keep the page light
M v4/glib/gsequence.go +47 -43 collapsed to keep the page light
M v4/glib/gshell.go +11 -7 collapsed to keep the page light
M v4/glib/gslice.go +16 -12 collapsed to keep the page light
M v4/glib/gslist.go +9 -5 collapsed to keep the page light
M v4/glib/gspawn.go +18 -14 collapsed to keep the page light
M v4/glib/gstdio.go +25 -21 collapsed to keep the page light
M v4/glib/gstrfuncs.go +66 -62 collapsed to keep the page light
M v4/glib/gstring.go +48 -44 collapsed to keep the page light
M v4/glib/gstringchunk.go +13 -9 collapsed to keep the page light
M v4/glib/gstrvbuilder.go +18 -14 collapsed to keep the page light
M v4/glib/gtestutils.go +77 -73 collapsed to keep the page light
M v4/glib/gthread.go +95 -91 collapsed to keep the page light
M v4/glib/gthreadpool.go +23 -19 collapsed to keep the page light
M v4/glib/gtimer.go +17 -13 collapsed to keep the page light
M v4/glib/gtimezone.go +24 -20 collapsed to keep the page light
M v4/glib/gtrashstack.go +12 -8 collapsed to keep the page light
M v4/glib/gtree.go +43 -39 collapsed to keep the page light
M v4/glib/gtypes.go +10 -6 collapsed to keep the page light
M v4/glib/gunicode.go +83 -79 collapsed to keep the page light
M v4/glib/guri.go +48 -44 collapsed to keep the page light
M v4/glib/gutils.go +39 -35 collapsed to keep the page light
M v4/glib/guuid.go +10 -6 collapsed to keep the page light
M v4/glib/gvariant-parser.go +9 -5 collapsed to keep the page light
M v4/glib/gvariant.go +141 -137 collapsed to keep the page light
M v4/glib/gvarianttype.go +43 -39 collapsed to keep the page light
M v4/glib/gversion.go +9 -5 collapsed to keep the page light
M v4/glib/main.go +24 -20 collapsed to keep the page light
M v4/gmodule/gmodule.go +15 -11 collapsed to keep the page light
M v4/gmodule/main.go +9 -5 collapsed to keep the page light
M v4/gobject/gbinding.go +18 -14 collapsed to keep the page light
M v4/gobject/gbindinggroup.go +15 -11 collapsed to keep the page light
M v4/gobject/gboxed.go +11 -7 collapsed to keep the page light
M v4/gobject/gclosure.go +30 -26 collapsed to keep the page light
M v4/gobject/genums.go +20 -16 collapsed to keep the page light
M v4/gobject/glib-types.go +9 -5 collapsed to keep the page light
M v4/gobject/gmarshal.go +30 -26 collapsed to keep the page light
M v4/gobject/gobject.go +83 -79 collapsed to keep the page light
M v4/gobject/gparam.go +44 -40 collapsed to keep the page light
M v4/gobject/gparamspecs.go +54 -50 collapsed to keep the page light
M v4/gobject/gsignal.go +48 -44 collapsed to keep the page light
M v4/gobject/gsignalgroup.go +20 -16 collapsed to keep the page light
M v4/gobject/gsourceclosure.go +10 -6 collapsed to keep the page light
M v4/gobject/gtype.go +80 -76 collapsed to keep the page light
M v4/gobject/gtypemodule.go +16 -12 collapsed to keep the page light
M v4/gobject/gtypeplugin.go +13 -9 collapsed to keep the page light
M v4/gobject/gvalue.go +83 -79 collapsed to keep the page light
M v4/gobject/gvaluearray.go +19 -15 collapsed to keep the page light
M v4/gobject/gvaluetypes.go +11 -7 collapsed to keep the page light
M v4/graphene/graphene-box.go +42 -38 collapsed to keep the page light
M v4/graphene/graphene-euler.go +32 -28 collapsed to keep the page light
M v4/graphene/graphene-frustum.go +19 -15 collapsed to keep the page light
M v4/graphene/graphene-matrix.go +78 -74 collapsed to keep the page light
M v4/graphene/graphene-plane.go +25 -21 collapsed to keep the page light
M v4/graphene/graphene-point.go +20 -16 collapsed to keep the page light
M v4/graphene/graphene-point3d.go +29 -25 collapsed to keep the page light
M v4/graphene/graphene-quad.go +17 -13 collapsed to keep the page light
M v4/graphene/graphene-quaternion.go +35 -31 collapsed to keep the page light
M v4/graphene/graphene-ray.go +29 -25 collapsed to keep the page light
M v4/graphene/graphene-rect.go +44 -40 collapsed to keep the page light
M v4/graphene/graphene-size.go +17 -13 collapsed to keep the page light
M v4/graphene/graphene-sphere.go +24 -20 collapsed to keep the page light
M v4/graphene/graphene-triangle.go +27 -23 collapsed to keep the page light
M v4/graphene/graphene-vec2.go +38 -34 collapsed to keep the page light
M v4/graphene/graphene-vec3.go +46 -42 collapsed to keep the page light
M v4/graphene/graphene-vec4.go +46 -42 collapsed to keep the page light
M v4/gsk/gskbroadwayrenderer.go +10 -6 collapsed to keep the page light
M v4/gsk/gskcairorenderer.go +10 -6 collapsed to keep the page light
M v4/gsk/gskglrenderer.go +12 -8 collapsed to keep the page light
M v4/gsk/gskglshader.go +48 -44 collapsed to keep the page light
M v4/gsk/gskpath.go +10 -6 collapsed to keep the page light
M v4/gsk/gskpathpoint.go +19 -15 collapsed to keep the page light
M v4/gsk/gskrenderer.go +17 -13 collapsed to keep the page light
M v4/gsk/gskrendernode.go +23 -19 collapsed to keep the page light
M v4/gsk/gskrendernodeimpl.go +154 -150 collapsed to keep the page light
M v4/gsk/gskroundedrect.go +18 -14 collapsed to keep the page light
M v4/gsk/gskstroke.go +9 -5 collapsed to keep the page light
M v4/gsk/gsktransform.go +9 -5 collapsed to keep the page light
M v4/gsk/gsktypes.go +120 -116 collapsed to keep the page light
M v4/gsk/gskvulkanrenderer.go +10 -6 collapsed to keep the page light
M v4/gtk/gtkaboutdialog.go +49 -45 collapsed to keep the page light
M v4/gtk/gtkaccelgroup.go +16 -12 collapsed to keep the page light
M v4/gtk/gtkaccessible.go +43 -39 collapsed to keep the page light
M v4/gtk/gtkaccessibletext.go +14 -10 collapsed to keep the page light
M v4/gtk/gtkactionable.go +15 -11 collapsed to keep the page light
M v4/gtk/gtkactionbar.go +17 -13 collapsed to keep the page light
M v4/gtk/gtkadjustment.go +27 -23 collapsed to keep the page light
M v4/gtk/gtkalertdialog.go +27 -23 collapsed to keep the page light
M v4/gtk/gtkappchooser.go +12 -8 collapsed to keep the page light
M v4/gtk/gtkappchooserbutton.go +23 -19 collapsed to keep the page light
M v4/gtk/gtkappchooserdialog.go +14 -10 collapsed to keep the page light
M v4/gtk/gtkappchooserwidget.go +24 -20 collapsed to keep the page light
M v4/gtk/gtkapplication.go +28 -24 collapsed to keep the page light
M v4/gtk/gtkapplicationwindow.go +15 -11 collapsed to keep the page light
M v4/gtk/gtkaspectframe.go +20 -16 collapsed to keep the page light
M v4/gtk/gtkassistant.go +41 -37 collapsed to keep the page light
M v4/gtk/gtkatcontext.go +12 -8 collapsed to keep the page light
M v4/gtk/gtkbinlayout.go +10 -6 collapsed to keep the page light
M v4/gtk/gtkbitset.go +16 -12 collapsed to keep the page light
M v4/gtk/gtkbookmarklist.go +16 -12 collapsed to keep the page light
M v4/gtk/gtkboolfilter.go +14 -10 collapsed to keep the page light
M v4/gtk/gtkborder.go +12 -8 collapsed to keep the page light
M v4/gtk/gtkbox.go +25 -21 collapsed to keep the page light
M v4/gtk/gtkboxlayout.go +18 -14
| @@ -172,23 +172,27 @@ func (x *BoxLayout) SetOrientation(OrientationVar Orientation) { | |||
| 172 | 172 | ||
| 173 | 173 | func init() { | |
| 174 | 174 | core.SetPackageName("GTK", "gtk4") | |
| 175 | - | core.SetSharedLibrary("GTK", "libgtk-4.so.1") | |
| 176 | - | lib, err := purego.Dlopen(core.GetPath("GTK"), purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 177 | - | if err != nil { | |
| 178 | - | panic(err) | |
| 175 | + | core.SetSharedLibraries("GTK", []string{"libgtk-4.so.1"}) | |
| 176 | + | var libs []uintptr | |
| 177 | + | for _, libPath := range core.GetPaths("GTK") { | |
| 178 | + | lib, err := purego.Dlopen(libPath, purego.RTLD_NOW|purego.RTLD_GLOBAL) | |
| 179 | + | if err != nil { | |
| 180 | + | panic(err) | |
| 181 | + | } | |
| 182 | + | libs = append(libs, lib) | |
| 179 | 183 | } | |
| 180 | 184 | ||
| 181 | - | core.PuregoSafeRegister(&xBoxLayoutGLibType, lib, "gtk_box_layout_get_type") | |
| 185 | + | core.PuregoSafeRegister(&xBoxLayoutGLibType, libs, "gtk_box_layout_get_type") | |
| 182 | 186 | ||
| 183 | - | core.PuregoSafeRegister(&xNewBoxLayout, lib, "gtk_box_layout_new") | |
| 187 | + | core.PuregoSafeRegister(&xNewBoxLayout, libs, "gtk_box_layout_new") | |
| 184 | 188 | ||
| 185 | - | core.PuregoSafeRegister(&xBoxLayoutGetBaselineChild, lib, "gtk_box_layout_get_baseline_child") | |
| 186 | - | core.PuregoSafeRegister(&xBoxLayoutGetBaselinePosition, lib, "gtk_box_layout_get_baseline_position") | |
| 187 | - | core.PuregoSafeRegister(&xBoxLayoutGetHomogeneous, lib, "gtk_box_layout_get_homogeneous") | |
| 188 | - | core.PuregoSafeRegister(&xBoxLayoutGetSpacing, lib, "gtk_box_layout_get_spacing") | |
| 189 | - | core.PuregoSafeRegister(&xBoxLayoutSetBaselineChild, lib, "gtk_box_layout_set_baseline_child") | |
| 190 | - | core.PuregoSafeRegister(&xBoxLayoutSetBaselinePosition, lib, "gtk_box_layout_set_baseline_position") | |
| 191 | - | core.PuregoSafeRegister(&xBoxLayoutSetHomogeneous, lib, "gtk_box_layout_set_homogeneous") | |
| 192 | - | core.PuregoSafeRegister(&xBoxLayoutSetSpacing, lib, "gtk_box_layout_set_spacing") | |
| 189 | + | core.PuregoSafeRegister(&xBoxLayoutGetBaselineChild, libs, "gtk_box_layout_get_baseline_child") | |
| 190 | + | core.PuregoSafeRegister(&xBoxLayoutGetBaselinePosition, libs, "gtk_box_layout_get_baseline_position") | |
| 191 | + | core.PuregoSafeRegister(&xBoxLayoutGetHomogeneous, libs, "gtk_box_layout_get_homogeneous") | |
| 192 | + | core.PuregoSafeRegister(&xBoxLayoutGetSpacing, libs, "gtk_box_layout_get_spacing") | |
| 193 | + | core.PuregoSafeRegister(&xBoxLayoutSetBaselineChild, libs, "gtk_box_layout_set_baseline_child") | |
| 194 | + | core.PuregoSafeRegister(&xBoxLayoutSetBaselinePosition, libs, "gtk_box_layout_set_baseline_position") | |
| 195 | + | core.PuregoSafeRegister(&xBoxLayoutSetHomogeneous, libs, "gtk_box_layout_set_homogeneous") | |
| 196 | + | core.PuregoSafeRegister(&xBoxLayoutSetSpacing, libs, "gtk_box_layout_set_spacing") | |
| 193 | 197 | ||
| 194 | 198 | } | |