[Glade-devel] [glade3, patch] load library module before calling *_get_type ()

[tommi komulainen nokia com (Tommi Komulainen)]

--=-FV5vI/OLyQXaUNHPwP85
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

On Fri, 2004-01-09 at 16:51, ext Joaquin Cuenca Abela wrote:
> That makes perfect sense to me.  If none else
> disagrees, feel free to commit a patch with your
> suggested changes, which should equal to your earliest
> patch + this change.

I'll rather attach a followup patch to be applied after the previous
one.  They are solving slightly different issues.  The first one simply
fixed the library loading.  This one makes it more general and
convenient (unfortunately library="gnomeui-2" is pretty useless without
wrappers)


-- 
Tommi Komulainen <tommi komulainen nokia com>

--=-FV5vI/OLyQXaUNHPwP85
Content-Disposition: attachment; filename=library-name.diff
Content-Type: text/x-patch; name=library-name.diff; charset=ISO-8859-15
Content-Transfer-Encoding: base64

ZGlmZiAtdSBDaGFuZ2VMb2cgQ2hhbmdlTG9nDQotLS0gQ2hhbmdlTG9nCTIwMDQtMDEtMDggMTg6
MTQ6MjcuMDAwMDAwMDAwICswMjAwDQorKysgQ2hhbmdlTG9nCTIwMDQtMDEtMDkgMTc6Mjc6NTQu
MDAwMDAwMDAwICswMjAwDQpAQCAtMSwzICsxLDEzIEBADQorMjAwNC0wMS0wOSAgVG9tbWkgS29t
dWxhaW5lbiAgPHRvbW1pLmtvbXVsYWluZW5Abm9raWEuY29tPg0KKw0KKwkqIHNyYy9nbGFkZS1j
YXRhbG9nLmMNCisJKiBzcmMvZ2xhZGUtd2lkZ2V0LWNsYXNzLmMNCisJKiB3aWRnZXRzL2d0ay1h
ZGRpdGlvbmFsLnhtbA0KKwkqIHdpZGdldHMvZ3RrLWJhc2UueG1sOiBJbnN0ZWFkIG9mIHBsYXlp
bmcgdHJpY2tzIHdpdGggdGhlIGxpYnJhcnkNCisJZmlsZW5hbWUsIHVzZSB0aGUgZ2l2ZW4gbmFt
ZSB2ZXJiYXRpbSBhbmQgbGV0IEdNb2R1bGUgaGFuZGxlIHBsYXRmb3JtDQorCXNwZWNpZmljcy4g
IExvYWQgdGhlIGxpYnJhcnkgZnJvbSBHbGFkZSBtb2R1bGVzIGRpcmVjdG9yeSwgb3IgZmFpbGlu
Zw0KKwl0aGF0IGZyb20gc3RhbmRhcmQgbGlicmFyeSBwYXRocy4NCisNCiAyMDA0LTAxLTA4ICBU
b21taSBLb211bGFpbmVuICA8dG9tbWkua29tdWxhaW5lbkBub2tpYS5jb20+DQogDQogCSogc3Jj
L2dsYWRlLXdpZGdldC1jbGFzcy5jOiBsb2FkIHRoZSBsaWJyYXJ5IG1vZHVsZSBiZWZvcmUgYXR0
ZW1wdGluZw0KZGlmZiAtdSBzcmMvZ2xhZGUtd2lkZ2V0LWNsYXNzLmMgc3JjL2dsYWRlLXdpZGdl
dC1jbGFzcy5jDQotLS0gc3JjL2dsYWRlLXdpZGdldC1jbGFzcy5jCTIwMDQtMDEtMDggMTY6MzQ6
MDUuMDAwMDAwMDAwICswMjAwDQorKysgc3JjL2dsYWRlLXdpZGdldC1jbGFzcy5jCTIwMDQtMDEt
MDkgMTc6NDM6MjMuMDAwMDAwMDAwICswMjAwDQpAQCAtNDcyLDYgKzQ3Miw1NSBAQA0KIH0NCiAN
CiAvKioNCisgKiBnbGFkZV93aWRnZXRfY2xhc3NfbG9hZF9saWJyYXJ5Og0KKyAqIEBsaWJyYXJ5
X25hbWU6IG5hbWUgb2YgdGhlIGxpYnJhcnkgLg0KKyAqDQorICogTG9hZHMgdGhlIG5hbWVkIGxp
YnJhcnkgZnJvbSB0aGUgR2xhZGUgbW9kdWxlcyBkaXJlY3RvcnksIG9yIGZhaWxpbmcgdGhhdA0K
KyAqIGZyb20gdGhlIHN0YW5kYXJkIHBsYXRmb3JtIHNwZWNpZmljIGRpcmVjdG9yaWVzLg0KKyAq
DQorICogVGhlIEBsaWJyYXJ5X25hbWUgc2hvdWxkIG5vdCBpbmNsdWRlIGFueSBwbGF0Zm9ybSBz
cGVjaWZpeCBwcmVmaXggb3Igc3VmZml4LA0KKyAqIHRob3NlIGFyZSBhdXRvbWF0aWNhbGx5IGFk
ZGVkLCBpZiBuZWVkZWQsIGJ5IGdfbW9kdWxlX2J1aWxkX3BhdGgoKQ0KKyAqDQorICogQHJldHVy
bnM6IGEgI0dNb2R1bGUgb24gc3VjY2Vzcywgb3IgJU5VTEwgb24gZmFpbHVyZS4NCisgKi8NCitz
dGF0aWMgR01vZHVsZSAqDQorZ2xhZGVfd2lkZ2V0X2NsYXNzX2xvYWRfbGlicmFyeSAoY29uc3Qg
Z2NoYXIgKmxpYnJhcnlfbmFtZSkNCit7DQorCWdjaGFyICAgKnBhdGg7DQorCUdNb2R1bGUgKm1v
ZHVsZTsNCisNCisJcGF0aCA9IGdfbW9kdWxlX2J1aWxkX3BhdGggKE1PRFVMRVNfRElSLCBsaWJy
YXJ5X25hbWUpOw0KKwlpZiAoIXBhdGgpDQorCXsNCisJCWdfd2FybmluZyAoXygiTm90IGVub3Vn
aCBtZW1vcnkuIikpOw0KKwkJcmV0dXJuIE5VTEw7DQorCX0NCisNCisJbW9kdWxlID0gZ19tb2R1
bGVfb3BlbiAocGF0aCwgR19NT0RVTEVfQklORF9MQVpZKTsNCisJZ19mcmVlIChwYXRoKTsNCisN
CisJaWYgKCFtb2R1bGUpDQorCXsNCisJCXBhdGggPSBnX21vZHVsZV9idWlsZF9wYXRoIChOVUxM
LCBsaWJyYXJ5X25hbWUpOw0KKwkJaWYgKCFwYXRoKQ0KKwkJew0KKwkJCWdfd2FybmluZyAoXygi
Tm90IGVub3VnaCBtZW1vcnkuIikpOw0KKwkJCXJldHVybiBOVUxMOw0KKwkJfQ0KKw0KKwkJbW9k
dWxlID0gZ19tb2R1bGVfb3BlbiAocGF0aCwgR19NT0RVTEVfQklORF9MQVpZKTsNCisJCWdfZnJl
ZSAocGF0aCk7DQorCX0NCisNCisJaWYgKCFtb2R1bGUpDQorCXsNCisJCWdfd2FybmluZyAoXygi
VW5hYmxlIHRvIG9wZW4gdGhlIG1vZHVsZSAlcy4iKSwgbGlicmFyeV9uYW1lKTsNCisJfQ0KKw0K
KwlyZXR1cm4gbW9kdWxlOw0KK30NCisNCisvKioNCiAgKiBnbGFkZV93aWRnZXRfY2xhc3NfbmV3
Og0KICAqIEBuYW1lOiBuYW1lIG9mIHRoZSB3aWRnZXQgY2xhc3MgKGZvciBpbnN0YW5jZTogR3Rr
QnV0dG9uKQ0KICAqIEBnZW5lcmljX25hbWU6IGJhc2Ugb2YgdGhlIG5hbWUgZm9yIHRoZSB3aWRn
ZXRzIG9mIHRoaXMgY2xhc3MgKGZvciBpbnN0YW5jZTogYnV0dG9uKS4NCkBAIC00OTYsNyArNTQ1
LDYgQEANCiB7DQogCUdsYWRlV2lkZ2V0Q2xhc3MgKndpZGdldF9jbGFzcyA9IE5VTEw7DQogCWNo
YXIgKmZpbGVuYW1lID0gTlVMTDsNCi0JY2hhciAqbGlicmFyeSA9IE5VTEw7DQogCWNoYXIgKmlu
aXRfZnVuY3Rpb25fbmFtZSA9IE5VTEw7DQogCUdNb2R1bGUgKm1vZHVsZSA9IE5VTEw7DQogCUdU
eXBlIHBhcmVudF90eXBlOw0KQEAgLTUyMSwxOSArNTY5LDkgQEANCiANCiAJaWYgKGJhc2VfbGli
cmFyeSAhPSBOVUxMKQ0KIAl7DQotCQlsaWJyYXJ5ID0gZ19zdHJjb25jYXQgKE1PRFVMRVNfRElS
IEdfRElSX1NFUEFSQVRPUl9TLCBiYXNlX2xpYnJhcnksIE5VTEwpOw0KLQkJaWYgKGxpYnJhcnkg
PT0gTlVMTCkNCi0JCXsNCi0JCQlnX3dhcm5pbmcgKF8oIk5vdCBlbm91Z2ggbWVtb3J5LiIpKTsN
Ci0JCQlnb3RvIGxibEVycm9yOw0KLQkJfQ0KLQ0KLQkJbW9kdWxlID0gZ19tb2R1bGVfb3BlbiAo
bGlicmFyeSwgR19NT0RVTEVfQklORF9MQVpZKTsNCisJCW1vZHVsZSA9IGdsYWRlX3dpZGdldF9j
bGFzc19sb2FkX2xpYnJhcnkgKGJhc2VfbGlicmFyeSk7DQogCQlpZiAoIW1vZHVsZSkNCi0JCXsN
Ci0JCQlnX3dhcm5pbmcgKF8oIlVuYWJsZSB0byBvcGVuIHRoZSBtb2R1bGUgJXMuIiksIGxpYnJh
cnkpOw0KIAkJCWdvdG8gbGJsRXJyb3I7DQotCQl9DQogCX0NCiANCiAJd2lkZ2V0X2NsYXNzID0g
Z19uZXcwIChHbGFkZVdpZGdldENsYXNzLCAxKTsNCkBAIC02MDYsNyArNjQ0LDYgQEANCiANCiBs
YmxFcnJvcjoNCiAJZ19mcmVlIChmaWxlbmFtZSk7DQotCWdfZnJlZSAobGlicmFyeSk7DQogCWdf
ZnJlZSAoaW5pdF9mdW5jdGlvbl9uYW1lKTsNCiAJZ2xhZGVfd2lkZ2V0X2NsYXNzX2ZyZWUgKHdp
ZGdldF9jbGFzcyk7DQogCXJldHVybiBOVUxMOw0Kb25seSBpbiBwYXRjaDI6DQp1bmNoYW5nZWQ6
DQotLS0gd2lkZ2V0cy9ndGstYmFzZS54bWwJMjAwMy0xMS0yOSAxNTo0NDo0NS4wMDAwMDAwMDAg
KzAyMDANCisrKyB3aWRnZXRzL2d0ay1iYXNlLnhtbAkyMDA0LTAxLTA5IDE3OjAwOjMwLjAwMDAw
MDAwMCArMDIwMA0KQEAgLTEsNCArMSw0IEBADQotPEdsYWRlQ2F0YWxvZyBUaXRsZT0iR3RrKyBC
YXNpYyIgbGlicmFyeT0iZ3RrIj4NCis8R2xhZGVDYXRhbG9nIFRpdGxlPSJHdGsrIEJhc2ljIiBs
aWJyYXJ5PSJnbGFkZWd0ayI+DQogDQogICA8R2xhZGVXaWRnZXQgbmFtZT0iR3RrV2lkZ2V0IiBm
aWxlbmFtZT0iZ3Rrd2lkZ2V0LnhtbCIvPg0KICAgPEdsYWRlV2lkZ2V0IG5hbWU9Ikd0a0NvbnRh
aW5lciIgZmlsZW5hbWU9Imd0a2NvbnRhaW5lci54bWwiLz4NCm9ubHkgaW4gcGF0Y2gyOg0KdW5j
aGFuZ2VkOg0KLS0tIHdpZGdldHMvZ3RrLWFkZGl0aW9uYWwueG1sCTIwMDMtMTAtMDQgMTM6MzY6
MzEuMDAwMDAwMDAwICswMzAwDQorKysgd2lkZ2V0cy9ndGstYWRkaXRpb25hbC54bWwJMjAwNC0w
MS0wOSAxNzowMDo1Ny4wMDAwMDAwMDAgKzAyMDANCkBAIC0xLDQgKzEsNCBAQA0KLTxHbGFkZUNh
dGFsb2cgVGl0bGU9Ikd0aysgQWRkaXRpb25hbCIgbGlicmFyeT0iZ3RrIj4NCis8R2xhZGVDYXRh
bG9nIFRpdGxlPSJHdGsrIEFkZGl0aW9uYWwiIGxpYnJhcnk9ImdsYWRlZ3RrIj4NCiANCiAgIDxH
bGFkZVdpZGdldCBuYW1lPSJHdGtIU2NhbGUiIGdlbmVyaWNfbmFtZT0iaHNjYWxlIi8+DQogICA8
R2xhZGVXaWRnZXQgbmFtZT0iR3RrVlNjYWxlIiBnZW5lcmljX25hbWU9InZzY2FsZSIvPg0Kb25s
eSBpbiBwYXRjaDI6DQp1bmNoYW5nZWQ6DQotLS0gc3JjL2dsYWRlLWNhdGFsb2cuYwkyMDAzLTEx
LTA5IDE3OjE2OjQxLjAwMDAwMDAwMCArMDIwMA0KKysrIHNyYy9nbGFkZS1jYXRhbG9nLmMJMjAw
NC0wMS0wOSAxNTozNDo0Ny4wMDAwMDAwMDAgKzAyMDANCkBAIC02Niw3ICs2Niw2IEBADQogCWNo
YXIgKmdlbmVyaWNfbmFtZSA9IE5VTEw7DQogCWNoYXIgKmNhdGFsb2dfZmlsZW5hbWUgPSBOVUxM
Ow0KIAljaGFyICpiYXNlX2ZpbGVuYW1lID0gTlVMTDsNCi0JY2hhciAqcGFydGlhbF9saWJyYXJ5
ID0gTlVMTDsNCiAJY2hhciAqYmFzZV9saWJyYXJ5ID0gTlVMTDsNCiAJR0xpc3QgKmxhc3Rfd2lk
Z2V0X2NsYXNzID0gTlVMTDsNCiANCkBAIC0xMDIsMjIgKzEwMSwxMiBAQA0KIAl9DQogDQogCS8q
IGdldCB0aGUgbGlicmFyeSB0byBiZSB1c2VkIGJ5IHRoaXMgY2F0YWxvZyAoaWYgYW55KSAqLw0K
LQlwYXJ0aWFsX2xpYnJhcnkgPSBnbGFkZV94bWxfZ2V0X3Byb3BlcnR5X3N0cmluZyAocm9vdCwg
ImxpYnJhcnkiKTsNCi0JaWYgKHBhcnRpYWxfbGlicmFyeSAmJiAqcGFydGlhbF9saWJyYXJ5KQ0K
LQl7DQotCQliYXNlX2xpYnJhcnkgPSBnX3N0cmR1cF9wcmludGYgKCJsaWJnbGFkZSVzIiwgcGFy
dGlhbF9saWJyYXJ5KTsNCi0JCWlmICghYmFzZV9saWJyYXJ5KQ0KLQkJew0KLQkJCWdfY3JpdGlj
YWwgKF8oIk5vdCBlbm91Z2ggbWVtb3J5LiIpKTsNCi0JCQlnb3RvIGxibEVycm9yOw0KLQkJfQ0K
LQl9DQorCWJhc2VfbGlicmFyeSA9IGdsYWRlX3htbF9nZXRfcHJvcGVydHlfc3RyaW5nIChyb290
LCAibGlicmFyeSIpOw0KIA0KIAkvKiBidWlsZCBhbGwgdGhlIEdsYWRlV2lkZ2V0Q2xhc3MnZXMg
YXNzb2NpYXRlZCB3aXRoIHRoaXMgY2F0YWxvZyAqLw0KIAl3aWRnZXRfbm9kZSA9IGdsYWRlX3ht
bF9ub2RlX2dldF9jaGlsZHJlbiAocm9vdCk7DQogCWZvciAoOyB3aWRnZXRfbm9kZTsgd2lkZ2V0
X25vZGUgPSBnbGFkZV94bWxfbm9kZV9uZXh0ICh3aWRnZXRfbm9kZSkpDQogCXsNCi0JCWNoYXIg
KnBhcnRpYWxfd2lkZ2V0X2NsYXNzX2xpYnJhcnkgPSBOVUxMOw0KIAkJY2hhciAqYmFzZV93aWRn
ZXRfY2xhc3NfbGlicmFyeSA9IE5VTEw7DQogDQogCQlpZiAoIWdsYWRlX3htbF9ub2RlX3Zlcmlm
eSAod2lkZ2V0X25vZGUsIEdMQURFX1RBR19HTEFERV9XSURHRVQpKQ0KQEAgLTEyOCwxNiArMTE3
LDcgQEANCiAJCQljb250aW51ZTsNCiANCiAJCS8qIGdldCB0aGUgc3BlY2lmaWMgbGlicmFyeSB0
byB0aGUgd2lkZ2V0IGNsYXNzLCBpZiBhbnkgKi8NCi0JCXBhcnRpYWxfd2lkZ2V0X2NsYXNzX2xp
YnJhcnkgPSBnbGFkZV94bWxfZ2V0X3Byb3BlcnR5X3N0cmluZyAod2lkZ2V0X25vZGUsICJsaWJy
YXJ5Iik7DQotCQlpZiAocGFydGlhbF93aWRnZXRfY2xhc3NfbGlicmFyeSAmJiAqcGFydGlhbF93
aWRnZXRfY2xhc3NfbGlicmFyeSkNCi0JCXsNCi0JCQliYXNlX3dpZGdldF9jbGFzc19saWJyYXJ5
ID0gZ19zdHJkdXBfcHJpbnRmICgibGliZ2xhZGUlcyIsIHBhcnRpYWxfd2lkZ2V0X2NsYXNzX2xp
YnJhcnkpOw0KLQkJCWlmICghYmFzZV93aWRnZXRfY2xhc3NfbGlicmFyeSkNCi0JCQl7DQotCQkJ
CWdfY3JpdGljYWwgKF8oIk5vdCBlbm91Z2ggbWVtb3J5LiIpKTsNCi0JCQkJY29udGludWU7DQot
CQkJfQ0KLQkJfQ0KKwkJYmFzZV93aWRnZXRfY2xhc3NfbGlicmFyeSA9IGdsYWRlX3htbF9nZXRf
cHJvcGVydHlfc3RyaW5nICh3aWRnZXRfbm9kZSwgImxpYnJhcnkiKTsNCiANCiAJCWdlbmVyaWNf
bmFtZSA9IGdsYWRlX3htbF9nZXRfcHJvcGVydHlfc3RyaW5nICh3aWRnZXRfbm9kZSwgImdlbmVy
aWNfbmFtZSIpOw0KIAkJYmFzZV9maWxlbmFtZSA9IGdsYWRlX3htbF9nZXRfcHJvcGVydHlfc3Ry
aW5nICh3aWRnZXRfbm9kZSwgImZpbGVuYW1lIik7DQpAQCAtMTU3LDcgKzEzNyw2IEBADQogCQln
X2ZyZWUgKG5hbWUpOw0KIAkJZ19mcmVlIChnZW5lcmljX25hbWUpOw0KIAkJZ19mcmVlIChiYXNl
X2ZpbGVuYW1lKTsNCi0JCWdfZnJlZSAocGFydGlhbF93aWRnZXRfY2xhc3NfbGlicmFyeSk7DQog
CQlnX2ZyZWUgKGJhc2Vfd2lkZ2V0X2NsYXNzX2xpYnJhcnkpOw0KIAl9DQogDQpAQCAtMTY5LDcg
KzE0OCw2IEBADQogCWdsYWRlX3htbF9jb250ZXh0X2ZyZWUgKGNvbnRleHQpOw0KIAlnX2ZyZWUg
KGNhdGFsb2dfZmlsZW5hbWUpOw0KIAlnX2ZyZWUgKGNhdGFsb2cpOw0KLQlnX2ZyZWUgKHBhcnRp
YWxfbGlicmFyeSk7DQogCWdfZnJlZSAoYmFzZV9saWJyYXJ5KTsNCiAJcmV0dXJuIE5VTEw7DQog
fQ0K

--=-FV5vI/OLyQXaUNHPwP85--