From kde-devel Sun Aug 26 22:40:41 2007 From: "Ulrik Mikaelsson" Date: Sun, 26 Aug 2007 22:40:41 +0000 To: kde-devel Subject: Re: Fwd: Announcing KShortcutAssistant Message-Id: <15c1dfa0708261540s72409d9egddd3378b737df0d2 () mail ! gmail ! com> X-MARC-Message: https://marc.info/?l=kde-devel&m=118816808312634 MIME-Version: 1 Content-Type: multipart/mixed; boundary="------=_Part_140207_20018905.1188168041015" ------=_Part_140207_20018905.1188168041015 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline Certainly, without the full understanding of the article, the screenshot will only raise the question "Yes, but why on EARTH would you DO that to my program?" ;) Anyways, here's a new patch that should apply cleanly to HEAD@trunk. It's getting late here, and I gotta get up to work tomorrow. But if I get some time, I'll try to attach a small screenshot on the wiki-page tomorrow to show the current state. Regards / Ulrik On 8/26/07, Andreas Pakulat wrote: > On 26.08.07 20:47:35, Ulrik Mikaelsson wrote: > > On 8/26/07, Andreas Pakulat wrote: > > > It would have been nice if you could've provided some more information > > > how that class/code works specifically. What changes did you do? > > > > Certainly, although the important part is not the code itself. The > > code is trivial and probably not optimal (re-generating the > > KShortcutAssistant-panel on each display, for instance). What's > > important here is how it affects usability, and if the direction of > > development is desired. > > > > Anyways, the attached patch should pretty much be self-explanatory, > > but the current concept is; > > > > - Create a new core-widget that displays a centered panel containing > > all available shortcut-actions. > > + Currently, the available actions are inferred by examining the > > menu of the current KMainWindow. (This happens on each display, room > > for improvements) > > + Actions are currently grouped by where in the menu they occur. > > Probably not desireable, at least they should be grouped by what the > > complete key-combo looks like (look how it's done in the article.) > > - Hook up the widget in the main application event-loop (the only > > place if found where I are guaranteed to see all keydown-events for > > the ctrl-key.) > > > > Don't hesitate to ask for further questions. > > Thanks thats mostly what I was looking for (and not having to read that > full article). Oh, one last thing: Got a screenshot? You know pictures > say more than a 1000 words ;) Anyway, I guess to fully understand I have > to read that article (scheduled for tomorrow). > > Andreas > > -- > Chicken Little only has to be right once. > > >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe << > ------=_Part_140207_20018905.1188168041015 Content-Type: text/x-patch; name=kshortcutassistant-r16227.patch; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: base64 X-Attachment-Id: f_f5u4ini9 Content-Disposition: attachment; filename="kshortcutassistant-r16227.patch" PT09IGFkZGVkIGZpbGUgJ2tkZXVpL2tlcm5lbC9rc2hvcnRjdXRhc3Npc3RhbnQuY3BwJwotLS0g a2RldWkva2VybmVsL2tzaG9ydGN1dGFzc2lzdGFudC5jcHAJMTk3MC0wMS0wMSAwMDowMDowMCAr MDAwMAorKysga2RldWkva2VybmVsL2tzaG9ydGN1dGFzc2lzdGFudC5jcHAJMjAwNy0wOC0yNiAy MTo0NzoxMiArMDAwMApAQCAtMCwwICsxLDE1NiBAQAorLyogVGhpcyBmaWxlIGlzIHBhcnQgb2Yg dGhlIEtERSBsaWJyYXJpZXMKKyAgICBDb3B5cmlnaHQgKEMpIDIwMDcsIFVscmlrIE1pa2FlbHNz b24gKHJhd2xlckB1c2Vycy5zZi5uZXQpCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0 d2FyZTsgeW91IGNhbiByZWRpc3RyaWJ1dGUgaXQgYW5kL29yCisgICAgbW9kaWZ5IGl0IHVuZGVy IHRoZSB0ZXJtcyBvZiB0aGUgR05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKKyAgICBMaWNlbnNl IGFzIHB1Ymxpc2hlZCBieSB0aGUgRnJlZSBTb2Z0d2FyZSBGb3VuZGF0aW9uOyBlaXRoZXIKKyAg ICB2ZXJzaW9uIDIgb2YgdGhlIExpY2Vuc2UsIG9yIChhdCB5b3VyIG9wdGlvbikgYW55IGxhdGVy IHZlcnNpb24uCisKKyAgICBUaGlzIGxpYnJhcnkgaXMgZGlzdHJpYnV0ZWQgaW4gdGhlIGhvcGUg dGhhdCBpdCB3aWxsIGJlIHVzZWZ1bCwKKyAgICBidXQgV0lUSE9VVCBBTlkgV0FSUkFOVFk7IHdp dGhvdXQgZXZlbiB0aGUgaW1wbGllZCB3YXJyYW50eSBvZgorICAgIE1FUkNIQU5UQUJJTElUWSBv ciBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIgUFVSUE9TRS4gIFNlZSB0aGUgR05VCisgICAgTGli cmFyeSBHZW5lcmFsIFB1YmxpYyBMaWNlbnNlIGZvciBtb3JlIGRldGFpbHMuCisKKyAgICBZb3Ug c2hvdWxkIGhhdmUgcmVjZWl2ZWQgYSBjb3B5IG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1 YmxpYyBMaWNlbnNlCisgICAgYWxvbmcgd2l0aCB0aGlzIGxpYnJhcnk7IHNlZSB0aGUgZmlsZSBD T1BZSU5HLkxJQi4gIElmIG5vdCwgd3JpdGUgdG8KKyAgICB0aGUgRnJlZSBTb2Z0d2FyZSBGb3Vu ZGF0aW9uLCBJbmMuLCA1MSBGcmFua2xpbiBTdHJlZXQsIEZpZnRoIEZsb29yLAorICAgIEJvc3Rv biwgTUEgMDIxMTAtMTMwMSwgVVNBLgorKi8KKworI3VuZGVmIFFUX05PX1RSQU5TTEFUSU9OCisj aW5jbHVkZSAia3Nob3J0Y3V0YXNzaXN0YW50LmgiCisjZGVmaW5lIFFUX05PX1RSQU5TTEFUSU9O CisKKyNpbmNsdWRlIDxtYXRoLmg+CisKKyNpbmNsdWRlIDxRdENvcmUvUUxpc3Q+CisjaW5jbHVk ZSA8UXRHdWkvUURlc2t0b3BXaWRnZXQ+CisjaW5jbHVkZSA8UXRHdWkvUUZvbnQ+CisjaW5jbHVk ZSA8UXRHdWkvUUdyaWRMYXlvdXQ+CisjaW5jbHVkZSA8UXRHdWkvUUhCb3hMYXlvdXQ+CisjaW5j bHVkZSA8UXRHdWkvUUtleVNlcXVlbmNlPgorI2luY2x1ZGUgPFF0R3VpL1FMYWJlbD4KKyNpbmNs dWRlIDxRdEd1aS9RVkJveExheW91dD4KKworI2luY2x1ZGUgImthcHBsaWNhdGlvbi5oIgorI2lu Y2x1ZGUgImtkZWJ1Zy5oIgorI2luY2x1ZGUgImttYWlud2luZG93LmgiCisjaW5jbHVkZSAia21l bnViYXIuaCIKKworY2xhc3MgS1Nob3J0Y3V0QXNzaXN0YW50OjpQcml2YXRlCit7CitwdWJsaWM6 CisgICAgUUdyaWRMYXlvdXQgKiBncmlkOworCisgICAgUHJpdmF0ZSgpCisgICAgeworICAgICAg ICBtYWtlR3JpZCgpOworICAgIH0KKworICAgIHZvaWQgbWFrZUdyaWQoKQorICAgIHsKKyAgICAg ICAgZ3JpZCA9IG5ldyBRR3JpZExheW91dCgpOworICAgICAgICBncmlkLT5zZXRTcGFjaW5nKDMw KTsKKyAgICB9Cit9OworCitLU2hvcnRjdXRBc3Npc3RhbnQ6OktTaG9ydGN1dEFzc2lzdGFudCgp IDoKKyAgICBRV2lkZ2V0KE5VTEwsIFF0OjpXaW5kb3cgfCBRdDo6V2luZG93U3RheXNPblRvcEhp bnQgfCBRdDo6RnJhbWVsZXNzV2luZG93SGludCB8IFF0OjpYMTFCeXBhc3NXaW5kb3dNYW5hZ2Vy SGludCksIC8vIE5lZWQgcG9ydGFibGUgc3VwcG9ydCBmb3IgYXZvaWRpbmcgdGhlIGtleWJvYXJk LXN0dWZmCisgICAgcChuZXcgUHJpdmF0ZSkKK3sKKyAgICBtb3ZlKDIwLDIwKTsKKyAgICByZXNp emUoODAwLDgwMCk7CisgICAgc2V0TGF5b3V0KHAtPmdyaWQpOworfQorCitLU2hvcnRjdXRBc3Np c3RhbnQ6On5LU2hvcnRjdXRBc3Npc3RhbnQoKQoreworCit9CisKK1FMYXlvdXQgKiBLU2hvcnRj dXRBc3Npc3RhbnQ6OmJ1aWxkR3JvdXAoUU1lbnUgKiBzb3VyY2VNZW51KQoreworICAgIFFWQm94 TGF5b3V0ICpyZXRWYWwgPSBuZXcgUVZCb3hMYXlvdXQoKTsKKyAgICByZXRWYWwtPnNldFNwYWNp bmcoNSk7CisKKyAgICBRTGFiZWwgKiB0aXRsZSA9IG5ldyBRTGFiZWwoc291cmNlTWVudS0+dGl0 bGUoKS5yZW1vdmUoJyYnKSwgdGhpcyk7CisgICAgdGl0bGUtPnNldEZvbnQoUUZvbnQoIkhlbHZl dGljYSIsIDEyLCBRRm9udDo6Qm9sZCkpOworICAgIHJldFZhbC0+YWRkV2lkZ2V0KHRpdGxlKTsK KyAgICByZXRWYWwtPmFkZFNwYWNpbmcoNSk7CisKKyAgICBmb3JlYWNoIChRQWN0aW9uICogYWN0 aW9uLCBzb3VyY2VNZW51LT5hY3Rpb25zKCkpIHsKKyAgICAgICAgaWYgKCFhY3Rpb24tPnNob3J0 Y3V0KCkuaXNFbXB0eSgpKQorICAgICAgICB7CisgICAgICAgICAgICBRSEJveExheW91dCAqIGFj dGlvbkxheW91dCA9IG5ldyBRSEJveExheW91dCgpOworICAgICAgICAgICAgUUxhYmVsICogaWNv bkxhYmVsID0gbmV3IFFMYWJlbCh0aGlzKTsKKyAgICAgICAgICAgIGljb25MYWJlbC0+c2V0UGl4 bWFwKGFjdGlvbi0+aWNvbigpLnBpeG1hcCgxNikpOworICAgICAgICAgICAgUUxhYmVsICogbmFt ZUxhYmVsID0gbmV3IFFMYWJlbChhY3Rpb24tPnRleHQoKS5yZW1vdmUoJyYnKSwgdGhpcyk7Cisg ICAgICAgICAgICBuYW1lTGFiZWwtPnNldEFsaWdubWVudChRdDo6QWxpZ25MZWZ0KTsKKyAgICAg ICAgICAgIFFMYWJlbCAqIHNob3J0Y3V0TGFiZWwgPSBuZXcgUUxhYmVsKGFjdGlvbi0+c2hvcnRj dXQoKS50b1N0cmluZygpLCB0aGlzKTsKKyAgICAgICAgICAgIHNob3J0Y3V0TGFiZWwtPnNldEFs aWdubWVudChRdDo6QWxpZ25SaWdodCk7CisgICAgICAgICAgICBhY3Rpb25MYXlvdXQtPmFkZFdp ZGdldChpY29uTGFiZWwpOworICAgICAgICAgICAgYWN0aW9uTGF5b3V0LT5hZGRXaWRnZXQobmFt ZUxhYmVsKTsKKyAgICAgICAgICAgIGFjdGlvbkxheW91dC0+YWRkV2lkZ2V0KHNob3J0Y3V0TGFi ZWwpOworICAgICAgICAgICAgcmV0VmFsLT5hZGRMYXlvdXQoYWN0aW9uTGF5b3V0KTsKKyAgICAg ICAgfQorICAgIH0KKworICAgIHJldHVybiByZXRWYWw7Cit9CisKK3ZvaWQgS1Nob3J0Y3V0QXNz aXN0YW50OjpidWlsZEdyaWQoUU1lbnVCYXIgKiBzb3VyY2VNZW51KQoreworICAgIFFMaXN0PFFM YXlvdXQqPiBhY3Rpb25Hcm91cExheW91dHM7CisgICAgaW50IGNvbHM7CisgICAgaW50IHg9MCx5 PTA7CisKKyAgICBmb3JlYWNoIChRQWN0aW9uICogYWN0aW9uLCBzb3VyY2VNZW51LT5hY3Rpb25z KCkpIHsKKyAgICAgICAgaWYgKGFjdGlvbi0+bWVudSgpKSB7CisgICAgICAgICAgICBRTGF5b3V0 ICogbCA9IGJ1aWxkR3JvdXAoYWN0aW9uLT5tZW51KCkpOworCisgICAgICAgICAgICBpZiAobCkK KyAgICAgICAgICAgICAgICBhY3Rpb25Hcm91cExheW91dHMgPDwgbDsKKyAgICAgICAgfQorICAg IH0KKworICAgIGNvbHMgPSAoaW50KWNlaWwoc3FydChhY3Rpb25Hcm91cExheW91dHMuY291bnQo KSkpOworCisgICAgZm9yZWFjaCAoUUxheW91dCAqbCwgYWN0aW9uR3JvdXBMYXlvdXRzKSB7Cisg ICAgICAgIHAtPmdyaWQtPmFkZExheW91dChsLCB5LCB4KTsKKyAgICAgICAgeCA9ICh4ICsgMSkg JSBjb2xzOworICAgICAgICBpZiAoeCA9PSAwKQorICAgICAgICAgICAgeSArPSAxOworICAgIH0K K30KKwordm9pZCBLU2hvcnRjdXRBc3Npc3RhbnQ6OnNob3coKQoreworICAgIFFNYWluV2luZG93 ICogYWN0aXZlV2luZG93ID0gcW9iamVjdF9jYXN0PFFNYWluV2luZG93Kj4oS0FwcGxpY2F0aW9u OjprQXBwbGljYXRpb24oKS0+YWN0aXZlV2luZG93KCkpOworICAgIFFNZW51QmFyICogYWN0aXZl TWVudSA9IGFjdGl2ZVdpbmRvdyA/IGFjdGl2ZVdpbmRvdy0+bWVudUJhcigpIDogTlVMTDsKKwor ICAgIGlmIChhY3RpdmVNZW51KSB7IC8vIEZvY3VzIGlzIGluIGEgd2luZG93IHRoYXQgaGFzIGEg bWVudS1zdHJ1Y3R1cmUKKyAgICAgICAgYnVpbGRHcmlkKGFjdGl2ZU1lbnUpOyAvLyBCdWlsZCBh IGhlbHBlci1wYW5lIGZvciB0aGUgbWVudQorICAgICAgICByZXNpemUocC0+Z3JpZC0+bWluaW11 bVNpemUoKSk7CisKKyAgICAgICAgUVJlY3Qgc2NyZWVuID0gS0FwcGxpY2F0aW9uOjprQXBwbGlj YXRpb24oKS0+ZGVza3RvcCgpLT5zY3JlZW5HZW9tZXRyeShLQXBwbGljYXRpb246OmtBcHBsaWNh dGlvbigpLT5mb2N1c1dpZGdldCgpKTsKKyAgICAgICAgUVJlY3Qgc2VsZlJlY3QgPSBnZW9tZXRy eSgpOworICAgICAgICBzZWxmUmVjdC5zZXRTaXplKHAtPmdyaWQtPm1pbmltdW1TaXplKCkpOwor ICAgICAgICBzZWxmUmVjdC5tb3ZlQ2VudGVyKHNjcmVlbi5jZW50ZXIoKSk7CisgICAgICAgIHNl dEdlb21ldHJ5KHNlbGZSZWN0KTsKKworICAgICAgICBRV2lkZ2V0OjpzaG93KCk7CisgICAgfQor fQorCit2b2lkIEtTaG9ydGN1dEFzc2lzdGFudDo6aGlkZSgpCit7CisgICAgLy8gRGVzdHJveSBp bnRlcm5hbCB3aWRnZXQtc3R1ZmYKKyAgICBRV2lkZ2V0OjpoaWRlKCk7CisKKyAgICB3aGlsZSAo UUxheW91dEl0ZW0gKiBjaGlsZCA9IHAtPmdyaWQtPnRha2VBdCgwKSkgeyAvLyBFbXB0eSB0aGUg Z3JpZC1sYXlvdXQKKyAgICAgICAgcC0+Z3JpZC0+cmVtb3ZlSXRlbShjaGlsZCk7CisgICAgICAg IGRlbGV0ZShjaGlsZCk7CisgICAgfQorICAgIGZvcmVhY2ggKFFXaWRnZXQqIGNoaWxkLCBmaW5k Q2hpbGRyZW48UVdpZGdldCo+KCkpIC8vIFJlbW92ZSB0aGUgY2hpbGQtd2lkZ2V0cworICAgICAg ICBkZWxldGUoY2hpbGQpOworfQoKPT09IGFkZGVkIGZpbGUgJ2tkZXVpL2tlcm5lbC9rc2hvcnRj dXRhc3Npc3RhbnQuaCcKLS0tIGtkZXVpL2tlcm5lbC9rc2hvcnRjdXRhc3Npc3RhbnQuaAkxOTcw LTAxLTAxIDAwOjAwOjAwICswMDAwCisrKyBrZGV1aS9rZXJuZWwva3Nob3J0Y3V0YXNzaXN0YW50 LmgJMjAwNy0wOC0yNiAyMTo0NzoxMiArMDAwMApAQCAtMCwwICsxLDQ5IEBACisvKiBUaGlzIGZp bGUgaXMgcGFydCBvZiB0aGUgS0RFIGxpYnJhcmllcworICAgIENvcHlyaWdodCAoQykgMjAwNywg VWxyaWsgTWlrYWVsc3NvbiAocmF3bGVyQHVzZXJzLnNmLm5ldCkKKworICAgIFRoaXMgbGlicmFy eSBpcyBmcmVlIHNvZnR3YXJlOyB5b3UgY2FuIHJlZGlzdHJpYnV0ZSBpdCBhbmQvb3IKKyAgICBt b2RpZnkgaXQgdW5kZXIgdGhlIHRlcm1zIG9mIHRoZSBHTlUgTGlicmFyeSBHZW5lcmFsIFB1Ymxp YworICAgIExpY2Vuc2UgYXMgcHVibGlzaGVkIGJ5IHRoZSBGcmVlIFNvZnR3YXJlIEZvdW5kYXRp b247IGVpdGhlcgorICAgIHZlcnNpb24gMiBvZiB0aGUgTGljZW5zZSwgb3IgKGF0IHlvdXIgb3B0 aW9uKSBhbnkgbGF0ZXIgdmVyc2lvbi4KKworICAgIFRoaXMgbGlicmFyeSBpcyBkaXN0cmlidXRl ZCBpbiB0aGUgaG9wZSB0aGF0IGl0IHdpbGwgYmUgdXNlZnVsLAorICAgIGJ1dCBXSVRIT1VUIEFO WSBXQVJSQU5UWTsgd2l0aG91dCBldmVuIHRoZSBpbXBsaWVkIHdhcnJhbnR5IG9mCisgICAgTUVS Q0hBTlRBQklMSVRZIG9yIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUiBQVVJQT1NFLiAgU2VlIHRo ZSBHTlUKKyAgICBMaWJyYXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UgZm9yIG1vcmUgZGV0YWls cy4KKworICAgIFlvdSBzaG91bGQgaGF2ZSByZWNlaXZlZCBhIGNvcHkgb2YgdGhlIEdOVSBMaWJy YXJ5IEdlbmVyYWwgUHVibGljIExpY2Vuc2UKKyAgICBhbG9uZyB3aXRoIHRoaXMgbGlicmFyeTsg c2VlIHRoZSBmaWxlIENPUFlJTkcuTElCLiAgSWYgbm90LCB3cml0ZSB0bworICAgIHRoZSBGcmVl IFNvZnR3YXJlIEZvdW5kYXRpb24sIEluYy4sIDUxIEZyYW5rbGluIFN0cmVldCwgRmlmdGggRmxv b3IsCisgICAgQm9zdG9uLCBNQSAwMjExMC0xMzAxLCBVU0EuCisqLworCisjaWZuZGVmIEtTSE9S VENVVEFTU0lTVEFOVF9ICisjZGVmaW5lIEtTSE9SVENVVEFTU0lTVEFOVF9ICisKKy8vIFZlcnNp b24gbWFjcm9zLiBOZXZlciBwdXQgdGhpcyBmdXJ0aGVyIGRvd24uCisjaW5jbHVkZSAia2RldmVy c2lvbi5oIgorI2luY2x1ZGUgPGtkZXVpX2V4cG9ydC5oPgorCisjaW5jbHVkZSA8UXRHdWkvUU1l bnU+CisjaW5jbHVkZSA8UXRHdWkvUU1lbnVCYXI+CisjaW5jbHVkZSA8UXRHdWkvUUxheW91dD4K KworY2xhc3MgS0RFVUlfRVhQT1JUIEtTaG9ydGN1dEFzc2lzdGFudCA6IHB1YmxpYyBRV2lkZ2V0 Cit7CisgIFFfT0JKRUNUCitwdWJsaWM6CisgIGV4cGxpY2l0IEtTaG9ydGN1dEFzc2lzdGFudCgp OworICB2aXJ0dWFsIH5LU2hvcnRjdXRBc3Npc3RhbnQoKTsKKworICB2aXJ0dWFsIHZvaWQgc2hv dygpOworICB2aXJ0dWFsIHZvaWQgaGlkZSgpOworCitwcml2YXRlOgorICBRTGF5b3V0KiBidWls ZEdyb3VwKFFNZW51KiBzb3VyY2VNZW51KTsKKyAgdm9pZCBidWlsZEdyaWQoUU1lbnVCYXIqIHNv dXJjZU1lbnUpOworCisgIGNsYXNzIFByaXZhdGU7CisgIFByaXZhdGUgKiBjb25zdCBwOworfTsK KworI2VuZGlmCgo9PT0gbW9kaWZpZWQgZmlsZSAna2RldWkvQ01ha2VMaXN0cy50eHQnCi0tLSBr ZGV1aS9DTWFrZUxpc3RzLnR4dAkyMDA3LTA4LTIxIDE4OjE0OjI0ICswMDAwCisrKyBrZGV1aS9D TWFrZUxpc3RzLnR4dAkyMDA3LTA4LTI2IDIyOjA5OjIxICswMDAwCkBAIC0xMTEsNiArMTExLDcg QEAKICBrZXJuZWwva2NsaXBib2FyZC5jcHAKICBrZXJuZWwva3VuaXF1ZWFwcGxpY2F0aW9uLmNw cAogIGtlcm5lbC9rc2Vzc2lvbm1hbmFnZXIuY3BwCisga2VybmVsL2tzaG9ydGN1dGFzc2lzdGFu dC5jcHAKICBrZXJuZWwva3N0eWxlLmNwcAogIGtlcm5lbC9rc3RhcnR1cGluZm8uY3BwCiAga2Vy bmVsL2tnbG9iYWxzZXR0aW5ncy5jcHAKQEAgLTM2NCw2ICszNjUsNyBAQAogIGtlcm5lbC9rYXBw bGljYXRpb24uaAogIGtlcm5lbC9rdW5pcXVlYXBwbGljYXRpb24uaAogIGtlcm5lbC9rc2Vzc2lv bm1hbmFnZXIuaAorIGtlcm5lbC9rc2hvcnRjdXRhc3Npc3RhbnQuaAogIGtlcm5lbC9rc3R5bGUu aAogIGtlcm5lbC9rc3RhcnR1cGluZm8uaAogIGtlcm5lbC9rZ2xvYmFsc2V0dGluZ3MuaAoKPT09 IG1vZGlmaWVkIGZpbGUgJ2tkZXVpL2tlcm5lbC9rYXBwbGljYXRpb24uY3BwJwotLS0ga2RldWkv a2VybmVsL2thcHBsaWNhdGlvbi5jcHAJMjAwNy0wOC0yMCAyMTozMzoxNiArMDAwMAorKysga2Rl dWkva2VybmVsL2thcHBsaWNhdGlvbi5jcHAJMjAwNy0wOC0yNiAyMjowMzowNCArMDAwMApAQCAt NTMsNiArNTMsNyBAQAogI2luY2x1ZGUgImtzZXNzaW9ubWFuYWdlci5oIgogI2luY2x1ZGUgImtz dGFuZGFyZGRpcnMuaCIKICNpbmNsdWRlICJrc3RhbmRhcmRzaG9ydGN1dC5oIgorI2luY2x1ZGUg ImtzaG9ydGN1dGFzc2lzdGFudC5oIgogI2luY2x1ZGUgImt0b29saW52b2NhdGlvbi5oIgogI2lu Y2x1ZGUgImtnZXN0dXJlbWFwLmgiCiAjaW5jbHVkZSAia3VybC5oIgpAQCAtMTYwLDYgKzE2MSw3 IEBACiAgIFByaXZhdGUoY29uc3QgUUJ5dGVBcnJheSAmY05hbWUpCiAgICAgICA6IGNvbXBvbmVu dERhdGEoY05hbWUpLAogICAgICAgY2hlY2tBY2NlbGVyYXRvcnMoMCksCisgICAgICBzaG9ydGN1 dEFzc2lzdGFudCgwKSwKICAgICAgIHN0YXJ0dXBfaWQoIjAiKSwKICAgICAgIGFwcF9zdGFydGVk X3RpbWVyKDApLAogICAgICAgc2Vzc2lvbl9zYXZlKGZhbHNlKQpAQCAtMTc2LDYgKzE3OCw3IEBA CiAgIFByaXZhdGUoY29uc3QgS0NvbXBvbmVudERhdGEgJmNEYXRhKQogICAgICAgOiBjb21wb25l bnREYXRhKGNEYXRhKSwKICAgICAgIGNoZWNrQWNjZWxlcmF0b3JzKDApLAorICAgICAgc2hvcnRj dXRBc3Npc3RhbnQoMCksCiAgICAgICBzdGFydHVwX2lkKCIwIiksCiAgICAgICBhcHBfc3RhcnRl ZF90aW1lcigwKSwKICAgICAgIHNlc3Npb25fc2F2ZShmYWxzZSkKQEAgLTE5Miw2ICsxOTUsNyBA QAogICBQcml2YXRlKCkKICAgICAgIDogY29tcG9uZW50RGF0YShLQ21kTGluZUFyZ3M6OmFib3V0 RGF0YSgpKSwKICAgICAgIGNoZWNrQWNjZWxlcmF0b3JzKDApLAorICAgICAgc2hvcnRjdXRBc3Np c3RhbnQoMCksCiAgICAgICBzdGFydHVwX2lkKCAiMCIgKSwKICAgICAgIGFwcF9zdGFydGVkX3Rp bWVyKCAwICksCiAgICAgICBzZXNzaW9uX3NhdmUoIGZhbHNlICkKQEAgLTIxMSw2ICsyMTUsNyBA QAogCiAgIEtDb21wb25lbnREYXRhIGNvbXBvbmVudERhdGE7CiAgIEtDaGVja0FjY2VsZXJhdG9y cyogY2hlY2tBY2NlbGVyYXRvcnM7CisgIEtTaG9ydGN1dEFzc2lzdGFudCogc2hvcnRjdXRBc3Np c3RhbnQ7CiAgIFFCeXRlQXJyYXkgc3RhcnR1cF9pZDsKICAgUVRpbWVyKiBhcHBfc3RhcnRlZF90 aW1lcjsKICAgYm9vbCBzZXNzaW9uX3NhdmU7CkBAIC0yNzcsNiArMjgyLDcgQEAKIGJvb2wgS0Fw cGxpY2F0aW9uOjpub3RpZnkoUU9iamVjdCAqcmVjZWl2ZXIsIFFFdmVudCAqZXZlbnQpCiB7CiAg ICAgUUV2ZW50OjpUeXBlIHQgPSBldmVudC0+dHlwZSgpOworICAgIFFLZXlFdmVudCAqa2U7CiAg ICAgaWYoIHQgPT0gUUV2ZW50OjpTaG93ICYmIHJlY2VpdmVyLT5pc1dpZGdldFR5cGUoKSkKICAg ICB7CiAgICAgICAgIFFXaWRnZXQqIHcgPSBzdGF0aWNfY2FzdDwgUVdpZGdldCogPiggcmVjZWl2 ZXIgKTsKQEAgLTI5Niw3ICszMDIsMTMgQEAKICAgICAgICAgICAgICAgICBkLT5hcHBfc3RhcnRl ZF90aW1lci0+c3RhcnQoIDAgKTsKICAgICAgICAgICAgIH0KICAgICAgICAgfQorICAgIH0gZWxz ZSBpZiAoIChrZSA9IGR5bmFtaWNfY2FzdDxRS2V5RXZlbnQqPihldmVudCkpICYmIGtlLT5rZXko KSA9PSBRdDo6S2V5X0NvbnRyb2wgKSB7CisgICAgICAgIGlmICh0ID09IFFFdmVudDo6S2V5UHJl c3MpCisgICAgICAgICAgICBkLT5zaG9ydGN1dEFzc2lzdGFudC0+c2hvdygpOworICAgICAgICBl bHNlIGlmICh0ID09IFFFdmVudDo6S2V5UmVsZWFzZSkKKyAgICAgICAgICAgIGQtPnNob3J0Y3V0 QXNzaXN0YW50LT5oaWRlKCk7CiAgICAgfQorICAgIAogICAgIHJldHVybiBRQXBwbGljYXRpb246 Om5vdGlmeShyZWNlaXZlciwgZXZlbnQpOwogfQogCkBAIC01NzcsNiArNTg5LDcgQEAKICAgICBL TWVzc2FnZTo6c2V0TWVzc2FnZUhhbmRsZXIoIG5ldyBLTWVzc2FnZUJveE1lc3NhZ2VIYW5kbGVy KDApICk7CiAKICAgICBkLT5jaGVja0FjY2VsZXJhdG9ycyA9IG5ldyBLQ2hlY2tBY2NlbGVyYXRv cnMoIHRoaXMgKTsKKyAgICBkLT5zaG9ydGN1dEFzc2lzdGFudCA9IG5ldyBLU2hvcnRjdXRBc3Np c3RhbnQoKTsKICAgICBLR2VzdHVyZU1hcDo6c2VsZigpLT5pbnN0YWxsRXZlbnRGaWx0ZXJPbk1l KCB0aGlzICk7CiAKICAgICBjb25uZWN0KEtUb29sSW52b2NhdGlvbjo6c2VsZigpLCBTSUdOQUwo a2FwcGxpY2F0aW9uX2hvb2soUVN0cmluZ0xpc3QmLCBRQnl0ZUFycmF5JikpLAoK ------=_Part_140207_20018905.1188168041015 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline >> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe << ------=_Part_140207_20018905.1188168041015--