14812 2007-07-30 01:44:48 -0700 [gtk] [request] add webkit_gtk_frame_get_title() function 2007-09-20 06:39:01 -0700 1 1 1 Unclassified WebKit WebKit API 523.x (Safari 3) PC OS X 10.4 RESOLVED FIXED P2 Normal --- 0 diegoe webkit-unassigned cosimoc diegoe jasuarez oldest_to_newest 3462 0 diegoe 2007-07-30 01:44:48 -0700 In Epiphany there are certain times when we want to get the page title on demand, listening to title_changed isn't that much of a good idea in our case. Attached patch is pretty dirty, so I'm asking for some guidance on how to do it correctly. 3457 1 15739 diegoe 2007-07-30 01:47:21 -0700 Created attachment 15739 Initial proposal I guess there might be a better way of doing it. Adopted this idea after checking the forked gtk-webcore, they implement a signal listener to be between signals and the app so you can ask for stuff like title on-demand. 3459 2 zecke 2007-07-30 02:02:27 -0700 Well, if we start to cache the title in WebFrameGtk we might just add a default handler and avoid connecting to our own sginals. 3453 3 15741 diegoe 2007-07-30 02:34:26 -0700 Created attachment 15741 A better version Following your suggestion of not abusing g_signal_connect :P 3393 4 diegoe 2007-07-30 20:55:51 -0700 Also, can we have a get_location() function here too?. Btw, I was wondering if this should be here or in gtkpage. 3325 5 zecke 2007-08-01 10:33:44 -0700 The easy bits: -Yes get_location makes sense (IMHO) -I think they belong into WebKitGtkFrame Two style issues: -AFAIK you don't need a user_data in the signal signature. Please remove it -I would like to see another name for the closure, more similiar to the one in webkitgtkpage.cpp (or as in the pending patch for createFrame) -No new lines in the cb, I think they fit in one line on a display. 3193 6 15741 mrowe 2007-08-01 20:26:35 -0700 Comment on attachment 15741 A better version r- based on Holger's comments. There is also very inconsistent placement of the * next to types or variable names. The WebKit style is for the * to be next to the type in C and C++ code. The code related to the Gtk API seems to be very inconsistent in this regard, but we should be trying to improve the situation rather than adding to the problem. + g_debug("title_changed: title=%s, location=%s", title, location); We don't typically commit debugging printf's such as this. 3152 7 15806 diegoe 2007-08-02 06:46:08 -0700 Created attachment 15806 Updated. Ok, following your comments and including the webkitgtkprivate.h part that I forgot. I didn't get this comment however: -I would like to see another name for the closure, more similiar to the one in webkitgtkpage.cpp (or as in the pending patch for createFrame) Can you explain it to me please? PD: I couldn't try the patch, my webkit installation doesn't work anymore because of libWebKitGdk.so: undefined reference to `WebCore::Document::setDomain(WebCore::String const&, bool)'. Anyway it should work, and for the moment we can at least discuss about it. 2695 8 zecke 2007-08-09 17:55:01 -0700 (In reply to comment #7) > Can you explain it to me please? Gtk+ and WebKitGtk* prefix such handlers with the normal prefix. So title_changed_cb should probably be webkit_gtk_frame_real_title_changed or just webkit_gtk_frame_title_changed. > > PD: I couldn't try the patch, my webkit installation doesn't work anymore > because of libWebKitGdk.so: undefined reference to > `WebCore::Document::setDomain(WebCore::String const&, bool)'. > Anyway it should work, and for the moment we can at least discuss about it. > Sometimes qmake from Qt4.2 has issues tracking dependencies. Qt4.3 seems to do it better but we might need to set a couple more DEPENDPATH and HEADERS in the .pro file. 2085 9 jasuarez 2007-08-17 08:46:58 -0700 This bug should have the Gtk keyword. 1935 10 15806 aroben 2007-08-19 21:05:38 -0700 Comment on attachment 15806 Updated. r- given Holger's comments. 1843 11 16044 diegoe 2007-08-20 17:47:18 -0700 Created attachment 16044 Updated to trunk and following naming comments Updated. 1400 12 16044 mrowe 2007-08-27 03:30:16 -0700 Comment on attachment 16044 Updated to trunk and following naming comments Inside webkit_gtk_frame_title_changed_cb g_strdup is called but I don't see any corresponding calls to free the memory. There are some minor coding style issues present: +gchar* +webkit_gtk_frame_get_title (WebKitGtkFrame* frame) should be one line, for example. You should also include a ChangeLog entry. You can use WebKitTools/Scripts/prepare-ChangeLog to generate a template which you can then fill in. 428 13 16303 cyril.brulebois 2007-09-17 02:06:45 -0700 Created attachment 16303 Updated with g_free() calls, and coding style fixes. I added g_free on finalize() and on updating, and hopefully fixed coding style problems. I didn't include copyright information for webkitgtkframe.cpp since Diego might want to be added instead of me; waiting for a reply from him. 423 14 zecke 2007-09-17 05:23:53 -0700 (In reply to comment #13) > Created an attachment (id=16303) [edit] > Updated with g_free() calls, and coding style fixes. > +static void webkit_gtk_frame_title_changed_cb(WebKitGtkFrame* frame, gchar* title, gchar* location) +{ + WebKitGtkFramePrivate* frame_data = WEBKIT_GTK_FRAME_GET_PRIVATE(frame); + g_free (frame_data->title); + g_free (frame_data->location); + frame_data->title = g_strdup(title); + frame_data->location = g_strdup(location); +} frame_data -> frameData and "g_free (" -> "g_free(". but the memory leak spotted by Mark should be fixed. 412 15 zecke 2007-09-17 08:05:15 -0700 Landed in r25593. 248 16 16303 zecke 2007-09-20 06:39:01 -0700 Comment on attachment 16303 Updated with g_free() calls, and coding style fixes. The patch was landed and does not need further review. 15739 2007-07-30 01:47:21 -0700 2007-07-30 02:34:26 -0700 Initial proposal frame_get_title.diff text/plain 1271 diegoe SW5kZXg6IFdlYktpdC9ndGsvQXBpL3dlYmtpdGd0a2ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBX ZWJLaXQvZ3RrL0FwaS93ZWJraXRndGtmcmFtZS5jcHAJKHJldmlzaW9uIDI0NzcwKQorKysgV2Vi S2l0L2d0ay9BcGkvd2Via2l0Z3RrZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xMTYsOCAr MTE2LDIxIEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9ndGtfZnJhbWVfY2xhc3NfaW5pdCgKICAgICBH X09CSkVDVF9DTEFTUyhmcmFtZV9jbGFzcyktPmZpbmFsaXplID0gd2Via2l0X2d0a19mcmFtZV9m aW5hbGl6ZTsKIH0KIAorc3RhdGljIHZvaWQgdGl0bGVfY2hhbmdlZF9jYihXZWJLaXRHdGtGcmFt ZSogZnJhbWUsCisJCSAgICAgICAgICAgICBnY2hhciAqdGl0bGUsCisJCQkgICAgIGdjaGFyICps b2NhdGlvbiwKKwkJCSAgICAgZ3BvaW50ZXIgdXNlcl9kYXRhKQoreworICAgIGdfZGVidWcoInRp dGxlX2NoYW5nZWQ6IHRpdGxlPSVzLCBsb2NhdGlvbj0lcyIsIHRpdGxlLCBsb2NhdGlvbik7CisK KyAgICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lX2RhdGEgPSBXRUJLSVRfR1RLX0ZSQU1F X0dFVF9QUklWQVRFKGZyYW1lKTsKKyAgICBmcmFtZV9kYXRhLT50aXRsZSA9IGdfc3RyZHVwKHRp dGxlKTsKK30KKwogc3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFtZV9pbml0KFdlYktpdEd0a0Zy YW1lKiBmcmFtZSkKIHsKKyAgICBnX3NpZ25hbF9jb25uZWN0IChHX09CSkVDVCAoZnJhbWUpLCAi dGl0bGVfY2hhbmdlZCIsCisJCSAgICBHX0NBTExCQUNLICh0aXRsZV9jaGFuZ2VkX2NiKSwgTlVM TCk7CiB9CiAKIEdPYmplY3QqIHdlYmtpdF9ndGtfZnJhbWVfbmV3KFdlYktpdEd0a1BhZ2UqIHBh Z2UpCkBAIC0xNDUsNCArMTU4LDEyIEBAIHdlYmtpdF9ndGtfZnJhbWVfZ2V0X3BhZ2UoV2ViS2l0 R3RrRnJhbWUKICAgICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lX2RhdGEgPSBXRUJLSVRf R1RLX0ZSQU1FX0dFVF9QUklWQVRFKGZyYW1lKTsKICAgICByZXR1cm4gZnJhbWVfZGF0YS0+cGFn ZTsKIH0KKworZ2NoYXIqCit3ZWJraXRfZ3RrX2ZyYW1lX2dldF90aXRsZSAoV2ViS2l0R3RrRnJh bWUqIGZyYW1lKQoreworICAgIFdlYktpdEd0a0ZyYW1lUHJpdmF0ZSogZnJhbWVfZGF0YSA9IFdF QktJVF9HVEtfRlJBTUVfR0VUX1BSSVZBVEUoZnJhbWUpOworICAgIHJldHVybiBmcmFtZV9kYXRh LT50aXRsZTsKK30KKwogfQo= 15741 2007-07-30 02:34:26 -0700 2007-08-02 06:46:08 -0700 A better version frame_get_title.diff text/plain 2505 diegoe SW5kZXg6IGd0ay9BcGkvd2Via2l0Z3RrZnJhbWUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGd0ay9BcGkv d2Via2l0Z3RrZnJhbWUuY3BwCShyZXZpc2lvbiAyNDc3MSkKKysrIGd0ay9BcGkvd2Via2l0Z3Rr ZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01Niw2ICs1NiwxMSBAQCBlbnVtIHsKIAogc3Rh dGljIGd1aW50IHdlYmtpdF9ndGtfZnJhbWVfc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7IDAsIH07 CiAKK3N0YXRpYyB2b2lkIHRpdGxlX2NoYW5nZWRfY2IoV2ViS2l0R3RrRnJhbWUqIGZyYW1lLAor CQkgICAgICAgICAgICAgZ2NoYXIgKnRpdGxlLAorCQkJICAgICBnY2hhciAqbG9jYXRpb24sCisJ CQkgICAgIGdwb2ludGVyIHVzZXJfZGF0YSk7CisKIEdfREVGSU5FX1RZUEUoV2ViS2l0R3RrRnJh bWUsIHdlYmtpdF9ndGtfZnJhbWUsIEdfVFlQRV9PQkpFQ1QpCiAKIHN0YXRpYyB2b2lkIHdlYmtp dF9ndGtfZnJhbWVfZmluYWxpemUoR09iamVjdCogb2JqZWN0KQpAQCAtOTMsNyArOTgsNyBAQCBz dGF0aWMgdm9pZCB3ZWJraXRfZ3RrX2ZyYW1lX2NsYXNzX2luaXQoCiAgICAgd2Via2l0X2d0a19m cmFtZV9zaWduYWxzW1RJVExFX0NIQU5HRURdID0gZ19zaWduYWxfbmV3KCJ0aXRsZV9jaGFuZ2Vk IiwKICAgICAgICAgICAgIEdfVFlQRV9GUk9NX0NMQVNTKGZyYW1lX2NsYXNzKSwKICAgICAgICAg ICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lHTkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwK LSAgICAgICAgICAgIDAsCisgICAgICAgICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0R3RrRnJh bWVDbGFzcywgdGl0bGVfY2hhbmdlZCksCiAgICAgICAgICAgICBOVUxMLAogICAgICAgICAgICAg TlVMTCwKICAgICAgICAgICAgIHdlYmtpdF9ndGtfbWFyc2hhbF9WT0lEX19TVFJJTkdfU1RSSU5H LApAQCAtMTEwLDEyICsxMTUsMjUgQEAgc3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFtZV9jbGFz c19pbml0KAogICAgICAgICAgICAgR19UWVBFX05PTkUsIDIsCiAgICAgICAgICAgICBHX1RZUEVf U1RSSU5HLCBHX1RZUEVfU1RSSU5HKTsKIAorICAgIGZyYW1lX2NsYXNzLT50aXRsZV9jaGFuZ2Vk ID0gdGl0bGVfY2hhbmdlZF9jYjsKKwogICAgIC8qCiAgICAgICogaW1wbGVtZW50YXRpb25zIG9m IHZpcnR1YWwgbWV0aG9kcwogICAgICAqLwogICAgIEdfT0JKRUNUX0NMQVNTKGZyYW1lX2NsYXNz KS0+ZmluYWxpemUgPSB3ZWJraXRfZ3RrX2ZyYW1lX2ZpbmFsaXplOwogfQogCitzdGF0aWMgdm9p ZCB0aXRsZV9jaGFuZ2VkX2NiKFdlYktpdEd0a0ZyYW1lKiBmcmFtZSwKKwkJICAgICAgICAgICAg IGdjaGFyICp0aXRsZSwKKwkJCSAgICAgZ2NoYXIgKmxvY2F0aW9uLAorCQkJICAgICBncG9pbnRl ciB1c2VyX2RhdGEpCit7CisgICAgZ19kZWJ1ZygidGl0bGVfY2hhbmdlZDogdGl0bGU9JXMsIGxv Y2F0aW9uPSVzIiwgdGl0bGUsIGxvY2F0aW9uKTsKKworICAgIFdlYktpdEd0a0ZyYW1lUHJpdmF0 ZSogZnJhbWVfZGF0YSA9IFdFQktJVF9HVEtfRlJBTUVfR0VUX1BSSVZBVEUoZnJhbWUpOworICAg IGZyYW1lX2RhdGEtPnRpdGxlID0gZ19zdHJkdXAodGl0bGUpOworfQorCiBzdGF0aWMgdm9pZCB3 ZWJraXRfZ3RrX2ZyYW1lX2luaXQoV2ViS2l0R3RrRnJhbWUqIGZyYW1lKQogewogfQpAQCAtMTQ1 LDQgKzE2MywxMiBAQCB3ZWJraXRfZ3RrX2ZyYW1lX2dldF9wYWdlKFdlYktpdEd0a0ZyYW1lCiAg ICAgV2ViS2l0R3RrRnJhbWVQcml2YXRlKiBmcmFtZV9kYXRhID0gV0VCS0lUX0dUS19GUkFNRV9H RVRfUFJJVkFURShmcmFtZSk7CiAgICAgcmV0dXJuIGZyYW1lX2RhdGEtPnBhZ2U7CiB9CisKK2dj aGFyKgord2Via2l0X2d0a19mcmFtZV9nZXRfdGl0bGUgKFdlYktpdEd0a0ZyYW1lKiBmcmFtZSkK K3sKKyAgICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lX2RhdGEgPSBXRUJLSVRfR1RLX0ZS QU1FX0dFVF9QUklWQVRFKGZyYW1lKTsKKyAgICByZXR1cm4gZnJhbWVfZGF0YS0+dGl0bGU7Cit9 CisKIH0KSW5kZXg6IGd0ay9BcGkvd2Via2l0Z3RrZnJhbWUuaAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBndGsv QXBpL3dlYmtpdGd0a2ZyYW1lLmgJKHJldmlzaW9uIDI0NzcxKQorKysgZ3RrL0FwaS93ZWJraXRn dGtmcmFtZS5oCSh3b3JraW5nIGNvcHkpCkBAIC01NCw2ICs1NCw3IEBAIHN0cnVjdCBfV2ViS2l0 R3RrRnJhbWUgewogc3RydWN0IF9XZWJLaXRHdGtGcmFtZUNsYXNzIHsKICAgICBHT2JqZWN0Q2xh c3MgcGFyZW50OwogCisgICAgdm9pZCAoKnRpdGxlX2NoYW5nZWQpICAoV2ViS2l0R3RrRnJhbWUq IGZyYW1lLCBnY2hhciAqdGl0bGUsIGdjaGFyICpsb2NhdGlvbiwgZ3BvaW50ZXIgdXNlcl9kYXRh KTsKICAgICAvKgogICAgICAqIHByb3RlY3RlZCB2aXJ0dWFsIG1ldGhvZHMKICAgICAgKi8K 15806 2007-08-02 06:46:08 -0700 2007-08-20 17:47:18 -0700 Updated. bwo_14812_get-title-get-location.diff text/plain 3170 diegoe SW5kZXg6IHdlYmtpdGd0a2ZyYW1lLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB3ZWJraXRndGtmcmFtZS5j cHAJKHJldmlzaW9uIDI0NzkxKQorKysgd2Via2l0Z3RrZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkp CkBAIC01Niw2ICs1Niw4IEBAIGVudW0gewogCiBzdGF0aWMgZ3VpbnQgd2Via2l0X2d0a19mcmFt ZV9zaWduYWxzW0xBU1RfU0lHTkFMXSA9IHsgMCwgfTsKIAorc3RhdGljIHZvaWQgdGl0bGVfY2hh bmdlZF9jYihXZWJLaXRHdGtGcmFtZSogZnJhbWUsIGdjaGFyKiB0aXRsZSwgZ2NoYXIqIGxvY2F0 aW9uKTsKKwogR19ERUZJTkVfVFlQRShXZWJLaXRHdGtGcmFtZSwgd2Via2l0X2d0a19mcmFtZSwg R19UWVBFX09CSkVDVCkKIAogc3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFtZV9maW5hbGl6ZShH T2JqZWN0KiBvYmplY3QpCkBAIC05Myw3ICs5NSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9ndGtf ZnJhbWVfY2xhc3NfaW5pdCgKICAgICB3ZWJraXRfZ3RrX2ZyYW1lX3NpZ25hbHNbVElUTEVfQ0hB TkdFRF0gPSBnX3NpZ25hbF9uZXcoInRpdGxlX2NoYW5nZWQiLAogICAgICAgICAgICAgR19UWVBF X0ZST01fQ0xBU1MoZnJhbWVfY2xhc3MpLAogICAgICAgICAgICAgKEdTaWduYWxGbGFncykoR19T SUdOQUxfUlVOX0xBU1QgfCBHX1NJR05BTF9BQ1RJT04pLAotICAgICAgICAgICAgMCwKKyAgICAg ICAgICAgIEdfU1RSVUNUX09GRlNFVChXZWJLaXRHdGtGcmFtZUNsYXNzLCB0aXRsZV9jaGFuZ2Vk KSwKICAgICAgICAgICAgIE5VTEwsCiAgICAgICAgICAgICBOVUxMLAogICAgICAgICAgICAgd2Vi a2l0X2d0a19tYXJzaGFsX1ZPSURfX1NUUklOR19TVFJJTkcsCkBAIC0xMTAsMTIgKzExMiwyMSBA QCBzdGF0aWMgdm9pZCB3ZWJraXRfZ3RrX2ZyYW1lX2NsYXNzX2luaXQoCiAgICAgICAgICAgICBH X1RZUEVfTk9ORSwgMiwKICAgICAgICAgICAgIEdfVFlQRV9TVFJJTkcsIEdfVFlQRV9TVFJJTkcp OwogCisgICAgZnJhbWVfY2xhc3MtPnRpdGxlX2NoYW5nZWQgPSB0aXRsZV9jaGFuZ2VkX2NiOwor CiAgICAgLyoKICAgICAgKiBpbXBsZW1lbnRhdGlvbnMgb2YgdmlydHVhbCBtZXRob2RzCiAgICAg ICovCiAgICAgR19PQkpFQ1RfQ0xBU1MoZnJhbWVfY2xhc3MpLT5maW5hbGl6ZSA9IHdlYmtpdF9n dGtfZnJhbWVfZmluYWxpemU7CiB9CiAKK3N0YXRpYyB2b2lkIHRpdGxlX2NoYW5nZWRfY2IoV2Vi S2l0R3RrRnJhbWUqIGZyYW1lLCBnY2hhciogdGl0bGUsIGdjaGFyKiBsb2NhdGlvbikKK3sKKyAg ICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1lX2RhdGEgPSBXRUJLSVRfR1RLX0ZSQU1FX0dF VF9QUklWQVRFKGZyYW1lKTsKKyAgICBmcmFtZV9kYXRhLT50aXRsZSA9IGdfc3RyZHVwKHRpdGxl KTsKKyAgICBmcmFtZV9kYXRhLT5sb2NhdGlvbiA9IGdfc3RyZHVwKGxvY2F0aW9uKTsKK30KKwog c3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFtZV9pbml0KFdlYktpdEd0a0ZyYW1lKiBmcmFtZSkK IHsKIH0KQEAgLTE0NSw0ICsxNTYsMTkgQEAgd2Via2l0X2d0a19mcmFtZV9nZXRfcGFnZShXZWJL aXRHdGtGcmFtZQogICAgIFdlYktpdEd0a0ZyYW1lUHJpdmF0ZSogZnJhbWVfZGF0YSA9IFdFQktJ VF9HVEtfRlJBTUVfR0VUX1BSSVZBVEUoZnJhbWUpOwogICAgIHJldHVybiBmcmFtZV9kYXRhLT5w YWdlOwogfQorCitnY2hhcioKK3dlYmtpdF9ndGtfZnJhbWVfZ2V0X3RpdGxlIChXZWJLaXRHdGtG cmFtZSogZnJhbWUpCit7CisgICAgV2ViS2l0R3RrRnJhbWVQcml2YXRlKiBmcmFtZV9kYXRhID0g V0VCS0lUX0dUS19GUkFNRV9HRVRfUFJJVkFURShmcmFtZSk7CisgICAgcmV0dXJuIGZyYW1lX2Rh dGEtPnRpdGxlOworfQorCitnY2hhcioKK3dlYmtpdF9ndGtfZnJhbWVfZ2V0X2xvY2F0aW9uIChX ZWJLaXRHdGtGcmFtZSogZnJhbWUpCit7CisgICAgV2ViS2l0R3RrRnJhbWVQcml2YXRlKiBmcmFt ZV9kYXRhID0gV0VCS0lUX0dUS19GUkFNRV9HRVRfUFJJVkFURShmcmFtZSk7CisgICAgcmV0dXJu IGZyYW1lX2RhdGEtPmxvY2F0aW9uOworfQorCiB9CkluZGV4OiB3ZWJraXRndGtmcmFtZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIHdlYmtpdGd0a2ZyYW1lLmgJKHJldmlzaW9uIDI0NzkxKQorKysgd2Via2l0 Z3RrZnJhbWUuaAkod29ya2luZyBjb3B5KQpAQCAtNTQsNiArNTQsNyBAQCBzdHJ1Y3QgX1dlYktp dEd0a0ZyYW1lIHsKIHN0cnVjdCBfV2ViS2l0R3RrRnJhbWVDbGFzcyB7CiAgICAgR09iamVjdENs YXNzIHBhcmVudDsKIAorICAgIHZvaWQgKCp0aXRsZV9jaGFuZ2VkKSAgKFdlYktpdEd0a0ZyYW1l KiBmcmFtZSwgZ2NoYXIqIHRpdGxlLCBnY2hhciogbG9jYXRpb24pOwogICAgIC8qCiAgICAgICog cHJvdGVjdGVkIHZpcnR1YWwgbWV0aG9kcwogICAgICAqLwpAQCAtODUsNiArODYsOSBAQCB3ZWJr aXRfZ3RrX2ZyYW1lX2dldF9zZWxlY3RlZF90ZXh0IChXZWJLCiBXRUJLSVRfR1RLX0FQSSBnY2hh cioKIHdlYmtpdF9ndGtfZnJhbWVfZ2V0X3RpdGxlIChXZWJLaXRHdGtGcmFtZSogZnJhbWUpOwog CitXRUJLSVRfR1RLX0FQSSBnY2hhcioKK3dlYmtpdF9ndGtfZnJhbWVfZ2V0X2xvY2F0aW9uIChX ZWJLaXRHdGtGcmFtZSogZnJhbWUpOworCiBXRUJLSVRfR1RLX0FQSSBHU0xpc3QqCiB3ZWJraXRf Z3RrX2ZyYW1lX2dldF9jaGlsZF9mcmFtZXMgKFdlYktpdEd0a0ZyYW1lKiBmcmFtZSk7CiAKSW5k ZXg6IHdlYmtpdGd0a3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB3ZWJraXRndGtwcml2YXRlLmgJ KHJldmlzaW9uIDI0NzkxKQorKysgd2Via2l0Z3RrcHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBA IC03Nyw2ICs3Nyw5IEBAIGV4dGVybiAiQyIgewogICAgICAgICBXZWJDb3JlOjpGcmFtZUdkayog ZnJhbWU7CiAgICAgICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50R2RrKiBjbGllbnQ7CiAg ICAgICAgIFdlYktpdEd0a1BhZ2UqIHBhZ2U7CisKKyAgICAgICAgZ2NoYXIqIHRpdGxlOworICAg ICAgICBnY2hhciogbG9jYXRpb247CiAgICAgfTsKIH0KIAo= 16044 2007-08-20 17:47:18 -0700 2007-09-17 05:28:53 -0700 Updated to trunk and following naming comments bgw_14812.diff text/plain 3205 diegoe SW5kZXg6IHdlYmtpdGd0a3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB3ZWJraXRndGtwcml2YXRl LmgJKHJldmlzaW9uIDI1MTY1KQorKysgd2Via2l0Z3RrcHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkp CkBAIC03OCw2ICs3OCw5IEBAIGV4dGVybiAiQyIgewogICAgICAgICBXZWJDb3JlOjpGcmFtZSog ZnJhbWU7CiAgICAgICAgIFdlYkNvcmU6OkZyYW1lTG9hZGVyQ2xpZW50KiBjbGllbnQ7CiAgICAg ICAgIFdlYktpdEd0a1BhZ2UqIHBhZ2U7CisKKyAgICAgICAgZ2NoYXIqIHRpdGxlOworICAgICAg ICBnY2hhciogbG9jYXRpb247CiAgICAgfTsKIAogCkluZGV4OiB3ZWJraXRndGtmcmFtZS5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gd2Via2l0Z3RrZnJhbWUuY3BwCShyZXZpc2lvbiAyNTE2NSkKKysrIHdl YmtpdGd0a2ZyYW1lLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsNiArNTcsOCBAQCBlbnVtIHsK IAogc3RhdGljIGd1aW50IHdlYmtpdF9ndGtfZnJhbWVfc2lnbmFsc1tMQVNUX1NJR05BTF0gPSB7 IDAsIH07CiAKK3N0YXRpYyB2b2lkIHdlYmtpdF9ndGtfZnJhbWVfdGl0bGVfY2hhbmdlZF9jYihX ZWJLaXRHdGtGcmFtZSogZnJhbWUsIGdjaGFyKiB0aXRsZSwgZ2NoYXIqIGxvY2F0aW9uKTsKKwog R19ERUZJTkVfVFlQRShXZWJLaXRHdGtGcmFtZSwgd2Via2l0X2d0a19mcmFtZSwgR19UWVBFX09C SkVDVCkKIAogc3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFtZV9maW5hbGl6ZShHT2JqZWN0KiBv YmplY3QpCkBAIC05Nyw3ICs5OSw3IEBAIHN0YXRpYyB2b2lkIHdlYmtpdF9ndGtfZnJhbWVfY2xh c3NfaW5pdCgKICAgICB3ZWJraXRfZ3RrX2ZyYW1lX3NpZ25hbHNbVElUTEVfQ0hBTkdFRF0gPSBn X3NpZ25hbF9uZXcoInRpdGxlX2NoYW5nZWQiLAogICAgICAgICAgICAgR19UWVBFX0ZST01fQ0xB U1MoZnJhbWVDbGFzcyksCiAgICAgICAgICAgICAoR1NpZ25hbEZsYWdzKShHX1NJR05BTF9SVU5f TEFTVCB8IEdfU0lHTkFMX0FDVElPTiksCi0gICAgICAgICAgICAwLAorICAgICAgICAgICAgR19T VFJVQ1RfT0ZGU0VUKFdlYktpdEd0a0ZyYW1lQ2xhc3MsIHRpdGxlX2NoYW5nZWQpLAogICAgICAg ICAgICAgTlVMTCwKICAgICAgICAgICAgIE5VTEwsCiAgICAgICAgICAgICB3ZWJraXRfZ3RrX21h cnNoYWxfVk9JRF9fU1RSSU5HX1NUUklORywKQEAgLTExNCwxMiArMTE2LDIxIEBAIHN0YXRpYyB2 b2lkIHdlYmtpdF9ndGtfZnJhbWVfY2xhc3NfaW5pdCgKICAgICAgICAgICAgIEdfVFlQRV9OT05F LCAyLAogICAgICAgICAgICAgR19UWVBFX1NUUklORywgR19UWVBFX1NUUklORyk7CiAKKyAgICBm cmFtZUNsYXNzLT50aXRsZV9jaGFuZ2VkID0gd2Via2l0X2d0a19mcmFtZV90aXRsZV9jaGFuZ2Vk X2NiOworCiAgICAgLyoKICAgICAgKiBpbXBsZW1lbnRhdGlvbnMgb2YgdmlydHVhbCBtZXRob2Rz CiAgICAgICovCiAgICAgR19PQkpFQ1RfQ0xBU1MoZnJhbWVDbGFzcyktPmZpbmFsaXplID0gd2Vi a2l0X2d0a19mcmFtZV9maW5hbGl6ZTsKIH0KIAorc3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFt ZV90aXRsZV9jaGFuZ2VkX2NiKFdlYktpdEd0a0ZyYW1lKiBmcmFtZSwgZ2NoYXIqIHRpdGxlLCBn Y2hhciogbG9jYXRpb24pCit7CisgICAgV2ViS2l0R3RrRnJhbWVQcml2YXRlKiBmcmFtZV9kYXRh ID0gV0VCS0lUX0dUS19GUkFNRV9HRVRfUFJJVkFURShmcmFtZSk7CisgICAgZnJhbWVfZGF0YS0+ dGl0bGUgPSBnX3N0cmR1cCh0aXRsZSk7CisgICAgZnJhbWVfZGF0YS0+bG9jYXRpb24gPSBnX3N0 cmR1cChsb2NhdGlvbik7Cit9CisKIHN0YXRpYyB2b2lkIHdlYmtpdF9ndGtfZnJhbWVfaW5pdChX ZWJLaXRHdGtGcmFtZSogZnJhbWUpCiB7CiB9CkBAIC0xNjksNCArMTgwLDE5IEBAIHdlYmtpdF9n dGtfZnJhbWVfZ2V0X3BhZ2UoV2ViS2l0R3RrRnJhbWUKICAgICBXZWJLaXRHdGtGcmFtZVByaXZh dGUqIGZyYW1lRGF0YSA9IFdFQktJVF9HVEtfRlJBTUVfR0VUX1BSSVZBVEUoZnJhbWUpOwogICAg IHJldHVybiBmcmFtZURhdGEtPnBhZ2U7CiB9CisKK2djaGFyKgord2Via2l0X2d0a19mcmFtZV9n ZXRfdGl0bGUgKFdlYktpdEd0a0ZyYW1lKiBmcmFtZSkKK3sKKyAgICBXZWJLaXRHdGtGcmFtZVBy aXZhdGUqIGZyYW1lRGF0YSA9IFdFQktJVF9HVEtfRlJBTUVfR0VUX1BSSVZBVEUoZnJhbWUpOwor ICAgIHJldHVybiBmcmFtZURhdGEtPnRpdGxlOworfQorCitnY2hhcioKK3dlYmtpdF9ndGtfZnJh bWVfZ2V0X2xvY2F0aW9uIChXZWJLaXRHdGtGcmFtZSogZnJhbWUpCit7CisgICAgV2ViS2l0R3Rr RnJhbWVQcml2YXRlKiBmcmFtZURhdGEgPSBXRUJLSVRfR1RLX0ZSQU1FX0dFVF9QUklWQVRFKGZy YW1lKTsKKyAgICByZXR1cm4gZnJhbWVEYXRhLT5sb2NhdGlvbjsKK30KKwogfQpJbmRleDogd2Vi a2l0Z3RrZnJhbWUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSB3ZWJraXRndGtmcmFtZS5oCShyZXZpc2lvbiAy NTE2NSkKKysrIHdlYmtpdGd0a2ZyYW1lLmgJKHdvcmtpbmcgY29weSkKQEAgLTU0LDYgKzU0LDcg QEAgc3RydWN0IF9XZWJLaXRHdGtGcmFtZSB7CiBzdHJ1Y3QgX1dlYktpdEd0a0ZyYW1lQ2xhc3Mg ewogICAgIEdPYmplY3RDbGFzcyBwYXJlbnQ7CiAKKyAgICB2b2lkICgqdGl0bGVfY2hhbmdlZCkg IChXZWJLaXRHdGtGcmFtZSogZnJhbWUsIGdjaGFyKiB0aXRsZSwgZ2NoYXIqIGxvY2F0aW9uKTsK ICAgICAvKgogICAgICAqIHByb3RlY3RlZCB2aXJ0dWFsIG1ldGhvZHMKICAgICAgKi8KQEAgLTg1 LDYgKzg2LDkgQEAgd2Via2l0X2d0a19mcmFtZV9nZXRfc2VsZWN0ZWRfdGV4dCAoV2ViSwogV0VC S0lUX0dUS19BUEkgZ2NoYXIqCiB3ZWJraXRfZ3RrX2ZyYW1lX2dldF90aXRsZSAoV2ViS2l0R3Rr RnJhbWUqIGZyYW1lKTsKIAorV0VCS0lUX0dUS19BUEkgZ2NoYXIqCit3ZWJraXRfZ3RrX2ZyYW1l X2dldF9sb2NhdGlvbiAoV2ViS2l0R3RrRnJhbWUqIGZyYW1lKTsKKwogV0VCS0lUX0dUS19BUEkg R1NMaXN0Kgogd2Via2l0X2d0a19mcmFtZV9nZXRfY2hpbGRfZnJhbWVzIChXZWJLaXRHdGtGcmFt ZSogZnJhbWUpOwogCg== 16303 2007-09-17 02:06:45 -0700 2007-09-20 06:39:01 -0700 Updated with g_free() calls, and coding style fixes. add-frame_get_title.diff text/plain 4795 cyril.brulebois SW5kZXg6IFdlYktpdC9ndGsvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYktpdC9ndGsvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTU5MSkKKysrIFdlYktpdC9ndGsvQ2hhbmdlTG9nCSh3b3JraW5n IGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMDctMDktMTcgIEN5cmlsIEJydWxlYm9pcyAgPGN5 cmlsLmJydWxlYm9pc0BlbnN0LWJyZXRhZ25lLmZyPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCB0aXRsZSBhbmQgbG9jYXRpb24gdG8gV2ViS2l0 R3RrRnJhbWVQcml2YXRlLCBhZGQKKyAgICAgICAgd2Via2l0X2d0a19mcmFtZV9nZXRfbG9jYXRp b24gdG8gdGhlIFdlYktpdEd0a0ZyYW1lIEFQSSBhcyB3ZWxsCisgICAgICAgIGFzIGEgdGl0bGVf Y2hhbmdlZCBjYWxsYmFjaywgaW1wbGVtZW50CisgICAgICAgIHdlYmtpdF9ndGtfZnJhbWVfZ2V0 X3RpdGxlIGFuZCB3ZWJraXRfZ3RrX2ZyYW1lX2dldF9sb2NhdGlvbi4KKworICAgICAgICBJbml0 aWFsIHBhdGNoIGJ5IERpZWdvIEVzY2FsYW50ZSBVcnJlbG8uCisKKyAgICAgICAgKiBBcGkvd2Vi a2l0Z3RrZnJhbWUuY3BwOgorICAgICAgICAqIEFwaS93ZWJraXRndGtmcmFtZS5oOgorICAgICAg ICAqIEFwaS93ZWJraXRndGtwcml2YXRlLmg6CisKIDIwMDctMDktMTUgIEhvbGdlciBIYW5zIFBl dGVyIEZyZXl0aGVyICA8emVja2VAc2VsZmlzaC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQgYnkg TWFyay4KSW5kZXg6IFdlYktpdC9ndGsvQXBpL3dlYmtpdGd0a2ZyYW1lLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBXZWJLaXQvZ3RrL0FwaS93ZWJraXRndGtmcmFtZS5jcHAJKHJldmlzaW9uIDI1NTg1KQor KysgV2ViS2l0L2d0ay9BcGkvd2Via2l0Z3RrZnJhbWUuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 NywxMiArNTcsMTYgQEAgZW51bSB7CiAKIHN0YXRpYyBndWludCB3ZWJraXRfZ3RrX2ZyYW1lX3Np Z25hbHNbTEFTVF9TSUdOQUxdID0geyAwLCB9OwogCitzdGF0aWMgdm9pZCB3ZWJraXRfZ3RrX2Zy YW1lX3RpdGxlX2NoYW5nZWRfY2IoV2ViS2l0R3RrRnJhbWUqIGZyYW1lLCBnY2hhciogdGl0bGUs IGdjaGFyKiBsb2NhdGlvbik7CisKIEdfREVGSU5FX1RZUEUoV2ViS2l0R3RrRnJhbWUsIHdlYmtp dF9ndGtfZnJhbWUsIEdfVFlQRV9PQkpFQ1QpCiAKIHN0YXRpYyB2b2lkIHdlYmtpdF9ndGtfZnJh bWVfZmluYWxpemUoR09iamVjdCogb2JqZWN0KQogewogICAgIFdlYktpdEd0a0ZyYW1lUHJpdmF0 ZSogcHJpdmF0ZURhdGEgPSBXRUJLSVRfR1RLX0ZSQU1FX0dFVF9QUklWQVRFKFdFQktJVF9HVEtf RlJBTUUob2JqZWN0KSk7CiAgICAgcHJpdmF0ZURhdGEtPmZyYW1lLT5sb2FkZXIoKS0+Y2FuY2Vs QW5kQ2xlYXIoKTsKKyAgICBnX2ZyZWUocHJpdmF0ZURhdGEtPnRpdGxlKTsKKyAgICBnX2ZyZWUo cHJpdmF0ZURhdGEtPmxvY2F0aW9uKTsKICAgICBkZWxldGUgcHJpdmF0ZURhdGEtPmZyYW1lOwog CiAgICAgR19PQkpFQ1RfQ0xBU1Mod2Via2l0X2d0a19mcmFtZV9wYXJlbnRfY2xhc3MpLT5maW5h bGl6ZShvYmplY3QpOwpAQCAtOTcsNyArMTAxLDcgQEAgc3RhdGljIHZvaWQgd2Via2l0X2d0a19m cmFtZV9jbGFzc19pbml0KAogICAgIHdlYmtpdF9ndGtfZnJhbWVfc2lnbmFsc1tUSVRMRV9DSEFO R0VEXSA9IGdfc2lnbmFsX25ldygidGl0bGVfY2hhbmdlZCIsCiAgICAgICAgICAgICBHX1RZUEVf RlJPTV9DTEFTUyhmcmFtZUNsYXNzKSwKICAgICAgICAgICAgIChHU2lnbmFsRmxhZ3MpKEdfU0lH TkFMX1JVTl9MQVNUIHwgR19TSUdOQUxfQUNUSU9OKSwKLSAgICAgICAgICAgIDAsCisgICAgICAg ICAgICBHX1NUUlVDVF9PRkZTRVQoV2ViS2l0R3RrRnJhbWVDbGFzcywgdGl0bGVfY2hhbmdlZCks CiAgICAgICAgICAgICBOVUxMLAogICAgICAgICAgICAgTlVMTCwKICAgICAgICAgICAgIHdlYmtp dF9ndGtfbWFyc2hhbF9WT0lEX19TVFJJTkdfU1RSSU5HLApAQCAtMTE0LDEyICsxMTgsMjMgQEAg c3RhdGljIHZvaWQgd2Via2l0X2d0a19mcmFtZV9jbGFzc19pbml0KAogICAgICAgICAgICAgR19U WVBFX05PTkUsIDIsCiAgICAgICAgICAgICBHX1RZUEVfU1RSSU5HLCBHX1RZUEVfU1RSSU5HKTsK IAorICAgIGZyYW1lQ2xhc3MtPnRpdGxlX2NoYW5nZWQgPSB3ZWJraXRfZ3RrX2ZyYW1lX3RpdGxl X2NoYW5nZWRfY2I7CisKICAgICAvKgogICAgICAqIGltcGxlbWVudGF0aW9ucyBvZiB2aXJ0dWFs IG1ldGhvZHMKICAgICAgKi8KICAgICBHX09CSkVDVF9DTEFTUyhmcmFtZUNsYXNzKS0+ZmluYWxp emUgPSB3ZWJraXRfZ3RrX2ZyYW1lX2ZpbmFsaXplOwogfQogCitzdGF0aWMgdm9pZCB3ZWJraXRf Z3RrX2ZyYW1lX3RpdGxlX2NoYW5nZWRfY2IoV2ViS2l0R3RrRnJhbWUqIGZyYW1lLCBnY2hhciog dGl0bGUsIGdjaGFyKiBsb2NhdGlvbikKK3sKKyAgICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZy YW1lX2RhdGEgPSBXRUJLSVRfR1RLX0ZSQU1FX0dFVF9QUklWQVRFKGZyYW1lKTsKKyAgICBnX2Zy ZWUgKGZyYW1lX2RhdGEtPnRpdGxlKTsKKyAgICBnX2ZyZWUgKGZyYW1lX2RhdGEtPmxvY2F0aW9u KTsKKyAgICBmcmFtZV9kYXRhLT50aXRsZSA9IGdfc3RyZHVwKHRpdGxlKTsKKyAgICBmcmFtZV9k YXRhLT5sb2NhdGlvbiA9IGdfc3RyZHVwKGxvY2F0aW9uKTsKK30KKwogc3RhdGljIHZvaWQgd2Vi a2l0X2d0a19mcmFtZV9pbml0KFdlYktpdEd0a0ZyYW1lKiBmcmFtZSkKIHsKIH0KQEAgLTE0MCw2 ICsxNTUsOCBAQCBHT2JqZWN0KiB3ZWJraXRfZ3RrX2ZyYW1lX25ldyhXZWJLaXRHdGtQCiAgICAg ZnJhbWVEYXRhLT5mcmFtZS0+c2V0VmlldyhmcmFtZVZpZXcpOwogICAgIGZyYW1lRGF0YS0+ZnJh bWUtPmluaXQoKTsKICAgICBmcmFtZURhdGEtPnBhZ2UgPSBwYWdlOworICAgIGZyYW1lRGF0YS0+ dGl0bGUgPSAwOworICAgIGZyYW1lRGF0YS0+bG9jYXRpb24gPSAwOwogCiAgICAgcmV0dXJuIEdf T0JKRUNUKGZyYW1lKTsKIH0KQEAgLTE2OSw0ICsxODYsMTcgQEAgd2Via2l0X2d0a19mcmFtZV9n ZXRfcGFnZShXZWJLaXRHdGtGcmFtZQogICAgIFdlYktpdEd0a0ZyYW1lUHJpdmF0ZSogZnJhbWVE YXRhID0gV0VCS0lUX0dUS19GUkFNRV9HRVRfUFJJVkFURShmcmFtZSk7CiAgICAgcmV0dXJuIGZy YW1lRGF0YS0+cGFnZTsKIH0KKworZ2NoYXIqIHdlYmtpdF9ndGtfZnJhbWVfZ2V0X3RpdGxlKFdl YktpdEd0a0ZyYW1lKiBmcmFtZSkKK3sKKyAgICBXZWJLaXRHdGtGcmFtZVByaXZhdGUqIGZyYW1l RGF0YSA9IFdFQktJVF9HVEtfRlJBTUVfR0VUX1BSSVZBVEUoZnJhbWUpOworICAgIHJldHVybiBm cmFtZURhdGEtPnRpdGxlOworfQorCitnY2hhciogd2Via2l0X2d0a19mcmFtZV9nZXRfbG9jYXRp b24oV2ViS2l0R3RrRnJhbWUqIGZyYW1lKQoreworICAgIFdlYktpdEd0a0ZyYW1lUHJpdmF0ZSog ZnJhbWVEYXRhID0gV0VCS0lUX0dUS19GUkFNRV9HRVRfUFJJVkFURShmcmFtZSk7CisgICAgcmV0 dXJuIGZyYW1lRGF0YS0+bG9jYXRpb247Cit9CisKIH0KSW5kZXg6IFdlYktpdC9ndGsvQXBpL3dl YmtpdGd0a2ZyYW1lLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViS2l0L2d0ay9BcGkvd2Via2l0Z3RrZnJh bWUuaAkocmV2aXNpb24gMjU1ODUpCisrKyBXZWJLaXQvZ3RrL0FwaS93ZWJraXRndGtmcmFtZS5o CSh3b3JraW5nIGNvcHkpCkBAIC01NCw2ICs1NCw4IEBAIHN0cnVjdCBfV2ViS2l0R3RrRnJhbWUg ewogc3RydWN0IF9XZWJLaXRHdGtGcmFtZUNsYXNzIHsKICAgICBHT2JqZWN0Q2xhc3MgcGFyZW50 OwogCisgICAgdm9pZCAoKnRpdGxlX2NoYW5nZWQpIChXZWJLaXRHdGtGcmFtZSogZnJhbWUsIGdj aGFyKiB0aXRsZSwgZ2NoYXIqIGxvY2F0aW9uKTsKKwogICAgIC8qCiAgICAgICogcHJvdGVjdGVk IHZpcnR1YWwgbWV0aG9kcwogICAgICAqLwpAQCAtODUsNiArODcsOSBAQCB3ZWJraXRfZ3RrX2Zy YW1lX2dldF9zZWxlY3RlZF90ZXh0IChXZWJLCiBXRUJLSVRfR1RLX0FQSSBnY2hhcioKIHdlYmtp dF9ndGtfZnJhbWVfZ2V0X3RpdGxlIChXZWJLaXRHdGtGcmFtZSogZnJhbWUpOwogCitXRUJLSVRf R1RLX0FQSSBnY2hhcioKK3dlYmtpdF9ndGtfZnJhbWVfZ2V0X2xvY2F0aW9uIChXZWJLaXRHdGtG cmFtZSogZnJhbWUpOworCiBXRUJLSVRfR1RLX0FQSSBHU0xpc3QqCiB3ZWJraXRfZ3RrX2ZyYW1l X2dldF9jaGlsZF9mcmFtZXMgKFdlYktpdEd0a0ZyYW1lKiBmcmFtZSk7CiAKSW5kZXg6IFdlYktp dC9ndGsvQXBpL3dlYmtpdGd0a3ByaXZhdGUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJLaXQvZ3RrL0Fw aS93ZWJraXRndGtwcml2YXRlLmgJKHJldmlzaW9uIDI1NTg1KQorKysgV2ViS2l0L2d0ay9BcGkv d2Via2l0Z3RrcHJpdmF0ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC03OCw2ICs3OCw5IEBAIGV4dGVy biAiQyIgewogICAgICAgICBXZWJDb3JlOjpGcmFtZSogZnJhbWU7CiAgICAgICAgIFdlYkNvcmU6 OkZyYW1lTG9hZGVyQ2xpZW50KiBjbGllbnQ7CiAgICAgICAgIFdlYktpdEd0a1BhZ2UqIHBhZ2U7 CisKKyAgICAgICAgZ2NoYXIqIHRpdGxlOworICAgICAgICBnY2hhciogbG9jYXRpb247CiAgICAg fTsKIAogCg==