From kde-core-devel Fri Jul 13 17:22:21 2007 From: "George Goldberg" Date: Fri, 13 Jul 2007 17:22:21 +0000 To: kde-core-devel Subject: EBN Fixes Message-Id: <1aa4e8880707131022w7cc4b795t4a671d3e4d9c56f1 () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=kde-core-devel&m=118434739232318 MIME-Version: 1 Content-Type: multipart/mixed; boundary="------=_Part_6600_5299441.1184347341190" ------=_Part_6600_5299441.1184347341190 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Just a couple of really basic EBN fixes to khtml which I did whilst waiting for something to compile :). Assuming they're OK, could someone please commit them since I don't have an svn account. cheers george ------=_Part_6600_5299441.1184347341190 Content-Type: application/octet-stream; name=khtml_ebn_fixes.diff Content-Transfer-Encoding: base64 X-Attachment-Id: f_f42xrxce Content-Disposition: attachment; filename="khtml_ebn_fixes.diff" SW5kZXg6IGVjbWEva2pzX2JpbmRpbmcuY3BwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gZWNtYS9ranNfYmlu ZGluZy5jcHAJKHJldmlzaW9uIDY4NzQ0MSkNCisrKyBlY21hL2tqc19iaW5kaW5nLmNwcAkod29y a2luZyBjb3B5KQ0KQEAgLTUyLDcgKzUyLDcgQEANCiAKIFVTdHJpbmcgRE9NT2JqZWN0Ojp0b1N0 cmluZyhFeGVjU3RhdGUgKikgY29uc3QKIHsKLSAgcmV0dXJuICJbb2JqZWN0ICIgKyBjbGFzc05h bWUoKSArICJdIjsKKyAgcmV0dXJuICJbb2JqZWN0ICIgKyBjbGFzc05hbWUoKSArICddJzsKIH0K IAogdHlwZWRlZiBRTGlzdDxTY3JpcHRJbnRlcnByZXRlcio+IEludGVycHJldGVyTGlzdDsKSW5k ZXg6IGVjbWEva2pzX2RvbS5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBlY21hL2tqc19kb20uY3BwCShy ZXZpc2lvbiA2ODc0NDEpDQorKysgZWNtYS9ranNfZG9tLmNwcAkod29ya2luZyBjb3B5KQ0KQEAg LTU0Niw3ICs1NDYsNyBAQA0KICAgfSBlbHNlCiAgICAgcyA9IGNsYXNzTmFtZSgpOyAvLyBmYWxs YmFjawogCi0gIHJldHVybiAiW29iamVjdCAiICsgcyArICJdIjsKKyAgcmV0dXJuICJbb2JqZWN0 ICIgKyBzICsgJ10nOwogfQogCiB2b2lkIERPTU5vZGU6OnNldExpc3RlbmVyKEV4ZWNTdGF0ZSAq ZXhlYywgaW50IGV2ZW50SWQsIFZhbHVlSW1wKiBmdW5jKSBjb25zdApJbmRleDogZWNtYS9ranNf aHRtbC5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0NCi0tLSBlY21hL2tqc19odG1sLmNwcAkocmV2aXNpb24gNjg3 NDQxKQ0KKysrIGVjbWEva2pzX2h0bWwuY3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMTI4LDcgKzEy OCw3IEBADQogICAgIGZvciAoaW50IGkgPSAwOyBpIDwgYXJncy5zaXplKCk7IGkrKykKICAgICAg IHN0ciArPSBhcmdzW2ldLT50b1N0cmluZyhleGVjKTsKICAgICBpZiAoaWQgPT0gSFRNTERvY3Vt ZW50OjpXcml0ZUxuKQotICAgICAgc3RyICs9ICJcbiI7CisgICAgICBzdHIgKz0gJ1xuJzsKICNp ZmRlZiBLSlNfVkVSQk9TRQogICAgIGtEZWJ1Zyg2MDcwKSA8PCAiZG9jdW1lbnQud3JpdGU6ICIg PDwgc3RyLnFzdHJpbmcoKSA8PCBlbmRsOwogI2VuZGlmCkBAIC0xODAxLDExICsxODAxLDExIEBA DQogICAgICAgaWYgKHVybC5wb3J0KCk8PTApCiAgICAgICAgIHJldHVybiBTdHJpbmcodXJsLmhv c3QoKSk7CiAgICAgICBlbHNlCi0gICAgICAgIHJldHVybiBTdHJpbmcodXJsLmhvc3QoKSArICI6 IiArIFFTdHJpbmc6Om51bWJlcih1cmwucG9ydCgpKSk7CisgICAgICAgIHJldHVybiBTdHJpbmco dXJsLmhvc3QoKSArICc6JyArIFFTdHJpbmc6Om51bWJlcih1cmwucG9ydCgpKSk7CiAgICAgfQog ICAgIGNhc2UgQW5jaG9yUGF0aE5hbWU6ICAgICAgICByZXR1cm4gU3RyaW5nKEtVcmwoaHJlZiku cGF0aCgpKTsKICAgICBjYXNlIEFuY2hvclBvcnQ6ICAgICAgICAgICAgcmV0dXJuIFN0cmluZyhR U3RyaW5nOjpudW1iZXIoS1VybChocmVmKS5wb3J0KCkpKTsKLSAgICBjYXNlIEFuY2hvclByb3Rv Y29sOiAgICAgICAgcmV0dXJuIFN0cmluZyhLVXJsKGhyZWYpLnByb3RvY29sKCkrIjoiKTsKKyAg ICBjYXNlIEFuY2hvclByb3RvY29sOiAgICAgICAgcmV0dXJuIFN0cmluZyhLVXJsKGhyZWYpLnBy b3RvY29sKCkrJzonKTsKICAgICBjYXNlIEFuY2hvclNlYXJjaDogICAgICAgICAgeyBLVXJsIHUo aHJlZik7CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUVN0cmluZyBxID0gdS5x dWVyeSgpOwogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmIChxLmxlbmd0aCgp ID09IDEpCkBAIC0xODU3LDEzICsxODU3LDEzIEBADQogICAgICAgICBpZiAodXJsLnBvcnQoKTw9 MCkKICAgICAgICAgICByZXR1cm4gU3RyaW5nKHVybC5ob3N0KCkpOwogICAgICAgICBlbHNlCi0g ICAgICAgICAgcmV0dXJuIFN0cmluZyh1cmwuaG9zdCgpICsgIjoiICsgUVN0cmluZzo6bnVtYmVy KHVybC5wb3J0KCkpKTsKKyAgICAgICAgICByZXR1cm4gU3RyaW5nKHVybC5ob3N0KCkgKyAnOicg KyBRU3RyaW5nOjpudW1iZXIodXJsLnBvcnQoKSkpOwogICAgICAgfQogICAgICAgY2FzZSBBcmVh UGF0aE5hbWU6ICAgICAgICB7CiAgICAgICAgIHJldHVybiBTdHJpbmcodXJsLnBhdGgoKSk7CiAg ICAgICB9CiAgICAgICBjYXNlIEFyZWFQb3J0OiAgICAgICAgICAgIHJldHVybiBTdHJpbmcoUVN0 cmluZzo6bnVtYmVyKHVybC5wb3J0KCkpKTsKLSAgICAgIGNhc2UgQXJlYVByb3RvY29sOiAgICAg ICAgcmV0dXJuIFN0cmluZyh1cmwuaXNFbXB0eSgpID8gIiIgOiB1cmwucHJvdG9jb2woKSsiOiIp OworICAgICAgY2FzZSBBcmVhUHJvdG9jb2w6ICAgICAgICByZXR1cm4gU3RyaW5nKHVybC5pc0Vt cHR5KCkgPyAiIiA6IHVybC5wcm90b2NvbCgpKyc6Jyk7CiAgICAgICBjYXNlIEFyZWFTZWFyY2g6 ICAgICAgICAgIHJldHVybiBTdHJpbmcodXJsLnF1ZXJ5KCkpOwogICAgIH0KICAgfQpAQCAtMTk5 OSw3ICsxOTk5LDcgQEANCiAgIGVsc2UgaWYgKGltcGwoKS0+aWQoKSA9PSBJRF9JTUcpIHsKICAg ICBET01TdHJpbmcgYWx0ID0gaW1wbCgpLT5nZXRBdHRyaWJ1dGUoQVRUUl9BTFQpOwogICAgIGlm ICghYWx0LmlzRW1wdHkoKSkKLSAgICAgIHJldHVybiBVU3RyaW5nKGFsdCkgKyAiICIgKyBET01F bGVtZW50Ojp0b1N0cmluZyhleGVjKTsKKyAgICAgIHJldHVybiBVU3RyaW5nKGFsdCkgKyAnICcg KyBET01FbGVtZW50Ojp0b1N0cmluZyhleGVjKTsKICAgfQogICByZXR1cm4gRE9NRWxlbWVudDo6 dG9TdHJpbmcoZXhlYyk7CiB9CkluZGV4OiBodG1sL2h0bWxfZWxlbWVudGltcGwuY3BwDQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09DQotLS0gaHRtbC9odG1sX2VsZW1lbnRpbXBsLmNwcAkocmV2aXNpb24gNjg3NDQxKQ0K KysrIGh0bWwvaHRtbF9lbGVtZW50aW1wbC5jcHAJKHdvcmtpbmcgY29weSkNCkBAIC0xNDYsNyAr MTQ2LDcgQEANCiAgICAgICAgIHRuID0gdG4udXBwZXIoKTsKIAogICAgIGlmIChtX3ByZWZpeCkK LSAgICAgICAgcmV0dXJuIERPTVN0cmluZyhtX3ByZWZpeCkgKyAiOiIgKyB0bjsKKyAgICAgICAg cmV0dXJuIERPTVN0cmluZyhtX3ByZWZpeCkgKyAnOicgKyB0bjsKIAogICAgIHJldHVybiB0bjsK IH0KQEAgLTY1MSwxMiArNjUxLDEyIEBADQogewogICAgIGlmICghaGFzQ2hpbGROb2RlcygpKSB7 CiAJRE9NU3RyaW5nIHJlc3VsdCA9IG9wZW5UYWdTdGFydFRvU3RyaW5nKCk7Ci0JcmVzdWx0ICs9 ICI+IjsKKwlyZXN1bHQgKz0gJz4nOwogCiAJaWYgKGVuZFRhZ1tpZCgpXSA9PSBSRVFVSVJFRCkg ewogCSAgICByZXN1bHQgKz0gIjwvIjsKIAkgICAgcmVzdWx0ICs9IHRhZ05hbWUoKTsKLQkgICAg cmVzdWx0ICs9ICI+IjsKKwkgICAgcmVzdWx0ICs9ICc+JzsKIAl9CiAKIAlyZXR1cm4gcmVzdWx0 OwpJbmRleDogaHRtbC9odG1sX2Zvcm1pbXBsLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGh0bWwvaHRt bF9mb3JtaW1wbC5jcHAJKHJldmlzaW9uIDY4NzQ0MSkNCisrKyBodG1sL2h0bWxfZm9ybWltcGwu Y3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMTM4MCw3ICsxMzgwLDcgQEANCiAgICAgICAgIGJyZWFr OwogICAgIGRlZmF1bHQ6CiAgICAgICAgIHNldFZhbHVlKERPTVN0cmluZyhzdGF0ZS5sZWZ0KHN0 YXRlLmxlbmd0aCgpLTEpKSk7Ci0gICAgICAgIG1fdW5zdWJtaXR0ZWRGb3JtQ2hhbmdlID0gc3Rh dGUuZW5kc1dpdGgoIk0iKTsKKyAgICAgICAgbV91bnN1Ym1pdHRlZEZvcm1DaGFuZ2UgPSBzdGF0 ZS5lbmRzV2l0aCgnTScpOwogICAgICAgICBicmVhazsKICAgICB9CiB9CkBAIC0yNzEyLDcgKzI3 MTIsNyBAQA0KIHZvaWQgSFRNTFRleHRBcmVhRWxlbWVudEltcGw6OnJlc3RvcmVTdGF0ZShjb25z dCBRU3RyaW5nICZzdGF0ZSkKIHsKICAgICBzZXREZWZhdWx0VmFsdWUoc3RhdGUubGVmdChzdGF0 ZS5sZW5ndGgoKS0xKSk7Ci0gICAgbV91bnN1Ym1pdHRlZEZvcm1DaGFuZ2UgPSBzdGF0ZS5lbmRz V2l0aCgiTSIpOworICAgIG1fdW5zdWJtaXR0ZWRGb3JtQ2hhbmdlID0gc3RhdGUuZW5kc1dpdGgo J00nKTsKICAgICAvLyB0aGUgY2xvc2UoKSBpbiB0aGUgcmVuZGVydHJlZSB3aWxsIHRha2UgY2Fy ZSBvZiB0cmFuc2ZlcnJpbmcgZGVmYXVsdHZhbHVlIHRvICd2YWx1ZScKIH0KIApJbmRleDogamF2 YS9ramF2YWFwcGxldHNlcnZlci5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSBqYXZhL2tqYXZhYXBwbGV0 c2VydmVyLmNwcAkocmV2aXNpb24gNjg3NDQxKQ0KKysrIGphdmEva2phdmFhcHBsZXRzZXJ2ZXIu Y3BwCSh3b3JraW5nIGNvcHkpDQpAQCAtMjY3LDcgKzI2Nyw3IEBADQogICAgICAgICBmb3IoIDsg aXQgIT0gaXRFbmQ7ICsraXQgKQogICAgICAgICB7CiAgICAgICAgICAgICBpZiggIWNsYXNzZXMu aXNFbXB0eSgpICkKLSAgICAgICAgICAgICAgICBjbGFzc2VzICs9ICI6IjsKKyAgICAgICAgICAg ICAgICBjbGFzc2VzICs9ICc6JzsKICAgICAgICAgICAgIGNsYXNzZXMgKz0gZGlyLmFic29sdXRl RmlsZVBhdGgoICppdCApOwogICAgICAgICB9CiAgICAgfQpJbmRleDogcmVuZGVyaW5nL3JlbmRl cl9zdHlsZS5jcHANCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0NCi0tLSByZW5kZXJpbmcvcmVuZGVyX3N0eWxlLmNwcAko cmV2aXNpb24gNjg3NDQxKQ0KKysrIHJlbmRlcmluZy9yZW5kZXJfc3R5bGUuY3BwCSh3b3JraW5n IGNvcHkpDQpAQCAtMTI0NywxMSArMTI0NywxMSBAQA0KIHsKICAgICBRU3RyaW5nIHJlczsKICAg ICAgIGlmICggY29sb3IoKS5pc1ZhbGlkKCkgJiYgcGFyZW50LmNvbG9yKCkgIT0gY29sb3IoKSAp Ci0gICAgICAgIHJlcyArPSAiIFtjb2xvcj0iICsgY29sb3IoKS5uYW1lKCkgKyAiXSI7CisgICAg ICAgIHJlcyArPSAiIFtjb2xvcj0iICsgY29sb3IoKS5uYW1lKCkgKyAnXSc7CiAgICAgaWYgKCBi YWNrZ3JvdW5kQ29sb3IoKS5pc1ZhbGlkKCkgJiYgcGFyZW50LmJhY2tncm91bmRDb2xvcigpICE9 IGJhY2tncm91bmRDb2xvcigpICkKLSAgICAgICAgcmVzICs9ICIgW2JnY29sb3I9IiArIGJhY2tn cm91bmRDb2xvcigpLm5hbWUoKSArICJdIjsKKyAgICAgICAgcmVzICs9ICIgW2JnY29sb3I9IiAr IGJhY2tncm91bmRDb2xvcigpLm5hbWUoKSArICddJzsKICAgICBpZiAoIHBhcmVudC5mb250KCkg IT0gZm9udCgpICkKLSAgICAgICAgcmVzICs9ICIgW2ZvbnQ9IiArIGRlc2NyaWJlRm9udCggZm9u dCgpICkgKyAiXSI7CisgICAgICAgIHJlcyArPSAiIFtmb250PSIgKyBkZXNjcmliZUZvbnQoIGZv bnQoKSApICsgJ10nOwogCiAgICAgcmV0dXJuIHJlczsKIH0K ------=_Part_6600_5299441.1184347341190--