57968 2011-04-06 12:06:33 -0700 [GTK] Need a way to get the path for a WebKitWebPlugin 2011-04-07 10:45:05 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED Gtk P2 Normal --- 1 gustavo webkit-unassigned mrobinson xan.lopez oldest_to_newest 380707 0 gustavo 2011-04-06 12:06:33 -0700 I would like to only disable the flash plugin in Epiphany if it is not running through nspluginwrapper, but I need the plugin path to detect that =) 380709 1 88483 gustavo 2011-04-06 12:09:17 -0700 Created attachment 88483 Patch 380711 2 88484 gustavo 2011-04-06 12:10:19 -0700 Created attachment 88484 how I plan to use this new API Btw, we should make path, name, description actual GObject properties =) 380822 3 88483 xan.lopez 2011-04-06 14:13:05 -0700 Comment on attachment 88483 Patch There's not going to be 1.3.14. But looks fine to me otherwise. r +1/2 380835 4 88483 mrobinson 2011-04-06 14:25:41 -0700 Comment on attachment 88483 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=88483&action=review > Source/WebKit/gtk/webkit/webkitwebplugin.cpp:179 > + * Returns: the absolute path for @plugin. Nit! "the absolute path for @plugin" --> "the absolute path to the @plugin" > Source/WebKit/gtk/webkit/webkitwebplugin.cpp:192 > + if (!priv->path.length()) > + priv->path = priv->corePlugin->path().utf8(); > + > + return priv->path.data(); I think this should return the path in the filesystem encoding. For instance, g_fopen takes filenames in the system encoding. Either way the documentation should be clear about what encoding is returned. 380956 5 gustavo 2011-04-06 16:27:13 -0700 (In reply to comment #4) > > Source/WebKit/gtk/webkit/webkitwebplugin.cpp:192 > > + if (!priv->path.length()) > > + priv->path = priv->corePlugin->path().utf8(); > > + > > + return priv->path.data(); > > I think this should return the path in the filesystem encoding. For instance, g_fopen takes filenames in the system encoding. Either way the documentation should be clear about what encoding is returned. Well-thought! Do you guys agree to having this as part of 1.4.0? If so I'll address these comments and land it with Since: 1.4.0, and get it merged =) 380958 6 mrobinson 2011-04-06 16:29:51 -0700 Seems like a safe addition to 1.4.0 to me. 381301 7 88624 gustavo 2011-04-07 06:57:09 -0700 Created attachment 88624 patch addressing mrobinson's comments 381332 8 88624 mrobinson 2011-04-07 07:46:52 -0700 Comment on attachment 88624 patch addressing mrobinson's comments View in context: https://bugs.webkit.org/attachment.cgi?id=88624&action=review Great. > Source/WebKit/gtk/webkit/webkitwebplugin.cpp:182 > + * Returns: the absolute path to @plugin in glib filename encoding. s/glib/system. Should say it returns null on error. > Source/WebKit/gtk/webkit/webkitwebplugin.cpp:206 > + g_warning("Failed to convert '%s' to glib filename encoding: %s", priv->corePlugin->path().utf8().data(), error->message); Ditto. 381479 9 88624 gustavo 2011-04-07 10:44:58 -0700 Comment on attachment 88624 patch addressing mrobinson's comments Landed in r83185 88483 2011-04-06 12:09:17 -0700 2011-04-07 06:57:09 -0700 Patch bug-57968-20110406160915.patch text/plain 2882 gustavo U3VidmVyc2lvbiBSZXZpc2lvbjogODI4OTUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZwppbmRleCBjM2RjMDc2NDk3 MjNiNGI4N2NmODY0NTc3Njg2NTk4OWI4YmEwMDNjLi40OGVlYWJlNmY4ODA0ZjE0YmVkOGUxMWY5 NWU4NTY3NjM5MzZmNTRjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cK KysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEt MDQtMDYgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bnbm9tZS5vcmc+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgW0dUS10gTmVlZCBhIHdheSB0 byBnZXQgdGhlIHBhdGggZm9yIGEgV2ViS2l0V2ViUGx1Z2luCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzk2OAorCisgICAgICAgIEV4cG9zZSB0aGUg cGF0aCBvZiB0aGUgcGx1Z2luIHRocm91Z2ggdGhlIFdlYktpdFdlYlBsdWdpbiBvYmplY3QuCisK KyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2VicGx1Z2luLmNwcDoKKyAgICAgICAgKHdlYmtpdF93 ZWJfcGx1Z2luX2dldF9wYXRoKToKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2VicGx1Z2luLmg6 CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnBsdWdpbnByaXZhdGUuaDoKKwogMjAxMS0wNC0w NCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxpYS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdHdlYnBsdWdpbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJr aXQvd2Via2l0d2VicGx1Z2luLmNwcAppbmRleCA1MmQ1OTY1ZDBkYzg3NDYwMzU5NWUxM2E4ZWE5 N2E1MzA3MGY5ODQyLi5jZGIzMGRmM2ZjM2JkOGU3YWFkNjgyOTdlODhlMGEwY2M3ZjQ4M2EwIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2luLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2luLmNwcApAQCAtMTcz LDYgKzE3MywyNyBAQCBjb25zdCBjaGFyKiB3ZWJraXRfd2ViX3BsdWdpbl9nZXRfZGVzY3JpcHRp b24oV2ViS2l0V2ViUGx1Z2luKiBwbHVnaW4pCiB9CiAKIC8qKgorICogd2Via2l0X3dlYl9wbHVn aW5fZ2V0X3BhdGg6CisgKiBAcGx1Z2luOiBhICNXZWJLaXRXZWJQbHVnaW4KKyAqCisgKiBSZXR1 cm5zOiB0aGUgYWJzb2x1dGUgcGF0aCBmb3IgQHBsdWdpbi4KKyAqCisgKiBTaW5jZTogMS4zLjE0 CisgKi8KK2NvbnN0IGNoYXIqIHdlYmtpdF93ZWJfcGx1Z2luX2dldF9wYXRoKFdlYktpdFdlYlBs dWdpbiogcGx1Z2luKQoreworICAgIGdfcmV0dXJuX3ZhbF9pZl9mYWlsKFdFQktJVF9JU19XRUJf UExVR0lOKHBsdWdpbiksIDApOworCisgICAgV2ViS2l0V2ViUGx1Z2luUHJpdmF0ZSogcHJpdiA9 IHBsdWdpbi0+cHJpdjsKKworICAgIGlmICghcHJpdi0+cGF0aC5sZW5ndGgoKSkKKyAgICAgICAg cHJpdi0+cGF0aCA9IHByaXYtPmNvcmVQbHVnaW4tPnBhdGgoKS51dGY4KCk7CisKKyAgICByZXR1 cm4gcHJpdi0+cGF0aC5kYXRhKCk7Cit9CisKKworLyoqCiAgKiB3ZWJraXRfd2ViX3BsdWdpbl9n ZXRfbWltZXR5cGVzOgogICogQHBsdWdpbjogYSAjV2ViS2l0V2ViUGx1Z2luCiAgKgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnBsdWdpbi5oIGIvU291cmNl L1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnBsdWdpbi5oCmluZGV4IDM1MTRkMWU4ZDdkYWE2 MTI2YTYyNWQ2YzU4NWU4MzRhMzlhNzhjYTMuLjkyMDU2NzRlOWZmMTQ5MjNhNjg4YjNiZDAzOTg5 NjY3OGI5YWQxYTQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3 ZWJwbHVnaW4uaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2lu LmgKQEAgLTczLDYgKzczLDkgQEAgd2Via2l0X3dlYl9wbHVnaW5fZ2V0X25hbWUgICAgICAgIChX ZWJLaXRXZWJQbHVnaW4qKTsKIFdFQktJVF9BUEkgY29uc3QgY2hhcioKIHdlYmtpdF93ZWJfcGx1 Z2luX2dldF9kZXNjcmlwdGlvbiAoV2ViS2l0V2ViUGx1Z2luKik7CiAKK1dFQktJVF9BUEkgY29u c3QgY2hhcioKK3dlYmtpdF93ZWJfcGx1Z2luX2dldF9wYXRoICAgICAgICAoV2ViS2l0V2ViUGx1 Z2luKik7CisKIFdFQktJVF9BUEkgR1NMaXN0Kgogd2Via2l0X3dlYl9wbHVnaW5fZ2V0X21pbWV0 eXBlcyAgIChXZWJLaXRXZWJQbHVnaW4qKTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9n dGsvd2Via2l0L3dlYmtpdHdlYnBsdWdpbnByaXZhdGUuaCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dl YmtpdC93ZWJraXR3ZWJwbHVnaW5wcml2YXRlLmgKaW5kZXggNGFlMjA0YjY2Zjg2ZWU1NDk4YWE4 ODIyYmIxZmUyMDFjODg2ZTE5Mi4uNjgxOTRkNDk5Y2MwOWExNWI0ZGU0MmVkOWNkODBlZmM2MWFk OTRjZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnBsdWdp bnByaXZhdGUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2lu cHJpdmF0ZS5oCkBAIC0zOCw2ICszOCw3IEBAIHN0cnVjdCBfV2ViS2l0V2ViUGx1Z2luUHJpdmF0 ZSB7CiAgICAgUmVmUHRyPFdlYkNvcmU6OlBsdWdpblBhY2thZ2U+IGNvcmVQbHVnaW47CiAgICAg Q1N0cmluZyBuYW1lOwogICAgIENTdHJpbmcgZGVzY3JpcHRpb247CisgICAgQ1N0cmluZyBwYXRo OwogICAgIEdTTGlzdCogbWltZVR5cGVzOwogfTsKIAo= 88484 2011-04-06 12:10:19 -0700 2011-04-06 12:10:19 -0700 how I plan to use this new API 0001-Do-not-disable-flash-if-running-through-npwrapper.patch text/plain 1510 gustavo RnJvbSBkODliM2NiYjViZmM5Y2I0Yzc4ZTIxNzc5NGRjZTgzZGU2NjRmODU1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBHdXN0YXZvIE5vcm9uaGEgU2lsdmEgPGduc0Bnbm9tZS5vcmc+ CkRhdGU6IFdlZCwgNiBBcHIgMjAxMSAxNjowODozNiAtMDMwMApTdWJqZWN0OiBbUEFUQ0hdIERv IG5vdCBkaXNhYmxlIGZsYXNoIGlmIHJ1bm5pbmcgdGhyb3VnaCBucHdyYXBwZXIuCgotLS0KIGVt YmVkL2VwaHktZW1iZWQtc2luZ2xlLmMgfCAgIDEzICsrKysrKysrKystLS0KIDEgZmlsZXMgY2hh bmdlZCwgMTAgaW5zZXJ0aW9ucygrKSwgMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9lbWJl ZC9lcGh5LWVtYmVkLXNpbmdsZS5jIGIvZW1iZWQvZXBoeS1lbWJlZC1zaW5nbGUuYwppbmRleCAz ZmQ1OGFhLi43ZDRhZjc4IDEwMDY0NAotLS0gYS9lbWJlZC9lcGh5LWVtYmVkLXNpbmdsZS5jCisr KyBiL2VtYmVkL2VwaHktZW1iZWQtc2luZ2xlLmMKQEAgLTU0OSwxMyArNTQ5LDIwIEBAIGVwaHlf ZW1iZWRfc2luZ2xlX2luaXRpYWxpemUgKEVwaHlFbWJlZFNpbmdsZSAqc2luZ2xlKQogI2VuZGlm CiAKICAgLyogRGlzYWJsZSBGbGFzaCBieSBkZWZhdWx0LCBzaW5jZSBpdCB1c2VzIEdUSysyLngg YW5kIHdlIGNhbid0IG1peAotICAgKiBpdCBpbiBvdXIgR1RLKzMueCBwcm9jZXNzICovCisgICAq IGl0IGluIG91ciBHVEsrMy54IHByb2Nlc3MsIGJ1dCBvbmx5IGlmIGl0IGlzIG5vdCBiZWluZyB3 cmFwcGVkIGJ5CisgICAqIG5zcGx1Z2lud3JhcHBlci4gKi8KICAgZGF0YWJhc2UgPSB3ZWJraXRf Z2V0X3dlYl9wbHVnaW5fZGF0YWJhc2UgKCk7CiAgIGxpc3QgPSB3ZWJraXRfd2ViX3BsdWdpbl9k YXRhYmFzZV9nZXRfcGx1Z2lucyAoZGF0YWJhc2UpOwogICBmb3IgKHAgPSBsaXN0OyBwOyBwID0g cC0+bmV4dCkgewogICAgIFdlYktpdFdlYlBsdWdpbiAqcGx1Z2luID0gV0VCS0lUX1dFQl9QTFVH SU4gKHAtPmRhdGEpOwotICAgIGlmIChnX3N0cmNtcDAgKHdlYmtpdF93ZWJfcGx1Z2luX2dldF9u YW1lIChwbHVnaW4pLCAiU2hvY2t3YXZlIEZsYXNoIikgPT0gMCkKLSAgICAgIHdlYmtpdF93ZWJf cGx1Z2luX3NldF9lbmFibGVkIChwbHVnaW4sIEZBTFNFKTsKKyAgICBpZiAoZ19zdHJjbXAwICh3 ZWJraXRfd2ViX3BsdWdpbl9nZXRfbmFtZSAocGx1Z2luKSwgIlNob2Nrd2F2ZSBGbGFzaCIpID09 IDApIHsKKyAgICAgIGNoYXIgKmZpbGVuYW1lID0gZ19wYXRoX2dldF9iYXNlbmFtZSAod2Via2l0 X3dlYl9wbHVnaW5fZ2V0X3BhdGggKHBsdWdpbikpOworCisgICAgICBpZiAoIWdfc3RyX2hhc19w cmVmaXggKGZpbGVuYW1lLCAibnB3cmFwcGVyLiIpKQorICAgICAgICB3ZWJraXRfd2ViX3BsdWdp bl9zZXRfZW5hYmxlZCAocGx1Z2luLCBGQUxTRSk7CisKKyAgICAgIGdfZnJlZSAoZmlsZW5hbWUp OworICAgIH0KICAgfQogCiAgIHdlYmtpdF93ZWJfcGx1Z2luX2RhdGFiYXNlX3BsdWdpbnNfbGlz dF9mcmVlIChsaXN0KTsKLS0gCjEuNy40LjEKCg== 88624 2011-04-07 06:57:09 -0700 2011-04-07 10:44:58 -0700 patch addressing mrobinson's comments patch.diff text/plain 3656 gustavo ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQv Z3RrL0NoYW5nZUxvZwppbmRleCBjM2RjMDc2Li40OGVlYWJlIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViS2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTEtMDQtMDYgIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSAgPGduc0Bn bm9tZS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgW0dUS10gTmVlZCBhIHdheSB0byBnZXQgdGhlIHBhdGggZm9yIGEgV2ViS2l0V2ViUGx1Z2lu CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01Nzk2OAor CisgICAgICAgIEV4cG9zZSB0aGUgcGF0aCBvZiB0aGUgcGx1Z2luIHRocm91Z2ggdGhlIFdlYktp dFdlYlBsdWdpbiBvYmplY3QuCisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0d2VicGx1Z2luLmNw cDoKKyAgICAgICAgKHdlYmtpdF93ZWJfcGx1Z2luX2dldF9wYXRoKToKKyAgICAgICAgKiB3ZWJr aXQvd2Via2l0d2VicGx1Z2luLmg6CisgICAgICAgICogd2Via2l0L3dlYmtpdHdlYnBsdWdpbnBy aXZhdGUuaDoKKwogMjAxMS0wNC0wNCAgTWFydGluIFJvYmluc29uICA8bXJvYmluc29uQGlnYWxp YS5jb20+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkgR3VzdGF2byBOb3JvbmhhIFNpbHZhLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnBsdWdpbi5jcHAgYi9T b3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2luLmNwcAppbmRleCA1MmQ1OTY1 Li4xYTQzNDk4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2Vi cGx1Z2luLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2lu LmNwcApAQCAtMSw1ICsxLDYgQEAKIC8qCiAgKiAgQ29weXJpZ2h0IChDKSAyMDEwIElnYWxpYSBT LkwuCisgKiAgQ29weXJpZ2h0IChDKSAyMDExIEd1c3Rhdm8gTm9yb25oYSBTaWx2YSA8Z25zQGdu b21lLm9yZz4KICAqCiAgKiAgVGhpcyBsaWJyYXJ5IGlzIGZyZWUgc29mdHdhcmU7IHlvdSBjYW4g cmVkaXN0cmlidXRlIGl0IGFuZC9vcgogICogIG1vZGlmeSBpdCB1bmRlciB0aGUgdGVybXMgb2Yg dGhlIEdOVSBMZXNzZXIgR2VuZXJhbCBQdWJsaWMKQEAgLTYyLDYgKzYzLDggQEAgc3RhdGljIHZv aWQgd2Via2l0X3dlYl9wbHVnaW5fZmluYWxpemUoR09iamVjdCogb2JqZWN0KQogICAgIFdlYktp dFdlYlBsdWdpbiogcGx1Z2luID0gV0VCS0lUX1dFQl9QTFVHSU4ob2JqZWN0KTsKICAgICBXZWJL aXRXZWJQbHVnaW5Qcml2YXRlKiBwcml2ID0gcGx1Z2luLT5wcml2OwogCisgICAgZ19mcmVlKHBy aXYtPnBhdGgpOworCiAgICAgZ19zbGlzdF9mb3JlYWNoKHByaXYtPm1pbWVUeXBlcywgKEdGdW5j KWZyZWVNSU1FVHlwZSwgMCk7CiAgICAgZ19zbGlzdF9mcmVlKHByaXYtPm1pbWVUeXBlcyk7CiAK QEAgLTE3Myw2ICsxNzYsNDIgQEAgY29uc3QgY2hhciogd2Via2l0X3dlYl9wbHVnaW5fZ2V0X2Rl c2NyaXB0aW9uKFdlYktpdFdlYlBsdWdpbiogcGx1Z2luKQogfQogCiAvKioKKyAqIHdlYmtpdF93 ZWJfcGx1Z2luX2dldF9wYXRoOgorICogQHBsdWdpbjogYSAjV2ViS2l0V2ViUGx1Z2luCisgKgor ICogUmV0dXJuczogdGhlIGFic29sdXRlIHBhdGggdG8gQHBsdWdpbiBpbiBnbGliIGZpbGVuYW1l IGVuY29kaW5nLgorICoKKyAqIFNpbmNlOiAxLjQuMAorICovCitjb25zdCBjaGFyKiB3ZWJraXRf d2ViX3BsdWdpbl9nZXRfcGF0aChXZWJLaXRXZWJQbHVnaW4qIHBsdWdpbikKK3sKKyAgICBnX3Jl dHVybl92YWxfaWZfZmFpbChXRUJLSVRfSVNfV0VCX1BMVUdJTihwbHVnaW4pLCAwKTsKKworICAg IFdlYktpdFdlYlBsdWdpblByaXZhdGUqIHByaXYgPSBwbHVnaW4tPnByaXY7CisKKyAgICBpZiAo cHJpdi0+cGF0aCkKKyAgICAgICAgcmV0dXJuIHByaXYtPnBhdGg7CisKKyAgICBHRXJyb3IqIGVy cm9yID0gMDsKKyAgICBwcml2LT5wYXRoID0gZ19maWxlbmFtZV9mcm9tX3V0ZjgocHJpdi0+Y29y ZVBsdWdpbi0+cGF0aCgpLnV0ZjgoKS5kYXRhKCksIC0xLCAwLCAwLCAmZXJyb3IpOworCisgICAg aWYgKCFlcnJvcikKKyAgICAgICAgcmV0dXJuIHByaXYtPnBhdGg7CisKKyAgICAvLyBJbiB0aGUg dW5saWtlbHkgY2FzZSB0aGUgY29udmVydGlvbiBmYWlscywgcmVwb3J0IHRoZSBlcnJvciBhbmQg bWFrZSBzdXJlIHdlIGZyZWUKKyAgICAvLyBhbnkgcGFydGlhbCBjb252ZXJ0aW9uIHRoYXQgZW5k ZWQgdXAgaW4gdGhlIHZhcmlhYmxlLgorICAgIGdfZnJlZShwcml2LT5wYXRoKTsKKyAgICBwcml2 LT5wYXRoID0gMDsKKworICAgIGdfd2FybmluZygiRmFpbGVkIHRvIGNvbnZlcnQgJyVzJyB0byBn bGliIGZpbGVuYW1lIGVuY29kaW5nOiAlcyIsIHByaXYtPmNvcmVQbHVnaW4tPnBhdGgoKS51dGY4 KCkuZGF0YSgpLCBlcnJvci0+bWVzc2FnZSk7CisKKyAgICBnX2NsZWFyX2Vycm9yKCZlcnJvcik7 CisKKyAgICByZXR1cm4gMDsKK30KKworCisvKioKICAqIHdlYmtpdF93ZWJfcGx1Z2luX2dldF9t aW1ldHlwZXM6CiAgKiBAcGx1Z2luOiBhICNXZWJLaXRXZWJQbHVnaW4KICAqCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2luLmggYi9Tb3VyY2UvV2Vi S2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2luLmgKaW5kZXggMzUxNGQxZS4uOTIwNTY3NCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdlYnBsdWdpbi5oCisr KyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJwbHVnaW4uaApAQCAtNzMsNiAr NzMsOSBAQCB3ZWJraXRfd2ViX3BsdWdpbl9nZXRfbmFtZSAgICAgICAgKFdlYktpdFdlYlBsdWdp biopOwogV0VCS0lUX0FQSSBjb25zdCBjaGFyKgogd2Via2l0X3dlYl9wbHVnaW5fZ2V0X2Rlc2Ny aXB0aW9uIChXZWJLaXRXZWJQbHVnaW4qKTsKIAorV0VCS0lUX0FQSSBjb25zdCBjaGFyKgord2Vi a2l0X3dlYl9wbHVnaW5fZ2V0X3BhdGggICAgICAgIChXZWJLaXRXZWJQbHVnaW4qKTsKKwogV0VC S0lUX0FQSSBHU0xpc3QqCiB3ZWJraXRfd2ViX3BsdWdpbl9nZXRfbWltZXR5cGVzICAgKFdlYktp dFdlYlBsdWdpbiopOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Vi a2l0d2VicGx1Z2lucHJpdmF0ZS5oIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdHdl YnBsdWdpbnByaXZhdGUuaAppbmRleCA0YWUyMDRiLi44YTFiYTFiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0d2VicGx1Z2lucHJpdmF0ZS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXR3ZWJwbHVnaW5wcml2YXRlLmgKQEAgLTM4LDYgKzM4 LDcgQEAgc3RydWN0IF9XZWJLaXRXZWJQbHVnaW5Qcml2YXRlIHsKICAgICBSZWZQdHI8V2ViQ29y ZTo6UGx1Z2luUGFja2FnZT4gY29yZVBsdWdpbjsKICAgICBDU3RyaW5nIG5hbWU7CiAgICAgQ1N0 cmluZyBkZXNjcmlwdGlvbjsKKyAgICBjaGFyKiBwYXRoOwogICAgIEdTTGlzdCogbWltZVR5cGVz OwogfTsKIAo=