48335 2010-10-26 08:46:48 -0700 [GTK] [review] Support for new-window in GtkLauncher 2010-10-29 09:32:09 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED P2 Normal --- 0 nicolas webkit-unassigned gustavo mrobinson xan.lopez oldest_to_newest 299491 0 71894 nicolas 2010-10-26 08:46:48 -0700 Created attachment 71894 Enable popup window in GtkLauncher The GtkLauncher application does not support opening new window when a "target=_blank" is clicked or similar call to window.open() is made withing a user gesture. Instead, GtkLauncher does nothing. This prevents using GtkLauncher for testing certain sites. The attach patch implement minimal support for creating new window. This is done by implementing signals "create-web-view", "web-view-ready" and "close-web-view". 301274 1 71894 mrobinson 2010-10-28 13:19:48 -0700 Comment on attachment 71894 Enable popup window in GtkLauncher Great patch. I'm in favor of putting a little more into GtkLauncher while keeping it minimal. This patch does need a ChangeLog though, which can be generated via prepare-ChangeLog in the WebKitTools/Scripts directory. 301277 2 mrobinson 2010-10-28 13:21:35 -0700 CCing some other GTK+ reviewers, who might have more insight into whether this should be added to GtkLauncher. I'm all for it though. 301437 3 xan.lopez 2010-10-28 16:36:57 -0700 Yes. I'm also in favor of keeping the launcher (very) minimal, but this seems to be needed to browse to some pages since we do nothing in the default handler of create-web-view. Perhaps that's something we should fix too, not sure. 301454 4 mrobinson 2010-10-28 16:47:19 -0700 (In reply to comment #3) > Yes. I'm also in favor of keeping the launcher (very) minimal, but this seems to be needed to browse to some pages since we do nothing in the default handler of create-web-view. Perhaps that's something we should fix too, not sure. I think two good metrics to help decide whether or not to put something in the GTKLauncher are: 1. Will this help debug layout test failures? 2. Will this help demonstrate the API to embedders? In my mind, this patch does both. 301770 5 72336 nicolas 2010-10-29 08:22:26 -0700 Created attachment 72336 Enable popup window in GtkLauncher (with changelog) The GtkLauncher application does not support opening new window when a link with "target=_blank" is clicked or similar call to window.open(). Instead, GtkLauncher does nothing which breaks navigation of some websites. 301791 6 72336 mrobinson 2010-10-29 08:51:44 -0700 Comment on attachment 72336 Enable popup window in GtkLauncher (with changelog) View in context: https://bugs.webkit.org/attachment.cgi?id=72336&action=review > WebKitTools/ChangeLog:11 > + Enable popup window in GtkLauncher > + > + The GtkLauncher application does not support opening new window when > + a link with "target=_blank" is clicked or similar call to > + window.open(). Instead, GtkLauncher does nothing which breaks > + navigation of some websites. > + https://bugs.webkit.org/show_bug.cgi?id=48335 It's more typical for the order to be: <bug title> <bug url> <description> This isn't a big deal though, and I'll fix it locally before landing. 301796 7 xan.lopez 2010-10-29 08:59:16 -0700 (In reply to comment #6) > It's more typical for the order to be: > <bug title> > <bug url> > > <description> > > This isn't a big deal though, and I'll fix it locally before landing. prepare-ChangeLog --bug <number> gets it right for you at no extra cost! :) 301816 8 mrobinson 2010-10-29 09:32:09 -0700 Committed r70886: <http://trac.webkit.org/changeset/70886> 71894 2010-10-26 08:46:48 -0700 2010-10-29 08:22:26 -0700 Enable popup window in GtkLauncher 0001-Enable-popup-window-in-GtkLauncher.patch text/plain 10416 nicolas RnJvbSA0NzNhODg1OTI5ZjFhNDc0OTkzMmRhMTE4NTkzMzdlMGQzMzI4NGNiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGFzIER1ZnJlc25lIDxuaWNvbGFzLmR1ZnJlc25lQGNv bGxhYm9yYS5jby51az4KRGF0ZTogTW9uLCAyNSBPY3QgMjAxMCAxODoyNDo1NiAtMDQwMApTdWJq ZWN0OiBbUEFUQ0hdIEVuYWJsZSBwb3B1cCB3aW5kb3cgaW4gR3RrTGF1bmNoZXIKCi0tLQogV2Vi S2l0VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jIHwgIDEzOCArKysrKysrKysrKysrKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tCiAxIGZpbGVzIGNoYW5nZWQsIDkxIGluc2VydGlvbnMoKyksIDQ3 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4u YyBiL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYwppbmRleCAxN2VkNDBmLi40YWJlZTA4 IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMKKysrIGIvV2ViS2l0 VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCkBAIC0yNywyNiArMjcsMjQgQEAKICNpbmNsdWRlIDxn dGsvZ3RrLmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtpdC5oPgogCi1zdGF0aWMgR3RrV2lkZ2V0 KiBtYWluX3dpbmRvdzsKLXN0YXRpYyBHdGtXaWRnZXQqIHVyaV9lbnRyeTsKLXN0YXRpYyBHdGtT dGF0dXNiYXIqIG1haW5fc3RhdHVzYmFyOwotc3RhdGljIFdlYktpdFdlYlZpZXcqIHdlYl92aWV3 Owotc3RhdGljIGdjaGFyKiBtYWluX3RpdGxlOwotc3RhdGljIGdkb3VibGUgbG9hZF9wcm9ncmVz czsKLXN0YXRpYyBndWludCBzdGF0dXNfY29udGV4dF9pZDsKK3N0YXRpYyBnaW50IHdpbmRvd19j b3VudCA9IDA7CisKK3N0YXRpYyBHdGtXaWRnZXQqIGNyZWF0ZV93aW5kb3cgKFdlYktpdFdlYlZp ZXcqKiBvdXRfd2ViX3ZpZXcpOwogCiBzdGF0aWMgdm9pZAogYWN0aXZhdGVfdXJpX2VudHJ5X2Ni IChHdGtXaWRnZXQqIGVudHJ5LCBncG9pbnRlciBkYXRhKQogeworICAgIFdlYktpdFdlYlZpZXcg KndlYl92aWV3ID0gZ19vYmplY3RfZ2V0X2RhdGEgKEdfT0JKRUNUIChlbnRyeSksICJ3ZWItdmll dyIpOwogICAgIGNvbnN0IGdjaGFyKiB1cmkgPSBndGtfZW50cnlfZ2V0X3RleHQgKEdUS19FTlRS WSAoZW50cnkpKTsKICAgICBnX2Fzc2VydCAodXJpKTsKICAgICB3ZWJraXRfd2ViX3ZpZXdfbG9h ZF91cmkgKHdlYl92aWV3LCB1cmkpOwogfQogCiBzdGF0aWMgdm9pZAotdXBkYXRlX3RpdGxlIChH dGtXaW5kb3cqIHdpbmRvdykKK3VwZGF0ZV90aXRsZSAoR3RrV2luZG93KiB3aW5kb3csIFdlYktp dFdlYlZpZXcqIHdlYl92aWV3KQogewotICAgIEdTdHJpbmcqIHN0cmluZyA9IGdfc3RyaW5nX25l dyAobWFpbl90aXRsZSk7CisgICAgR1N0cmluZyAqc3RyaW5nID0gZ19zdHJpbmdfbmV3ICh3ZWJr aXRfd2ViX3ZpZXdfZ2V0X3RpdGxlKHdlYl92aWV3KSk7CisgICAgZ2RvdWJsZSBsb2FkX3Byb2dy ZXNzID0gd2Via2l0X3dlYl92aWV3X2dldF9wcm9ncmVzcyAod2ViX3ZpZXcpICogMTAwOwogICAg IGdfc3RyaW5nX2FwcGVuZCAoc3RyaW5nLCAiIC0gV2ViS2l0IExhdW5jaGVyIik7CiAgICAgaWYg KGxvYWRfcHJvZ3Jlc3MgPCAxMDApCiAgICAgICAgIGdfc3RyaW5nX2FwcGVuZF9wcmludGYgKHN0 cmluZywgIiAoJWYlJSkiLCBsb2FkX3Byb2dyZXNzKTsKQEAgLTU2LDI1ICs1NCwyNCBAQCB1cGRh dGVfdGl0bGUgKEd0a1dpbmRvdyogd2luZG93KQogfQogCiBzdGF0aWMgdm9pZAotbGlua19ob3Zl cl9jYiAoV2ViS2l0V2ViVmlldyogcGFnZSwgY29uc3QgZ2NoYXIqIHRpdGxlLCBjb25zdCBnY2hh ciogbGluaywgZ3BvaW50ZXIgZGF0YSkKK2xpbmtfaG92ZXJfY2IgKFdlYktpdFdlYlZpZXcqIHBh Z2UsIGNvbnN0IGdjaGFyKiB0aXRsZSwgY29uc3QgZ2NoYXIqIGxpbmssIEd0a1N0YXR1c2Jhciog c3RhdHVzYmFyKQogeworICAgIGd1aW50IHN0YXR1c19jb250ZXh0X2lkID0KKyAgICAgIEdQT0lO VEVSX1RPX1VJTlQgKGdfb2JqZWN0X2dldF9kYXRhIChHX09CSkVDVCAoc3RhdHVzYmFyKSwgImxp bmstaG92ZXItY29udGV4dCIpKTsKICAgICAvKiB1bmRlcmZsb3cgaXMgYWxsb3dlZCAqLwotICAg IGd0a19zdGF0dXNiYXJfcG9wIChtYWluX3N0YXR1c2Jhciwgc3RhdHVzX2NvbnRleHRfaWQpOwor ICAgIGd0a19zdGF0dXNiYXJfcG9wIChzdGF0dXNiYXIsIHN0YXR1c19jb250ZXh0X2lkKTsKICAg ICBpZiAobGluaykKLSAgICAgICAgZ3RrX3N0YXR1c2Jhcl9wdXNoIChtYWluX3N0YXR1c2Jhciwg c3RhdHVzX2NvbnRleHRfaWQsIGxpbmspOworICAgICAgICBndGtfc3RhdHVzYmFyX3B1c2ggKHN0 YXR1c2Jhciwgc3RhdHVzX2NvbnRleHRfaWQsIGxpbmspOwogfQogCiBzdGF0aWMgdm9pZAotbm90 aWZ5X3RpdGxlX2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR1BhcmFtU3BlYyogcHNwZWMs IGdwb2ludGVyIGRhdGEpCitub3RpZnlfdGl0bGVfY2IgKFdlYktpdFdlYlZpZXcqIHdlYl92aWV3 LCBHUGFyYW1TcGVjKiBwc3BlYywgR3RrV2lkZ2V0KiB3aW5kb3cpCiB7Ci0gICAgaWYgKG1haW5f dGl0bGUpCi0gICAgICAgIGdfZnJlZSAobWFpbl90aXRsZSk7Ci0gICAgbWFpbl90aXRsZSA9IGdf c3RyZHVwICh3ZWJraXRfd2ViX3ZpZXdfZ2V0X3RpdGxlKHdlYl92aWV3KSk7Ci0gICAgdXBkYXRl X3RpdGxlIChHVEtfV0lORE9XIChtYWluX3dpbmRvdykpOworICAgIHVwZGF0ZV90aXRsZSAoR1RL X1dJTkRPVyAod2luZG93KSwgd2ViX3ZpZXcpOwogfQogCiBzdGF0aWMgdm9pZAotbm90aWZ5X2xv YWRfc3RhdHVzX2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR1BhcmFtU3BlYyogcHNwZWMs IGdwb2ludGVyIGRhdGEpCitub3RpZnlfbG9hZF9zdGF0dXNfY2IgKFdlYktpdFdlYlZpZXcqIHdl Yl92aWV3LCBHUGFyYW1TcGVjKiBwc3BlYywgR3RrV2lkZ2V0KiB1cmlfZW50cnkpCiB7CiAgICAg aWYgKHdlYmtpdF93ZWJfdmlld19nZXRfbG9hZF9zdGF0dXMgKHdlYl92aWV3KSA9PSBXRUJLSVRf TE9BRF9DT01NSVRURUQpIHsKICAgICAgICAgV2ViS2l0V2ViRnJhbWUqIGZyYW1lID0gd2Via2l0 X3dlYl92aWV3X2dldF9tYWluX2ZyYW1lICh3ZWJfdmlldyk7CkBAIC04NSw0MyArODIsNjggQEAg bm90aWZ5X2xvYWRfc3RhdHVzX2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR1BhcmFtU3Bl YyogcHNwZWMsIGdwb2ludGVyIGRhdGEKIH0KIAogc3RhdGljIHZvaWQKLW5vdGlmeV9wcm9ncmVz c19jYiAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIEdQYXJhbVNwZWMqIHBzcGVjLCBncG9pbnRl ciBkYXRhKQorbm90aWZ5X3Byb2dyZXNzX2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR1Bh cmFtU3BlYyogcHNwZWMsIEd0a1dpZGdldCogd2luZG93KQogewotICAgIGxvYWRfcHJvZ3Jlc3Mg PSB3ZWJraXRfd2ViX3ZpZXdfZ2V0X3Byb2dyZXNzICh3ZWJfdmlldykgKiAxMDA7Ci0gICAgdXBk YXRlX3RpdGxlIChHVEtfV0lORE9XIChtYWluX3dpbmRvdykpOworICAgIHVwZGF0ZV90aXRsZSAo R1RLX1dJTkRPVyAod2luZG93KSwgd2ViX3ZpZXcpOwogfQogCiBzdGF0aWMgdm9pZAotZGVzdHJv eV9jYiAoR3RrV2lkZ2V0KiB3aWRnZXQsIGdwb2ludGVyIGRhdGEpCitkZXN0cm95X2NiIChHdGtX aWRnZXQqIHdpZGdldCwgR3RrV2lkZ2V0KiB3aW5kb3cpCiB7Ci0gICAgZ3RrX21haW5fcXVpdCAo KTsKKyAgICBpZiAoZ19hdG9taWNfaW50X2RlY19hbmRfdGVzdCAoJndpbmRvd19jb3VudCkpCisg ICAgICBndGtfbWFpbl9xdWl0ICgpOwogfQogCiBzdGF0aWMgdm9pZAotZ29fYmFja19jYiAoR3Rr V2lkZ2V0KiB3aWRnZXQsIGdwb2ludGVyIGRhdGEpCitnb19iYWNrX2NiIChHdGtXaWRnZXQqIHdp ZGdldCwgIFdlYktpdFdlYlZpZXcqIHdlYl92aWV3KQogewogICAgIHdlYmtpdF93ZWJfdmlld19n b19iYWNrICh3ZWJfdmlldyk7CiB9CiAKIHN0YXRpYyB2b2lkCi1nb19mb3J3YXJkX2NiIChHdGtX aWRnZXQqIHdpZGdldCwgZ3BvaW50ZXIgZGF0YSkKK2dvX2ZvcndhcmRfY2IgKEd0a1dpZGdldCog d2lkZ2V0LCBXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldykKIHsKICAgICB3ZWJraXRfd2ViX3ZpZXdf Z29fZm9yd2FyZCAod2ViX3ZpZXcpOwogfQogCitzdGF0aWMgV2ViS2l0V2ViVmlldyoKK2NyZWF0 ZV93ZWJfdmlld19jYiAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIFdlYktpdFdlYkZyYW1lKiB3 ZWJfZnJhbWUsIEd0a1dpZGdldCogd2luZG93KQoreworICAgIFdlYktpdFdlYlZpZXcgKm5ld193 ZWJfdmlldzsKKyAgICBjcmVhdGVfd2luZG93ICgmbmV3X3dlYl92aWV3KTsKKyAgICByZXR1cm4g bmV3X3dlYl92aWV3OworfQorCitzdGF0aWMgZ2Jvb2xlYW4KK3dlYl92aWV3X3JlYWR5X2NiIChX ZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR3RrV2lkZ2V0KiB3aW5kb3cpCit7CisgICAgZ3RrX3dp ZGdldF9ncmFiX2ZvY3VzIChHVEtfV0lER0VUICh3ZWJfdmlldykpOworICAgIGd0a193aWRnZXRf c2hvd19hbGwgKHdpbmRvdyk7CisgICAgcmV0dXJuIEZBTFNFOworfQorCitzdGF0aWMgZ2Jvb2xl YW4KK2Nsb3NlX3dlYl92aWV3X2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR3RrV2lkZ2V0 KiB3aW5kb3cpCit7CisgICAgZ3RrX3dpZGdldF9kZXN0cm95ICh3aW5kb3cpOworICAgIHJldHVy biBUUlVFOworfQorCiBzdGF0aWMgR3RrV2lkZ2V0KgotY3JlYXRlX2Jyb3dzZXIgKCkKK2NyZWF0 ZV9icm93c2VyIChHdGtXaWRnZXQqIHdpbmRvdywgR3RrV2lkZ2V0KiB1cmlfZW50cnksIEd0a1dp ZGdldCogc3RhdHVzYmFyLCBXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldykKIHsKICAgICBHdGtXaWRn ZXQqIHNjcm9sbGVkX3dpbmRvdyA9IGd0a19zY3JvbGxlZF93aW5kb3dfbmV3IChOVUxMLCBOVUxM KTsKICAgICBndGtfc2Nyb2xsZWRfd2luZG93X3NldF9wb2xpY3kgKEdUS19TQ1JPTExFRF9XSU5E T1cgKHNjcm9sbGVkX3dpbmRvdyksIEdUS19QT0xJQ1lfQVVUT01BVElDLCBHVEtfUE9MSUNZX0FV VE9NQVRJQyk7CiAKLSAgICB3ZWJfdmlldyA9IFdFQktJVF9XRUJfVklFVyAod2Via2l0X3dlYl92 aWV3X25ldyAoKSk7CiAgICAgZ3RrX2NvbnRhaW5lcl9hZGQgKEdUS19DT05UQUlORVIgKHNjcm9s bGVkX3dpbmRvdyksIEdUS19XSURHRVQgKHdlYl92aWV3KSk7CiAKLSAgICBnX3NpZ25hbF9jb25u ZWN0ICh3ZWJfdmlldywgIm5vdGlmeTo6dGl0bGUiLCBHX0NBTExCQUNLIChub3RpZnlfdGl0bGVf Y2IpLCB3ZWJfdmlldyk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcsICJub3RpZnk6 OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyAobm90aWZ5X2xvYWRfc3RhdHVzX2NiKSwgd2ViX3Zp ZXcpOwotICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdlYl92aWV3LCAibm90aWZ5Ojpwcm9ncmVzcyIs IEdfQ0FMTEJBQ0sgKG5vdGlmeV9wcm9ncmVzc19jYiksIHdlYl92aWV3KTsKLSAgICBnX3NpZ25h bF9jb25uZWN0ICh3ZWJfdmlldywgImhvdmVyaW5nLW92ZXItbGluayIsIEdfQ0FMTEJBQ0sgKGxp bmtfaG92ZXJfY2IpLCB3ZWJfdmlldyk7CisgICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcs ICJub3RpZnk6OnRpdGxlIiwgR19DQUxMQkFDSyAobm90aWZ5X3RpdGxlX2NiKSwgd2luZG93KTsK KyAgICBnX3NpZ25hbF9jb25uZWN0ICh3ZWJfdmlldywgIm5vdGlmeTo6bG9hZC1zdGF0dXMiLCBH X0NBTExCQUNLIChub3RpZnlfbG9hZF9zdGF0dXNfY2IpLCB1cmlfZW50cnkpOworICAgIGdfc2ln bmFsX2Nvbm5lY3QgKHdlYl92aWV3LCAibm90aWZ5Ojpwcm9ncmVzcyIsIEdfQ0FMTEJBQ0sgKG5v dGlmeV9wcm9ncmVzc19jYiksIHdpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3Zp ZXcsICJob3ZlcmluZy1vdmVyLWxpbmsiLCBHX0NBTExCQUNLIChsaW5rX2hvdmVyX2NiKSwgc3Rh dHVzYmFyKTsKKyAgICBnX3NpZ25hbF9jb25uZWN0ICh3ZWJfdmlldywgImNyZWF0ZS13ZWItdmll dyIsIEdfQ0FMTEJBQ0sgKGNyZWF0ZV93ZWJfdmlld19jYiksIHdpbmRvdyk7CisgICAgZ19zaWdu YWxfY29ubmVjdCAod2ViX3ZpZXcsICJ3ZWItdmlldy1yZWFkeSIsIEdfQ0FMTEJBQ0sgKHdlYl92 aWV3X3JlYWR5X2NiKSwgd2luZG93KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0ICh3ZWJfdmlldywg ImNsb3NlLXdlYi12aWV3IiwgR19DQUxMQkFDSyAoY2xvc2Vfd2ViX3ZpZXdfY2IpLCB3aW5kb3cp OwogCiAgICAgcmV0dXJuIHNjcm9sbGVkX3dpbmRvdzsKIH0KQEAgLTEyOSwxNCArMTUxLDE2IEBA IGNyZWF0ZV9icm93c2VyICgpCiBzdGF0aWMgR3RrV2lkZ2V0KgogY3JlYXRlX3N0YXR1c2JhciAo KQogewotICAgIG1haW5fc3RhdHVzYmFyID0gR1RLX1NUQVRVU0JBUiAoZ3RrX3N0YXR1c2Jhcl9u ZXcgKCkpOwotICAgIHN0YXR1c19jb250ZXh0X2lkID0gZ3RrX3N0YXR1c2Jhcl9nZXRfY29udGV4 dF9pZCAobWFpbl9zdGF0dXNiYXIsICJMaW5rIEhvdmVyIik7CisgICAgR3RrU3RhdHVzYmFyICpz dGF0dXNiYXIgPSBHVEtfU1RBVFVTQkFSIChndGtfc3RhdHVzYmFyX25ldyAoKSk7CisgICAgZ3Vp bnQgc3RhdHVzX2NvbnRleHRfaWQgPSBndGtfc3RhdHVzYmFyX2dldF9jb250ZXh0X2lkIChzdGF0 dXNiYXIsICJMaW5rIEhvdmVyIik7CisgICAgZ19vYmplY3Rfc2V0X2RhdGEgKEdfT0JKRUNUIChz dGF0dXNiYXIpLCAibGluay1ob3Zlci1jb250ZXh0IiwKKyAgICAgICAgR1VJTlRfVE9fUE9JTlRF UihzdGF0dXNfY29udGV4dF9pZCkpOwogCi0gICAgcmV0dXJuIChHdGtXaWRnZXQqKW1haW5fc3Rh dHVzYmFyOworICAgIHJldHVybiBHVEtfV0lER0VUIChzdGF0dXNiYXIpOwogfQogCiBzdGF0aWMg R3RrV2lkZ2V0KgotY3JlYXRlX3Rvb2xiYXIgKCkKK2NyZWF0ZV90b29sYmFyIChHdGtXaWRnZXQq IHVyaV9lbnRyeSwgV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcpCiB7CiAgICAgR3RrV2lkZ2V0KiB0 b29sYmFyID0gZ3RrX3Rvb2xiYXJfbmV3ICgpOwogCkBAIC0xNTEsMjMgKzE3NSwyMyBAQCBjcmVh dGVfdG9vbGJhciAoKQogCiAgICAgLyogdGhlIGJhY2sgYnV0dG9uICovCiAgICAgaXRlbSA9IGd0 a190b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayAoR1RLX1NUT0NLX0dPX0JBQ0spOwotICAgIGdf c2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLIChn b19iYWNrX2NiKSwgTlVMTCk7CisgICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKGl0ZW0p LCAiY2xpY2tlZCIsIEdfQ0FMTEJBQ0sgKGdvX2JhY2tfY2IpLCB3ZWJfdmlldyk7CiAgICAgZ3Rr X3Rvb2xiYXJfaW5zZXJ0IChHVEtfVE9PTEJBUiAodG9vbGJhciksIGl0ZW0sIC0xKTsKIAogICAg IC8qIFRoZSBmb3J3YXJkIGJ1dHRvbiAqLwogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3 X2Zyb21fc3RvY2sgKEdUS19TVE9DS19HT19GT1JXQVJEKTsKLSAgICBnX3NpZ25hbF9jb25uZWN0 IChHX09CSkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoZ29fZm9yd2FyZF9jYiks IE5VTEwpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQi LCBHX0NBTExCQUNLIChnb19mb3J3YXJkX2NiKSwgd2ViX3ZpZXcpOwogICAgIGd0a190b29sYmFy X2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAKICAgICAvKiBUaGUg VVJMIGVudHJ5ICovCiAgICAgaXRlbSA9IGd0a190b29sX2l0ZW1fbmV3ICgpOwogICAgIGd0a190 b29sX2l0ZW1fc2V0X2V4cGFuZCAoaXRlbSwgVFJVRSk7Ci0gICAgdXJpX2VudHJ5ID0gZ3RrX2Vu dHJ5X25ldyAoKTsKICAgICBndGtfY29udGFpbmVyX2FkZCAoR1RLX0NPTlRBSU5FUiAoaXRlbSks IHVyaV9lbnRyeSk7CiAgICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKHVyaV9lbnRyeSks ICJhY3RpdmF0ZSIsIEdfQ0FMTEJBQ0sgKGFjdGl2YXRlX3VyaV9lbnRyeV9jYiksIE5VTEwpOwog ICAgIGd0a190b29sYmFyX2luc2VydCAoR1RLX1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAtMSk7 CiAKICAgICAvKiBUaGUgZ28gYnV0dG9uICovCisgICAgZ19vYmplY3Rfc2V0X2RhdGEgKEdfT0JK RUNUICh1cmlfZW50cnkpLCAid2ViLXZpZXciLCB3ZWJfdmlldyk7CiAgICAgaXRlbSA9IGd0a190 b29sX2J1dHRvbl9uZXdfZnJvbV9zdG9jayAoR1RLX1NUT0NLX09LKTsKICAgICBnX3NpZ25hbF9j b25uZWN0X3N3YXBwZWQgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExCQUNLIChh Y3RpdmF0ZV91cmlfZW50cnlfY2IpLCAoZ3BvaW50ZXIpdXJpX2VudHJ5KTsKICAgICBndGtfdG9v bGJhcl9pbnNlcnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwgaXRlbSwgLTEpOwpAQCAtMTc2LDEz ICsyMDAsMzYgQEAgY3JlYXRlX3Rvb2xiYXIgKCkKIH0KIAogc3RhdGljIEd0a1dpZGdldCoKLWNy ZWF0ZV93aW5kb3cgKCkKK2NyZWF0ZV93aW5kb3cgKFdlYktpdFdlYlZpZXcqKiBvdXRfd2ViX3Zp ZXcpCiB7Ci0gICAgR3RrV2lkZ2V0KiB3aW5kb3cgPSBndGtfd2luZG93X25ldyAoR1RLX1dJTkRP V19UT1BMRVZFTCk7CisgICAgV2ViS2l0V2ViVmlldyAqd2ViX3ZpZXc7CisgICAgR3RrV2lkZ2V0 ICp2Ym94OworICAgIEd0a1dpZGdldCAqd2luZG93OworICAgIEd0a1dpZGdldCAqdXJpX2VudHJ5 OworICAgIEd0a1dpZGdldCAqc3RhdHVzYmFyOworCisgICAgZ19hdG9taWNfaW50X2luYyAoJndp bmRvd19jb3VudCk7CisgICAKKyAgICB3aW5kb3cgPSBndGtfd2luZG93X25ldyAoR1RLX1dJTkRP V19UT1BMRVZFTCk7CiAgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9zaXplIChHVEtfV0lORE9X ICh3aW5kb3cpLCA4MDAsIDYwMCk7CiAgICAgZ3RrX3dpZGdldF9zZXRfbmFtZSAod2luZG93LCAi R3RrTGF1bmNoZXIiKTsKKworICAgIHdlYl92aWV3ID0gV0VCS0lUX1dFQl9WSUVXICh3ZWJraXRf d2ViX3ZpZXdfbmV3ICgpKTsKKyAgICB1cmlfZW50cnkgPSBndGtfZW50cnlfbmV3ICgpOworCisg ICAgdmJveCA9IGd0a192Ym94X25ldyAoRkFMU0UsIDApOworICAgIHN0YXR1c2JhciA9IGNyZWF0 ZV9zdGF0dXNiYXIgKHdlYl92aWV3KTsKKyAgICBndGtfYm94X3BhY2tfc3RhcnQgKEdUS19CT1gg KHZib3gpLCBjcmVhdGVfdG9vbGJhciAodXJpX2VudHJ5LCB3ZWJfdmlldyksIEZBTFNFLCBGQUxT RSwgMCk7CisgICAgZ3RrX2JveF9wYWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwgY3JlYXRlX2Jy b3dzZXIgKHdpbmRvdywgdXJpX2VudHJ5LCBzdGF0dXNiYXIsIHdlYl92aWV3KSwgVFJVRSwgVFJV RSwgMCk7CisgICAgZ3RrX2JveF9wYWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwgc3RhdHVzYmFy LCBGQUxTRSwgRkFMU0UsIDApOworCisgICAgZ3RrX2NvbnRhaW5lcl9hZGQgKEdUS19DT05UQUlO RVIgKHdpbmRvdyksIHZib3gpOworCiAgICAgZ19zaWduYWxfY29ubmVjdCAod2luZG93LCAiZGVz dHJveSIsIEdfQ0FMTEJBQ0sgKGRlc3Ryb3lfY2IpLCBOVUxMKTsKIAorICAgIGlmIChvdXRfd2Vi X3ZpZXcpCisgICAgICAgICpvdXRfd2ViX3ZpZXcgPSB3ZWJfdmlldzsKKwogICAgIHJldHVybiB3 aW5kb3c7CiB9CiAKQEAgLTIwMSwxNyArMjQ4LDE0IEBAIHN0YXRpYyBnY2hhciogZmlsZW5hbWVU b1VSTChjb25zdCBjaGFyKiBmaWxlbmFtZSkKIGludAogbWFpbiAoaW50IGFyZ2MsIGNoYXIqIGFy Z3ZbXSkKIHsKKyAgICBXZWJLaXRXZWJWaWV3ICp3ZWJfdmlldzsKKyAgICBHdGtXaWRnZXQgKm1h aW5fd2luZG93OworCiAgICAgZ3RrX2luaXQgKCZhcmdjLCAmYXJndik7CiAgICAgaWYgKCFnX3Ro cmVhZF9zdXBwb3J0ZWQgKCkpCiAgICAgICAgIGdfdGhyZWFkX2luaXQgKE5VTEwpOwogCi0gICAg R3RrV2lkZ2V0KiB2Ym94ID0gZ3RrX3Zib3hfbmV3IChGQUxTRSwgMCk7Ci0gICAgZ3RrX2JveF9w YWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwgY3JlYXRlX3Rvb2xiYXIgKCksIEZBTFNFLCBGQUxT RSwgMCk7Ci0gICAgZ3RrX2JveF9wYWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwgY3JlYXRlX2Jy b3dzZXIgKCksIFRSVUUsIFRSVUUsIDApOwotICAgIGd0a19ib3hfcGFja19zdGFydCAoR1RLX0JP WCAodmJveCksIGNyZWF0ZV9zdGF0dXNiYXIgKCksIEZBTFNFLCBGQUxTRSwgMCk7Ci0KLSAgICBt YWluX3dpbmRvdyA9IGNyZWF0ZV93aW5kb3cgKCk7Ci0gICAgZ3RrX2NvbnRhaW5lcl9hZGQgKEdU S19DT05UQUlORVIgKG1haW5fd2luZG93KSwgdmJveCk7CisgICAgbWFpbl93aW5kb3cgPSBjcmVh dGVfd2luZG93ICgmd2ViX3ZpZXcpOwogCiAgICAgZ2NoYXIgKnVyaSA9IChnY2hhciopIChhcmdj ID4gMSA/IGFyZ3ZbMV0gOiAiaHR0cDovL3d3dy5nb29nbGUuY29tLyIpOwogICAgIGdjaGFyICpm aWxlVVJMID0gZmlsZW5hbWVUb1VSTCh1cmkpOwotLSAKMS43LjIuMwoK 72336 2010-10-29 08:22:26 -0700 2010-10-29 08:51:44 -0700 Enable popup window in GtkLauncher (with changelog) 0001-Enable-popup-window-in-GtkLauncher.patch text/plain 11935 nicolas RnJvbSBiZTY5ZWEwOWIxMmNmOTg5YzEzYjE3YTZhOTI5NTZjMDJiOTNkYWVjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBOaWNvbGFzIER1ZnJlc25lIDxuaWNvbGFzLmR1ZnJlc25lQGNv bGxhYm9yYS5jby51az4KRGF0ZTogRnJpLCAyOSBPY3QgMjAxMCAxMDowNzoxOCAtMDQwMApTdWJq ZWN0OiBbUEFUQ0hdIEVuYWJsZSBwb3B1cCB3aW5kb3cgaW4gR3RrTGF1bmNoZXIKClRoZSBHdGtM YXVuY2hlciBhcHBsaWNhdGlvbiBkb2VzIG5vdCBzdXBwb3J0IG9wZW5pbmcgbmV3IHdpbmRvdyB3 aGVuCmEgbGluayB3aXRoICJ0YXJnZXQ9X2JsYW5rIiBpcyBjbGlja2VkIG9yIHNpbWlsYXIgY2Fs bCB0bwp3aW5kb3cub3BlbigpLiBJbnN0ZWFkLCBHdGtMYXVuY2hlciBkb2VzIG5vdGhpbmcgd2hp Y2ggYnJlYWtzCm5hdmlnYXRpb24gb2Ygc29tZSB3ZWJzaXRlcy4KaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTQ4MzM1Ci0tLQogV2ViS2l0VG9vbHMvQ2hhbmdlTG9nICAg ICAgICAgIHwgICAzMSArKysrKysrKysKIFdlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyB8 ICAxMzggKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLS0tLS0tLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAxMjIgaW5zZXJ0aW9ucygrKSwgNDcgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv V2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nCmluZGV4IDgzM2Y1 YTcuLmI1MjIyMWEgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0NoYW5nZUxvZworKysgYi9XZWJL aXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzNCBAQAorMjAxMC0xMC0yOSAgTmljb2xhcyBE dWZyZXNuZSAgPG5pY29sYXMuZHVmcmVzbmVAY29sbGFib3JhLmNvLnVrPgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEVuYWJsZSBwb3B1cCB3aW5kb3cg aW4gR3RrTGF1bmNoZXIKKworICAgICAgICBUaGUgR3RrTGF1bmNoZXIgYXBwbGljYXRpb24gZG9l cyBub3Qgc3VwcG9ydCBvcGVuaW5nIG5ldyB3aW5kb3cgd2hlbgorICAgICAgICBhIGxpbmsgd2l0 aCAidGFyZ2V0PV9ibGFuayIgaXMgY2xpY2tlZCBvciBzaW1pbGFyIGNhbGwgdG8KKyAgICAgICAg d2luZG93Lm9wZW4oKS4gSW5zdGVhZCwgR3RrTGF1bmNoZXIgZG9lcyBub3RoaW5nIHdoaWNoIGJy ZWFrcworICAgICAgICBuYXZpZ2F0aW9uIG9mIHNvbWUgd2Vic2l0ZXMuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00ODMzNQorCisgICAgICAgICogR3Rr TGF1bmNoZXIvbWFpbi5jOgorICAgICAgICAoYWN0aXZhdGVfdXJpX2VudHJ5X2NiKToKKyAgICAg ICAgKHVwZGF0ZV90aXRsZSk6CisgICAgICAgIChsaW5rX2hvdmVyX2NiKToKKyAgICAgICAgKG5v dGlmeV90aXRsZV9jYik6CisgICAgICAgIChub3RpZnlfbG9hZF9zdGF0dXNfY2IpOgorICAgICAg ICAobm90aWZ5X3Byb2dyZXNzX2NiKToKKyAgICAgICAgKGRlc3Ryb3lfY2IpOgorICAgICAgICAo Z29fYmFja19jYik6CisgICAgICAgIChnb19mb3J3YXJkX2NiKToKKyAgICAgICAgKGNyZWF0ZV93 ZWJfdmlld19jYik6CisgICAgICAgICh3ZWJfdmlld19yZWFkeV9jYik6CisgICAgICAgIChjbG9z ZV93ZWJfdmlld19jYik6CisgICAgICAgIChjcmVhdGVfYnJvd3Nlcik6CisgICAgICAgIChjcmVh dGVfc3RhdHVzYmFyKToKKyAgICAgICAgKGNyZWF0ZV90b29sYmFyKToKKyAgICAgICAgKGNyZWF0 ZV93aW5kb3cpOgorICAgICAgICAobWFpbik6CisKIDIwMTAtMTAtMjUgIEVyaWMgU2VpZGVsICA8 ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEFkYW0gQmFydGguCmRpZmYg LS1naXQgYS9XZWJLaXRUb29scy9HdGtMYXVuY2hlci9tYWluLmMgYi9XZWJLaXRUb29scy9HdGtM YXVuY2hlci9tYWluLmMKaW5kZXggMTdlZDQwZi4uNGFiZWUwOCAxMDA2NDQKLS0tIGEvV2ViS2l0 VG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCisrKyBiL1dlYktpdFRvb2xzL0d0a0xhdW5jaGVyL21h aW4uYwpAQCAtMjcsMjYgKzI3LDI0IEBACiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogI2luY2x1ZGUg PHdlYmtpdC93ZWJraXQuaD4KIAotc3RhdGljIEd0a1dpZGdldCogbWFpbl93aW5kb3c7Ci1zdGF0 aWMgR3RrV2lkZ2V0KiB1cmlfZW50cnk7Ci1zdGF0aWMgR3RrU3RhdHVzYmFyKiBtYWluX3N0YXR1 c2JhcjsKLXN0YXRpYyBXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldzsKLXN0YXRpYyBnY2hhciogbWFp bl90aXRsZTsKLXN0YXRpYyBnZG91YmxlIGxvYWRfcHJvZ3Jlc3M7Ci1zdGF0aWMgZ3VpbnQgc3Rh dHVzX2NvbnRleHRfaWQ7CitzdGF0aWMgZ2ludCB3aW5kb3dfY291bnQgPSAwOworCitzdGF0aWMg R3RrV2lkZ2V0KiBjcmVhdGVfd2luZG93IChXZWJLaXRXZWJWaWV3Kiogb3V0X3dlYl92aWV3KTsK IAogc3RhdGljIHZvaWQKIGFjdGl2YXRlX3VyaV9lbnRyeV9jYiAoR3RrV2lkZ2V0KiBlbnRyeSwg Z3BvaW50ZXIgZGF0YSkKIHsKKyAgICBXZWJLaXRXZWJWaWV3ICp3ZWJfdmlldyA9IGdfb2JqZWN0 X2dldF9kYXRhIChHX09CSkVDVCAoZW50cnkpLCAid2ViLXZpZXciKTsKICAgICBjb25zdCBnY2hh ciogdXJpID0gZ3RrX2VudHJ5X2dldF90ZXh0IChHVEtfRU5UUlkgKGVudHJ5KSk7CiAgICAgZ19h c3NlcnQgKHVyaSk7CiAgICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpICh3ZWJfdmlldywgdXJp KTsKIH0KIAogc3RhdGljIHZvaWQKLXVwZGF0ZV90aXRsZSAoR3RrV2luZG93KiB3aW5kb3cpCit1 cGRhdGVfdGl0bGUgKEd0a1dpbmRvdyogd2luZG93LCBXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldykK IHsKLSAgICBHU3RyaW5nKiBzdHJpbmcgPSBnX3N0cmluZ19uZXcgKG1haW5fdGl0bGUpOworICAg IEdTdHJpbmcgKnN0cmluZyA9IGdfc3RyaW5nX25ldyAod2Via2l0X3dlYl92aWV3X2dldF90aXRs ZSh3ZWJfdmlldykpOworICAgIGdkb3VibGUgbG9hZF9wcm9ncmVzcyA9IHdlYmtpdF93ZWJfdmll d19nZXRfcHJvZ3Jlc3MgKHdlYl92aWV3KSAqIDEwMDsKICAgICBnX3N0cmluZ19hcHBlbmQgKHN0 cmluZywgIiAtIFdlYktpdCBMYXVuY2hlciIpOwogICAgIGlmIChsb2FkX3Byb2dyZXNzIDwgMTAw KQogICAgICAgICBnX3N0cmluZ19hcHBlbmRfcHJpbnRmIChzdHJpbmcsICIgKCVmJSUpIiwgbG9h ZF9wcm9ncmVzcyk7CkBAIC01NiwyNSArNTQsMjQgQEAgdXBkYXRlX3RpdGxlIChHdGtXaW5kb3cq IHdpbmRvdykKIH0KIAogc3RhdGljIHZvaWQKLWxpbmtfaG92ZXJfY2IgKFdlYktpdFdlYlZpZXcq IHBhZ2UsIGNvbnN0IGdjaGFyKiB0aXRsZSwgY29uc3QgZ2NoYXIqIGxpbmssIGdwb2ludGVyIGRh dGEpCitsaW5rX2hvdmVyX2NiIChXZWJLaXRXZWJWaWV3KiBwYWdlLCBjb25zdCBnY2hhciogdGl0 bGUsIGNvbnN0IGdjaGFyKiBsaW5rLCBHdGtTdGF0dXNiYXIqIHN0YXR1c2JhcikKIHsKKyAgICBn dWludCBzdGF0dXNfY29udGV4dF9pZCA9CisgICAgICBHUE9JTlRFUl9UT19VSU5UIChnX29iamVj dF9nZXRfZGF0YSAoR19PQkpFQ1QgKHN0YXR1c2JhciksICJsaW5rLWhvdmVyLWNvbnRleHQiKSk7 CiAgICAgLyogdW5kZXJmbG93IGlzIGFsbG93ZWQgKi8KLSAgICBndGtfc3RhdHVzYmFyX3BvcCAo bWFpbl9zdGF0dXNiYXIsIHN0YXR1c19jb250ZXh0X2lkKTsKKyAgICBndGtfc3RhdHVzYmFyX3Bv cCAoc3RhdHVzYmFyLCBzdGF0dXNfY29udGV4dF9pZCk7CiAgICAgaWYgKGxpbmspCi0gICAgICAg IGd0a19zdGF0dXNiYXJfcHVzaCAobWFpbl9zdGF0dXNiYXIsIHN0YXR1c19jb250ZXh0X2lkLCBs aW5rKTsKKyAgICAgICAgZ3RrX3N0YXR1c2Jhcl9wdXNoIChzdGF0dXNiYXIsIHN0YXR1c19jb250 ZXh0X2lkLCBsaW5rKTsKIH0KIAogc3RhdGljIHZvaWQKLW5vdGlmeV90aXRsZV9jYiAoV2ViS2l0 V2ViVmlldyogd2ViX3ZpZXcsIEdQYXJhbVNwZWMqIHBzcGVjLCBncG9pbnRlciBkYXRhKQorbm90 aWZ5X3RpdGxlX2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR1BhcmFtU3BlYyogcHNwZWMs IEd0a1dpZGdldCogd2luZG93KQogewotICAgIGlmIChtYWluX3RpdGxlKQotICAgICAgICBnX2Zy ZWUgKG1haW5fdGl0bGUpOwotICAgIG1haW5fdGl0bGUgPSBnX3N0cmR1cCAod2Via2l0X3dlYl92 aWV3X2dldF90aXRsZSh3ZWJfdmlldykpOwotICAgIHVwZGF0ZV90aXRsZSAoR1RLX1dJTkRPVyAo bWFpbl93aW5kb3cpKTsKKyAgICB1cGRhdGVfdGl0bGUgKEdUS19XSU5ET1cgKHdpbmRvdyksIHdl Yl92aWV3KTsKIH0KIAogc3RhdGljIHZvaWQKLW5vdGlmeV9sb2FkX3N0YXR1c19jYiAoV2ViS2l0 V2ViVmlldyogd2ViX3ZpZXcsIEdQYXJhbVNwZWMqIHBzcGVjLCBncG9pbnRlciBkYXRhKQorbm90 aWZ5X2xvYWRfc3RhdHVzX2NiIChXZWJLaXRXZWJWaWV3KiB3ZWJfdmlldywgR1BhcmFtU3BlYyog cHNwZWMsIEd0a1dpZGdldCogdXJpX2VudHJ5KQogewogICAgIGlmICh3ZWJraXRfd2ViX3ZpZXdf Z2V0X2xvYWRfc3RhdHVzICh3ZWJfdmlldykgPT0gV0VCS0lUX0xPQURfQ09NTUlUVEVEKSB7CiAg ICAgICAgIFdlYktpdFdlYkZyYW1lKiBmcmFtZSA9IHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9m cmFtZSAod2ViX3ZpZXcpOwpAQCAtODUsNDMgKzgyLDY4IEBAIG5vdGlmeV9sb2FkX3N0YXR1c19j YiAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIEdQYXJhbVNwZWMqIHBzcGVjLCBncG9pbnRlciBk YXRhCiB9CiAKIHN0YXRpYyB2b2lkCi1ub3RpZnlfcHJvZ3Jlc3NfY2IgKFdlYktpdFdlYlZpZXcq IHdlYl92aWV3LCBHUGFyYW1TcGVjKiBwc3BlYywgZ3BvaW50ZXIgZGF0YSkKK25vdGlmeV9wcm9n cmVzc19jYiAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIEdQYXJhbVNwZWMqIHBzcGVjLCBHdGtX aWRnZXQqIHdpbmRvdykKIHsKLSAgICBsb2FkX3Byb2dyZXNzID0gd2Via2l0X3dlYl92aWV3X2dl dF9wcm9ncmVzcyAod2ViX3ZpZXcpICogMTAwOwotICAgIHVwZGF0ZV90aXRsZSAoR1RLX1dJTkRP VyAobWFpbl93aW5kb3cpKTsKKyAgICB1cGRhdGVfdGl0bGUgKEdUS19XSU5ET1cgKHdpbmRvdyks IHdlYl92aWV3KTsKIH0KIAogc3RhdGljIHZvaWQKLWRlc3Ryb3lfY2IgKEd0a1dpZGdldCogd2lk Z2V0LCBncG9pbnRlciBkYXRhKQorZGVzdHJveV9jYiAoR3RrV2lkZ2V0KiB3aWRnZXQsIEd0a1dp ZGdldCogd2luZG93KQogewotICAgIGd0a19tYWluX3F1aXQgKCk7CisgICAgaWYgKGdfYXRvbWlj X2ludF9kZWNfYW5kX3Rlc3QgKCZ3aW5kb3dfY291bnQpKQorICAgICAgZ3RrX21haW5fcXVpdCAo KTsKIH0KIAogc3RhdGljIHZvaWQKLWdvX2JhY2tfY2IgKEd0a1dpZGdldCogd2lkZ2V0LCBncG9p bnRlciBkYXRhKQorZ29fYmFja19jYiAoR3RrV2lkZ2V0KiB3aWRnZXQsICBXZWJLaXRXZWJWaWV3 KiB3ZWJfdmlldykKIHsKICAgICB3ZWJraXRfd2ViX3ZpZXdfZ29fYmFjayAod2ViX3ZpZXcpOwog fQogCiBzdGF0aWMgdm9pZAotZ29fZm9yd2FyZF9jYiAoR3RrV2lkZ2V0KiB3aWRnZXQsIGdwb2lu dGVyIGRhdGEpCitnb19mb3J3YXJkX2NiIChHdGtXaWRnZXQqIHdpZGdldCwgV2ViS2l0V2ViVmll dyogd2ViX3ZpZXcpCiB7CiAgICAgd2Via2l0X3dlYl92aWV3X2dvX2ZvcndhcmQgKHdlYl92aWV3 KTsKIH0KIAorc3RhdGljIFdlYktpdFdlYlZpZXcqCitjcmVhdGVfd2ViX3ZpZXdfY2IgKFdlYktp dFdlYlZpZXcqIHdlYl92aWV3LCBXZWJLaXRXZWJGcmFtZSogd2ViX2ZyYW1lLCBHdGtXaWRnZXQq IHdpbmRvdykKK3sKKyAgICBXZWJLaXRXZWJWaWV3ICpuZXdfd2ViX3ZpZXc7CisgICAgY3JlYXRl X3dpbmRvdyAoJm5ld193ZWJfdmlldyk7CisgICAgcmV0dXJuIG5ld193ZWJfdmlldzsKK30KKwor c3RhdGljIGdib29sZWFuCit3ZWJfdmlld19yZWFkeV9jYiAoV2ViS2l0V2ViVmlldyogd2ViX3Zp ZXcsIEd0a1dpZGdldCogd2luZG93KQoreworICAgIGd0a193aWRnZXRfZ3JhYl9mb2N1cyAoR1RL X1dJREdFVCAod2ViX3ZpZXcpKTsKKyAgICBndGtfd2lkZ2V0X3Nob3dfYWxsICh3aW5kb3cpOwor ICAgIHJldHVybiBGQUxTRTsKK30KKworc3RhdGljIGdib29sZWFuCitjbG9zZV93ZWJfdmlld19j YiAoV2ViS2l0V2ViVmlldyogd2ViX3ZpZXcsIEd0a1dpZGdldCogd2luZG93KQoreworICAgIGd0 a193aWRnZXRfZGVzdHJveSAod2luZG93KTsKKyAgICByZXR1cm4gVFJVRTsKK30KKwogc3RhdGlj IEd0a1dpZGdldCoKLWNyZWF0ZV9icm93c2VyICgpCitjcmVhdGVfYnJvd3NlciAoR3RrV2lkZ2V0 KiB3aW5kb3csIEd0a1dpZGdldCogdXJpX2VudHJ5LCBHdGtXaWRnZXQqIHN0YXR1c2JhciwgV2Vi S2l0V2ViVmlldyogd2ViX3ZpZXcpCiB7CiAgICAgR3RrV2lkZ2V0KiBzY3JvbGxlZF93aW5kb3cg PSBndGtfc2Nyb2xsZWRfd2luZG93X25ldyAoTlVMTCwgTlVMTCk7CiAgICAgZ3RrX3Njcm9sbGVk X3dpbmRvd19zZXRfcG9saWN5IChHVEtfU0NST0xMRURfV0lORE9XIChzY3JvbGxlZF93aW5kb3cp LCBHVEtfUE9MSUNZX0FVVE9NQVRJQywgR1RLX1BPTElDWV9BVVRPTUFUSUMpOwogCi0gICAgd2Vi X3ZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcgKHdlYmtpdF93ZWJfdmlld19uZXcgKCkpOwogICAgIGd0 a19jb250YWluZXJfYWRkIChHVEtfQ09OVEFJTkVSIChzY3JvbGxlZF93aW5kb3cpLCBHVEtfV0lE R0VUICh3ZWJfdmlldykpOwogCi0gICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcsICJub3Rp Znk6OnRpdGxlIiwgR19DQUxMQkFDSyAobm90aWZ5X3RpdGxlX2NiKSwgd2ViX3ZpZXcpOwotICAg IGdfc2lnbmFsX2Nvbm5lY3QgKHdlYl92aWV3LCAibm90aWZ5Ojpsb2FkLXN0YXR1cyIsIEdfQ0FM TEJBQ0sgKG5vdGlmeV9sb2FkX3N0YXR1c19jYiksIHdlYl92aWV3KTsKLSAgICBnX3NpZ25hbF9j b25uZWN0ICh3ZWJfdmlldywgIm5vdGlmeTo6cHJvZ3Jlc3MiLCBHX0NBTExCQUNLIChub3RpZnlf cHJvZ3Jlc3NfY2IpLCB3ZWJfdmlldyk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcs ICJob3ZlcmluZy1vdmVyLWxpbmsiLCBHX0NBTExCQUNLIChsaW5rX2hvdmVyX2NiKSwgd2ViX3Zp ZXcpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdlYl92aWV3LCAibm90aWZ5Ojp0aXRsZSIsIEdf Q0FMTEJBQ0sgKG5vdGlmeV90aXRsZV9jYiksIHdpbmRvdyk7CisgICAgZ19zaWduYWxfY29ubmVj dCAod2ViX3ZpZXcsICJub3RpZnk6OmxvYWQtc3RhdHVzIiwgR19DQUxMQkFDSyAobm90aWZ5X2xv YWRfc3RhdHVzX2NiKSwgdXJpX2VudHJ5KTsKKyAgICBnX3NpZ25hbF9jb25uZWN0ICh3ZWJfdmll dywgIm5vdGlmeTo6cHJvZ3Jlc3MiLCBHX0NBTExCQUNLIChub3RpZnlfcHJvZ3Jlc3NfY2IpLCB3 aW5kb3cpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdlYl92aWV3LCAiaG92ZXJpbmctb3Zlci1s aW5rIiwgR19DQUxMQkFDSyAobGlua19ob3Zlcl9jYiksIHN0YXR1c2Jhcik7CisgICAgZ19zaWdu YWxfY29ubmVjdCAod2ViX3ZpZXcsICJjcmVhdGUtd2ViLXZpZXciLCBHX0NBTExCQUNLIChjcmVh dGVfd2ViX3ZpZXdfY2IpLCB3aW5kb3cpOworICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdlYl92aWV3 LCAid2ViLXZpZXctcmVhZHkiLCBHX0NBTExCQUNLICh3ZWJfdmlld19yZWFkeV9jYiksIHdpbmRv dyk7CisgICAgZ19zaWduYWxfY29ubmVjdCAod2ViX3ZpZXcsICJjbG9zZS13ZWItdmlldyIsIEdf Q0FMTEJBQ0sgKGNsb3NlX3dlYl92aWV3X2NiKSwgd2luZG93KTsKIAogICAgIHJldHVybiBzY3Jv bGxlZF93aW5kb3c7CiB9CkBAIC0xMjksMTQgKzE1MSwxNiBAQCBjcmVhdGVfYnJvd3NlciAoKQog c3RhdGljIEd0a1dpZGdldCoKIGNyZWF0ZV9zdGF0dXNiYXIgKCkKIHsKLSAgICBtYWluX3N0YXR1 c2JhciA9IEdUS19TVEFUVVNCQVIgKGd0a19zdGF0dXNiYXJfbmV3ICgpKTsKLSAgICBzdGF0dXNf Y29udGV4dF9pZCA9IGd0a19zdGF0dXNiYXJfZ2V0X2NvbnRleHRfaWQgKG1haW5fc3RhdHVzYmFy LCAiTGluayBIb3ZlciIpOworICAgIEd0a1N0YXR1c2JhciAqc3RhdHVzYmFyID0gR1RLX1NUQVRV U0JBUiAoZ3RrX3N0YXR1c2Jhcl9uZXcgKCkpOworICAgIGd1aW50IHN0YXR1c19jb250ZXh0X2lk ID0gZ3RrX3N0YXR1c2Jhcl9nZXRfY29udGV4dF9pZCAoc3RhdHVzYmFyLCAiTGluayBIb3ZlciIp OworICAgIGdfb2JqZWN0X3NldF9kYXRhIChHX09CSkVDVCAoc3RhdHVzYmFyKSwgImxpbmstaG92 ZXItY29udGV4dCIsCisgICAgICAgIEdVSU5UX1RPX1BPSU5URVIoc3RhdHVzX2NvbnRleHRfaWQp KTsKIAotICAgIHJldHVybiAoR3RrV2lkZ2V0KiltYWluX3N0YXR1c2JhcjsKKyAgICByZXR1cm4g R1RLX1dJREdFVCAoc3RhdHVzYmFyKTsKIH0KIAogc3RhdGljIEd0a1dpZGdldCoKLWNyZWF0ZV90 b29sYmFyICgpCitjcmVhdGVfdG9vbGJhciAoR3RrV2lkZ2V0KiB1cmlfZW50cnksIFdlYktpdFdl YlZpZXcqIHdlYl92aWV3KQogewogICAgIEd0a1dpZGdldCogdG9vbGJhciA9IGd0a190b29sYmFy X25ldyAoKTsKIApAQCAtMTUxLDIzICsxNzUsMjMgQEAgY3JlYXRlX3Rvb2xiYXIgKCkKIAogICAg IC8qIHRoZSBiYWNrIGJ1dHRvbiAqLwogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zy b21fc3RvY2sgKEdUS19TVE9DS19HT19CQUNLKTsKLSAgICBnX3NpZ25hbF9jb25uZWN0IChHX09C SkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoZ29fYmFja19jYiksIE5VTEwpOwor ICAgIGdfc2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUIChpdGVtKSwgImNsaWNrZWQiLCBHX0NBTExC QUNLIChnb19iYWNrX2NiKSwgd2ViX3ZpZXcpOwogICAgIGd0a190b29sYmFyX2luc2VydCAoR1RL X1RPT0xCQVIgKHRvb2xiYXIpLCBpdGVtLCAtMSk7CiAKICAgICAvKiBUaGUgZm9yd2FyZCBidXR0 b24gKi8KICAgICBpdGVtID0gZ3RrX3Rvb2xfYnV0dG9uX25ld19mcm9tX3N0b2NrIChHVEtfU1RP Q0tfR09fRk9SV0FSRCk7Ci0gICAgZ19zaWduYWxfY29ubmVjdCAoR19PQkpFQ1QgKGl0ZW0pLCAi Y2xpY2tlZCIsIEdfQ0FMTEJBQ0sgKGdvX2ZvcndhcmRfY2IpLCBOVUxMKTsKKyAgICBnX3NpZ25h bF9jb25uZWN0IChHX09CSkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoZ29fZm9y d2FyZF9jYiksIHdlYl92aWV3KTsKICAgICBndGtfdG9vbGJhcl9pbnNlcnQgKEdUS19UT09MQkFS ICh0b29sYmFyKSwgaXRlbSwgLTEpOwogCiAgICAgLyogVGhlIFVSTCBlbnRyeSAqLwogICAgIGl0 ZW0gPSBndGtfdG9vbF9pdGVtX25ldyAoKTsKICAgICBndGtfdG9vbF9pdGVtX3NldF9leHBhbmQg KGl0ZW0sIFRSVUUpOwotICAgIHVyaV9lbnRyeSA9IGd0a19lbnRyeV9uZXcgKCk7CiAgICAgZ3Rr X2NvbnRhaW5lcl9hZGQgKEdUS19DT05UQUlORVIgKGl0ZW0pLCB1cmlfZW50cnkpOwogICAgIGdf c2lnbmFsX2Nvbm5lY3QgKEdfT0JKRUNUICh1cmlfZW50cnkpLCAiYWN0aXZhdGUiLCBHX0NBTExC QUNLIChhY3RpdmF0ZV91cmlfZW50cnlfY2IpLCBOVUxMKTsKICAgICBndGtfdG9vbGJhcl9pbnNl cnQgKEdUS19UT09MQkFSICh0b29sYmFyKSwgaXRlbSwgLTEpOwogCiAgICAgLyogVGhlIGdvIGJ1 dHRvbiAqLworICAgIGdfb2JqZWN0X3NldF9kYXRhIChHX09CSkVDVCAodXJpX2VudHJ5KSwgIndl Yi12aWV3Iiwgd2ViX3ZpZXcpOwogICAgIGl0ZW0gPSBndGtfdG9vbF9idXR0b25fbmV3X2Zyb21f c3RvY2sgKEdUS19TVE9DS19PSyk7CiAgICAgZ19zaWduYWxfY29ubmVjdF9zd2FwcGVkIChHX09C SkVDVCAoaXRlbSksICJjbGlja2VkIiwgR19DQUxMQkFDSyAoYWN0aXZhdGVfdXJpX2VudHJ5X2Ni KSwgKGdwb2ludGVyKXVyaV9lbnRyeSk7CiAgICAgZ3RrX3Rvb2xiYXJfaW5zZXJ0IChHVEtfVE9P TEJBUiAodG9vbGJhciksIGl0ZW0sIC0xKTsKQEAgLTE3NiwxMyArMjAwLDM2IEBAIGNyZWF0ZV90 b29sYmFyICgpCiB9CiAKIHN0YXRpYyBHdGtXaWRnZXQqCi1jcmVhdGVfd2luZG93ICgpCitjcmVh dGVfd2luZG93IChXZWJLaXRXZWJWaWV3Kiogb3V0X3dlYl92aWV3KQogewotICAgIEd0a1dpZGdl dCogd2luZG93ID0gZ3RrX3dpbmRvd19uZXcgKEdUS19XSU5ET1dfVE9QTEVWRUwpOworICAgIFdl YktpdFdlYlZpZXcgKndlYl92aWV3OworICAgIEd0a1dpZGdldCAqdmJveDsKKyAgICBHdGtXaWRn ZXQgKndpbmRvdzsKKyAgICBHdGtXaWRnZXQgKnVyaV9lbnRyeTsKKyAgICBHdGtXaWRnZXQgKnN0 YXR1c2JhcjsKKworICAgIGdfYXRvbWljX2ludF9pbmMgKCZ3aW5kb3dfY291bnQpOworICAgCisg ICAgd2luZG93ID0gZ3RrX3dpbmRvd19uZXcgKEdUS19XSU5ET1dfVE9QTEVWRUwpOwogICAgIGd0 a193aW5kb3dfc2V0X2RlZmF1bHRfc2l6ZSAoR1RLX1dJTkRPVyAod2luZG93KSwgODAwLCA2MDAp OwogICAgIGd0a193aWRnZXRfc2V0X25hbWUgKHdpbmRvdywgIkd0a0xhdW5jaGVyIik7CisKKyAg ICB3ZWJfdmlldyA9IFdFQktJVF9XRUJfVklFVyAod2Via2l0X3dlYl92aWV3X25ldyAoKSk7Cisg ICAgdXJpX2VudHJ5ID0gZ3RrX2VudHJ5X25ldyAoKTsKKworICAgIHZib3ggPSBndGtfdmJveF9u ZXcgKEZBTFNFLCAwKTsKKyAgICBzdGF0dXNiYXIgPSBjcmVhdGVfc3RhdHVzYmFyICh3ZWJfdmll dyk7CisgICAgZ3RrX2JveF9wYWNrX3N0YXJ0IChHVEtfQk9YICh2Ym94KSwgY3JlYXRlX3Rvb2xi YXIgKHVyaV9lbnRyeSwgd2ViX3ZpZXcpLCBGQUxTRSwgRkFMU0UsIDApOworICAgIGd0a19ib3hf cGFja19zdGFydCAoR1RLX0JPWCAodmJveCksIGNyZWF0ZV9icm93c2VyICh3aW5kb3csIHVyaV9l bnRyeSwgc3RhdHVzYmFyLCB3ZWJfdmlldyksIFRSVUUsIFRSVUUsIDApOworICAgIGd0a19ib3hf cGFja19zdGFydCAoR1RLX0JPWCAodmJveCksIHN0YXR1c2JhciwgRkFMU0UsIEZBTFNFLCAwKTsK KworICAgIGd0a19jb250YWluZXJfYWRkIChHVEtfQ09OVEFJTkVSICh3aW5kb3cpLCB2Ym94KTsK KwogICAgIGdfc2lnbmFsX2Nvbm5lY3QgKHdpbmRvdywgImRlc3Ryb3kiLCBHX0NBTExCQUNLIChk ZXN0cm95X2NiKSwgTlVMTCk7CiAKKyAgICBpZiAob3V0X3dlYl92aWV3KQorICAgICAgICAqb3V0 X3dlYl92aWV3ID0gd2ViX3ZpZXc7CisKICAgICByZXR1cm4gd2luZG93OwogfQogCkBAIC0yMDEs MTcgKzI0OCwxNCBAQCBzdGF0aWMgZ2NoYXIqIGZpbGVuYW1lVG9VUkwoY29uc3QgY2hhciogZmls ZW5hbWUpCiBpbnQKIG1haW4gKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiB7CisgICAgV2ViS2l0 V2ViVmlldyAqd2ViX3ZpZXc7CisgICAgR3RrV2lkZ2V0ICptYWluX3dpbmRvdzsKKwogICAgIGd0 a19pbml0ICgmYXJnYywgJmFyZ3YpOwogICAgIGlmICghZ190aHJlYWRfc3VwcG9ydGVkICgpKQog ICAgICAgICBnX3RocmVhZF9pbml0IChOVUxMKTsKIAotICAgIEd0a1dpZGdldCogdmJveCA9IGd0 a192Ym94X25ldyAoRkFMU0UsIDApOwotICAgIGd0a19ib3hfcGFja19zdGFydCAoR1RLX0JPWCAo dmJveCksIGNyZWF0ZV90b29sYmFyICgpLCBGQUxTRSwgRkFMU0UsIDApOwotICAgIGd0a19ib3hf cGFja19zdGFydCAoR1RLX0JPWCAodmJveCksIGNyZWF0ZV9icm93c2VyICgpLCBUUlVFLCBUUlVF LCAwKTsKLSAgICBndGtfYm94X3BhY2tfc3RhcnQgKEdUS19CT1ggKHZib3gpLCBjcmVhdGVfc3Rh dHVzYmFyICgpLCBGQUxTRSwgRkFMU0UsIDApOwotCi0gICAgbWFpbl93aW5kb3cgPSBjcmVhdGVf d2luZG93ICgpOwotICAgIGd0a19jb250YWluZXJfYWRkIChHVEtfQ09OVEFJTkVSIChtYWluX3dp bmRvdyksIHZib3gpOworICAgIG1haW5fd2luZG93ID0gY3JlYXRlX3dpbmRvdyAoJndlYl92aWV3 KTsKIAogICAgIGdjaGFyICp1cmkgPSAoZ2NoYXIqKSAoYXJnYyA+IDEgPyBhcmd2WzFdIDogImh0 dHA6Ly93d3cuZ29vZ2xlLmNvbS8iKTsKICAgICBnY2hhciAqZmlsZVVSTCA9IGZpbGVuYW1lVG9V UkwodXJpKTsKLS0gCjEuNy4yLjMKCg==