--------------Boundary-00=_GRNEDRE4RJWRG9OI45PP Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 8bit Hiya, I don't know how many requests / bugreports there have been, but this is something that should be fixed before 2.2. To avoid having tons of KGlobalAccel objects all over the place in kicker, I moved the existing object (for the K-Button) to PGlobal. Keep in mind you can also have multiple K-Buttons or Show-Desktop buttons, we don't want one KGlobalAccel object for every button. Besides that, the following made me a bit curious: keys->insertItem(i18n("Panel"), "Program:kicker", 0); I guess this is for grouping all those entries in the keybindings control module? Why is it misusing insertItem() for that? Cheers, Carsten Pfeiffer --------------Boundary-00=_GRNEDRE4RJWRG9OI45PP Content-Type: text/x-c++; charset="iso-8859-1"; name="showdesktop.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="showdesktop.patch" PyBzaG93ZGVza3RvcC5wYXRjaApJbmRleDogZ2xvYmFsLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxl OiAvaG9tZS9rZGUva2RlYmFzZS9raWNrZXIvY29yZS9nbG9iYWwuY3BwLHYKcmV0cmlldmluZyBy ZXZpc2lvbiAxLjYKZGlmZiAtdSAtcCAtQiAtdyAtcjEuNiBnbG9iYWwuY3BwCi0tLSBnbG9iYWwu Y3BwCTIwMDEvMDYvMDQgMTk6MzQ6MDcJMS42CisrKyBnbG9iYWwuY3BwCTIwMDEvMDYvMjMgMjI6 NTE6MTkKQEAgLTI3LDYgKzI3LDcgQEAgUGFuZWwqIFBHbG9iYWw6OnBhbmVsID0gMDsKIEtpY2tl clBsdWdpbk1hbmFnZXIqIFBHbG9iYWw6OnBsdWdpbm1nciA9IDA7CiBLV2luTW9kdWxlKiBQR2xv YmFsOjprd2luX21vZHVsZSA9IDA7CiBFeHRlbnNpb25NYW5hZ2VyKiBQR2xvYmFsOjpleHRlbnNp b25NYW5hZ2VyID0gMDsKK0tHbG9iYWxBY2NlbCogUEdsb2JhbDo6Z2xvYmFsS2V5cyA9IDA7CiAK IGludCBQR2xvYmFsOjpzaXplVmFsdWUoU2l6ZSBzKQogewpJbmRleDogZ2xvYmFsLmgKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQpSQ1MgZmlsZTogL2hvbWUva2RlL2tkZWJhc2Uva2lja2VyL2NvcmUvZ2xvYmFsLmgsdgpy ZXRyaWV2aW5nIHJldmlzaW9uIDEuNgpkaWZmIC11IC1wIC1CIC13IC1yMS42IGdsb2JhbC5oCi0t LSBnbG9iYWwuaAkyMDAxLzA2LzA0IDE5OjM0OjA3CTEuNgorKysgZ2xvYmFsLmgJMjAwMS8wNi8y MyAyMjo1MToxOQpAQCAtMzIsNiArMzIsNyBAQCBlbnVtIFNpemUge1Rpbnk9MCwgU21hbGwsIE5v cm1hbCwgTGFyZ2V9CiAKIGNsYXNzIFBhbmVsOwogY2xhc3MgS2lja2VyUGx1Z2luTWFuYWdlcjsK K2NsYXNzIEtHbG9iYWxBY2NlbDsKIGNsYXNzIEtXaW5Nb2R1bGU7CiBjbGFzcyBFeHRlbnNpb25N YW5hZ2VyOwogCkBAIC00Myw2ICs0NCw3IEBAIHB1YmxpYzoKICAgICBzdGF0aWMgS1dpbk1vZHVs ZSAqa3dpbl9tb2R1bGU7CiAgICAgc3RhdGljIEtpY2tlclBsdWdpbk1hbmFnZXIgKnBsdWdpbm1n cjsKICAgICBzdGF0aWMgRXh0ZW5zaW9uTWFuYWdlciAqZXh0ZW5zaW9uTWFuYWdlcjsKKyAgICBz dGF0aWMgS0dsb2JhbEFjY2VsICpnbG9iYWxLZXlzOwogfTsKIAogI2VuZGlmIC8vIF9fcGdsb2Jh bF9oX18KSW5kZXg6IGtpY2tlcmJpbmRpbmdzLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBmaWxlOiAvaG9t ZS9rZGUva2RlYmFzZS9raWNrZXIvY29yZS9raWNrZXJiaW5kaW5ncy5jcHAsdgpyZXRyaWV2aW5n IHJldmlzaW9uIDEuMwpkaWZmIC11IC1wIC1CIC13IC1yMS4zIGtpY2tlcmJpbmRpbmdzLmNwcAot LS0ga2lja2VyYmluZGluZ3MuY3BwCTIwMDEvMDYvMTAgMDQ6MTA6NDEJMS4zCisrKyBraWNrZXJi aW5kaW5ncy5jcHAJMjAwMS8wNi8yMyAyMjo1MToxOQpAQCAtMSw1ICsxLDE2IEBACisjaWZkZWYg S0lDS0VSX0FMTF9CSU5ESU5HUworI2RlZmluZSBMQVVOQ0hfTUVOVQorI2RlZmluZSBTSE9XX0RF U0tUT1AKKyNlbmRpZgorCisKKyNpZmRlZiBMQVVOQ0hfTUVOVQogI2lmZGVmIFdJVEhfTEFCRUxT CiBrZXlzLT5pbnNlcnRJdGVtKGkxOG4oIlBhbmVsIiksICJQcm9ncmFtOmtpY2tlciIsIDApOwog I2VuZGlmCiBrZXlzLT5pbnNlcnRJdGVtKGkxOG4oIlBvcHVwIExhdW5jaCBNZW51IiksIlBvcHVw IExhdW5jaCBNZW51IiwgS0tleSgiQUxUK0YxIiksIEtLZXkoIk1ldGErU3BhY2UiKSk7CisjZW5k aWYKIAorI2lmZGVmIFNIT1dfREVTS1RPUAora2V5cy0+aW5zZXJ0SXRlbShpMThuKCJUb2dnbGUg c2hvd2luZyBEZXNrdG9wIiksIlRvZ2dsZSBTaG93IERlc2t0b3AiLCBLS2V5KCJDVFJMK0FMVCtE IiksIEtLZXkoIk1ldGErQ3RybCtEIikpOworI2VuZGlmCkluZGV4OiBtYWluLmNwcAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09ClJDUyBmaWxlOiAvaG9tZS9rZGUva2RlYmFzZS9raWNrZXIvY29yZS9tYWluLmNwcCx2CnJl dHJpZXZpbmcgcmV2aXNpb24gMS4yMQpkaWZmIC11IC1wIC1CIC13IC1yMS4yMSBtYWluLmNwcAot LS0gbWFpbi5jcHAJMjAwMS8wNi8wNCAxOTozNDowNwkxLjIxCisrKyBtYWluLmNwcAkyMDAxLzA2 LzIzIDIyOjUxOjE5CkBAIC0zNCw2ICszNCw3IEBAIENPTk5FQ1RJT04gV0lUSCBUSEUgU09GVFdB UkUgT1IgVEhFIFVTRSAKICNpbmNsdWRlIDxrY29uZmlnLmg+CiAjaW5jbHVkZSA8ZGNvcGNsaWVu dC5oPgogI2luY2x1ZGUgPGt3aW5tb2R1bGUuaD4KKyNpbmNsdWRlIDxrZ2xvYmFsYWNjZWwuaD4K IAogI2luY2x1ZGUgPFgxMS9YbGliLmg+CiAKQEAgLTc3LDYgKzc4LDcgQEAgS2lja2VyQXBwOjpL aWNrZXJBcHAoKSA6IEtVbmlxdWVBcHBsaWNhdAogICAgIC8vIGluc3RhbnRpYXRlIHBsdWdpbiBt YW5hZ2VyIGFuZCBrd2luIG1vZHVsZQogICAgIFBHbG9iYWw6OnBsdWdpbm1nciA9IG5ldyBLaWNr ZXJQbHVnaW5NYW5hZ2VyKCk7CiAgICAgUEdsb2JhbDo6a3dpbl9tb2R1bGUgPSBuZXcgS1dpbk1v ZHVsZSh0aGlzICk7CisgICAgUEdsb2JhbDo6Z2xvYmFsS2V5cyA9IG5ldyBLR2xvYmFsQWNjZWwo KTsKIAogICAgIHAgPSBuZXcgUGFuZWwoKTsKICAgICBzZXRNYWluV2lkZ2V0KHApOwpJbmRleDog cGFuZWxidXR0b24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KUkNTIGZpbGU6IC9ob21lL2tkZS9rZGViYXNlL2tp Y2tlci9jb3JlL3BhbmVsYnV0dG9uLmNwcCx2CnJldHJpZXZpbmcgcmV2aXNpb24gMS4zNwpkaWZm IC11IC1wIC1CIC13IC1yMS4zNyBwYW5lbGJ1dHRvbi5jcHAKLS0tIHBhbmVsYnV0dG9uLmNwcAky MDAxLzA2LzIyIDIwOjI0OjIyCTEuMzcKKysrIHBhbmVsYnV0dG9uLmNwcAkyMDAxLzA2LzIzIDIy OjUxOjIwCkBAIC00MzgsNyArNDM4LDcgQEAgdm9pZCBQYW5lbFNlcnZpY2VNZW51QnV0dG9uOjpp bml0UG9wdXAoKQogCiAKIFBhbmVsS0J1dHRvbjo6UGFuZWxLQnV0dG9uKFFXaWRnZXQgKnBhcmVu dCwgY29uc3QgY2hhciAqbmFtZSkKLSAgICA6UGFuZWxQb3B1cEJ1dHRvbihwYXJlbnQsIG5hbWUp LCBrZXlzKDApCisgICAgOlBhbmVsUG9wdXBCdXR0b24ocGFyZW50LCBuYW1lKQogewogICAgIFFU b29sVGlwOjphZGQodGhpcywgaTE4bigiU3RhcnQgQXBwbGljYXRpb24iKSk7CiAgICAgc2V0VGl0 bGUoaTE4bigiU3RhcnQgQXBwbGljYXRpb24iKSk7CkBAIC00NTEsMjMgKzQ1MSwyNiBAQCBQYW5l bEtCdXR0b246OlBhbmVsS0J1dHRvbihRV2lkZ2V0ICpwYXJlCiAgICAgbWVudU1nciA9IG5ldyBL aWNrZXJNZW51TWFuYWdlciggdG9wTWVudSwgdGhpcywgImtpY2tlck1lbnVNYW5hZ2VyIiApOwog ICAgIGNvbm5lY3QobWVudU1nciwgU0lHTkFMKHBvcHVwS01lbnUoaW50LCBpbnQpKSwgdGhpcywK ICAgICAgICAgICAgIFNMT1Qoc2xvdEV4ZWNNZW51QXQoaW50LCBpbnQpKSk7Ci0KLSAgICBrZXlz ID0gbmV3IEtHbG9iYWxBY2NlbCgpOwogCisgICAgc3RhdGljIGJvb2wgaW5pdEdsb2JhbCA9IHRy dWU7CisgICAgaWYgKCBpbml0R2xvYmFsICkgeworICAgICAgICBpbml0R2xvYmFsID0gZmFsc2U7 CisgICAgICAgIEtHbG9iYWxBY2NlbCAqa2V5cyA9IFBHbG9iYWw6Omdsb2JhbEtleXM7CisjZGVm aW5lIExBVU5DSF9NRU5VCiAjaW5jbHVkZSAia2lja2VyYmluZGluZ3MuY3BwIgotCi0gICAga2V5 cy0+Y29ubmVjdEl0ZW0oICJQb3B1cCBMYXVuY2ggTWVudSIsIHRoaXMsIFNMT1QoIHNsb3RBY2Nl bEFjdGl2YXRlZCgpICkgKTsKKyN1bmRlZiBMQVVOQ0hfTUVOVQorICAgICAgICBrZXlzLT5jb25u ZWN0SXRlbSggIlBvcHVwIExhdW5jaCBNZW51IiwgdGhpcywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgIFNMT1QoIHNsb3RBY2NlbEFjdGl2YXRlZCgpICkgKTsKKyAgICB9CiB9CiAKIFBhbmVs S0J1dHRvbjo6flBhbmVsS0J1dHRvbigpCiB7Ci0gICAgZGVsZXRlIGtleXM7CiB9CiAKIHZvaWQg UGFuZWxLQnV0dG9uOjpjb25maWd1cmUoKQogewotICAgIGlmICgga2V5cyApCi0Ja2V5cy0+cmVh ZFNldHRpbmdzKCk7CisgICAgUEdsb2JhbDo6Z2xvYmFsS2V5cy0+cmVhZFNldHRpbmdzKCk7CiAg ICAgaWYgKCB0b3BNZW51ICkKIAl0b3BNZW51LT5yZWluaXRpYWxpemUoKTsKIApAQCAtNTM4LDYg KzU0MSwxNiBAQCBQYW5lbERlc2t0b3BCdXR0b246OlBhbmVsRGVza3RvcEJ1dHRvbihRCiAgICAg UVRvb2xUaXA6OmFkZCh0aGlzLCBpMThuKCJTaG93IERlc2t0b3AiKSk7CiAgICAgc2V0VGl0bGUo aTE4bigiU2hvdyBEZXNrdG9wIikpOwogCisgICAgc3RhdGljIGJvb2wgaW5pdEdsb2JhbCA9IHRy dWU7CisgICAgaWYgKCBpbml0R2xvYmFsICkgeworICAgICAgICBpbml0R2xvYmFsID0gZmFsc2U7 CisgICAgICAgIEtHbG9iYWxBY2NlbCAqa2V5cyA9IFBHbG9iYWw6Omdsb2JhbEtleXM7CisjZGVm aW5lIFNIT1dfREVTS1RPUAorI2luY2x1ZGUgImtpY2tlcmJpbmRpbmdzMi5jcHAiCisjdW5kZWYg U0hPV19ERVNLVE9QCisgICAgICAgIGtleXMtPmNvbm5lY3RJdGVtKCJUb2dnbGUgU2hvdyBEZXNr dG9wIiwgdGhpcywgU0xPVCh0b2dnbGUoKSkpOworICAgIH0KKwogICAgIC8vIG9uIGRlc2t0b3Ag Y2hhbmdlcyBvciB3aGVuIGEgd2luZG93IGlzIGRlaWNvbmlmaWVkLCB3ZSBhYm9ydCB0aGUgc2hv dyBkZXNrdG9wIG1vZGUKICAgICBjb25uZWN0KFBHbG9iYWw6Omt3aW5fbW9kdWxlLCBTSUdOQUwo Y3VycmVudERlc2t0b3BDaGFuZ2VkKGludCkpLCBTTE9UKHNsb3RDdXJyZW50RGVza3RvcENoYW5n ZWQoaW50KSkpOwogICAgIGNvbm5lY3QoIFBHbG9iYWw6Omt3aW5fbW9kdWxlLCBTSUdOQUwoIHdp bmRvd0NoYW5nZWQoV0lkLHVuc2lnbmVkIGludCkgKSwKQEAgLTYyMSw2ICs2MzQsOCBAQCB2b2lk IFBhbmVsRGVza3RvcEJ1dHRvbjo6Y29uZmlndXJlKCkKIHsKICAgICBQYW5lbEJ1dHRvbjo6Y29u ZmlndXJlKCk7CiAKKyAgICBQR2xvYmFsOjpnbG9iYWxLZXlzLT5yZWFkU2V0dGluZ3MoKTsKKwog ICAgIEtDb25maWcgKmNvbmZpZyA9IEtHbG9iYWw6OmNvbmZpZygpOwogICAgIGNvbmZpZy0+c2V0 R3JvdXAoImJ1dHRvbnMiKTsKIApJbmRleDogcGFuZWxidXR0b24uaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09ClJDUyBm aWxlOiAvaG9tZS9rZGUva2RlYmFzZS9raWNrZXIvY29yZS9wYW5lbGJ1dHRvbi5oLHYKcmV0cmll dmluZyByZXZpc2lvbiAxLjE4CmRpZmYgLXUgLXAgLUIgLXcgLXIxLjE4IHBhbmVsYnV0dG9uLmgK LS0tIHBhbmVsYnV0dG9uLmgJMjAwMS8wNS8yMyAxNDozNzozMQkxLjE4CisrKyBwYW5lbGJ1dHRv bi5oCTIwMDEvMDYvMjMgMjI6NTE6MjAKQEAgLTI4LDcgKzI4LDYgQEAgQ09OTkVDVElPTiBXSVRI IFRIRSBTT0ZUV0FSRSBPUiBUSEUgVVNFIAogI2luY2x1ZGUgInBhbmVsYnV0dG9uYmFzZS5oIgog I2luY2x1ZGUgImdsb2JhbC5oIgogCi1jbGFzcyBLR2xvYmFsQWNjZWw7CiBjbGFzcyBLUHJvcGVy dGllc0RpYWxvZzsKIGNsYXNzIFBhbmVsQnJvd3Nlck1lbnU7CiBjbGFzcyBQYW5lbEtNZW51OwpA QCAtMTk1LDcgKzE5NCw2IEBAIHByb3RlY3RlZDoKIAogICAgIFBhbmVsS01lbnUgKnRvcE1lbnU7 CiAgICAgS2lja2VyTWVudU1hbmFnZXIqIG1lbnVNZ3I7Ci0gICAgS0dsb2JhbEFjY2VsICprZXlz OwogfTsKIAogCg== --------------Boundary-00=_GRNEDRE4RJWRG9OI45PP Content-Type: text/x-c; charset="iso-8859-1"; name="showdesktop2.patch" Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="showdesktop2.patch" PyBzaG93ZGVza3RvcDIucGF0Y2gKSW5kZXg6IGtleWNvbmZpZy5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQpSQ1Mg ZmlsZTogL2hvbWUva2RlL2tkZWJhc2Uva2NvbnRyb2wva2V5cy9rZXljb25maWcuY3BwLHYKcmV0 cmlldmluZyByZXZpc2lvbiAxLjU1CmRpZmYgLXUgLXAgLUIgLXcgLXIxLjU1IGtleWNvbmZpZy5j cHAKLS0tIGtleWNvbmZpZy5jcHAJMjAwMS8wNi8xOSAxOTowNToxOAkxLjU1CisrKyBrZXljb25m aWcuY3BwCTIwMDEvMDYvMjMgMjI6NTQ6MjcKQEAgLTM2LDYgKzM2LDcgQEAKICNpbmNsdWRlICJr ZXljb25maWcuaCIKICNpbmNsdWRlICJrZXljb25maWcubW9jIgogCisjZGVmaW5lIEtJQ0tFUl9B TExfQklORElOR1MKIAogLy8tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCiAK --------------Boundary-00=_GRNEDRE4RJWRG9OI45PP--