18363 2008-04-08 06:57:53 -0700 [GTK] Combo boxes cannot be opened pressing space 2009-07-17 20:29:34 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P3 Normal --- 1 marco.barisione jmalonzo abarth christian jmalonzo vdepizzol zecke oldest_to_newest 76604 0 marco.barisione 2008-04-08 06:57:53 -0700 In GTK combo boxes can be opened by pressing space when they are focused. I tried to implement this behaviour in WebKit but I got lost while debugging keyboard events handling :( 129029 1 jmalonzo 2009-06-30 04:10:06 -0700 *** Bug 26818 has been marked as a duplicate of this bug. *** 130993 2 32586 jmalonzo 2009-07-10 15:52:39 -0700 Created attachment 32586 Take away space out of ARROW_KEYS_POP_MENU and into SPACE_POP_MENU for platforms that display the popup when spacebar is pressed The patch takes away space (' ') out of ARROW_KEYS_POP_MENU and into SPACE_POP_MENU for platforms that want to display a popup menu when spacebar is pressed. No change in behaviour except for Gtk. 131082 3 32586 eric 2009-07-10 23:08:01 -0700 Comment on attachment 32586 Take away space out of ARROW_KEYS_POP_MENU and into SPACE_POP_MENU for platforms that display the popup when spacebar is pressed This looks like it will break mac. You seem to want #if and #endif then another #if, not #elif This also needs a manual test. 131271 4 32652 jmalonzo 2009-07-13 01:28:27 -0700 Created attachment 32652 addressed eric's feedback and added a manual test 131676 5 32652 gustavo 2009-07-14 14:34:28 -0700 Comment on attachment 32652 addressed eric's feedback and added a manual test Looks good to me, after the changes. While you're at it, you could also have enter also open the combo box, to match what GTK+ does. Should be a matter of adding || keyCode == 'r' to the if inside SPACE_POP_MENU. Make it SPACE_AND_RETURN_POP_MENU =P. 132508 6 abarth 2009-07-17 00:22:42 -0700 Will land. 132509 7 abarth 2009-07-17 00:28:47 -0700 On second thought, I probably should go to sleep... 132742 8 32984 jmalonzo 2009-07-17 15:52:16 -0700 Created attachment 32984 updated: return key should popup the menu list too for gtk 132807 9 zecke 2009-07-17 18:17:06 -0700 (In reply to comment #8) > Created an attachment (id=32984) [details] > updated: return key should popup the menu list too for gtk Now a ' ' will show the popup twice? 132813 10 zecke 2009-07-17 18:33:13 -0700 (In reply to comment #9) > (In reply to comment #8) > > Created an attachment (id=32984) [details] [details] > > updated: return key should popup the menu list too for gtk > > Now a ' ' will show the popup twice? To be more precise this can happen when both ARROW_KEYS_POP_MENU and SPACE_OR_RETURN_POP_MENU are set. It should be mutual exclusive given that the current code is #if #else #endif and we turn it into #if #endif, #if #else #endif. 132828 11 33001 jmalonzo 2009-07-17 19:25:32 -0700 Created attachment 33001 Make it if-elif-else-endif as suggested by Holger 132831 12 33001 zecke 2009-07-17 19:41:55 -0700 Comment on attachment 33001 Make it if-elif-else-endif as suggested by Holger OKay, the next thing boils down to taste. To reduce code duplication one could do if ( #if SPACE_OR_.. keyCode == ' ' || keyCode == '\r' #elif keyCode == ' ' #endif ) { common Code } 132844 13 jmalonzo 2009-07-17 20:29:34 -0700 (In reply to comment #12) > (From update of attachment 33001 [details]) Landed as http://trac.webkit.org/changeset/46081 > OKay, the next thing boils down to taste. To reduce code duplication one could > do > > if ( > #if SPACE_OR_.. > keyCode == ' ' || keyCode == '\r' > #elif > keyCode == ' ' > #endif > ) { > common Code > } I'll do this in a separate bug. 32586 2009-07-10 15:52:39 -0700 2009-07-13 01:28:21 -0700 Take away space out of ARROW_KEYS_POP_MENU and into SPACE_POP_MENU for platforms that display the popup when spacebar is pressed spacepopmenu.patch text/plain 1967 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MDI0OGQzYi4uNDgzYzFhMCAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0xMCAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICA8aHR0cDovL3dlYmtpdC5v cmcvYi8xODM2Mz4gW0dUS10gQ29tYm8gYm94ZXMgY2Fubm90IGJlIG9wZW5lZCBwcmVzc2luZyBz cGFjZQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBHdGsgdG8gcGxhdGZvcm1zIHRoYXQgd2FudCB0byBvcGVuIHRoZSBtZW51bGlzdCB1c2luZyB0 aGUKKyAgICAgICAgc3BhY2ViYXIuCisKKyAgICAgICAgKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhh bmRsZXIpOgorCiAyMDA5LTA3LTEwICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4K IAogICAgICAgICBUcnkgdG8gdW5icmVhayBub24tTWFjIGJ1aWxkLgpkaWZmIC0tZ2l0IGEvV2Vi Q29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAgYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmNw cAppbmRleCA3NTUyYzU2Li41Y2U0OWZlIDEwMDY0NAotLS0gYS9XZWJDb3JlL2RvbS9TZWxlY3RF bGVtZW50LmNwcAorKysgYi9XZWJDb3JlL2RvbS9TZWxlY3RFbGVtZW50LmNwcApAQCAtNDksOCAr NDksMTIgQEAKIAogI2lmIFBMQVRGT1JNKE1BQykKICNkZWZpbmUgQVJST1dfS0VZU19QT1BfTUVO VSAxCisjZGVmaW5lIFNQQUNFX1BPUF9NRU5VIDEKKyNlbGlmIFBMQVRGT1JNKEdUSykKKyNkZWZp bmUgU1BBQ0VfUE9QX01FTlUgMQogI2Vsc2UKICNkZWZpbmUgQVJST1dfS0VZU19QT1BfTUVOVSAw CisjZGVmaW5lIFNQQUNFX1BPUF9NRU5VIDAKICNlbmRpZgogCiB1c2luZyBzdGQ6Om1pbjsKQEAg LTU2Nyw3ICs1NzEsNyBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6Om1lbnVMaXN0RGVmYXVsdEV2ZW50 SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudAogICAgICAgICBpbnQga2V5 Q29kZSA9IHN0YXRpY19jYXN0PEtleWJvYXJkRXZlbnQqPihldmVudCktPmtleUNvZGUoKTsKICAg ICAgICAgYm9vbCBoYW5kbGVkID0gZmFsc2U7CiAKLSNpZiBBUlJPV19LRVlTX1BPUF9NRU5VCisj aWYgU1BBQ0VfUE9QX01FTlUKICAgICAgICAgaWYgKGtleUNvZGUgPT0gJyAnKSB7CiAgICAgICAg ICAgICBlbGVtZW50LT5mb2N1cygpOwogICAgICAgICAgICAgLy8gU2F2ZSB0aGUgc2VsZWN0aW9u IHNvIGl0IGNhbiBiZSBjb21wYXJlZCB0byB0aGUgbmV3IHNlbGVjdGlvbiB3aGVuIGRpc3BhdGNo aW5nIGNoYW5nZSBldmVudHMgZHVyaW5nIHNldFNlbGVjdGVkSW5kZXgsCkBAIC01NzYsNyArNTgw LDkgQEAgdm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2Vs ZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQKICAgICAgICAgICAgIGlmIChSZW5kZXJNZW51 TGlzdCogbWVudUxpc3QgPSBzdGF0aWNfY2FzdDxSZW5kZXJNZW51TGlzdCo+KGVsZW1lbnQtPnJl bmRlcmVyKCkpKQogICAgICAgICAgICAgICAgIG1lbnVMaXN0LT5zaG93UG9wdXAoKTsKICAgICAg ICAgICAgIGhhbmRsZWQgPSB0cnVlOwotICAgICAgICB9IGVsc2UgaWYgKGtleUNvZGUgPT0gJ1xy JykgeworICAgICAgICB9CisjZWxpZiBBUlJPV19LRVlTX1BPUF9NRU5VCisgICAgICAgIGVsc2Ug aWYgKGtleUNvZGUgPT0gJ1xyJykgewogICAgICAgICAgICAgbWVudUxpc3RPbkNoYW5nZShkYXRh LCBlbGVtZW50KTsKICAgICAgICAgICAgIGlmIChodG1sRm9ybSkKICAgICAgICAgICAgICAgICBo dG1sRm9ybS0+c3VibWl0Q2xpY2soZXZlbnQpOwo= 32652 2009-07-13 01:28:27 -0700 2009-07-17 15:52:09 -0700 addressed eric's feedback and added a manual test bug-18363-20090713182821.patch text/plain 2607 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg ZWE3YjFmMi4uOGNlNmI1OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0xMyAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICA8aHR0cDovL3dlYmtpdC5v cmcvYi8xODM2Mz4gW0dUS10gQ29tYm8gYm94ZXMgY2Fubm90IGJlIG9wZW5lZCBwcmVzc2luZyBz cGFjZQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBHdGsgdG8gcGxhdGZvcm1zIHRoYXQgd2FudCB0byBvcGVuIHRoZSBtZW51bGlzdCB1c2luZyB0 aGUKKyAgICAgICAgc3BhY2ViYXIuCisKKyAgICAgICAgKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhh bmRsZXIpOgorCiAyMDA5LTA3LTEyICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgT2xpdmVyIEh1bnQuCmRpZmYgLS1naXQgYS9XZWJDb3JlL2Rv bS9TZWxlY3RFbGVtZW50LmNwcCBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCmluZGV4 IDc1NTJjNTYuLjk3ZmE0NzQgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQu Y3BwCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCkBAIC00OSw4ICs0OSwxMiBA QAogCiAjaWYgUExBVEZPUk0oTUFDKQogI2RlZmluZSBBUlJPV19LRVlTX1BPUF9NRU5VIDEKKyNk ZWZpbmUgU1BBQ0VfUE9QX01FTlUgMQorI2VsaWYgUExBVEZPUk0oR1RLKQorI2RlZmluZSBTUEFD RV9QT1BfTUVOVSAxCiAjZWxzZQogI2RlZmluZSBBUlJPV19LRVlTX1BPUF9NRU5VIDAKKyNkZWZp bmUgU1BBQ0VfUE9QX01FTlUgMAogI2VuZGlmCiAKIHVzaW5nIHN0ZDo6bWluOwpAQCAtNTY3LDcg KzU3MSw3IEBAIHZvaWQgU2VsZWN0RWxlbWVudDo6bWVudUxpc3REZWZhdWx0RXZlbnRIYW5kbGVy KFNlbGVjdEVsZW1lbnREYXRhJiBkYXRhLCBFbGVtZW50CiAgICAgICAgIGludCBrZXlDb2RlID0g c3RhdGljX2Nhc3Q8S2V5Ym9hcmRFdmVudCo+KGV2ZW50KS0+a2V5Q29kZSgpOwogICAgICAgICBi b29sIGhhbmRsZWQgPSBmYWxzZTsKIAotI2lmIEFSUk9XX0tFWVNfUE9QX01FTlUKKyNpZiBTUEFD RV9QT1BfTUVOVQogICAgICAgICBpZiAoa2V5Q29kZSA9PSAnICcpIHsKICAgICAgICAgICAgIGVs ZW1lbnQtPmZvY3VzKCk7CiAgICAgICAgICAgICAvLyBTYXZlIHRoZSBzZWxlY3Rpb24gc28gaXQg Y2FuIGJlIGNvbXBhcmVkIHRvIHRoZSBuZXcgc2VsZWN0aW9uIHdoZW4gZGlzcGF0Y2hpbmcgY2hh bmdlIGV2ZW50cyBkdXJpbmcgc2V0U2VsZWN0ZWRJbmRleCwKQEAgLTU3Niw3ICs1ODAsMTAgQEAg dm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhhbmRsZXIoU2VsZWN0RWxl bWVudERhdGEmIGRhdGEsIEVsZW1lbnQKICAgICAgICAgICAgIGlmIChSZW5kZXJNZW51TGlzdCog bWVudUxpc3QgPSBzdGF0aWNfY2FzdDxSZW5kZXJNZW51TGlzdCo+KGVsZW1lbnQtPnJlbmRlcmVy KCkpKQogICAgICAgICAgICAgICAgIG1lbnVMaXN0LT5zaG93UG9wdXAoKTsKICAgICAgICAgICAg IGhhbmRsZWQgPSB0cnVlOwotICAgICAgICB9IGVsc2UgaWYgKGtleUNvZGUgPT0gJ1xyJykgewor ICAgICAgICB9CisjZW5kaWYKKyNpZiBBUlJPV19LRVlTX1BPUF9NRU5VCisgICAgICAgIGlmIChr ZXlDb2RlID09ICdccicpIHsKICAgICAgICAgICAgIG1lbnVMaXN0T25DaGFuZ2UoZGF0YSwgZWxl bWVudCk7CiAgICAgICAgICAgICBpZiAoaHRtbEZvcm0pCiAgICAgICAgICAgICAgICAgaHRtbEZv cm0tPnN1Ym1pdENsaWNrKGV2ZW50KTsKZGlmZiAtLWdpdCBhL1dlYkNvcmUvbWFudWFsLXRlc3Rz L3NlbGVjdC1wb3B1cC1vbi1zcGFjZWJhci5odG1sIGIvV2ViQ29yZS9tYW51YWwtdGVzdHMvc2Vs ZWN0LXBvcHVwLW9uLXNwYWNlYmFyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMC4uZTcxODdiMAotLS0gL2Rldi9udWxsCisrKyBiL1dlYkNvcmUvbWFudWFsLXRlc3RzL3Nl bGVjdC1wb3B1cC1vbi1zcGFjZWJhci5odG1sCkBAIC0wLDAgKzEsMTggQEAKKzxodG1sPgorPGhl YWQ+CitTZWxlY3Qgd2lsbCBwb3B1cCB3aGVuIHNwYWNlYmFyIGlzIHByZXNzZWQgbWFudWFsIHRl c3QuCis8L2hlYWQ+CisKKzxib2R5PgorU2VlIGJ1Zzo8YSBocmVmPSJodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzNjMiPjE4MzYzPC9hPi4KKzxwPgorVGhpcyB0ZXN0 IGVuc3VyZXMgdGhhdCBwcmVzc2luZyBzcGFjZWJhciBvbiBNYWMgYW5kIEd0ayBwb3J0cyB3aWxs IHBvcHVwIHRoZSBzZWxlY3QgY29udHJvbCB3aGVuIGZvY3VzZWQuCis8YnI+CisKKzxzZWxlY3Qg aWQ9InNlbGVjdElkIj4KKyAgPG9wdGlvbj5JdGVtIDE8L29wdGlvbj4KKyAgPG9wdGlvbj5JdGVt IDI8L29wdGlvbj4KKzwvc2VsZWN0PgorCis8L2JvZHk+Cis8L2h0bWw+ 32984 2009-07-17 15:52:16 -0700 2009-07-17 19:25:26 -0700 updated: return key should popup the menu list too for gtk bug-18363-20090718085214.patch text/plain 3203 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg YTUyNTFkZS4uODdlNDY3OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0xNyAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICA8aHR0cDovL3dlYmtpdC5v cmcvYi8xODM2Mz4gW0dUS10gQ29tYm8gYm94ZXMgY2Fubm90IGJlIG9wZW5lZCBwcmVzc2luZyBz cGFjZQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBHdGsgdG8gcGxhdGZvcm1zIHRoYXQgd2FudCB0byBvcGVuIHRoZSBtZW51bGlzdCB1c2luZyB0 aGUKKyAgICAgICAgc3BhY2ViYXIuCisKKyAgICAgICAgKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhh bmRsZXIpOgorCiAyMDA5LTA3LTE3ICBBbGV4ZXkgUHJvc2t1cnlha292ICA8YXBAd2Via2l0Lm9y Zz4KIAogICAgICAgICBSZXZpZXdlZCBieSBEYXZpZCBMZXZpbi4KZGlmZiAtLWdpdCBhL1dlYkNv cmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwIGIvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAK aW5kZXggNzU1MmM1Ni4uODcyNTU3NyAxMDA2NDQKLS0tIGEvV2ViQ29yZS9kb20vU2VsZWN0RWxl bWVudC5jcHAKKysrIGIvV2ViQ29yZS9kb20vU2VsZWN0RWxlbWVudC5jcHAKQEAgLTQ5LDggKzQ5 LDEzIEBACiAKICNpZiBQTEFURk9STShNQUMpCiAjZGVmaW5lIEFSUk9XX0tFWVNfUE9QX01FTlUg MQorI2RlZmluZSBTUEFDRV9PUl9SRVRVUk5fUE9QX01FTlUgMAorI2VsaWYgUExBVEZPUk0oR1RL KQorI2RlZmluZSBBUlJPV19LRVlTX1BPUF9NRU5VIDAKKyNkZWZpbmUgU1BBQ0VfT1JfUkVUVVJO X1BPUF9NRU5VIDEKICNlbHNlCiAjZGVmaW5lIEFSUk9XX0tFWVNfUE9QX01FTlUgMAorI2RlZmlu ZSBTUEFDRV9PUl9SRVRVUk5fUE9QX01FTlUgMAogI2VuZGlmCiAKIHVzaW5nIHN0ZDo6bWluOwpA QCAtNTY3LDYgKzU3MiwxNyBAQCB2b2lkIFNlbGVjdEVsZW1lbnQ6Om1lbnVMaXN0RGVmYXVsdEV2 ZW50SGFuZGxlcihTZWxlY3RFbGVtZW50RGF0YSYgZGF0YSwgRWxlbWVudAogICAgICAgICBpbnQg a2V5Q29kZSA9IHN0YXRpY19jYXN0PEtleWJvYXJkRXZlbnQqPihldmVudCktPmtleUNvZGUoKTsK ICAgICAgICAgYm9vbCBoYW5kbGVkID0gZmFsc2U7CiAKKyNpZiBTUEFDRV9PUl9SRVRVUk5fUE9Q X01FTlUKKyAgICAgICAgaWYgKGtleUNvZGUgPT0gJyAnIHx8IGtleUNvZGUgPT0gJ1xyJykgewor ICAgICAgICAgICAgZWxlbWVudC0+Zm9jdXMoKTsKKyAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNl bGVjdGlvbiBzbyBpdCBjYW4gYmUgY29tcGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBk aXNwYXRjaGluZyBjaGFuZ2UgZXZlbnRzIGR1cmluZyBzZXRTZWxlY3RlZEluZGV4LAorICAgICAg ICAgICAgLy8gd2hpY2ggZ2V0cyBjYWxsZWQgZnJvbSBSZW5kZXJNZW51TGlzdDo6dmFsdWVDaGFu Z2VkLCB3aGljaCBnZXRzIGNhbGxlZCBhZnRlciB0aGUgdXNlciBtYWtlcyBhIHNlbGVjdGlvbiBm cm9tIHRoZSBtZW51LgorICAgICAgICAgICAgc2F2ZUxhc3RTZWxlY3Rpb24oZGF0YSwgZWxlbWVu dCk7CisgICAgICAgICAgICBpZiAoUmVuZGVyTWVudUxpc3QqIG1lbnVMaXN0ID0gc3RhdGljX2Nh c3Q8UmVuZGVyTWVudUxpc3QqPihlbGVtZW50LT5yZW5kZXJlcigpKSkKKyAgICAgICAgICAgICAg ICBtZW51TGlzdC0+c2hvd1BvcHVwKCk7CisgICAgICAgICAgICBoYW5kbGVkID0gdHJ1ZTsKKyAg ICAgICAgfQorI2VuZGlmCiAjaWYgQVJST1dfS0VZU19QT1BfTUVOVQogICAgICAgICBpZiAoa2V5 Q29kZSA9PSAnICcpIHsKICAgICAgICAgICAgIGVsZW1lbnQtPmZvY3VzKCk7CmRpZmYgLS1naXQg YS9XZWJDb3JlL21hbnVhbC10ZXN0cy9zZWxlY3QtcG9wdXAtb24tc3BhY2ViYXIuaHRtbCBiL1dl YkNvcmUvbWFudWFsLXRlc3RzL3NlbGVjdC1wb3B1cC1vbi1zcGFjZWJhci5odG1sCm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAuLmRmY2VlNDAKLS0tIC9kZXYvbnVsbAorKysgYi9X ZWJDb3JlL21hbnVhbC10ZXN0cy9zZWxlY3QtcG9wdXAtb24tc3BhY2ViYXIuaHRtbApAQCAtMCww ICsxLDI5IEBACis8IURPQ1RZUEUgSFRNTCBQVUJMSUMgIi0vL1czQy8vRFREIEhUTUwgNC4wMS8v RU4iCisgICAgICAgICJodHRwOi8vd3d3LnczLm9yZy9UUi9odG1sNC9zdHJpY3QuZHRkIj4KKzxo dG1sPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9ImRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdzZWxlY3RJZCcpLmZvY3VzKCkiPgorPHA+PGI+QlVHIElEOjxhIGhyZWY9Imh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM2MyI+MTgzNjM8L2E+LjwvcD4KKzxw IGlkPSJkZXNjcmlwdGlvbiI+CitUaGlzIHRlc3QgZW5zdXJlcyB0aGF0IHByZXNzaW5nIHNwYWNl YmFyIG9uIE1hYyBhbmQgR3RrIHBvcnRzIG9yIHByZXNzaW5nCityZXR1cm4gaW4gR3RrIHBvcnQg d2lsbCBwb3B1cCB0aGUgc2VsZWN0IGNvbnRyb2wgd2hlbiBmb2N1c2VkLgorPC9wPgorCis8cCBp ZD0idGVzdCIgc3R5bGU9ImJhY2tncm91bmQtY29sb3I6c2t5Ymx1ZTsgcGFkZGluZzozcHg7Ij48 Yj5TVEVQUyBUTyBURVNUOjwvYj4gPGJyPgorUHJlc3MgPGVtPnNwYWNlYmFyPC9lbT4gb3IgdGhl IDxlbT5yZXR1cm48L2VtPiBrZXkgKEd0ayBvbmx5KS4KKworPHAgaWQ9InN1Y2Nlc3MiIHN0eWxl PSJiYWNrZ3JvdW5kLWNvbG9yOnBhbGVncmVlbjsgcGFkZGluZzozcHg7Ij48Yj5URVNUIFBBU1M6 PC9iPiAKK1NlbGVjdCBwb3BzIHVwIHRoZSBtZW51IGxpc3Q8L3A+CisKKzxwIGlkPSJmYWlsdXJl IiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjojRkYzMzAwOyBwYWRkaW5nOjNweDsiPjxiPlRFU1Qg RkFJTDo8L2I+ICAKK1NlbGVjdCBkb2VzIG5vdCBwb3B1cCBhIG1lbnUgbGlzdCAtIG5vdGhpbmcg aGFwcGVucy48L3A+CisKKworPHNlbGVjdCBpZD0ic2VsZWN0SWQiPgorICA8b3B0aW9uPlNlbGVj dDwvb3B0aW9uPgorICA8b3B0aW9uPkl0ZW0gMTwvb3B0aW9uPgorPC9zZWxlY3Q+CisKKzwvYm9k eT4KKzwvaHRtbD4= 33001 2009-07-17 19:25:32 -0700 2009-07-17 19:41:55 -0700 Make it if-elif-else-endif as suggested by Holger bug-18363-20090718122529.patch text/plain 3354 jmalonzo ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MzBmMmEzNi4uMjY5Y2ZhYSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAwOS0wNy0xNyAgSmFuIE1pY2hhZWwg QWxvbnpvICA8am1hbG9uem9Ad2Via2l0Lm9yZz4KKworICAgICAgICA8aHR0cDovL3dlYmtpdC5v cmcvYi8xODM2Mz4gW0dUS10gQ29tYm8gYm94ZXMgY2Fubm90IGJlIG9wZW5lZCBwcmVzc2luZyBz cGFjZQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFk ZCBHdGsgdG8gcGxhdGZvcm1zIHRoYXQgd2FudCB0byBvcGVuIHRoZSBtZW51bGlzdCB1c2luZyB0 aGUKKyAgICAgICAgc3BhY2ViYXIuCisKKyAgICAgICAgKiBkb20vU2VsZWN0RWxlbWVudC5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVudEhh bmRsZXIpOgorCiAyMDA5LTA3LTE3ICBNYWRzIEFnZXIgIDxhZ2VyQGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEaW1pdHJpIEdsYXprb3YuCmRpZmYgLS1naXQgYS9XZWJDb3Jl L2RvbS9TZWxlY3RFbGVtZW50LmNwcCBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCmlu ZGV4IDc1NTJjNTYuLmJiMGVhOWMgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1l bnQuY3BwCisrKyBiL1dlYkNvcmUvZG9tL1NlbGVjdEVsZW1lbnQuY3BwCkBAIC00OSw4ICs0OSwx MyBAQAogCiAjaWYgUExBVEZPUk0oTUFDKQogI2RlZmluZSBBUlJPV19LRVlTX1BPUF9NRU5VIDEK KyNkZWZpbmUgU1BBQ0VfT1JfUkVUVVJOX1BPUF9NRU5VIDAKKyNlbGlmIFBMQVRGT1JNKEdUSykK KyNkZWZpbmUgQVJST1dfS0VZU19QT1BfTUVOVSAwCisjZGVmaW5lIFNQQUNFX09SX1JFVFVSTl9Q T1BfTUVOVSAxCiAjZWxzZQogI2RlZmluZSBBUlJPV19LRVlTX1BPUF9NRU5VIDAKKyNkZWZpbmUg U1BBQ0VfT1JfUkVUVVJOX1BPUF9NRU5VIDAKICNlbmRpZgogCiB1c2luZyBzdGQ6Om1pbjsKQEAg LTU2Nyw3ICs1NzIsMTcgQEAgdm9pZCBTZWxlY3RFbGVtZW50OjptZW51TGlzdERlZmF1bHRFdmVu dEhhbmRsZXIoU2VsZWN0RWxlbWVudERhdGEmIGRhdGEsIEVsZW1lbnQKICAgICAgICAgaW50IGtl eUNvZGUgPSBzdGF0aWNfY2FzdDxLZXlib2FyZEV2ZW50Kj4oZXZlbnQpLT5rZXlDb2RlKCk7CiAg ICAgICAgIGJvb2wgaGFuZGxlZCA9IGZhbHNlOwogCi0jaWYgQVJST1dfS0VZU19QT1BfTUVOVQor I2lmIFNQQUNFX09SX1JFVFVSTl9QT1BfTUVOVQorICAgICAgICBpZiAoa2V5Q29kZSA9PSAnICcg fHwga2V5Q29kZSA9PSAnXHInKSB7CisgICAgICAgICAgICBlbGVtZW50LT5mb2N1cygpOworICAg ICAgICAgICAgLy8gU2F2ZSB0aGUgc2VsZWN0aW9uIHNvIGl0IGNhbiBiZSBjb21wYXJlZCB0byB0 aGUgbmV3IHNlbGVjdGlvbiB3aGVuIGRpc3BhdGNoaW5nIGNoYW5nZSBldmVudHMgZHVyaW5nIHNl dFNlbGVjdGVkSW5kZXgsCisgICAgICAgICAgICAvLyB3aGljaCBnZXRzIGNhbGxlZCBmcm9tIFJl bmRlck1lbnVMaXN0Ojp2YWx1ZUNoYW5nZWQsIHdoaWNoIGdldHMgY2FsbGVkIGFmdGVyIHRoZSB1 c2VyIG1ha2VzIGEgc2VsZWN0aW9uIGZyb20gdGhlIG1lbnUuCisgICAgICAgICAgICBzYXZlTGFz dFNlbGVjdGlvbihkYXRhLCBlbGVtZW50KTsKKyAgICAgICAgICAgIGlmIChSZW5kZXJNZW51TGlz dCogbWVudUxpc3QgPSBzdGF0aWNfY2FzdDxSZW5kZXJNZW51TGlzdCo+KGVsZW1lbnQtPnJlbmRl cmVyKCkpKQorICAgICAgICAgICAgICAgIG1lbnVMaXN0LT5zaG93UG9wdXAoKTsKKyAgICAgICAg ICAgIGhhbmRsZWQgPSB0cnVlOworICAgICAgICB9CisjZWxpZiBBUlJPV19LRVlTX1BPUF9NRU5V CiAgICAgICAgIGlmIChrZXlDb2RlID09ICcgJykgewogICAgICAgICAgICAgZWxlbWVudC0+Zm9j dXMoKTsKICAgICAgICAgICAgIC8vIFNhdmUgdGhlIHNlbGVjdGlvbiBzbyBpdCBjYW4gYmUgY29t cGFyZWQgdG8gdGhlIG5ldyBzZWxlY3Rpb24gd2hlbiBkaXNwYXRjaGluZyBjaGFuZ2UgZXZlbnRz IGR1cmluZyBzZXRTZWxlY3RlZEluZGV4LApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9tYW51YWwtdGVz dHMvc2VsZWN0LXBvcHVwLW9uLXNwYWNlYmFyLmh0bWwgYi9XZWJDb3JlL21hbnVhbC10ZXN0cy9z ZWxlY3QtcG9wdXAtb24tc3BhY2ViYXIuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAw MDAwMDAwLi5kZmNlZTQwCi0tLSAvZGV2L251bGwKKysrIGIvV2ViQ29yZS9tYW51YWwtdGVzdHMv c2VsZWN0LXBvcHVwLW9uLXNwYWNlYmFyLmh0bWwKQEAgLTAsMCArMSwyOSBAQAorPCFET0NUWVBF IEhUTUwgUFVCTElDICItLy9XM0MvL0RURCBIVE1MIDQuMDEvL0VOIgorICAgICAgICAiaHR0cDov L3d3dy53My5vcmcvVFIvaHRtbDQvc3RyaWN0LmR0ZCI+Cis8aHRtbD4KKzxoZWFkPgorPC9oZWFk PgorPGJvZHkgb25sb2FkPSJkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnc2VsZWN0SWQnKS5mb2N1 cygpIj4KKzxwPjxiPkJVRyBJRDo8YSBocmVmPSJodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTgzNjMiPjE4MzYzPC9hPi48L3A+Cis8cCBpZD0iZGVzY3JpcHRpb24iPgor VGhpcyB0ZXN0IGVuc3VyZXMgdGhhdCBwcmVzc2luZyBzcGFjZWJhciBvbiBNYWMgYW5kIEd0ayBw b3J0cyBvciBwcmVzc2luZworcmV0dXJuIGluIEd0ayBwb3J0IHdpbGwgcG9wdXAgdGhlIHNlbGVj dCBjb250cm9sIHdoZW4gZm9jdXNlZC4KKzwvcD4KKworPHAgaWQ9InRlc3QiIHN0eWxlPSJiYWNr Z3JvdW5kLWNvbG9yOnNreWJsdWU7IHBhZGRpbmc6M3B4OyI+PGI+U1RFUFMgVE8gVEVTVDo8L2I+ IDxicj4KK1ByZXNzIDxlbT5zcGFjZWJhcjwvZW0+IG9yIHRoZSA8ZW0+cmV0dXJuPC9lbT4ga2V5 IChHdGsgb25seSkuCisKKzxwIGlkPSJzdWNjZXNzIiBzdHlsZT0iYmFja2dyb3VuZC1jb2xvcjpw YWxlZ3JlZW47IHBhZGRpbmc6M3B4OyI+PGI+VEVTVCBQQVNTOjwvYj4gCitTZWxlY3QgcG9wcyB1 cCB0aGUgbWVudSBsaXN0PC9wPgorCis8cCBpZD0iZmFpbHVyZSIgc3R5bGU9ImJhY2tncm91bmQt Y29sb3I6I0ZGMzMwMDsgcGFkZGluZzozcHg7Ij48Yj5URVNUIEZBSUw6PC9iPiAgCitTZWxlY3Qg ZG9lcyBub3QgcG9wdXAgYSBtZW51IGxpc3QgLSBub3RoaW5nIGhhcHBlbnMuPC9wPgorCisKKzxz ZWxlY3QgaWQ9InNlbGVjdElkIj4KKyAgPG9wdGlvbj5TZWxlY3Q8L29wdGlvbj4KKyAgPG9wdGlv bj5JdGVtIDE8L29wdGlvbj4KKzwvc2VsZWN0PgorCis8L2JvZHk+Cis8L2h0bWw+