------=_Part_3777_31597258.1203289768722 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline Patches for KPassivePopup , KMessageBox attached. On 17/02/2008, Robert Knight wrote: > Hi David, > > The attached patch attempts to fix this inside KIO by taking the top > level window associated with the passed widget in > JobUiDelegate::setWindow(). > > The patch does change the semantics of the API slightly since it > becomes possible that JobUiDelegate::window() does not return the same > value passed to JobUiDelegate::setWindow(). > > QWidget does provide an alternative, effectiveWinId() which goes up > the widget chain and finds the first widget that does have an X11 > window associated with it and returns the id of that. The setWindow() > change is simpler since it only occurs in one place. > > Regards, > Robert. > > On 15/02/2008, David Faure wrote: > > On Thursday 14 February 2008, Robert Knight wrote: > > > Since the actual call to winId() happens deep inside KIO, perhaps it > > > would be better to put a fix there and only ever get winIds for > > > top-level widgets to prevent applications doing this accidentally. > > > Thoughts? > > > > Yes. We take the winId in several places in KIO, but in every case, the toplevel would > > be fine, it's only about associating dialogs from other processes (e.g. the cookie dialog) > > with the toplevel window that requested the KIO operation. > > > > -- > > David Faure, faure@kde.org, sponsored by Trolltech to work on KDE, > > Konqueror (http://www.konqueror.org), and KOffice (http://www.koffice.org). > > > > ------=_Part_3777_31597258.1203289768722 Content-Type: text/x-patch; name=kdelibs_kdeui_winid_fix_kmessagebox.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fcs7nn08 Content-Disposition: attachment; filename=kdelibs_kdeui_winid_fix_kmessagebox.patch SW5kZXg6IGRpYWxvZ3Mva21lc3NhZ2Vib3guY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGRpYWxvZ3Mva21l c3NhZ2Vib3guY3BwCShyZXZpc2lvbiA3NzYxODkpCisrKyBkaWFsb2dzL2ttZXNzYWdlYm94LmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzcyLDcgKzM3Miw3IEBACiAgICAgICAgICAgICAgICAgICAg ICAgICAgICBjb25zdCBRU3RyaW5nICZkb250QXNrQWdhaW5OYW1lLAogICAgICAgICAgICAgICAg ICAgICAgICAgICAgT3B0aW9ucyBvcHRpb25zKQogeyAvLyBpbiBvcmRlciB0byBhdm9pZCBjb2Rl IGR1cGxpY2F0aW9uLCBjb252ZXJ0IHRvIFdJZCwgaXQgd2lsbCBiZSBjb252ZXJ0ZWQgYmFjawot ICAgIHJldHVybiBxdWVzdGlvblllc05vTGlzdFdJZCggcGFyZW50ID8gcGFyZW50LT53aW5JZCgp IDogMCwgdGV4dCwgc3RybGlzdCwKKyAgICByZXR1cm4gcXVlc3Rpb25ZZXNOb0xpc3RXSWQoIHBh cmVudCA/IHBhcmVudC0+ZWZmZWN0aXZlV2luSWQoKSA6IDAsIHRleHQsIHN0cmxpc3QsCiAgICAg ICAgIGNhcHRpb24sIGJ1dHRvblllcywgYnV0dG9uTm8sIGRvbnRBc2tBZ2Fpbk5hbWUsIG9wdGlv bnMgKTsKIH0KIApAQCAtNDM0LDcgKzQzNCw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFFTdHJpbmcgJmRvbnRBc2tBZ2Fpbk5hbWUsCiAgICAgICAgICAgICAgICAgICAgICAg ICAgIE9wdGlvbnMgb3B0aW9ucykKIHsKLSAgICByZXR1cm4gcXVlc3Rpb25ZZXNOb0NhbmNlbFdJ ZCggcGFyZW50ID8gcGFyZW50LT53aW5JZCgpIDogMCwgdGV4dCwgY2FwdGlvbiwgYnV0dG9uWWVz LCBidXR0b25ObywgYnV0dG9uQ2FuY2VsLAorICAgIHJldHVybiBxdWVzdGlvblllc05vQ2FuY2Vs V0lkKCBwYXJlbnQgPyBwYXJlbnQtPmVmZmVjdGl2ZVdpbklkKCkgOiAwLCB0ZXh0LCBjYXB0aW9u LCBidXR0b25ZZXMsIGJ1dHRvbk5vLCBidXR0b25DYW5jZWwsCiAgICAgICAgIGRvbnRBc2tBZ2Fp bk5hbWUsIG9wdGlvbnMgKTsKIH0KIApAQCAtNTI3LDcgKzUyNyw3IEBACiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZkb250QXNrQWdhaW5OYW1lLAogICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgT3B0aW9ucyBvcHRpb25zKQogewotICAgIHJldHVybiB3 YXJuaW5nWWVzTm9MaXN0V0lkKCBwYXJlbnQgPyBwYXJlbnQtPndpbklkKCkgOiAwLCB0ZXh0LCBz dHJsaXN0LCBjYXB0aW9uLAorICAgIHJldHVybiB3YXJuaW5nWWVzTm9MaXN0V0lkKCBwYXJlbnQg PyBwYXJlbnQtPmVmZmVjdGl2ZVdpbklkKCkgOiAwLCB0ZXh0LCBzdHJsaXN0LCBjYXB0aW9uLAog ICAgICAgICBidXR0b25ZZXMsIGJ1dHRvbk5vLCBkb250QXNrQWdhaW5OYW1lLCBvcHRpb25zICk7 CiB9CiAKQEAgLTYxMiw3ICs2MTIsNyBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBj b25zdCBRU3RyaW5nICZkb250QXNrQWdhaW5OYW1lLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBPcHRpb25zIG9wdGlvbnMpCiB7Ci0gICAgcmV0dXJuIHdhcm5pbmdDb250aW51ZUNhbmNl bExpc3RXSWQoIHBhcmVudCA/IHBhcmVudC0+d2luSWQoKSA6IDAsIHRleHQsIHN0cmxpc3QsCisg ICAgcmV0dXJuIHdhcm5pbmdDb250aW51ZUNhbmNlbExpc3RXSWQoIHBhcmVudCA/IHBhcmVudC0+ ZWZmZWN0aXZlV2luSWQoKSA6IDAsIHRleHQsIHN0cmxpc3QsCiAgICAgICAgIGNhcHRpb24sIGJ1 dHRvbkNvbnRpbnVlLCBidXR0b25DYW5jZWwsIGRvbnRBc2tBZ2Fpbk5hbWUsIG9wdGlvbnMgKTsK IH0KIApAQCAtNjk4LDcgKzY5OCw3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBjb25zdCBRU3RyaW5nICZkb250QXNrQWdhaW5OYW1lLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgT3B0aW9ucyBvcHRpb25zKQogewotICAgIHJldHVybiB3YXJuaW5n WWVzTm9DYW5jZWxMaXN0V0lkKCBwYXJlbnQgPyBwYXJlbnQtPndpbklkKCkgOiAwLCB0ZXh0LCBz dHJsaXN0LAorICAgIHJldHVybiB3YXJuaW5nWWVzTm9DYW5jZWxMaXN0V0lkKCBwYXJlbnQgPyBw YXJlbnQtPmVmZmVjdGl2ZVdpbklkKCkgOiAwLCB0ZXh0LCBzdHJsaXN0LAogICAgICAgICBjYXB0 aW9uLCBidXR0b25ZZXMsIGJ1dHRvbk5vLCBidXR0b25DYW5jZWwsIGRvbnRBc2tBZ2Fpbk5hbWUs IG9wdGlvbnMgKTsKIH0KIApAQCAtNzYzLDcgKzc2Myw3IEBACiB2b2lkIEtNZXNzYWdlQm94Ojpl cnJvcihRV2lkZ2V0ICpwYXJlbnQsICBjb25zdCBRU3RyaW5nICZ0ZXh0LAogICAgICAgICAgICAg ICAgICAgIGNvbnN0IFFTdHJpbmcgJmNhcHRpb24sIE9wdGlvbnMgb3B0aW9ucykKIHsKLSAgICBy ZXR1cm4gZXJyb3JMaXN0V0lkKCBwYXJlbnQgPyBwYXJlbnQtPndpbklkKCkgOiAwLCB0ZXh0LCBR U3RyaW5nTGlzdCgpLCBjYXB0aW9uLCBvcHRpb25zICk7CisgICAgcmV0dXJuIGVycm9yTGlzdFdJ ZCggcGFyZW50ID8gcGFyZW50LT5lZmZlY3RpdmVXaW5JZCgpIDogMCwgdGV4dCwgUVN0cmluZ0xp c3QoKSwgY2FwdGlvbiwgb3B0aW9ucyApOwogfQogCiB2b2lkIEtNZXNzYWdlQm94OjplcnJvcldJ ZChXSWQgcGFyZW50X2lkLCBjb25zdCBRU3RyaW5nICZ0ZXh0LApAQCAtNzc1LDcgKzc3NSw3IEBA CiB2b2lkIEtNZXNzYWdlQm94OjplcnJvckxpc3QoUVdpZGdldCAqcGFyZW50LCBjb25zdCBRU3Ry aW5nICZ0ZXh0LCBjb25zdCBRU3RyaW5nTGlzdCAmc3RybGlzdCwKICAgICAgICAgICAgICAgICAg ICAgICAgY29uc3QgUVN0cmluZyAmY2FwdGlvbiwgT3B0aW9ucyBvcHRpb25zKQogewotICAgIHJl dHVybiBlcnJvckxpc3RXSWQoIHBhcmVudCA/IHBhcmVudC0+d2luSWQoKSA6IDAsIHRleHQsIHN0 cmxpc3QsIGNhcHRpb24sIG9wdGlvbnMgKTsKKyAgICByZXR1cm4gZXJyb3JMaXN0V0lkKCBwYXJl bnQgPyBwYXJlbnQtPmVmZmVjdGl2ZVdpbklkKCkgOiAwLCB0ZXh0LCBzdHJsaXN0LCBjYXB0aW9u LCBvcHRpb25zICk7CiB9CiAKIHZvaWQgS01lc3NhZ2VCb3g6OmVycm9yTGlzdFdJZChXSWQgcGFy ZW50X2lkLCAgY29uc3QgUVN0cmluZyAmdGV4dCwgY29uc3QgUVN0cmluZ0xpc3QgJnN0cmxpc3Qs CkBAIC04MDksNyArODA5LDcgQEAKICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3RyaW5nICZk ZXRhaWxzLAogICAgICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcgJmNhcHRpb24sIE9wdGlv bnMgb3B0aW9ucykKIHsKLSAgICByZXR1cm4gZGV0YWlsZWRFcnJvcldJZCggcGFyZW50ID8gcGFy ZW50LT53aW5JZCgpIDogMCwgdGV4dCwgZGV0YWlscywgY2FwdGlvbiwgb3B0aW9ucyApOworICAg IHJldHVybiBkZXRhaWxlZEVycm9yV0lkKCBwYXJlbnQgPyBwYXJlbnQtPmVmZmVjdGl2ZVdpbklk KCkgOiAwLCB0ZXh0LCBkZXRhaWxzLCBjYXB0aW9uLCBvcHRpb25zICk7CiB9CiAKIHZvaWQgS01l c3NhZ2VCb3g6OmRldGFpbGVkRXJyb3JXSWQoV0lkIHBhcmVudF9pZCwgIGNvbnN0IFFTdHJpbmcg JnRleHQsCkBAIC04NDIsNyArODQyLDcgQEAKICAgICAgICAgICAgICAgICAgICBjb25zdCBRU3Ry aW5nICZkZXRhaWxzLAogICAgICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcgJmNhcHRpb24p CiB7Ci0gICAgcmV0dXJuIHF1ZXVlZERldGFpbGVkRXJyb3JXSWQoIHBhcmVudCA/IHBhcmVudC0+ d2luSWQoKSA6IDAsIHRleHQsIGRldGFpbHMsIGNhcHRpb24gKTsKKyAgICByZXR1cm4gcXVldWVk RGV0YWlsZWRFcnJvcldJZCggcGFyZW50ID8gcGFyZW50LT5lZmZlY3RpdmVXaW5JZCgpIDogMCwg dGV4dCwgZGV0YWlscywgY2FwdGlvbiApOwogfQogCiB2b2lkIEtNZXNzYWdlQm94OjpxdWV1ZWRE ZXRhaWxlZEVycm9yV0lkKFdJZCBwYXJlbnRfaWQsICBjb25zdCBRU3RyaW5nICZ0ZXh0LApAQCAt ODU4LDcgKzg1OCw3IEBACiB2b2lkIEtNZXNzYWdlQm94Ojpzb3JyeShRV2lkZ2V0ICpwYXJlbnQs IGNvbnN0IFFTdHJpbmcgJnRleHQsCiAgICAgICAgICAgICAgICAgICAgY29uc3QgUVN0cmluZyAm Y2FwdGlvbiwgT3B0aW9ucyBvcHRpb25zKQogewotICAgIHJldHVybiBzb3JyeVdJZCggcGFyZW50 ID8gcGFyZW50LT53aW5JZCgpIDogMCwgdGV4dCwgY2FwdGlvbiwgb3B0aW9ucyApOworICAgIHJl dHVybiBzb3JyeVdJZCggcGFyZW50ID8gcGFyZW50LT5lZmZlY3RpdmVXaW5JZCgpIDogMCwgdGV4 dCwgY2FwdGlvbiwgb3B0aW9ucyApOwogfQogCiB2b2lkIEtNZXNzYWdlQm94Ojpzb3JyeVdJZChX SWQgcGFyZW50X2lkLCBjb25zdCBRU3RyaW5nICZ0ZXh0LApAQCAtODkwLDcgKzg5MCw3IEBACiAg ICAgICAgICAgICAgICAgICAgY29uc3QgUVN0cmluZyAmZGV0YWlscywKICAgICAgICAgICAgICAg ICAgICBjb25zdCBRU3RyaW5nICZjYXB0aW9uLCBPcHRpb25zIG9wdGlvbnMpCiB7Ci0gICAgcmV0 dXJuIGRldGFpbGVkU29ycnlXSWQoIHBhcmVudCA/IHBhcmVudC0+d2luSWQoKSA6IDAsIHRleHQs IGRldGFpbHMsIGNhcHRpb24sIG9wdGlvbnMgKTsKKyAgICByZXR1cm4gZGV0YWlsZWRTb3JyeVdJ ZCggcGFyZW50ID8gcGFyZW50LT5lZmZlY3RpdmVXaW5JZCgpIDogMCwgdGV4dCwgZGV0YWlscywg Y2FwdGlvbiwgb3B0aW9ucyApOwogfQogCiB2b2lkIEtNZXNzYWdlQm94OjpkZXRhaWxlZFNvcnJ5 V0lkKFdJZCBwYXJlbnRfaWQsIGNvbnN0IFFTdHJpbmcgJnRleHQsCkBAIC05MzQsNyArOTM0LDcg QEAKIHZvaWQgS01lc3NhZ2VCb3g6OmluZm9ybWF0aW9uTGlzdChRV2lkZ2V0ICpwYXJlbnQsY29u c3QgUVN0cmluZyAmdGV4dCwgY29uc3QgUVN0cmluZ0xpc3QgJiBzdHJsaXN0LAogICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbnN0IFFTdHJpbmcgJmNhcHRpb24sIGNvbnN0IFFTdHJpbmcgJmRv bnRTaG93QWdhaW5OYW1lLCBPcHRpb25zIG9wdGlvbnMpCiB7Ci0gICAgcmV0dXJuIGluZm9ybWF0 aW9uTGlzdFdJZCggcGFyZW50ID8gcGFyZW50LT53aW5JZCgpIDogMCwgdGV4dCwgc3RybGlzdCwg Y2FwdGlvbiwKKyAgICByZXR1cm4gaW5mb3JtYXRpb25MaXN0V0lkKCBwYXJlbnQgPyBwYXJlbnQt PmVmZmVjdGl2ZVdpbklkKCkgOiAwLCB0ZXh0LCBzdHJsaXN0LCBjYXB0aW9uLAogICAgICAgICBk b250U2hvd0FnYWluTmFtZSwgb3B0aW9ucyApOwogfQogCkBAIC0xMDM4LDcgKzEwMzgsNyBAQAog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBLR3VpSXRlbSAmYnV0dG9uTm8sIGNv bnN0IEtHdWlJdGVtICZidXR0b25DYW5jZWwsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IGNvbnN0IFFTdHJpbmcgJmRvbnRTaG93QXNrQWdhaW5OYW1lLCBPcHRpb25zIG9wdGlvbnMgKQog ewotICAgIHJldHVybiBtZXNzYWdlQm94V0lkKCBwYXJlbnQgPyBwYXJlbnQtPndpbklkKCkgOiAw LCB0eXBlLCB0ZXh0LCBjYXB0aW9uLAorICAgIHJldHVybiBtZXNzYWdlQm94V0lkKCBwYXJlbnQg PyBwYXJlbnQtPmVmZmVjdGl2ZVdpbklkKCkgOiAwLCB0eXBlLCB0ZXh0LCBjYXB0aW9uLAogICAg ICAgICBidXR0b25ZZXMsIGJ1dHRvbk5vLCBidXR0b25DYW5jZWwsIGRvbnRTaG93QXNrQWdhaW5O YW1lLCBvcHRpb25zICk7CiB9CiAKQEAgLTEwODEsNyArMTA4MSw3IEBACiAKIHZvaWQgS01lc3Nh Z2VCb3g6OnF1ZXVlZE1lc3NhZ2VCb3goIFFXaWRnZXQgKnBhcmVudCwgRGlhbG9nVHlwZSB0eXBl LCBjb25zdCBRU3RyaW5nICZ0ZXh0LCBjb25zdCBRU3RyaW5nICZjYXB0aW9uLCBPcHRpb25zIG9w dGlvbnMgKQogewotICAgIHJldHVybiBxdWV1ZWRNZXNzYWdlQm94V0lkKCBwYXJlbnQgPyBwYXJl bnQtPndpbklkKCkgOiAwLCB0eXBlLCB0ZXh0LCBjYXB0aW9uLCBvcHRpb25zICk7CisgICAgcmV0 dXJuIHF1ZXVlZE1lc3NhZ2VCb3hXSWQoIHBhcmVudCA/IHBhcmVudC0+ZWZmZWN0aXZlV2luSWQo KSA6IDAsIHR5cGUsIHRleHQsIGNhcHRpb24sIG9wdGlvbnMgKTsKIH0KIAogdm9pZCBLTWVzc2Fn ZUJveDo6cXVldWVkTWVzc2FnZUJveFdJZCggV0lkIHBhcmVudF9pZCwgRGlhbG9nVHlwZSB0eXBl LCBjb25zdCBRU3RyaW5nICZ0ZXh0LCBjb25zdCBRU3RyaW5nICZjYXB0aW9uLCBPcHRpb25zIG9w dGlvbnMgKQpAQCAtMTA5NCw3ICsxMDk0LDcgQEAKIAogdm9pZCBLTWVzc2FnZUJveDo6cXVldWVk TWVzc2FnZUJveCggUVdpZGdldCAqcGFyZW50LCBEaWFsb2dUeXBlIHR5cGUsIGNvbnN0IFFTdHJp bmcgJnRleHQsIGNvbnN0IFFTdHJpbmcgJmNhcHRpb24gKQogewotICAgIHJldHVybiBxdWV1ZWRN ZXNzYWdlQm94V0lkKCBwYXJlbnQgPyBwYXJlbnQtPndpbklkKCkgOiAwLCB0eXBlLCB0ZXh0LCBj YXB0aW9uICk7CisgICAgcmV0dXJuIHF1ZXVlZE1lc3NhZ2VCb3hXSWQoIHBhcmVudCA/IHBhcmVu dC0+ZWZmZWN0aXZlV2luSWQoKSA6IDAsIHR5cGUsIHRleHQsIGNhcHRpb24gKTsKIH0KIAogdm9p ZCBLTWVzc2FnZUJveDo6cXVldWVkTWVzc2FnZUJveFdJZCggV0lkIHBhcmVudF9pZCwgRGlhbG9n VHlwZSB0eXBlLCBjb25zdCBRU3RyaW5nICZ0ZXh0LCBjb25zdCBRU3RyaW5nICZjYXB0aW9uICkK ------=_Part_3777_31597258.1203289768722 Content-Type: text/x-patch; name=kdelibs_kdeui_winid_fix_kpassivepopup.patch Content-Transfer-Encoding: base64 X-Attachment-Id: f_fcs7pdap Content-Disposition: attachment; filename=kdelibs_kdeui_winid_fix_kpassivepopup.patch SW5kZXg6IHV0aWwva3Bhc3NpdmVwb3B1cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gdXRpbC9rcGFzc2l2 ZXBvcHVwLmNwcAkocmV2aXNpb24gNzc2MTg5KQorKysgdXRpbC9rcGFzc2l2ZXBvcHVwLmNwcAko d29ya2luZyBjb3B5KQpAQCAtOTAsNyArOTAsNyBAQAogICAgIDogUUZyYW1lKCAwLCBmID8gZiA6 IFBPUFVQX0ZMQUdTICksCiAgICAgICBkKG5ldyBQcml2YXRlKCkpCiB7Ci0gICAgaW5pdCggcGFy ZW50ID8gcGFyZW50LT53aW5JZCgpIDogMEwgKTsKKyAgICBpbml0KCBwYXJlbnQgPyBwYXJlbnQt PmVmZmVjdGl2ZVdpbklkKCkgOiAwTCApOwogfQogCiBLUGFzc2l2ZVBvcHVwOjpLUGFzc2l2ZVBv cHVwKCBXSWQgd2luICkK ------=_Part_3777_31597258.1203289768722--