55929 2011-03-08 01:20:26 -0800 [GTK] Add proxy support to GtkLauncher 2011-04-18 09:13:48 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) All All RESOLVED WONTFIX P2 Normal --- 0 thouraya.andolsi webkit-unassigned gustavo.noronha gustavo mrobinson ryuan.choi thouraya.andolsi xan.lopez oldest_to_newest 363896 0 thouraya.andolsi 2011-03-08 01:20:26 -0800 Hello, We are using GtkLauncher and we want to access to internet via proxy. I'll attach a patch that will help to do it. Regards, Thouraya. 363911 1 85037 thouraya.andolsi 2011-03-08 02:24:44 -0800 Created attachment 85037 Add proxy support to GtkLauncher 363912 2 gustavo.noronha 2011-03-08 02:33:29 -0800 Attachment 85037 did not build on gtk: Build output: http://queues.webkit.org/results/8106768 363940 3 85045 thouraya.andolsi 2011-03-08 05:54:42 -0800 Created attachment 85045 Add proxy support to GtkLauncher Hello, I'm working on Linux and I built GtkLauncher successfully without any undefined reference symbol. In the attached patch I added LIBSOUP_LIBS flag to Programs_GtkLauncher_LDADD to fix the undefined symbol you had. Regards. 363969 4 85045 mrobinson 2011-03-08 08:23:33 -0800 Comment on attachment 85045 Add proxy support to GtkLauncher Wouldn't it make more sense to simply add the SOUP_TYPE_PROXY_RESOLVER_GNOME feature to the session? 363970 5 mrobinson 2011-03-08 08:25:22 -0800 Renaming this bug, since I think it's unrelated to the web inspector. 364546 6 thouraya.andolsi 2011-03-09 09:46:57 -0800 (In reply to comment #4) > (From update of attachment 85045 [details]) > Wouldn't it make more sense to simply add the SOUP_TYPE_PROXY_RESOLVER_GNOME feature to the session? Hello, We cannot do it because we are not using libsoup-gnome and cross-compiling it because it may depend on another gnome libraries. Regards, Thouraya. 371402 7 gustavo 2011-03-22 08:50:16 -0700 We can now use the new SoupProxyResolverDefault: https://bugzilla.gnome.org/show_bug.cgi?id=642928 371404 8 85045 gustavo 2011-03-22 08:59:24 -0700 Comment on attachment 85045 Add proxy support to GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=85045&action=review This patch does too many things in one go, going way beyong 'adding proxy support' - it would at least need to be broken up in two or three patches that each do its thing. I also don't like the idea of reinventing argument parsing inside GtkLauncher. So, to be clear: 1. If we want proxy support, I am OK with using the new default proxy resolver included in libsoup: https://bugzilla.gnome.org/show_bug.cgi?id=642928 2. I'm fine with options to request different width/height, but that should be a separate patch and use glib's option parsing infrastructure, no manual arguments parsing 3. The changes to how webkit_web_view_load_uri is apparently gain us nothing while removing the ability to give GtkLauncher a filename > Tools/GtkLauncher/main.c:359 > - gchar *uri =(gchar*)(argc > 1 ? argv[1] : "http://www.google.com/"); > - gchar *fileURL = filenameToURL(uri); > - > - webkit_web_view_load_uri(webView, fileURL ? fileURL : uri); > - g_free(fileURL); > + webkit_web_view_load_uri(webView, uri); This seems to be totally unrelated? 374602 9 87165 thouraya.andolsi 2011-03-28 10:49:56 -0700 Created attachment 87165 Add options to request width & height in GtkLauncher Hello, Attached a patch adding options to request width & height in GtkLauncher. Regards, Thouraya. 375292 10 87165 mrobinson 2011-03-29 07:21:06 -0700 Comment on attachment 87165 Add options to request width & height in GtkLauncher View in context: https://bugs.webkit.org/attachment.cgi?id=87165&action=review What's the use case for wanting to pass in width and height parameters to GTK+ launcher? > Tools/ChangeLog:6 > + Add options to request width/height in GtkLauncher. > + https://bugs.webkit.org/show_bug.cgi?id=55929 This is not actually the description in the bug. Probably either this change should be moved to another bug or you should rename this one. 375398 11 thouraya.andolsi 2011-03-29 09:02:25 -0700 Hello, (In reply to comment #10) > (From update of attachment 87165 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=87165&action=review > > What's the use case for wanting to pass in width and height parameters to GTK+ launcher? Because in Set top boxes there is no mouse to resize the window, and it's better to give customers the ability to do it. > > > Tools/ChangeLog:6 > > + Add options to request width/height in GtkLauncher. > > + https://bugs.webkit.org/show_bug.cgi?id=55929 > > This is not actually the description in the bug. Probably either this change should be moved to another bug or you should rename this one. 375424 12 thouraya.andolsi 2011-03-29 09:29:29 -0700 Hello, (In reply to comment #7) > We can now use the new SoupProxyResolverDefault: https://bugzilla.gnome.org/show_bug.cgi?id=642928 To add proxy support, I have only to add 3 lines: SoupSession * ss = webkit_get_default_session(); proxyUri = soup_uri_new(proxy); g_object_set(ss, SOUP_SESSION_PROXY_URI, proxyUri, NULL); Why shoold I replace them using SoupProxyResolverDefault? the problem is in the call to g_object_set()? Using that API, how to set the proxy property to the session? I won't use soup_session_async_new_with_options ( the session is already created) and I cannot add it as a new feature to the session. Thank you very much. Thouraya. 375573 13 mrobinson 2011-03-29 11:26:33 -0700 (In reply to comment #11) > > What's the use case for wanting to pass in width and height parameters to GTK+ launcher? > Because in Set top boxes there is no mouse to resize the window, and it's better to give customers the ability to do it. GtkLauncher is not meant to be shipped as a browser. It's really just an example of a very basic WebKit embed for developers. It's missing a lot of functionality that a useful browser requires. If you need to ship software for your customers, please create a separate, standalone browser. 376150 14 thouraya.andolsi 2011-03-30 02:36:10 -0700 Hello, (In reply to comment #13) > (In reply to comment #11) > > > What's the use case for wanting to pass in width and height parameters to GTK+ launcher? > > Because in Set top boxes there is no mouse to resize the window, and it's better to give customers the ability to do it. > > GtkLauncher is not meant to be shipped as a browser. It's really just an example of a very basic WebKit embed for developers. It's missing a lot of functionality that a useful browser requires. If you need to ship software for your customers, please create a separate, standalone browser. Thank you for the response. Regards. 387501 15 ryuan.choi 2011-04-17 19:11:38 -0700 (In reply to comment #13) > (In reply to comment #11) > > > What's the use case for wanting to pass in width and height parameters to GTK+ launcher? > > Because in Set top boxes there is no mouse to resize the window, and it's better to give customers the ability to do it. > > GtkLauncher is not meant to be shipped as a browser. It's really just an example of a very basic WebKit embed for developers. It's missing a lot of functionality that a useful browser requires. If you need to ship software for your customers, please create a separate, standalone browser. Hello, I am waiting this bug to get proxy support to Gtklauncher. As you mentioned, Gtklauncher is a good example for developer to test. And I want to contribute something for WebKit/Gtk if I can. But, I need to add proxy information to test Gtklauncher every time, because I am behind of proxy. I just want simple patch to add proxy via env. EWeblauncher already have it. If you are agree, I can propose a patch. 387738 16 mrobinson 2011-04-18 08:27:31 -0700 (In reply to comment #15) > As you mentioned, Gtklauncher is a good example for developer to test. And I want to contribute something for WebKit/Gtk if I can. But, I need to add proxy information to test Gtklauncher every time, because I am behind of proxy. Would adding the default soup proxy resolver to the session, as discussed earlier, fulfill your needs? If so, I'd be willing to r+ the patch. 387770 17 87165 eric 2011-04-18 09:13:48 -0700 Comment on attachment 87165 Add options to request width & height in GtkLauncher Cleared review? from attachment 87165 so that this bug does not appear in http://webkit.org/pending-review. If you would like this patch reviewed, please attach it to a new bug (or re-open this bug before marking it for review again). 85037 2011-03-08 02:24:44 -0800 2011-03-08 05:54:42 -0800 Add proxy support to GtkLauncher 0001-Add-proxy-support-to-GtkLauncher.patch text/plain 5772 thouraya.andolsi RnJvbSBiMzY5ODg5NTRiMmU1NzAxODQzYjAxZjk4NjE2ZDJiYzNhNjU0OTk1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaG91cmF5YSBBTkRPTFNJIDx0aG91cmF5YS5hbmRvbHNpQHN0 LmNvbT4KRGF0ZTogVHVlLCA4IE1hciAyMDExIDEwOjI4OjQ3ICswMTAwClN1YmplY3Q6IFtQQVRD SF0gQWRkIHByb3h5IHN1cHBvcnQgdG8gR3RrTGF1bmNoZXIuCgotLS0KIFRvb2xzL0NoYW5nZUxv ZyAgICAgICAgICB8ICAgMTUgKysrKysrCiBUb29scy9HdGtMYXVuY2hlci9tYWluLmMgfCAgMTE1 ICsrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogMiBmaWxlcyBj aGFuZ2VkLCAxMTcgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDFhNWQzNTguLmZhNDk3ODMg MTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOCBAQAorMjAxMS0wMy0wNyAgVGhvdXJheWEgQU5ET0xTSSAgPHRob3VyYXlhLmFuZG9s c2lAc3QuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIEFkZCBwcm94eSBzdXBwb3J0IHRvIEd0a0xhdW5jaGVyCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01NTkyOQorCisgICAgICAgICogR3RrTGF1bmNo ZXIvbWFpbi5jOgorICAgICAgICAoY3JlYXRlV2luZG93KToKKyAgICAgICAgKHVzYWdlKToKKyAg ICAgICAgKHBhcnNlX2FyZ3MpOgorICAgICAgICAoZ2V0X2h0dHBfcHJveHkpOgorICAgICAgICAo bWFpbik6CisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5 OgorCiAyMDExLTAzLTA3ICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1Rvb2xzL0d0a0xhdW5jaGVy L21haW4uYyBiL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYwppbmRleCBhZDY2NmUyLi5mNjZlNTNl IDEwMDY0NAotLS0gYS9Ub29scy9HdGtMYXVuY2hlci9tYWluLmMKKysrIGIvVG9vbHMvR3RrTGF1 bmNoZXIvbWFpbi5jCkBAIC0yNSw5ICsyNSwxNSBAQAogICovCiAKICNpbmNsdWRlIDxndGsvZ3Rr Lmg+CisjaW5jbHVkZSA8c3RyaW5nLmg+CiAjaW5jbHVkZSA8d2Via2l0L3dlYmtpdC5oPgogCiBz dGF0aWMgZ2ludCB3aW5kb3dDb3VudCA9IDA7CitzdGF0aWMgU291cFVSSSogcHJveHkgPSBOVUxM Oworc3RhdGljIGNoYXIgKnByb2dyYW07CitzdGF0aWMgZ2NoYXIqIHVyaSA9IE5VTEw7CitzdGF0 aWMgaW50ICB3aWR0aCA9IDY0MDsKK3N0YXRpYyBpbnQgIGhlaWdodCA9IDQ4MDsKIAogc3RhdGlj IEd0a1dpZGdldCogY3JlYXRlV2luZG93KFdlYktpdFdlYlZpZXcqKiBvdXRXZWJWaWV3KTsKIApA QCAtMTk2LDcgKzIwMiw4IEBAIHN0YXRpYyBHdGtXaWRnZXQqIGNyZWF0ZVdpbmRvdyhXZWJLaXRX ZWJWaWV3Kiogb3V0V2ViVmlldykKICAgICBnX2F0b21pY19pbnRfaW5jKCZ3aW5kb3dDb3VudCk7 CiAKICAgICB3aW5kb3cgPSBndGtfd2luZG93X25ldyhHVEtfV0lORE9XX1RPUExFVkVMKTsKLSAg ICBndGtfd2luZG93X3NldF9kZWZhdWx0X3NpemUoR1RLX1dJTkRPVyh3aW5kb3cpLCA4MDAsIDYw MCk7CisgICAgZ3RrX3dpbmRvd19zZXRfcG9zaXRpb24oR1RLX1dJTkRPVyh3aW5kb3cpLCBHVEtf V0lOX1BPU19DRU5URVIpOworICAgIGd0a193aW5kb3dfc2V0X2RlZmF1bHRfc2l6ZShHVEtfV0lO RE9XKHdpbmRvdyksIHdpZHRoLCBoZWlnaHQpOwogICAgIGd0a193aWRnZXRfc2V0X25hbWUod2lu ZG93LCAiR3RrTGF1bmNoZXIiKTsKIAogICAgIHdlYlZpZXcgPSBXRUJLSVRfV0VCX1ZJRVcod2Vi a2l0X3dlYl92aWV3X25ldygpKTsKQEAgLTIxOCwxNiArMjI1LDk3IEBAIHN0YXRpYyBHdGtXaWRn ZXQqIGNyZWF0ZVdpbmRvdyhXZWJLaXRXZWJWaWV3Kiogb3V0V2ViVmlldykKICAgICByZXR1cm4g d2luZG93OwogfQogCi1zdGF0aWMgZ2NoYXIqIGZpbGVuYW1lVG9VUkwoY29uc3QgY2hhciogZmls ZW5hbWUpCitzdGF0aWMgdm9pZAordXNhZ2Uodm9pZCkKIHsKLSAgICBpZiAoIWdfZmlsZV90ZXN0 KGZpbGVuYW1lLCBHX0ZJTEVfVEVTVF9FWElTVFMpKQotICAgICAgICByZXR1cm4gMDsKKyAgICBw cmludGYoIlVzYWdlOiAlcyBbb3B0aW9uc10gVVJJXG4iLCBwcm9ncmFtKTsKKyAgICBwcmludGYo IiAgICAgICAgIC13ICAgIGJyb3dzZXIgd2lkdGgsICBpbiBwaXhlbHMgKCVkKVxuIiwgd2lkdGgp OworICAgIHByaW50ZigiICAgICAgICAgLWggICAgYnJvd3NlciBoZWlnaHQsIGluIHBpeGVscyAo JWQpXG4iLCBoZWlnaHQpOworICAgIHByaW50ZigiICAgICAgICAgLXAgICAgcHJveHkgc2V0dGlu Z3MsIHNlcnZlcjpwb3J0XG4iKTsKK30KIAotICAgIEdGaWxlICpnZmlsZSA9IGdfZmlsZV9uZXdf Zm9yX3BhdGgoZmlsZW5hbWUpOwotICAgIGdjaGFyICpmaWxlVVJMID0gZ19maWxlX2dldF91cmko Z2ZpbGUpOwotICAgIGdfb2JqZWN0X3VucmVmKGdmaWxlKTsKK3N0YXRpYyBpbnQKK3BhcnNlX2Fy Z3MoaW50ICphcmdjLCBjaGFyICoqYXJndikKK3sKKyAgICBpbnQgbmFyZ3MgPSAqYXJnYzsKKyAg ICBjaGFyICoqYXJncyA9IChjaGFyICoqKSAqYXJndjsKKyAgICBjaGFyICpvcHRpb247CisgICAg aW50IGk7CisKKyAgICBwcm9ncmFtID0gc3RycmNocihhcmdzWzBdLCAnLycpID8gc3RycmNocihh cmdzWzBdLCAnLycpICArIDEgOiBhcmdzWzBdOworICAgIGkgPSAxOworICAgIHdoaWxlIChpIDwg bmFyZ3MpIHsKKyAgICAgICAgb3B0aW9uID0gYXJnc1tpXTsKKyAgICAgICAgaWYgKCFzdHJjbXAo b3B0aW9uLCAiLXciKSkgeworICAgICAgICAgICAgaWYgKGFyZ3NbaSsxXSkKKyAgICAgICAgICAg ICAgICB3aWR0aCA9IGF0b2koYXJnc1tpKzFdKTsKKyAgICAgICAgICAgIGVsc2UgeworICAgICAg ICAgICAgICAgIHByaW50ZigiJXM6IGludmFsaWQgd2lkdGhcbiIsIHByb2dyYW0pOworICAgICAg ICAgICAgICAgIHVzYWdlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICAg ICAgfQorICAgICAgICAgICAgaWYgKCF3aWR0aCkgeworICAgICAgICAgICAgICAgIHByaW50Zigi JXM6IGludmFsaWQgd2lkdGggLS0gJWRcbiIsIHByb2dyYW0sIHdpZHRoKTsKKyAgICAgICAgICAg ICAgICB1c2FnZSgpOworICAgICAgICAgICAgICAgIHJldHVybiAtMTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgICAgIGkgKz0gMjsKKyAgICAgICAgfSBlbHNlIGlmICghc3RyY21wKG9wdGlvbiwg Ii1oIikpIHsKKyAgICAgICAgICAgIGlmIChhcmdzW2krMV0pCisgICAgICAgICAgICAgICAgaGVp Z2h0ID0gYXRvaShhcmdzW2krMV0pOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAg ICAgcHJpbnRmKCIlczogaW52YWxpZCBoZWlnaHRcbiIsIHByb2dyYW0pOworICAgICAgICAgICAg ICAgIHVzYWdlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICAgICAgfQor ICAgICAgICAgICAgaWYgKCFoZWlnaHQpIHsKKyAgICAgICAgICAgICAgICBwcmludGYoIiVzOiBp bnZhbGlkIGhlaWdodCAtLSAlZFxuIiwgcHJvZ3JhbSwgaGVpZ2h0KTsKKyAgICAgICAgICAgICAg ICB1c2FnZSgpOworICAgICAgICAgICAgICAgIHJldHVybiAtMTsKKyAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIGkgKz0gMjsKKyAgICAgICAgfSBlbHNlIGlmICghc3RyY21wKG9wdGlvbiwgIi1w IikpIHsKKyAgICAgICAgICAgIGlmIChhcmdzW2krMV0pCisgICAgICAgICAgICAgICAgZ2V0X2h0 dHBfcHJveHkoYXJnc1tpKzFdKTsKKyAgICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAg IHByaW50ZigiJXM6IG1pc3NpbmcgcHJveHkgc2V0dGluZ3MgXG4iLCBwcm9ncmFtKTsKKyAgICAg ICAgICAgICAgICB1c2FnZSgpOworICAgICAgICAgICAgICAgIHJldHVybiAtMTsKKyAgICAgICAg ICAgIH0KKyAgICAgICAgICAgIGkgKz0gMjsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICAg IGlmIChpID09IChuYXJncyAtIDEpKQorICAgICAgICAgICAgICAgIHVyaSA9IG9wdGlvbjsKKyAg ICAgICAgICAgIGVsc2UgeworICAgICAgICAgICAgICAgIHByaW50ZigiJXM6IGludmFsaWQgb3B0 aW9uIC0tICVzXG4iLCBwcm9ncmFtLCBvcHRpb24pOworICAgICAgICAgICAgICAgIHVzYWdlKCk7 CisgICAgICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAgICAgICAgfQorICAgICAgICAgICAg aSsrOworICAgICAgICB9CisgICAgfQorICAgIGlmICghdXJpKSB7CisgICAgICAgIHByaW50Zigi JXM6IG5vIHVyaSBzcGVjaWZpZWRcbiIsIHByb2dyYW0pOworICAgICAgICB1c2FnZSgpOworICAg ICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIGlmICh1cmlbMF0gPT0gJy0nKSB7CisgICAgICAg IHByaW50ZigiJXM6IGludmFsaWQgdXJpIC0tICVzXG4iLCBwcm9ncmFtLCB1cmkpOworICAgICAg ICB1c2FnZSgpOworICAgICAgICByZXR1cm4gLTE7CisgICAgfQorICAgIHJldHVybiAwOworfQog Ci0gICAgcmV0dXJuIGZpbGVVUkw7Cit2b2lkCitnZXRfaHR0cF9wcm94eShnY2hhciogaHR0cF9w cm94eSkKK3sKKyAgICBpZiAoZ19zdHJfaGFzX3ByZWZpeCAoaHR0cF9wcm94eSwgImh0dHA6Ly8i KSkKKyAgICAgICAgcHJveHkgPSBzb3VwX3VyaV9uZXcoaHR0cF9wcm94eSk7CisgICAgZWxzZSB7 CisgICAgICAgIGdjaGFyICogaHR0cFByb3h5ID0gZ19zdHJjb25jYXQoImh0dHA6Ly8iLCBodHRw X3Byb3h5LCBOVUxMKTsKKyAgICAgICAgcHJveHkgPSBzb3VwX3VyaV9uZXcoaHR0cFByb3h5KTsK KyAgICB9CiB9CiAKICNpZm5kZWYgR1RLX0FQSV9WRVJTSU9OXzIKQEAgLTI1NCw2ICszNDIsOCBA QCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciogYXJndltdKQogICAgIEd0a1dpZGdldCAqbWFpbl93 aW5kb3c7CiAKICAgICBndGtfaW5pdCgmYXJnYywgJmFyZ3YpOworICAgIGlmIChwYXJzZV9hcmdz KCZhcmdjLCAoY2hhciAqKikmYXJndikgPCAwKQorICAgICAgICByZXR1cm4gLTE7CiAgICAgaWYg KCFnX3RocmVhZF9zdXBwb3J0ZWQoKSkKICAgICAgICAgZ190aHJlYWRfaW5pdChOVUxMKTsKIApA QCAtMjYyLDEyICszNTIsMTEgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIqIGFyZ3ZbXSkKICNl bmRpZgogCiAgICAgbWFpbl93aW5kb3cgPSBjcmVhdGVXaW5kb3coJndlYlZpZXcpOworICAgIFNv dXBTZXNzaW9uICogc3MgPSB3ZWJraXRfZ2V0X2RlZmF1bHRfc2Vzc2lvbigpOworICAgIGlmIChw cm94eSkKKyAgICAgICAgZ19vYmplY3Rfc2V0KHNzLCAicHJveHktdXJpIiwgcHJveHksIE5VTEwp OwogCi0gICAgZ2NoYXIgKnVyaSA9KGdjaGFyKikoYXJnYyA+IDEgPyBhcmd2WzFdIDogImh0dHA6 Ly93d3cuZ29vZ2xlLmNvbS8iKTsKLSAgICBnY2hhciAqZmlsZVVSTCA9IGZpbGVuYW1lVG9VUkwo dXJpKTsKLQotICAgIHdlYmtpdF93ZWJfdmlld19sb2FkX3VyaSh3ZWJWaWV3LCBmaWxlVVJMID8g ZmlsZVVSTCA6IHVyaSk7Ci0gICAgZ19mcmVlKGZpbGVVUkwpOworICAgIHdlYmtpdF93ZWJfdmll d19sb2FkX3VyaSh3ZWJWaWV3LCB1cmkpOwogCiAgICAgZ3RrX3dpZGdldF9ncmFiX2ZvY3VzKEdU S19XSURHRVQod2ViVmlldykpOwogICAgIGd0a193aWRnZXRfc2hvd19hbGwobWFpbl93aW5kb3cp OwotLSAKMS43LjIuMwoK 85045 2011-03-08 05:54:42 -0800 2011-03-22 08:59:24 -0700 Add proxy support to GtkLauncher 0001-Add-proxy-support-to-GtkLauncher.patch text/plain 6182 thouraya.andolsi RnJvbSBkZWY3NjhlMWVkMjU0OTY4MGY0MmYxZTkyYjgxMTJiYTUwZGMwMDgyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaG91cmF5YSBBTkRPTFNJIDx0aG91cmF5YS5hbmRvbHNpQHN0 LmNvbT4KRGF0ZTogVHVlLCA4IE1hciAyMDExIDEzOjU0OjAzICswMTAwClN1YmplY3Q6IFtQQVRD SF0gQWRkIHByb3h5IHN1cHBvcnQgdG8gR3RrTGF1bmNoZXIuCgotLS0KIFRvb2xzL0NoYW5nZUxv ZyAgICAgICAgICB8ICAgMTUgKysrKysrCiBUb29scy9HTlVtYWtlZmlsZS5hbSAgICAgfCAgICAx ICsKIFRvb2xzL0d0a0xhdW5jaGVyL21haW4uYyB8ICAxMTUgKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKysrKysrKy0tLS0tCiAzIGZpbGVzIGNoYW5nZWQsIDExOCBpbnNlcnRpb25z KCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29s cy9DaGFuZ2VMb2cKaW5kZXggMWE1ZDM1OC4uZmE0OTc4MyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hh bmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDExLTAzLTA3 ICBUaG91cmF5YSBBTkRPTFNJICA8dGhvdXJheWEuYW5kb2xzaUBzdC5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHByb3h5IHN1cHBvcnQg dG8gR3RrTGF1bmNoZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTU1OTI5CisKKyAgICAgICAgKiBHdGtMYXVuY2hlci9tYWluLmM6CisgICAgICAgIChj cmVhdGVXaW5kb3cpOgorICAgICAgICAodXNhZ2UpOgorICAgICAgICAocGFyc2VfYXJncyk6Cisg ICAgICAgIChnZXRfaHR0cF9wcm94eSk6CisgICAgICAgIChtYWluKToKKyAgICAgICAgKiBTY3Jp cHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0X18ucHk6CisKIDIwMTEtMDMtMDcgIE9qYW4g VmFmYWkgIDxvamFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJh cnRoLgpkaWZmIC0tZ2l0IGEvVG9vbHMvR05VbWFrZWZpbGUuYW0gYi9Ub29scy9HTlVtYWtlZmls ZS5hbQppbmRleCA4N2Y1NDI5Li5hNTliMjEyIDEwMDY0NAotLS0gYS9Ub29scy9HTlVtYWtlZmls ZS5hbQorKysgYi9Ub29scy9HTlVtYWtlZmlsZS5hbQpAQCAtMjYsNiArMjYsNyBAQCBQcm9ncmFt c19HdGtMYXVuY2hlcl9MREFERCA9IFwKIAlsaWJ3ZWJraXRndGstQFdFQktJVEdUS19BUElfTUFK T1JfVkVSU0lPTkAuQFdFQktJVEdUS19BUElfTUlOT1JfVkVSU0lPTkAubGEgXAogCSQoR1RLX0xJ QlMpIFwKIAkkKEdMSUJfTElCUykgXAorCSQoTElCU09VUF9MSUJTKSBcCiAJJChXSU5NTV9MSUJT KQogCiBQcm9ncmFtc19HdGtMYXVuY2hlcl9MREZMQUdTID0gXApkaWZmIC0tZ2l0IGEvVG9vbHMv R3RrTGF1bmNoZXIvbWFpbi5jIGIvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCmluZGV4IGFkNjY2 ZTIuLmY2NmU1M2UgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYworKysgYi9U b29scy9HdGtMYXVuY2hlci9tYWluLmMKQEAgLTI1LDkgKzI1LDE1IEBACiAgKi8KIAogI2luY2x1 ZGUgPGd0ay9ndGsuaD4KKyNpbmNsdWRlIDxzdHJpbmcuaD4KICNpbmNsdWRlIDx3ZWJraXQvd2Vi a2l0Lmg+CiAKIHN0YXRpYyBnaW50IHdpbmRvd0NvdW50ID0gMDsKK3N0YXRpYyBTb3VwVVJJKiBw cm94eSA9IE5VTEw7CitzdGF0aWMgY2hhciAqcHJvZ3JhbTsKK3N0YXRpYyBnY2hhciogdXJpID0g TlVMTDsKK3N0YXRpYyBpbnQgIHdpZHRoID0gNjQwOworc3RhdGljIGludCAgaGVpZ2h0ID0gNDgw OwogCiBzdGF0aWMgR3RrV2lkZ2V0KiBjcmVhdGVXaW5kb3coV2ViS2l0V2ViVmlldyoqIG91dFdl YlZpZXcpOwogCkBAIC0xOTYsNyArMjAyLDggQEAgc3RhdGljIEd0a1dpZGdldCogY3JlYXRlV2lu ZG93KFdlYktpdFdlYlZpZXcqKiBvdXRXZWJWaWV3KQogICAgIGdfYXRvbWljX2ludF9pbmMoJndp bmRvd0NvdW50KTsKIAogICAgIHdpbmRvdyA9IGd0a193aW5kb3dfbmV3KEdUS19XSU5ET1dfVE9Q TEVWRUwpOwotICAgIGd0a193aW5kb3dfc2V0X2RlZmF1bHRfc2l6ZShHVEtfV0lORE9XKHdpbmRv dyksIDgwMCwgNjAwKTsKKyAgICBndGtfd2luZG93X3NldF9wb3NpdGlvbihHVEtfV0lORE9XKHdp bmRvdyksIEdUS19XSU5fUE9TX0NFTlRFUik7CisgICAgZ3RrX3dpbmRvd19zZXRfZGVmYXVsdF9z aXplKEdUS19XSU5ET1cod2luZG93KSwgd2lkdGgsIGhlaWdodCk7CiAgICAgZ3RrX3dpZGdldF9z ZXRfbmFtZSh3aW5kb3csICJHdGtMYXVuY2hlciIpOwogCiAgICAgd2ViVmlldyA9IFdFQktJVF9X RUJfVklFVyh3ZWJraXRfd2ViX3ZpZXdfbmV3KCkpOwpAQCAtMjE4LDE2ICsyMjUsOTcgQEAgc3Rh dGljIEd0a1dpZGdldCogY3JlYXRlV2luZG93KFdlYktpdFdlYlZpZXcqKiBvdXRXZWJWaWV3KQog ICAgIHJldHVybiB3aW5kb3c7CiB9CiAKLXN0YXRpYyBnY2hhciogZmlsZW5hbWVUb1VSTChjb25z dCBjaGFyKiBmaWxlbmFtZSkKK3N0YXRpYyB2b2lkCit1c2FnZSh2b2lkKQogewotICAgIGlmICgh Z19maWxlX3Rlc3QoZmlsZW5hbWUsIEdfRklMRV9URVNUX0VYSVNUUykpCi0gICAgICAgIHJldHVy biAwOworICAgIHByaW50ZigiVXNhZ2U6ICVzIFtvcHRpb25zXSBVUklcbiIsIHByb2dyYW0pOwor ICAgIHByaW50ZigiICAgICAgICAgLXcgICAgYnJvd3NlciB3aWR0aCwgIGluIHBpeGVscyAoJWQp XG4iLCB3aWR0aCk7CisgICAgcHJpbnRmKCIgICAgICAgICAtaCAgICBicm93c2VyIGhlaWdodCwg aW4gcGl4ZWxzICglZClcbiIsIGhlaWdodCk7CisgICAgcHJpbnRmKCIgICAgICAgICAtcCAgICBw cm94eSBzZXR0aW5ncywgc2VydmVyOnBvcnRcbiIpOworfQogCi0gICAgR0ZpbGUgKmdmaWxlID0g Z19maWxlX25ld19mb3JfcGF0aChmaWxlbmFtZSk7Ci0gICAgZ2NoYXIgKmZpbGVVUkwgPSBnX2Zp bGVfZ2V0X3VyaShnZmlsZSk7Ci0gICAgZ19vYmplY3RfdW5yZWYoZ2ZpbGUpOworc3RhdGljIGlu dAorcGFyc2VfYXJncyhpbnQgKmFyZ2MsIGNoYXIgKiphcmd2KQoreworICAgIGludCBuYXJncyA9 ICphcmdjOworICAgIGNoYXIgKiphcmdzID0gKGNoYXIgKiopICphcmd2OworICAgIGNoYXIgKm9w dGlvbjsKKyAgICBpbnQgaTsKKworICAgIHByb2dyYW0gPSBzdHJyY2hyKGFyZ3NbMF0sICcvJykg PyBzdHJyY2hyKGFyZ3NbMF0sICcvJykgICsgMSA6IGFyZ3NbMF07CisgICAgaSA9IDE7CisgICAg d2hpbGUgKGkgPCBuYXJncykgeworICAgICAgICBvcHRpb24gPSBhcmdzW2ldOworICAgICAgICBp ZiAoIXN0cmNtcChvcHRpb24sICItdyIpKSB7CisgICAgICAgICAgICBpZiAoYXJnc1tpKzFdKQor ICAgICAgICAgICAgICAgIHdpZHRoID0gYXRvaShhcmdzW2krMV0pOworICAgICAgICAgICAgZWxz ZSB7CisgICAgICAgICAgICAgICAgcHJpbnRmKCIlczogaW52YWxpZCB3aWR0aFxuIiwgcHJvZ3Jh bSk7CisgICAgICAgICAgICAgICAgdXNhZ2UoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gLTE7 CisgICAgICAgICAgICB9CisgICAgICAgICAgICBpZiAoIXdpZHRoKSB7CisgICAgICAgICAgICAg ICAgcHJpbnRmKCIlczogaW52YWxpZCB3aWR0aCAtLSAlZFxuIiwgcHJvZ3JhbSwgd2lkdGgpOwor ICAgICAgICAgICAgICAgIHVzYWdlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIC0xOworICAg ICAgICAgICAgfQorICAgICAgICAgICAgaSArPSAyOworICAgICAgICB9IGVsc2UgaWYgKCFzdHJj bXAob3B0aW9uLCAiLWgiKSkgeworICAgICAgICAgICAgaWYgKGFyZ3NbaSsxXSkKKyAgICAgICAg ICAgICAgICBoZWlnaHQgPSBhdG9pKGFyZ3NbaSsxXSk7CisgICAgICAgICAgICBlbHNlIHsKKyAg ICAgICAgICAgICAgICBwcmludGYoIiVzOiBpbnZhbGlkIGhlaWdodFxuIiwgcHJvZ3JhbSk7Cisg ICAgICAgICAgICAgICAgdXNhZ2UoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gLTE7CisgICAg ICAgICAgICB9CisgICAgICAgICAgICBpZiAoIWhlaWdodCkgeworICAgICAgICAgICAgICAgIHBy aW50ZigiJXM6IGludmFsaWQgaGVpZ2h0IC0tICVkXG4iLCBwcm9ncmFtLCBoZWlnaHQpOworICAg ICAgICAgICAgICAgIHVzYWdlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIC0xOworICAgICAg ICAgICAgfQorICAgICAgICAgICAgaSArPSAyOworICAgICAgICB9IGVsc2UgaWYgKCFzdHJjbXAo b3B0aW9uLCAiLXAiKSkgeworICAgICAgICAgICAgaWYgKGFyZ3NbaSsxXSkKKyAgICAgICAgICAg ICAgICBnZXRfaHR0cF9wcm94eShhcmdzW2krMV0pOworICAgICAgICAgICAgZWxzZSB7CisgICAg ICAgICAgICAgICAgcHJpbnRmKCIlczogbWlzc2luZyBwcm94eSBzZXR0aW5ncyBcbiIsIHByb2dy YW0pOworICAgICAgICAgICAgICAgIHVzYWdlKCk7CisgICAgICAgICAgICAgICAgcmV0dXJuIC0x OworICAgICAgICAgICAgfQorICAgICAgICAgICAgaSArPSAyOworICAgICAgICB9IGVsc2Ugewor ICAgICAgICAgICAgaWYgKGkgPT0gKG5hcmdzIC0gMSkpCisgICAgICAgICAgICAgICAgdXJpID0g b3B0aW9uOworICAgICAgICAgICAgZWxzZSB7CisgICAgICAgICAgICAgICAgcHJpbnRmKCIlczog aW52YWxpZCBvcHRpb24gLS0gJXNcbiIsIHByb2dyYW0sIG9wdGlvbik7CisgICAgICAgICAgICAg ICAgdXNhZ2UoKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gLTE7CisgICAgICAgICAgICB9Cisg ICAgICAgICAgICBpKys7CisgICAgICAgIH0KKyAgICB9CisgICAgaWYgKCF1cmkpIHsKKyAgICAg ICAgcHJpbnRmKCIlczogbm8gdXJpIHNwZWNpZmllZFxuIiwgcHJvZ3JhbSk7CisgICAgICAgIHVz YWdlKCk7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisgICAgaWYgKHVyaVswXSA9PSAnLScp IHsKKyAgICAgICAgcHJpbnRmKCIlczogaW52YWxpZCB1cmkgLS0gJXNcbiIsIHByb2dyYW0sIHVy aSk7CisgICAgICAgIHVzYWdlKCk7CisgICAgICAgIHJldHVybiAtMTsKKyAgICB9CisgICAgcmV0 dXJuIDA7Cit9CiAKLSAgICByZXR1cm4gZmlsZVVSTDsKK3ZvaWQKK2dldF9odHRwX3Byb3h5KGdj aGFyKiBodHRwX3Byb3h5KQoreworICAgIGlmIChnX3N0cl9oYXNfcHJlZml4IChodHRwX3Byb3h5 LCAiaHR0cDovLyIpKQorICAgICAgICBwcm94eSA9IHNvdXBfdXJpX25ldyhodHRwX3Byb3h5KTsK KyAgICBlbHNlIHsKKyAgICAgICAgZ2NoYXIgKiBodHRwUHJveHkgPSBnX3N0cmNvbmNhdCgiaHR0 cDovLyIsIGh0dHBfcHJveHksIE5VTEwpOworICAgICAgICBwcm94eSA9IHNvdXBfdXJpX25ldyho dHRwUHJveHkpOworICAgIH0KIH0KIAogI2lmbmRlZiBHVEtfQVBJX1ZFUlNJT05fMgpAQCAtMjU0 LDYgKzM0Miw4IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyKiBhcmd2W10pCiAgICAgR3RrV2lk Z2V0ICptYWluX3dpbmRvdzsKIAogICAgIGd0a19pbml0KCZhcmdjLCAmYXJndik7CisgICAgaWYg KHBhcnNlX2FyZ3MoJmFyZ2MsIChjaGFyICoqKSZhcmd2KSA8IDApCisgICAgICAgIHJldHVybiAt MTsKICAgICBpZiAoIWdfdGhyZWFkX3N1cHBvcnRlZCgpKQogICAgICAgICBnX3RocmVhZF9pbml0 KE5VTEwpOwogCkBAIC0yNjIsMTIgKzM1MiwxMSBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciog YXJndltdKQogI2VuZGlmCiAKICAgICBtYWluX3dpbmRvdyA9IGNyZWF0ZVdpbmRvdygmd2ViVmll dyk7CisgICAgU291cFNlc3Npb24gKiBzcyA9IHdlYmtpdF9nZXRfZGVmYXVsdF9zZXNzaW9uKCk7 CisgICAgaWYgKHByb3h5KQorICAgICAgICBnX29iamVjdF9zZXQoc3MsICJwcm94eS11cmkiLCBw cm94eSwgTlVMTCk7CiAKLSAgICBnY2hhciAqdXJpID0oZ2NoYXIqKShhcmdjID4gMSA/IGFyZ3Zb MV0gOiAiaHR0cDovL3d3dy5nb29nbGUuY29tLyIpOwotICAgIGdjaGFyICpmaWxlVVJMID0gZmls ZW5hbWVUb1VSTCh1cmkpOwotCi0gICAgd2Via2l0X3dlYl92aWV3X2xvYWRfdXJpKHdlYlZpZXcs IGZpbGVVUkwgPyBmaWxlVVJMIDogdXJpKTsKLSAgICBnX2ZyZWUoZmlsZVVSTCk7CisgICAgd2Vi a2l0X3dlYl92aWV3X2xvYWRfdXJpKHdlYlZpZXcsIHVyaSk7CiAKICAgICBndGtfd2lkZ2V0X2dy YWJfZm9jdXMoR1RLX1dJREdFVCh3ZWJWaWV3KSk7CiAgICAgZ3RrX3dpZGdldF9zaG93X2FsbCht YWluX3dpbmRvdyk7Ci0tIAoxLjcuMi4zCgo= 87165 2011-03-28 10:49:56 -0700 2011-04-18 09:13:48 -0700 Add options to request width & height in GtkLauncher 0001-add-options-to-request-width-and-height-in-GtkLaunch.patch text/plain 2737 thouraya.andolsi RnJvbSBhZmY3MWU0NjAwOTdhNmNiYWU3MzRiMDMxNTQ4YWVhYjQ1MThhYTcwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBUaG91cmF5YSBBTkRPTFNJIDx0aG91cmF5YS5hbmRvbHNpQHN0 LmNvbT4KRGF0ZTogTW9uLCAyOCBNYXIgMjAxMSAxODo1MzoyNSArMDIwMApTdWJqZWN0OiBbUEFU Q0hdIGFkZCBvcHRpb25zIHRvIHJlcXVlc3Qgd2lkdGggYW5kIGhlaWdodCBpbiBHdGtMYXVuY2hl ci4KCi0tLQogVG9vbHMvQ2hhbmdlTG9nICAgICAgICAgIHwgICAgOSArKysrKysrKysKIFRvb2xz L0d0a0xhdW5jaGVyL21haW4uYyB8ICAgMjUgKysrKysrKysrKysrKysrKysrKysrKystLQogMiBm aWxlcyBjaGFuZ2VkLCAzMiBpbnNlcnRpb25zKCspLCAyIGRlbGV0aW9ucygtKQoKZGlmZiAtLWdp dCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCAyNGI3NWI2Li41MDQz MDBkIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTEtMDMtMjggIFRob3VyYXlhIEFORE9MU0kgIDx0aG91cmF5YS5h bmRvbHNpQHN0LmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBZGQgb3B0aW9ucyB0byByZXF1ZXN0IHdpZHRoL2hlaWdodCBpbiBHdGtMYXVuY2hl ci4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTU1OTI5 CisKKyAgICAgICAgKiBHdGtMYXVuY2hlci9tYWluLmM6CisKIDIwMTEtMDMtMjggIEFuZHJlYXMg S2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJldmlld2VkIGJ5IEtlbm5ldGgg Um9oZGUgQ2hyaXN0aWFuc2VuLgpkaWZmIC0tZ2l0IGEvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5j IGIvVG9vbHMvR3RrTGF1bmNoZXIvbWFpbi5jCmluZGV4IGFkNjY2ZTIuLjJkOTQ4Y2YgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL0d0a0xhdW5jaGVyL21haW4uYworKysgYi9Ub29scy9HdGtMYXVuY2hlci9t YWluLmMKQEAgLTI4LDkgKzI4LDE4IEBACiAjaW5jbHVkZSA8d2Via2l0L3dlYmtpdC5oPgogCiBz dGF0aWMgZ2ludCB3aW5kb3dDb3VudCA9IDA7CitnaW50IHdpZHRoOworZ2ludCBoZWlnaHQ7CiAK IHN0YXRpYyBHdGtXaWRnZXQqIGNyZWF0ZVdpbmRvdyhXZWJLaXRXZWJWaWV3Kiogb3V0V2ViVmll dyk7CiAKK0dPcHRpb25FbnRyeSBlbnRyaWVzW10gPQorICAgIHsKKyAgICAgICAgeyAid2lkdGgi LCAwLCAwLCBHX09QVElPTl9BUkdfSU5ULCAmd2lkdGgsICJ3aWR0aCIsICJ3aWR0aCIgfSwKKyAg ICAgICAgeyAiaGVpZ2h0IiwgMCwgMCwgR19PUFRJT05fQVJHX0lOVCwgJmhlaWdodCwgImhlaWdo dCIsICJoZWlnaHQiIH0sCisgICAgICAgIHsgTlVMTCB9CisgICAgIH07CisKIHN0YXRpYyB2b2lk IGFjdGl2YXRlVXJpRW50cnlDYihHdGtXaWRnZXQqIGVudHJ5LCBncG9pbnRlciBkYXRhKQogewog ICAgIFdlYktpdFdlYlZpZXcgKndlYlZpZXcgPSBnX29iamVjdF9nZXRfZGF0YShHX09CSkVDVChl bnRyeSksICJ3ZWItdmlldyIpOwpAQCAtMTk2LDcgKzIwNSw5IEBAIHN0YXRpYyBHdGtXaWRnZXQq IGNyZWF0ZVdpbmRvdyhXZWJLaXRXZWJWaWV3Kiogb3V0V2ViVmlldykKICAgICBnX2F0b21pY19p bnRfaW5jKCZ3aW5kb3dDb3VudCk7CiAKICAgICB3aW5kb3cgPSBndGtfd2luZG93X25ldyhHVEtf V0lORE9XX1RPUExFVkVMKTsKLSAgICBndGtfd2luZG93X3NldF9kZWZhdWx0X3NpemUoR1RLX1dJ TkRPVyh3aW5kb3cpLCA4MDAsIDYwMCk7CisgICAgZ3RrX3dpbmRvd19zZXRfcG9zaXRpb24oR1RL X1dJTkRPVyh3aW5kb3cpLCBHVEtfV0lOX1BPU19DRU5URVIpOworCisgICAgZ3RrX3dpbmRvd19z ZXRfZGVmYXVsdF9zaXplKEdUS19XSU5ET1cod2luZG93KSwgd2lkdGggPyB3aWR0aCA6IDgwMCwg aGVpZ2h0ID8gaGVpZ2h0IDogNjAwKTsKICAgICBndGtfd2lkZ2V0X3NldF9uYW1lKHdpbmRvdywg Ikd0a0xhdW5jaGVyIik7CiAKICAgICB3ZWJWaWV3ID0gV0VCS0lUX1dFQl9WSUVXKHdlYmtpdF93 ZWJfdmlld19uZXcoKSk7CkBAIC0yNTIsOCArMjYzLDE4IEBAIGludCBtYWluKGludCBhcmdjLCBj aGFyKiBhcmd2W10pCiB7CiAgICAgV2ViS2l0V2ViVmlldyAqd2ViVmlldzsKICAgICBHdGtXaWRn ZXQgKm1haW5fd2luZG93OworICAgIEdFcnJvciAqZXJyb3IgPSBOVUxMOworICAgIEdPcHRpb25D b250ZXh0ICpjb250ZXh0OworCisgICAgY29udGV4dCA9IGdfb3B0aW9uX2NvbnRleHRfbmV3KE5V TEwpOworICAgIGdfb3B0aW9uX2NvbnRleHRfYWRkX21haW5fZW50cmllcyhjb250ZXh0LCBlbnRy aWVzLCBOVUxMKTsKKyAgICBnX29wdGlvbl9jb250ZXh0X2FkZF9ncm91cChjb250ZXh0LCBndGtf Z2V0X29wdGlvbl9ncm91cChUUlVFKSk7CisKKyAgICBndGtfaW5pdF93aXRoX2FyZ3MoJmFyZ2Ms ICZhcmd2LCAiR3RrTGF1bmNoZXIiLCBlbnRyaWVzLCBOVUxMLCBOVUxMKTsKKworICAgIGlmICgh Z19vcHRpb25fY29udGV4dF9wYXJzZSAoY29udGV4dCwgJmFyZ2MsICZhcmd2LCAmZXJyb3IpKQor ICAgICAgICBnX3ByaW50KCJvcHRpb24gcGFyc2luZyBmYWlsZWQ6ICVzXG4iLCBlcnJvci0+bWVz c2FnZSk7CiAKLSAgICBndGtfaW5pdCgmYXJnYywgJmFyZ3YpOwogICAgIGlmICghZ190aHJlYWRf c3VwcG9ydGVkKCkpCiAgICAgICAgIGdfdGhyZWFkX2luaXQoTlVMTCk7CiAKLS0gCjEuNy4yLjMK Cg==