From kde-commits Wed Dec 25 16:10:24 2013 From: Dawit A Date: Wed, 25 Dec 2013 16:10:24 +0000 To: kde-commits Subject: Re: [kdelibs/KDE/4.12] kio/bookmarks: When a user creates a new bookmark folder make that the curren Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=138798788226786 MIME-Version: 1 Content-Type: multipart/mixed; boundary="--047d7b33d5a09ee63e04ee5e1bf2" --047d7b33d5a09ee63e04ee5e1bf2 Content-Type: multipart/alternative; boundary=047d7b33d5a09ee63904ee5e1bf0 --047d7b33d5a09ee63904ee5e1bf0 Content-Type: text/plain; charset=UTF-8 Well I can and did do the forward port, but at the moment I cannot check whether that compile fine or not. If someone can check that, I can push these changes. Otherwise, they will have to wait until I have properly setup frameworks environment. On Tue, Dec 24, 2013 at 10:36 AM, David Faure wrote: > On Tuesday 24 December 2013 14:49:59 Dawit Alemayehu wrote: > > Git commit 2d83344174fe956dd6df0be6c96e068e5186371c by Dawit Alemayehu. > > Committed on 15/12/2013 at 16:25. > > Pushed by adawit into branch 'KDE/4.12'. > > > > When a user creates a new bookmark folder make that the current item. > > > > BUG: 152158 > > REVIEW: 114479 > > FIXED-IN: 4.12.1 > > Don't forget to forwardport to the "kbookmarks" framework by hand. > > Same for your kio commit -> "kio" framework. > > There's no automatic merge anymore, as announced on k-c-d. > > -- > David Faure, faure@kde.org, http://www.davidfaure.fr > Working on KDE, in particular KDE Frameworks 5 > > --047d7b33d5a09ee63904ee5e1bf0 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
Well I can and did do the forward port, but at the moment = I cannot check whether that compile fine or not. If someone can check that,= I can push these changes. Otherwise, they will have to wait until I have p= roperly setup frameworks environment.


On Tue, Dec 2= 4, 2013 at 10:36 AM, David Faure <faure@kde.org> wrote:
On Tuesday 24 December 2013 14:49:59 Dawit Alemayehu wrot= e:
> Git commit 2d83344174fe956dd6df0be6c96e068e5186371c by Dawit Alemayehu= .
> Committed on 15/12/2013 at 16:25.
> Pushed by adawit into branch 'KDE/4.12'.
>
> When a user creates a new bookmark folder make that the current item.<= br> >
> BUG: 152158
> REVIEW: 114479
> FIXED-IN: 4.12.1

Don't forget to forwardport to the "kbookmarks" framewo= rk by hand.

Same for your kio commit -> "kio" framework.

There's no automatic merge anymore, as announced on k-c-d.

--
David Faure, faure@kde.org, http://www.davidfaure.fr Working on KDE, in particular KDE Frameworks 5


--047d7b33d5a09ee63904ee5e1bf0-- --047d7b33d5a09ee63e04ee5e1bf2 Content-Type: application/octet-stream; name="frameworks_bug_152158.patch" Content-Disposition: attachment; filename="frameworks_bug_152158.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hpmrxawz0 Y29tbWl0IDY4NGNiYWNkODgyZGZiZWJkNzIwMjkwNTQ5YWI4NzM0MzEwMDY5NWIKQXV0aG9yOiBE YXdpdCBBbGVtYXllaHUgPGFkYXdpdEBrZGUub3JnPgpEYXRlOiAgIFdlZCBEZWMgMjUgMTA6MTg6 NDEgMjAxMyAtMDUwMAoKICAgIFdoZW4gYSB1c2VyIGNyZWF0ZXMgYSBuZXcgYm9va21hcmsgZm9s ZGVyIG1ha2UgdGhhdCB0aGUgY3VycmVudCBpdGVtLgogICAgCiAgICBCVUc6IDE1MjE1OAogICAg UkVWSUVXOiAxMTQ0NzkKICAgIEZJWEVELUlOOiA0LjEyLjEKCmRpZmYgLS1naXQgYS9zcmMva2Jv b2ttYXJrZGlhbG9nLmNwcCBiL3NyYy9rYm9va21hcmtkaWFsb2cuY3BwCmluZGV4IGRhMTU4YWYu LjAxOTUzMWQgMTAwNjQ0Ci0tLSBhL3NyYy9rYm9va21hcmtkaWFsb2cuY3BwCisrKyBiL3NyYy9r Ym9va21hcmtkaWFsb2cuY3BwCkBAIC05OCwxMiArOTgsMTYgQEAgdm9pZCBLQm9va21hcmtEaWFs b2dQcml2YXRlOjppbml0TGF5b3V0UHJpdmF0ZSgpCiAgICAgbGF5b3V0ID0gdHJ1ZTsKIH0KIAot dm9pZCBLQm9va21hcmtEaWFsb2dQcml2YXRlOjpmaWxsR3JvdXAoUVRyZWVXaWRnZXRJdGVtICpw YXJlbnRJdGVtLCBjb25zdCBLQm9va21hcmtHcm91cCAmZ3JvdXApCit2b2lkIEtCb29rbWFya0Rp YWxvZ1ByaXZhdGU6OmZpbGxHcm91cChRVHJlZVdpZGdldEl0ZW0gKnBhcmVudEl0ZW0sIGNvbnN0 IEtCb29rbWFya0dyb3VwICZncm91cCwgY29uc3QgS0Jvb2ttYXJrR3JvdXAgJnNlbGVjdEdyb3Vw KQogewogICAgIGZvciAoS0Jvb2ttYXJrIGJrID0gZ3JvdXAuZmlyc3QoKTsgIWJrLmlzTnVsbCgp OyBiayA9IGdyb3VwLm5leHQoYmspKSB7CiAgICAgICAgIGlmIChiay5pc0dyb3VwKCkpIHsKLSAg ICAgICAgICAgIFFUcmVlV2lkZ2V0SXRlbSAqaXRlbSA9IG5ldyBLQm9va21hcmtUcmVlSXRlbShw YXJlbnRJdGVtLCBmb2xkZXJUcmVlLCBiay50b0dyb3VwKCkpOwotICAgICAgICAgICAgZmlsbEdy b3VwKGl0ZW0sIGJrLnRvR3JvdXAoKSk7CisgICAgICAgICAgICBjb25zdCBLQm9va21hcmtHcm91 cCBia0dyb3VwID0gYmsudG9Hcm91cCgpOworICAgICAgICAgICAgUVRyZWVXaWRnZXRJdGVtKiBp dGVtID0gbmV3IEtCb29rbWFya1RyZWVJdGVtKHBhcmVudEl0ZW0sIG1fZm9sZGVyVHJlZSwgYmtH cm91cCk7CisgICAgICAgICAgICBpZiAoc2VsZWN0R3JvdXAgPT0gYmtHcm91cCkgeworICAgICAg ICAgICAgICAgIG1fZm9sZGVyVHJlZS0+c2V0Q3VycmVudEl0ZW0oaXRlbSk7CisgICAgICAgICAg ICB9CisgICAgICAgICAgICBmaWxsR3JvdXAoaXRlbSwgYmtHcm91cCwgc2VsZWN0R3JvdXApOwog ICAgICAgICB9CiAgICAgfQogfQpAQCAtMzY5LDcgKzM3Myw3IEBAIHZvaWQgS0Jvb2ttYXJrRGlh bG9nOjpuZXdGb2xkZXJCdXR0b24oKQogICAgICAgICBkLT5tZ3ItPmVtaXRDaGFuZ2VkKHBhcmVu dEdyb3VwKTsKICAgICAgICAgZC0+Zm9sZGVyVHJlZS0+Y2xlYXIoKTsKICAgICAgICAgUVRyZWVX aWRnZXRJdGVtICpyb290ID0gbmV3IEtCb29rbWFya1RyZWVJdGVtKGQtPmZvbGRlclRyZWUpOwot ICAgICAgICBkLT5maWxsR3JvdXAocm9vdCwgZC0+bWdyLT5yb290KCkpOworICAgICAgICBkLT5m aWxsR3JvdXAocm9vdCwgZC0+bWdyLT5yb290KCksIGdyb3VwKTsKICAgICB9CiB9CiAKZGlmZiAt LWdpdCBhL3NyYy9rYm9va21hcmtkaWFsb2dfcC5oIGIvc3JjL2tib29rbWFya2RpYWxvZ19wLmgK aW5kZXggODFiZWI4NS4uYWM2Mzk1NCAxMDA2NDQKLS0tIGEvc3JjL2tib29rbWFya2RpYWxvZ19w LmgKKysrIGIvc3JjL2tib29rbWFya2RpYWxvZ19wLmgKQEAgLTQzLDcgKzQzLDcgQEAgcHVibGlj OgogICAgIC8vIHNlbGVjdHMgdGhlIHNwZWNpZmllZCBib29rbWFyayBpbiB0aGUgZm9sZGVyIHRy ZWUKICAgICB2b2lkIHNldFBhcmVudEJvb2ttYXJrKGNvbnN0IEtCb29rbWFyayAmYm0pOwogICAg IEtCb29rbWFya0dyb3VwIHBhcmVudEJvb2ttYXJrKCk7Ci0gICAgdm9pZCBmaWxsR3JvdXAoUVRy ZWVXaWRnZXRJdGVtICpwYXJlbnRJdGVtLCBjb25zdCBLQm9va21hcmtHcm91cCAmZ3JvdXApOwor ICAgIHZvaWQgZmlsbEdyb3VwKFFUcmVlV2lkZ2V0SXRlbSAqcGFyZW50SXRlbSwgY29uc3QgS0Jv b2ttYXJrR3JvdXAgJmdyb3VwLCBjb25zdCBLQm9va21hcmtHcm91cCAmc2VsZWN0R3JvdXAgPSBL Qm9va21hcmtHcm91cCgpKTsKIAogICAgIEtCb29rbWFya0RpYWxvZyAqcTsKICAgICBCb29rbWFy a0RpYWxvZ01vZGUgbW9kZTsK --047d7b33d5a09ee63e04ee5e1bf2 Content-Type: application/octet-stream; name="frameworks_bug_153421.patch" Content-Disposition: attachment; filename="frameworks_bug_153421.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hpmrxay21 Y29tbWl0IGUzNWQwYzQxZTc3ODg1MzYyYzkzZDhkMGIxNjk1MTE2ZmMyMDNmZDMKQXV0aG9yOiBE YXdpdCBBbGVtYXllaHUgPGFkYXdpdEBrZGUub3JnPgpEYXRlOiAgIFdlZCBEZWMgMjUgMDk6MzU6 MjEgMjAxMyAtMDUwMAoKICAgIENoYW5nZWQgT3BlbldpdGggZGlhbG9nIGZyb20gUXQ6OkFwcGxp Y2F0aW9uTW9kYWwgdG8gUXQ6OldpbmRvd01vZGFsLgogICAgCiAgICBCVUc6IDE1MzQyMQogICAg UkVWSUVXOiAxMTQ0NzMKICAgIEZJWEVELUlOOiA0LjEyLjEKCmRpZmYgLS1naXQgYS9zcmMvd2lk Z2V0cy9rcnVuLmNwcCBiL3NyYy93aWRnZXRzL2tydW4uY3BwCmluZGV4IDkyZGNmZDguLjliZGM2 YmQgMTAwNjQ0Ci0tLSBhL3NyYy93aWRnZXRzL2tydW4uY3BwCisrKyBiL3NyYy93aWRnZXRzL2ty dW4uY3BwCkBAIC0yNDUsNiArMjQ1LDcgQEAgYm9vbCBLUnVuOjpkaXNwbGF5T3BlbldpdGhEaWFs b2coY29uc3QgUUxpc3Q8UVVybD4gJmxzdCwgUVdpZGdldCAqd2luZG93LCBib29sIHQKICAgICB9 CiAjZW5kaWYKICAgICBLT3BlbldpdGhEaWFsb2cgbChsc3QsIGkxOG4oIk9wZW4gd2l0aDoiKSwg UVN0cmluZygpLCB3aW5kb3cpOworICAgIGwuc2V0V2luZG93TW9kYWxpdHkoUXQ6OldpbmRvd01v ZGFsKTsKICAgICBpZiAobC5leGVjKCkpIHsKICAgICAgICAgS1NlcnZpY2U6OlB0ciBzZXJ2aWNl ID0gbC5zZXJ2aWNlKCk7CiAgICAgICAgIGlmICghc2VydmljZSkgewo= --047d7b33d5a09ee63e04ee5e1bf2 Content-Type: application/octet-stream; name="frameworks_review_114436.patch" Content-Disposition: attachment; filename="frameworks_review_114436.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hpmrxayb2 Y29tbWl0IGQ0YjUxYmE1OWNlYzkwOGIzMDVlNTFmYzgwNGU2Yjc4YWVhMjU5ODgKQXV0aG9yOiBE YXdpdCBBbGVtYXllaHUgPGFkYXdpdEBrZGUub3JnPgpEYXRlOiAgIFdlZCBEZWMgMjUgMTA6MTA6 NDEgMjAxMyAtMDUwMAoKICAgIENoYW5nZWQgZGlhbG9ncyBmcm9tIFF0OjpBcHBsaWNhdGlvbk1v ZGFsIChkZWZhdWx0KSB0byBRdDo6V2luZG93TW9kYWwuCiAgICAKICAgIFJFVklFVzogMTE0NDM2 CgpkaWZmIC0tZ2l0IGEvc3JjL3dpZGdldHMvam9idWlkZWxlZ2F0ZS5jcHAgYi9zcmMvd2lkZ2V0 cy9qb2J1aWRlbGVnYXRlLmNwcAppbmRleCBlZTY1OWY3Li4xNjU0ZDk2IDEwMDY0NAotLS0gYS9z cmMvd2lkZ2V0cy9qb2J1aWRlbGVnYXRlLmNwcAorKysgYi9zcmMvd2lkZ2V0cy9qb2J1aWRlbGVn YXRlLmNwcApAQCAtMTUyLDYgKzE1Miw3IEBAIEtJTzo6UmVuYW1lRGlhbG9nX1Jlc3VsdCBLSU86 OkpvYlVpRGVsZWdhdGU6OmFza0ZpbGVSZW5hbWUoS0pvYiAqam9iLAogICAgICAgICAgICAgICAg ICAgICAgICAgICBzaXplU3JjLCBzaXplRGVzdCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg Y3RpbWVTcmMsIGN0aW1lRGVzdCwgbXRpbWVTcmMsCiAgICAgICAgICAgICAgICAgICAgICAgICAg IG10aW1lRGVzdCk7CisgICAgZGxnLnNldFdpbmRvd01vZGFsaXR5KFF0OjpXaW5kb3dNb2RhbCk7 CiAgICAgY29ubmVjdChqb2IsIFNJR05BTChmaW5pc2hlZChLSm9iKikpLCAmZGxnLCBTTE9UKHJl amVjdCgpKSk7IC8vICMxOTI5NzYKICAgICBLSU86OlJlbmFtZURpYWxvZ19SZXN1bHQgcmVzID0g c3RhdGljX2Nhc3Q8UmVuYW1lRGlhbG9nX1Jlc3VsdD4oZGxnLmV4ZWMoKSk7CiAgICAgaWYgKHJl cyA9PSBSX0FVVE9fUkVOQU1FKSB7CkBAIC0xNjgsNiArMTY5LDcgQEAgS0lPOjpTa2lwRGlhbG9n X1Jlc3VsdCBLSU86OkpvYlVpRGVsZWdhdGU6OmFza1NraXAoS0pvYiAqam9iLAogewogICAgIC8v IFdlIG5vdyBkbyBpdCBpbiBwcm9jZXNzLiBTbyB0aGlzIG1ldGhvZCBpcyBhIHVzZWxlc3Mgd3Jh cHBlciBhcm91bmQgS0lPOjpvcGVuX1JlbmFtZURpYWxvZy4KICAgICBLSU86OlNraXBEaWFsb2cg ZGxnKEtKb2JXaWRnZXRzOjp3aW5kb3coam9iKSwgbXVsdGksIGVycm9yX3RleHQpOworICAgIGRs Zy5zZXRXaW5kb3dNb2RhbGl0eShRdDo6V2luZG93TW9kYWwpOwogICAgIGNvbm5lY3Qoam9iLCBT SUdOQUwoZmluaXNoZWQoS0pvYiopKSwgJmRsZywgU0xPVChyZWplY3QoKSkpOyAvLyAjMTkyOTc2 CiAgICAgcmV0dXJuIHN0YXRpY19jYXN0PEtJTzo6U2tpcERpYWxvZ19SZXN1bHQ+KGRsZy5leGVj KCkpOwogfQpAQCAtMjEyLDggKzIxNCw5IEBAIGJvb2wgS0lPOjpKb2JVaURlbGVnYXRlOjphc2tE ZWxldGVDb25maXJtYXRpb24oY29uc3QgUUxpc3Q8UVVybD4gJnVybHMsCiAgICAgICAgICAgICB9 CiAgICAgICAgIH0KIAotICAgICAgICBRV2lkZ2V0ICp3aWRnZXQgPSBqb2IoKSA/IHdpbmRvdygp IDogTlVMTDsgLy8gIyMjIGpvYiBpcyBOVUxMIGhlcmUsIG1vc3Qgb2YgdGhlIHRpbWUsIHJpZ2h0 PwogICAgICAgICBpbnQgcmVzdWx0OworICAgICAgICBRV2lkZ2V0ICp3aWRnZXQgPSBqb2IoKSA/ IHdpbmRvdygpIDogTlVMTDsgLy8gIyMjIGpvYiBpcyBOVUxMIGhlcmUsIG1vc3Qgb2YgdGhlIHRp bWUsIHJpZ2h0PworICAgICAgICBjb25zdCBLTWVzc2FnZUJveDo6T3B0aW9ucyBvcHRpb25zID0g S01lc3NhZ2VCb3g6Ok5vdGlmeSB8IEtNZXNzYWdlQm94OjpXaW5kb3dNb2RhbDsKICAgICAgICAg c3dpdGNoIChkZWxldGlvblR5cGUpIHsKICAgICAgICAgY2FzZSBEZWxldGU6CiAgICAgICAgICAg ICByZXN1bHQgPSBLTWVzc2FnZUJveDo6d2FybmluZ0NvbnRpbnVlQ2FuY2VsTGlzdCgKQEAgLTIy Myw3ICsyMjYsNyBAQCBib29sIEtJTzo6Sm9iVWlEZWxlZ2F0ZTo6YXNrRGVsZXRlQ29uZmlybWF0 aW9uKGNvbnN0IFFMaXN0PFFVcmw+ICZ1cmxzLAogICAgICAgICAgICAgICAgICAgICAgICAgIGkx OG4oIkRlbGV0ZSBGaWxlcyIpLAogICAgICAgICAgICAgICAgICAgICAgICAgIEtTdGFuZGFyZEd1 aUl0ZW06OmRlbCgpLAogICAgICAgICAgICAgICAgICAgICAgICAgIEtTdGFuZGFyZEd1aUl0ZW06 OmNhbmNlbCgpLAotICAgICAgICAgICAgICAgICAgICAgICAgIGtleU5hbWUsIEtNZXNzYWdlQm94 OjpOb3RpZnkpOworICAgICAgICAgICAgICAgICAgICAgICAgIGtleU5hbWUsIG9wdGlvbnMpOwog ICAgICAgICAgICAgYnJlYWs7CiAgICAgICAgIGNhc2UgRW1wdHlUcmFzaDoKICAgICAgICAgICAg IHJlc3VsdCA9IEtNZXNzYWdlQm94Ojp3YXJuaW5nQ29udGludWVDYW5jZWwoCkBAIC0yMzMsNyAr MjM2LDcgQEAgYm9vbCBLSU86OkpvYlVpRGVsZWdhdGU6OmFza0RlbGV0ZUNvbmZpcm1hdGlvbihj b25zdCBRTGlzdDxRVXJsPiAmdXJscywKICAgICAgICAgICAgICAgICAgICAgICAgICBLR3VpSXRl bShpMThuYygiQGFjdGlvbjpidXR0b24iLCAiRW1wdHkgVHJhc2giKSwKICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBRSWNvbjo6ZnJvbVRoZW1lKCJ1c2VyLXRyYXNoIikpLAogICAg ICAgICAgICAgICAgICAgICAgICAgIEtTdGFuZGFyZEd1aUl0ZW06OmNhbmNlbCgpLAotICAgICAg ICAgICAgICAgICAgICAgICAgIGtleU5hbWUsIEtNZXNzYWdlQm94OjpOb3RpZnkpOworICAgICAg ICAgICAgICAgICAgICAgICAgIGtleU5hbWUsIG9wdGlvbnMpOwogICAgICAgICAgICAgYnJlYWs7 CiAgICAgICAgIGNhc2UgVHJhc2g6CiAgICAgICAgIGRlZmF1bHQ6CkBAIC0yNDQsNyArMjQ3LDcg QEAgYm9vbCBLSU86OkpvYlVpRGVsZWdhdGU6OmFza0RlbGV0ZUNvbmZpcm1hdGlvbihjb25zdCBR TGlzdDxRVXJsPiAmdXJscywKICAgICAgICAgICAgICAgICAgICAgICAgICBpMThuKCJNb3ZlIHRv IFRyYXNoIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgS0d1aUl0ZW0oaTE4bmMoIlZlcmIi LCAiJlRyYXNoIiksICJ1c2VyLXRyYXNoIiksCiAgICAgICAgICAgICAgICAgICAgICAgICAgS1N0 YW5kYXJkR3VpSXRlbTo6Y2FuY2VsKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAga2V5TmFt ZSwgS01lc3NhZ2VCb3g6Ok5vdGlmeSk7CisgICAgICAgICAgICAgICAgICAgICAgICAga2V5TmFt ZSwgb3B0aW9ucyk7CiAgICAgICAgIH0KICAgICAgICAgaWYgKCFrZXlOYW1lLmlzRW1wdHkoKSkg ewogICAgICAgICAgICAgLy8gQ2hlY2sga21lc3NhZ2Vib3ggc2V0dGluZy4uLiBlcmFzZSAmIGNv cHkgdG8ga29ucXVlcm9ycmMuCkBAIC0yNzksMzAgKzI4MiwzMiBAQCBpbnQgS0lPOjpKb2JVaURl bGVnYXRlOjpyZXF1ZXN0TWVzc2FnZUJveChLSU86OkpvYlVpRGVsZWdhdGU6Ok1lc3NhZ2VCb3hU eXBlIHR5cAogCiAgICAgY29uc3QgS0d1aUl0ZW0gYnV0dG9uWWVzR3VpKGJ1dHRvblllcywgaWNv blllcyk7CiAgICAgY29uc3QgS0d1aUl0ZW0gYnV0dG9uTm9HdWkoYnV0dG9uTm8sIGljb25Obyk7 CisgICAgS01lc3NhZ2VCb3g6Ok9wdGlvbnMgb3B0aW9ucyA9IChLTWVzc2FnZUJveDo6Tm90aWZ5 IHwgS01lc3NhZ2VCb3g6OldpbmRvd01vZGFsKTsKIAogICAgIHN3aXRjaCAodHlwZSkgewogICAg IGNhc2UgUXVlc3Rpb25ZZXNObzoKICAgICAgICAgcmVzdWx0ID0gS01lc3NhZ2VCb3g6OnF1ZXN0 aW9uWWVzTm8oCiAgICAgICAgICAgICAgICAgICAgICB3aW5kb3coKSwgdGV4dCwgY2FwdGlvbiwg YnV0dG9uWWVzR3VpLAotICAgICAgICAgICAgICAgICAgICAgYnV0dG9uTm9HdWksIGRvbnRBc2tB Z2Fpbk5hbWUpOworICAgICAgICAgICAgICAgICAgICAgYnV0dG9uTm9HdWksIGRvbnRBc2tBZ2Fp bk5hbWUsIG9wdGlvbnMpOwogICAgICAgICBicmVhazsKICAgICBjYXNlIFdhcm5pbmdZZXNObzoK ICAgICAgICAgcmVzdWx0ID0gS01lc3NhZ2VCb3g6Ondhcm5pbmdZZXNObygKICAgICAgICAgICAg ICAgICAgICAgIHdpbmRvdygpLCB0ZXh0LCBjYXB0aW9uLCBidXR0b25ZZXNHdWksCi0gICAgICAg ICAgICAgICAgICAgICBidXR0b25Ob0d1aSwgZG9udEFza0FnYWluTmFtZSk7CisgICAgICAgICAg ICAgICAgICAgICBidXR0b25Ob0d1aSwgZG9udEFza0FnYWluTmFtZSwKKyAgICAgICAgICAgICAg ICAgICAgIG9wdGlvbnMgfCBLTWVzc2FnZUJveDo6RGFuZ2Vyb3VzKTsKICAgICAgICAgYnJlYWs7 CiAgICAgY2FzZSBXYXJuaW5nWWVzTm9DYW5jZWw6CiAgICAgICAgIHJlc3VsdCA9IEtNZXNzYWdl Qm94Ojp3YXJuaW5nWWVzTm9DYW5jZWwoCiAgICAgICAgICAgICAgICAgICAgICB3aW5kb3coKSwg dGV4dCwgY2FwdGlvbiwgYnV0dG9uWWVzR3VpLCBidXR0b25Ob0d1aSwKLSAgICAgICAgICAgICAg ICAgICAgIEtTdGFuZGFyZEd1aUl0ZW06OmNhbmNlbCgpLCBkb250QXNrQWdhaW5OYW1lKTsKKyAg ICAgICAgICAgICAgICAgICAgIEtTdGFuZGFyZEd1aUl0ZW06OmNhbmNlbCgpLCBkb250QXNrQWdh aW5OYW1lLCBvcHRpb25zKTsKICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBXYXJuaW5nQ29udGlu dWVDYW5jZWw6CiAgICAgICAgIHJlc3VsdCA9IEtNZXNzYWdlQm94Ojp3YXJuaW5nQ29udGludWVD YW5jZWwoCiAgICAgICAgICAgICAgICAgICAgICB3aW5kb3coKSwgdGV4dCwgY2FwdGlvbiwgYnV0 dG9uWWVzR3VpLAotICAgICAgICAgICAgICAgICAgICAgS1N0YW5kYXJkR3VpSXRlbTo6Y2FuY2Vs KCksIGRvbnRBc2tBZ2Fpbk5hbWUpOworICAgICAgICAgICAgICAgICAgICAgS1N0YW5kYXJkR3Vp SXRlbTo6Y2FuY2VsKCksIGRvbnRBc2tBZ2Fpbk5hbWUsIG9wdGlvbnMpOwogICAgICAgICBicmVh azsKICAgICBjYXNlIEluZm9ybWF0aW9uOgotICAgICAgICBLTWVzc2FnZUJveDo6aW5mb3JtYXRp b24od2luZG93KCksIHRleHQsIGNhcHRpb24sIGRvbnRBc2tBZ2Fpbk5hbWUpOworICAgICAgICBL TWVzc2FnZUJveDo6aW5mb3JtYXRpb24od2luZG93KCksIHRleHQsIGNhcHRpb24sIGRvbnRBc2tB Z2Fpbk5hbWUsIG9wdGlvbnMpOwogICAgICAgICByZXN1bHQgPSAxOyAvLyB3aGF0ZXZlcgogICAg ICAgICBicmVhazsKICAgICBjYXNlIFNTTE1lc3NhZ2VCb3g6IHsKQEAgLTMzNCw3ICszMzksNyBA QCBpbnQgS0lPOjpKb2JVaURlbGVnYXRlOjpyZXF1ZXN0TWVzc2FnZUJveChLSU86OkpvYlVpRGVs ZWdhdGU6Ok1lc3NhZ2VCb3hUeXBlIHR5cAogICAgICAgICAgICAgcmVzdWx0ID0gLTE7CiAgICAg ICAgICAgICBLTWVzc2FnZUJveDo6aW5mb3JtYXRpb24od2luZG93KCksCiAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaTE4bigiVGhlIHBlZXIgU1NMIGNlcnRpZmljYXRlIGNo YWluIGFwcGVhcnMgdG8gYmUgY29ycnVwdC4iKSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBpMThuKCJTU0wiKSk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgaTE4bigiU1NMIiksIFFTdHJpbmcoKSwgb3B0aW9ucyk7CiAgICAgICAgIH0KICAgICAg ICAgLy8gS1NzbEluZm9EaWFsb2cgZGVsZXRlcyBpdHNlbGYgKFF0OjpXQV9EZWxldGVPbkNsb3Nl KS4KICAgICAgICAgZGVsZXRlIGtpZDsK --047d7b33d5a09ee63e04ee5e1bf2--