95188 2012-08-28 03:45:31 -0700 [GTK] Save original uri for downloaded files 2013-09-07 08:58:43 -0700 1 1 1 Unclassified WebKit WebKitGTK 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 alexl webkit-unassigned bugzilla cgarcia csaavedra mario webkit.review.bot oldest_to_newest 706227 0 160948 alexl 2012-08-28 03:45:31 -0700 Created attachment 160948 Implement saving download-uri in file metadata It would be very useful if epiphany and all webkit apps would store the original url as metadata for downloaded files. I've implemented this in webkit, patch applied. After downloading a file with this i can then do: $ gvfs-info -a "metadata::*" ~/ai.php attributes: metadata::download-uri: http://rotation.linuxnewmedia.com/www/delivery/ai.php?filename=sm_uso_20120726_x9_onlinemaster_adseries_336x280_idfsf_5workstation_2.jpg&contenttype=jpeg metadata::gedit-position: 0 GVfs stores file metadata in a set of journaled mmaped files in $home/.local/share-gvfs-metadata/ 706230 1 csaavedra 2012-08-28 03:48:27 -0700 We probably need to add the WK2 counterpart, test cases, and proper ChangeLogs. If we agree with doing this I can take it from here. 731507 2 166431 csaavedra 2012-10-01 02:23:50 -0700 Created attachment 166431 [GTK] Save original uri for downloaded files https://bugs.webkit.org/show_bug.cgi?id=95188 Reviewed by NOBODY (OOPS!). gvfs stores metadata locally, and this information can later be used by file management applications. Based on a patch by Alexander Larsson <alexl@redhat.com>. * webkit/webkitdownload.cpp: (webkit_download_open_stream_for_uri): Save the download-uri as file metadata. 731514 3 166431 cgarcia 2012-10-01 02:40:19 -0700 Comment on attachment 166431 [GTK] Save original uri for downloaded files https://bugs.webkit.org/show_bug.cgi?id=95188 View in context: https://bugs.webkit.org/attachment.cgi?id=166431&action=review > Source/WebKit/gtk/webkit/webkitdownload.cpp:473 > - g_object_unref(file); > - > if (error) { > webkitDownloadEmitError(download, downloadDestinationError(core(priv->networkResponse), error->message)); > g_error_free(error); > + g_object_unref(file); Use GRefPtr and you don't need this. > Source/WebKit/gtk/webkit/webkitdownload.cpp:478 > + g_file_set_attribute(file, "metadata::download-uri", G_FILE_ATTRIBUTE_TYPE_STRING, > + (gpointer)webkit_network_request_get_uri(priv->networkRequest), G_FILE_QUERY_INFO_NONE, NULL, &error); Why not using g_file_set_attribute_string()? so that you don't need the gpointer cast nor the attribute type parameter. Use 0 instead of NULL. We typically don't use that indentation, new line should be under the ( even if the style checker complains, I think it's a bug in the style checker script. > Source/WebKit/gtk/webkit/webkitdownload.cpp:482 > + if (error) { > + g_warning("Couldn't set downloaded file attribute: %s\n", error->message); > + g_error_free(error); We could use a GOwnPtr for the error too. I'm not sure showing a warning here is useful, maybe we can just silently ignore the error, since it doesn't affect the download at all. 731519 4 mario 2012-10-01 02:44:33 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=166431&action=review > Source/WebKit/gtk/webkit/webkitdownload.cpp:478 > + (gpointer)webkit_network_request_get_uri(priv->networkRequest), G_FILE_QUERY_INFO_NONE, NULL, &error); Are you sure priv->networkRequest will never be 0? If not, I think you should add an early return, otherwise an ASSERT might be helpful. 731616 5 166431 csaavedra 2012-10-01 05:45:42 -0700 Comment on attachment 166431 [GTK] Save original uri for downloaded files https://bugs.webkit.org/show_bug.cgi?id=95188 View in context: https://bugs.webkit.org/attachment.cgi?id=166431&action=review >> Source/WebKit/gtk/webkit/webkitdownload.cpp:473 >> + g_object_unref(file); > > Use GRefPtr and you don't need this. Fixed in a separate bug, already pushed. >> Source/WebKit/gtk/webkit/webkitdownload.cpp:478 >> + (gpointer)webkit_network_request_get_uri(priv->networkRequest), G_FILE_QUERY_INFO_NONE, NULL, &error); > > Why not using g_file_set_attribute_string()? so that you don't need the gpointer cast nor the attribute type parameter. Use 0 instead of NULL. We typically don't use that indentation, new line should be under the ( even if the style checker complains, I think it's a bug in the style checker script. OK, thanks. >> Source/WebKit/gtk/webkit/webkitdownload.cpp:482 >> + g_error_free(error); > > We could use a GOwnPtr for the error too. I'm not sure showing a warning here is useful, maybe we can just silently ignore the error, since it doesn't affect the download at all. You're right, I'll remove the warning. 731634 6 166462 csaavedra 2012-10-01 06:16:57 -0700 Created attachment 166462 Reviewed version - Updated, using GRefPtr now. - Ignore the error. - Use g_file_set_attribute_string() to avoid the need to cast. - Use webkit_download_get_uri() instead of accessing directly the network request. 731636 7 webkit.review.bot 2012-10-01 06:19:31 -0700 Attachment 166462 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebKit/gtk/ChangeLog', u'Source/Web..." exit_code: 1 Source/WebKit/gtk/webkit/webkitdownload.cpp:477: When wrapping a line, only indent 4 spaces. [whitespace/indent] [3] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 731638 8 166462 cgarcia 2012-10-01 06:24:30 -0700 Comment on attachment 166462 Reviewed version I'm not sure we want to set the metadata if the download fails or is cancelled, I guess the destination file will be deleted anyway, so it would be harmless, but maybe it's better to do it in webkit_download_finished_loading() to not delay the download setting the metadata. Also, we could probably use the async API and simply ignore the result. 731653 9 csaavedra 2012-10-01 06:47:00 -0700 (In reply to comment #8) > (From update of attachment 166462 [details]) > I'm not sure we want to set the metadata if the download fails or is cancelled, I guess the destination file will be deleted anyway, so it would be harmless, but maybe it's better to do it in webkit_download_finished_loading() to not delay the download setting the metadata. Also, we could probably use the async API and simply ignore the result. I think we should do it immediately when starting the download, because even for partial downloads the metadata can be relevant. I will attach a patch using the async API though. 731655 10 166465 csaavedra 2012-10-01 06:48:25 -0700 Created attachment 166465 patch updated, async - Use async API. 731657 11 cgarcia 2012-10-01 06:52:51 -0700 (In reply to comment #9) > (In reply to comment #8) > > (From update of attachment 166462 [details] [details]) > > I'm not sure we want to set the metadata if the download fails or is cancelled, I guess the destination file will be deleted anyway, so it would be harmless, but maybe it's better to do it in webkit_download_finished_loading() to not delay the download setting the metadata. Also, we could probably use the async API and simply ignore the result. > > I think we should do it immediately when starting the download, because even for partial downloads the metadata can be relevant. I will attach a patch using the async API though. fair enough 731659 12 166465 cgarcia 2012-10-01 06:53:38 -0700 Comment on attachment 166465 patch updated, async Thanks! 731676 13 166465 webkit.review.bot 2012-10-01 07:18:45 -0700 Comment on attachment 166465 patch updated, async Clearing flags on attachment: 166465 Committed r130046: <http://trac.webkit.org/changeset/130046> 731677 14 webkit.review.bot 2012-10-01 07:18:48 -0700 All reviewed patches have been landed. Closing bug. 925235 15 bugzilla 2013-09-05 15:05:28 -0700 In which version of WebKitGTK+ did this end up? "attr -l" on a file downloaded using epiphany only shows an "selinux" attribute having been set. webkitgtk3-2.0.4-1.fc19.x86_64 epiphany-3.8.2-1.fc19.x86_64 925422 16 cgarcia 2013-09-05 23:55:51 -0700 (In reply to comment #15) > In which version of WebKitGTK+ did this end up? > > "attr -l" on a file downloaded using epiphany only shows an "selinux" attribute having been set. > > webkitgtk3-2.0.4-1.fc19.x86_64 > epiphany-3.8.2-1.fc19.x86_64 Works here: $ gvfs-info -a "metadata::*" /tmp/bug-120404-20130830175701.patch attributes: metadata::download-uri: https://bug-120404-attachments.webkit.org/attachment.cgi?id=210125 926200 17 bugzilla 2013-09-07 08:58:43 -0700 (In reply to comment #16) > Works here: > > $ gvfs-info -a "metadata::*" /tmp/bug-120404-20130830175701.patch > attributes: > metadata::download-uri: https://bug-120404-attachments.webkit.org/attachment.cgi?id=210125 Ha, it's not in xattr, but in gvfs's metadata side-loading database. Thanks 160948 2012-08-28 03:45:31 -0700 2012-08-28 03:45:31 -0700 Implement saving download-uri in file metadata webkit-1.9.6-download-metadata.patch text/plain 1108 alexl ZGlmZiAtdXAgd2Via2l0LTEuOS42L1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3du bG9hZC5jcHAuZG93bmxvYWRfbWV0YWRhdGEgd2Via2l0LTEuOS42L1NvdXJjZS9XZWJLaXQvZ3Rr L3dlYmtpdC93ZWJraXRkb3dubG9hZC5jcHAKLS0tIHdlYmtpdC0xLjkuNi9Tb3VyY2UvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwLmRvd25sb2FkX21ldGFkYXRhCTIwMTItMDct MTkgMTI6MDI6MjkuMDAwMDAwMDAwICswMjAwCisrKyB3ZWJraXQtMS45LjYvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcAkyMDEyLTA4LTI4IDEwOjAyOjUzLjA5NTUz MDkzNCArMDIwMApAQCAtNDY3LDE0ICs0NjcsMjEgQEAgc3RhdGljIGdib29sZWFuIHdlYmtpdF9k b3dubG9hZF9vcGVuX3N0cgogICAgIGVsc2UKICAgICAgICAgcHJpdi0+b3V0cHV0U3RyZWFtID0g Z19maWxlX3JlcGxhY2UoZmlsZSwgTlVMTCwgVFJVRSwgR19GSUxFX0NSRUFURV9OT05FLCBOVUxM LCAmZXJyb3IpOwogCi0gICAgZ19vYmplY3RfdW5yZWYoZmlsZSk7Ci0KICAgICBpZiAoZXJyb3Ip IHsKICAgICAgICAgd2Via2l0RG93bmxvYWRFbWl0RXJyb3IoZG93bmxvYWQsIGRvd25sb2FkRGVz dGluYXRpb25FcnJvcihjb3JlKHByaXYtPm5ldHdvcmtSZXNwb25zZSksIGVycm9yLT5tZXNzYWdl KSk7CiAgICAgICAgIGdfZXJyb3JfZnJlZShlcnJvcik7CisgICAgICAgIGdfb2JqZWN0X3VucmVm KGZpbGUpOwogICAgICAgICByZXR1cm4gRkFMU0U7CiAgICAgfQogCisgICAgZ19maWxlX3NldF9h dHRyaWJ1dGUoZmlsZSwgIm1ldGFkYXRhOjpkb3dubG9hZC11cmkiLAorICAgICAgICAgICAgICAg ICAgICAgICAgIEdfRklMRV9BVFRSSUJVVEVfVFlQRV9TVFJJTkcsCisgICAgICAgICAgICAgICAg ICAgICAgICAgKGdwb2ludGVyKXdlYmtpdF9uZXR3b3JrX3JlcXVlc3RfZ2V0X3VyaShwcml2LT5u ZXR3b3JrUmVxdWVzdCksCisgICAgICAgICAgICAgICAgICAgICAgICAgR19GSUxFX1FVRVJZX0lO Rk9fTk9ORSwgTlVMTCwgTlVMTCk7CisgICAgCisgICAgZ19vYmplY3RfdW5yZWYoZmlsZSk7CisK KwogICAgIHJldHVybiBUUlVFOwogfQogCg== 166431 2012-10-01 02:23:50 -0700 2012-10-01 06:16:57 -0700 [GTK] Save original uri for downloaded files https://bugs.webkit.org/show_bug.cgi?id=95188 -GTK-Save-original-uri-for-downloaded-files-httpsb.patch text/plain 2825 csaavedra RnJvbSA0MjhhYmMyYWY0ZmM2ZmQ2YmFjOGZiYjk3YmFiOWQ1YmJmNzQzN2MwIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDbGF1ZGlvIFNhYXZlZHJhIDxjc2FhdmVkcmFAaWdhbGlhLmNv bT4KRGF0ZTogTW9uLCAxIE9jdCAyMDEyIDEyOjE5OjQwICswMzAwClN1YmplY3Q6IFtQQVRDSF0g ICAgICAgICBbR1RLXSBTYXZlIG9yaWdpbmFsIHVyaSBmb3IgZG93bmxvYWRlZCBmaWxlcyAgICAg ICAgCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUxODgKCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIGd2ZnMgc3RvcmVzIG1ldGFk YXRhIGxvY2FsbHksIGFuZCB0aGlzIGluZm9ybWF0aW9uIGNhbiBsYXRlciBiZQogICAgICAgIHVz ZWQgYnkgZmlsZSBtYW5hZ2VtZW50IGFwcGxpY2F0aW9ucy4gQmFzZWQgb24gYSBwYXRjaCBieQog ICAgICAgIEFsZXhhbmRlciBMYXJzc29uIDxhbGV4bEByZWRoYXQuY29tPi4KCiAgICAgICAgKiB3 ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwOgogICAgICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9z dHJlYW1fZm9yX3VyaSk6IFNhdmUgdGhlIGRvd25sb2FkLXVyaSBhcwogICAgICAgIGZpbGUgbWV0 YWRhdGEuCi0tLQogU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8 IDE1ICsrKysrKysrKysrKysrKwogU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRvd25s b2FkLmNwcCB8IDEzICsrKysrKysrKysrLS0KIDIgZmlsZXMgY2hhbmdlZCwgMjYgaW5zZXJ0aW9u cygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFu Z2VMb2cgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKaW5kZXggYTQxN2JhNy4uMWYyM2Zi NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDEyLTEwLTAxICBDbGF1ZGlv IFNhYXZlZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS10gU2F2ZSBv cmlnaW5hbCB1cmkgZm9yIGRvd25sb2FkZWQgZmlsZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTk1MTg4CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgZ3ZmcyBzdG9yZXMgbWV0YWRhdGEgbG9jYWxseSwgYW5k IHRoaXMgaW5mb3JtYXRpb24gY2FuIGxhdGVyIGJlCisgICAgICAgIHVzZWQgYnkgZmlsZSBtYW5h Z2VtZW50IGFwcGxpY2F0aW9ucy4gQmFzZWQgb24gYSBwYXRjaCBieQorICAgICAgICBBbGV4YW5k ZXIgTGFyc3NvbiA8YWxleGxAcmVkaGF0LmNvbT4uCisKKyAgICAgICAgKiB3ZWJraXQvd2Via2l0 ZG93bmxvYWQuY3BwOgorICAgICAgICAod2Via2l0X2Rvd25sb2FkX29wZW5fc3RyZWFtX2Zvcl91 cmkpOiBTYXZlIHRoZSBkb3dubG9hZC11cmkgYXMKKyAgICAgICAgZmlsZSBtZXRhZGF0YS4KKwog MjAxMi0wOS0yOCAgTWlraGFpbCBQb3pkbnlha292ICA8bWlraGFpbC5wb3pkbnlha292QGludGVs LmNvbT4KIAogICAgICAgICBDb2RlIGluc2lkZSBGcmFtZUxvYWRlckNsaWVudDo6Y2FuU2hvd01J TUVUeXBlKCkgaW1wbGVtZW50YXRpb25zIGNhbiBiZSBzaGFyZWQgYW1vbmcgZGlmZmVyZW50IFdL IHBvcnRzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0ZG93bmxv YWQuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcAppbmRl eCBlNjk4ZWQ1Li45MjJkZjcwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2d0ay93ZWJraXQv d2Via2l0ZG93bmxvYWQuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRk b3dubG9hZC5jcHAKQEAgLTQ2NywxNCArNDY3LDIzIEBAIHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRf ZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaShXZWJLaXREb3dubG9hZCogZG93bmxvYWQsIGNv CiAgICAgZWxzZQogICAgICAgICBwcml2LT5vdXRwdXRTdHJlYW0gPSBnX2ZpbGVfcmVwbGFjZShm aWxlLCBOVUxMLCBUUlVFLCBHX0ZJTEVfQ1JFQVRFX05PTkUsIE5VTEwsICZlcnJvcik7CiAKLSAg ICBnX29iamVjdF91bnJlZihmaWxlKTsKLQogICAgIGlmIChlcnJvcikgewogICAgICAgICB3ZWJr aXREb3dubG9hZEVtaXRFcnJvcihkb3dubG9hZCwgZG93bmxvYWREZXN0aW5hdGlvbkVycm9yKGNv cmUocHJpdi0+bmV0d29ya1Jlc3BvbnNlKSwgZXJyb3ItPm1lc3NhZ2UpKTsKICAgICAgICAgZ19l cnJvcl9mcmVlKGVycm9yKTsKKyAgICAgICAgZ19vYmplY3RfdW5yZWYoZmlsZSk7CiAgICAgICAg IHJldHVybiBGQUxTRTsKICAgICB9CiAKKyAgICBnX2ZpbGVfc2V0X2F0dHJpYnV0ZShmaWxlLCAi bWV0YWRhdGE6OmRvd25sb2FkLXVyaSIsIEdfRklMRV9BVFRSSUJVVEVfVFlQRV9TVFJJTkcsCisg ICAgICAgIChncG9pbnRlcil3ZWJraXRfbmV0d29ya19yZXF1ZXN0X2dldF91cmkocHJpdi0+bmV0 d29ya1JlcXVlc3QpLCBHX0ZJTEVfUVVFUllfSU5GT19OT05FLCBOVUxMLCAmZXJyb3IpOworCisg ICAgaWYgKGVycm9yKSB7CisgICAgICAgIGdfd2FybmluZygiQ291bGRuJ3Qgc2V0IGRvd25sb2Fk ZWQgZmlsZSBhdHRyaWJ1dGU6ICVzXG4iLCBlcnJvci0+bWVzc2FnZSk7CisgICAgICAgIGdfZXJy b3JfZnJlZShlcnJvcik7CisgICAgfQorCisgICAgZ19vYmplY3RfdW5yZWYoZmlsZSk7CisKICAg ICByZXR1cm4gVFJVRTsKIH0KIAotLSAKMS43LjExLjQ= 166462 2012-10-01 06:16:57 -0700 2012-10-01 06:48:25 -0700 Reviewed version 0001-GTK-Save-original-uri-for-downloaded-files.patch text/plain 2259 csaavedra RnJvbSBiMjlkMjY4NWM4ZTlmYTYxMjkwNzViNDYyMzI1NDdkN2JmOTZjYThjIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDbGF1ZGlvIFNhYXZlZHJhIDxjc2FhdmVkcmFAaWdhbGlhLmNv bT4KRGF0ZTogTW9uLCAxIE9jdCAyMDEyIDEyOjE5OjQwICswMzAwClN1YmplY3Q6IFtQQVRDSF0g ICAgICAgICBbR1RLXSBTYXZlIG9yaWdpbmFsIHVyaSBmb3IgZG93bmxvYWRlZCBmaWxlcyAgICAg ICAgCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUxODgKCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIGd2ZnMgc3RvcmVzIG1ldGFk YXRhIGxvY2FsbHksIGFuZCB0aGlzIGluZm9ybWF0aW9uIGNhbiBsYXRlciBiZQogICAgICAgIHVz ZWQgYnkgZmlsZSBtYW5hZ2VtZW50IGFwcGxpY2F0aW9ucy4gQmFzZWQgb24gYSBwYXRjaCBieQog ICAgICAgIEFsZXhhbmRlciBMYXJzc29uIDxhbGV4bEByZWRoYXQuY29tPi4KCiAgICAgICAgKiB3 ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwOgogICAgICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9z dHJlYW1fZm9yX3VyaSk6IFNhdmUgdGhlIGRvd25sb2FkLXVyaSBhcwogICAgICAgIGZpbGUgbWV0 YWRhdGEuCi0tLQogU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8 IDE1ICsrKysrKysrKysrKysrKwogU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRvd25s b2FkLmNwcCB8ICAzICsrKwogMiBmaWxlcyBjaGFuZ2VkLCAxOCBpbnNlcnRpb25zKCspCgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9ndGsv Q2hhbmdlTG9nCmluZGV4IDY3Y2YxZWEuLjFkOWJhZDkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvZ3RrL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L2d0ay9DaGFuZ2VMb2cKQEAgLTEs NSArMSwyMCBAQAogMjAxMi0xMC0wMSAgQ2xhdWRpbyBTYWF2ZWRyYSAgPGNzYWF2ZWRyYUBpZ2Fs aWEuY29tPgogCisgICAgICAgIFtHVEtdIFNhdmUgb3JpZ2luYWwgdXJpIGZvciBkb3dubG9hZGVk IGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05 NTE4OAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIGd2 ZnMgc3RvcmVzIG1ldGFkYXRhIGxvY2FsbHksIGFuZCB0aGlzIGluZm9ybWF0aW9uIGNhbiBsYXRl ciBiZQorICAgICAgICB1c2VkIGJ5IGZpbGUgbWFuYWdlbWVudCBhcHBsaWNhdGlvbnMuIEJhc2Vk IG9uIGEgcGF0Y2ggYnkKKyAgICAgICAgQWxleGFuZGVyIExhcnNzb24gPGFsZXhsQHJlZGhhdC5j b20+LgorCisgICAgICAgICogd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcDoKKyAgICAgICAgKHdl YmtpdF9kb3dubG9hZF9vcGVuX3N0cmVhbV9mb3JfdXJpKTogU2F2ZSB0aGUgZG93bmxvYWQtdXJp IGFzCisgICAgICAgIGZpbGUgbWV0YWRhdGEuCisKKzIwMTItMTAtMDEgIENsYXVkaW8gU2FhdmVk cmEgIDxjc2FhdmVkcmFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbR1RLXSBXZWJLaXREb3dubG9h ZDogdXNlIG1vcmUgb2YgR093blB0ci9HUmVmUHRyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD05ODAwOQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwIGIvU291cmNlL1dlYktpdC9ndGsvd2Via2l0 L3dlYmtpdGRvd25sb2FkLmNwcAppbmRleCA4Y2E4ZmEyLi42YTFkYzIwIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViS2l0L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvZ3RrL3dlYmtpdC93ZWJraXRkb3dubG9hZC5jcHAKQEAgLTQ3Myw2ICs0NzMsOSBAQCBz dGF0aWMgZ2Jvb2xlYW4gd2Via2l0X2Rvd25sb2FkX29wZW5fc3RyZWFtX2Zvcl91cmkoV2ViS2l0 RG93bmxvYWQqIGRvd25sb2FkLCBjbwogICAgICAgICByZXR1cm4gRkFMU0U7CiAgICAgfQogCisg ICAgZ19maWxlX3NldF9hdHRyaWJ1dGVfc3RyaW5nKGZpbGUuZ2V0KCksICJtZXRhZGF0YTo6ZG93 bmxvYWQtdXJpIiwgd2Via2l0X2Rvd25sb2FkX2dldF91cmkoZG93bmxvYWQpLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBHX0ZJTEVfUVVFUllfSU5GT19OT05FLCAwLCAwKTsKKwog ICAgIHJldHVybiBUUlVFOwogfQogCi0tIAoxLjcuMTEuNAoK 166465 2012-10-01 06:48:25 -0700 2012-10-01 07:18:45 -0700 patch updated, async 0001-GTK-Save-original-uri-for-downloaded-files.patch text/plain 2375 csaavedra RnJvbSBhNWUwYzliNjkwYTU3ZDdjMjVmMDdhNmYyOWNhNDgzZDFjZjI0YzRiIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBDbGF1ZGlvIFNhYXZlZHJhIDxjc2FhdmVkcmFAaWdhbGlhLmNv bT4KRGF0ZTogTW9uLCAxIE9jdCAyMDEyIDEyOjE5OjQwICswMzAwClN1YmplY3Q6IFtQQVRDSF0g ICAgICAgICBbR1RLXSBTYXZlIG9yaWdpbmFsIHVyaSBmb3IgZG93bmxvYWRlZCBmaWxlcyAgICAg ICAgCiBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTUxODgKCiAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCgogICAgICAgIGd2ZnMgc3RvcmVzIG1ldGFk YXRhIGxvY2FsbHksIGFuZCB0aGlzIGluZm9ybWF0aW9uIGNhbiBsYXRlciBiZQogICAgICAgIHVz ZWQgYnkgZmlsZSBtYW5hZ2VtZW50IGFwcGxpY2F0aW9ucy4gQmFzZWQgb24gYSBwYXRjaCBieQog ICAgICAgIEFsZXhhbmRlciBMYXJzc29uIDxhbGV4bEByZWRoYXQuY29tPi4KCiAgICAgICAgKiB3 ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwOgogICAgICAgICh3ZWJraXRfZG93bmxvYWRfb3Blbl9z dHJlYW1fZm9yX3VyaSk6IFNhdmUgdGhlIGRvd25sb2FkLXVyaSBhcwogICAgICAgIGZpbGUgbWV0 YWRhdGEuCi0tLQogU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nICAgICAgICAgICAgICAgICB8 IDE1ICsrKysrKysrKysrKysrKwogU291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRvd25s b2FkLmNwcCB8ICA0ICsrKysKIDIgZmlsZXMgY2hhbmdlZCwgMTkgaW5zZXJ0aW9ucygrKQoKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvZ3RrL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvZ3Rr L0NoYW5nZUxvZwppbmRleCA2N2NmMWVhLi4xZDliYWQ5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L2d0ay9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9ndGsvQ2hhbmdlTG9nCkBAIC0x LDUgKzEsMjAgQEAKIDIwMTItMTAtMDEgIENsYXVkaW8gU2FhdmVkcmEgIDxjc2FhdmVkcmFAaWdh bGlhLmNvbT4KIAorICAgICAgICBbR1RLXSBTYXZlIG9yaWdpbmFsIHVyaSBmb3IgZG93bmxvYWRl ZCBmaWxlcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 OTUxODgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBn dmZzIHN0b3JlcyBtZXRhZGF0YSBsb2NhbGx5LCBhbmQgdGhpcyBpbmZvcm1hdGlvbiBjYW4gbGF0 ZXIgYmUKKyAgICAgICAgdXNlZCBieSBmaWxlIG1hbmFnZW1lbnQgYXBwbGljYXRpb25zLiBCYXNl ZCBvbiBhIHBhdGNoIGJ5CisgICAgICAgIEFsZXhhbmRlciBMYXJzc29uIDxhbGV4bEByZWRoYXQu Y29tPi4KKworICAgICAgICAqIHdlYmtpdC93ZWJraXRkb3dubG9hZC5jcHA6CisgICAgICAgICh3 ZWJraXRfZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaSk6IFNhdmUgdGhlIGRvd25sb2FkLXVy aSBhcworICAgICAgICBmaWxlIG1ldGFkYXRhLgorCisyMDEyLTEwLTAxICBDbGF1ZGlvIFNhYXZl ZHJhICA8Y3NhYXZlZHJhQGlnYWxpYS5jb20+CisKICAgICAgICAgW0dUS10gV2ViS2l0RG93bmxv YWQ6IHVzZSBtb3JlIG9mIEdPd25QdHIvR1JlZlB0cgogICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgwMDkKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9ndGsvd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcCBiL1NvdXJjZS9XZWJLaXQvZ3RrL3dlYmtp dC93ZWJraXRkb3dubG9hZC5jcHAKaW5kZXggOGNhOGZhMi4uY2ZjZDMzNSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYktpdC9ndGsvd2Via2l0L3dlYmtpdGRvd25sb2FkLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L2d0ay93ZWJraXQvd2Via2l0ZG93bmxvYWQuY3BwCkBAIC00NzMsNiArNDczLDEwIEBA IHN0YXRpYyBnYm9vbGVhbiB3ZWJraXRfZG93bmxvYWRfb3Blbl9zdHJlYW1fZm9yX3VyaShXZWJL aXREb3dubG9hZCogZG93bmxvYWQsIGNvCiAgICAgICAgIHJldHVybiBGQUxTRTsKICAgICB9CiAK KyAgICBHUmVmUHRyPEdGaWxlSW5mbz4gaW5mbyA9IGFkb3B0R1JlZihnX2ZpbGVfaW5mb19uZXco KSk7CisgICAgZ19maWxlX2luZm9fc2V0X2F0dHJpYnV0ZV9zdHJpbmcoaW5mby5nZXQoKSwgIm1l dGFkYXRhOjpkb3dubG9hZC11cmkiLCB3ZWJraXRfZG93bmxvYWRfZ2V0X3VyaShkb3dubG9hZCkp OworICAgIGdfZmlsZV9zZXRfYXR0cmlidXRlc19hc3luYyhmaWxlLmdldCgpLCBpbmZvLmdldCgp LCBHX0ZJTEVfUVVFUllfSU5GT19OT05FLCBHX1BSSU9SSVRZX0RFRkFVTFQsIDAsIDAsIDApOwor CiAgICAgcmV0dXJuIFRSVUU7CiB9CiAKLS0gCjEuNy4xMS40Cgo=