15221 2007-09-15 07:20:05 -0700 Make the FileSystemChooserGdk implementation properly convert the WebCore::String presentation 2007-09-17 08:09:23 -0700 1 1 1 Unclassified WebKit New Bugs 523.x (Safari 3) Mac OS X 10.4 RESOLVED FIXED Gtk P2 Normal --- 1 zecke webkit-unassigned oldest_to_newest 449 0 zecke 2007-09-15 07:20:05 -0700 Currently the code assumes that the filesystem/system is using UTF-8. This assumption does not always hold true and there are the g_filename_convert_{from,to}_utf8 function to convert from the UTF-8 representation to the filesystem locale. Also implement proper NULL checking for the filechooser get_filename method. 448 1 16297 zecke 2007-09-15 07:21:37 -0700 Created attachment 16297 Properly convert the name of the file This should implement the NULL-checking and should properly convert from WebCore::String -> UTF-8 -> filesystem and from filesystem -> UTF-8 -> WebCore::String. 434 2 16297 aroben 2007-09-16 13:16:06 -0700 Comment on attachment 16297 Properly convert the name of the file + gchar* basename = g_filename_to_utf8(basenameSystem, -1, 0, 0, 0); + g_free(basenameSystem); + + if (basename) { + string = String::fromUTF8(basename); + g_free(basename); + } This sequence should be factored out into a static helper function instead of repeating it twice in this file. Otherwise looks good. 424 3 16304 zecke 2007-09-17 04:25:27 -0700 Created attachment 16304 Convert properly This takes the comments of Adam from this bug report and irc into account. 415 4 16304 mrowe 2007-09-17 07:51:44 -0700 Comment on attachment 16304 Convert properly I think "convertToStringByAdoptingTheFilesystemRepresentation" may be a little bit wordy. At the least, I think "The" does not add anything. Elsewhere we also treat "filesystem" as two words. Perhaps "stringWithFileSystemRepresentation" would be a better name? "filenameSystem" also feels backwards. "systemFilename" reads better to me. Other than these naming niggles, r=me. 413 5 zecke 2007-09-17 08:09:23 -0700 (In reply to comment #4) > (From update of attachment 16304 [edit]) > I think "convertToStringByAdoptingTheFilesystemRepresentation" may be a little > bit wordy. At the least, I think "The" does not add anything. Elsewhere we > also treat "filesystem" as two words. Perhaps > "stringWithFileSystemRepresentation" would be a better name? > > "filenameSystem" also feels backwards. "systemFilename" reads better to me. > > Other than these naming niggles, r=me. > Oops, I landed that without reading that part. I agree with systemFilename and will do a fixup (without going through review) but the function name is difficult as it takes ownership of the systemFilename and we wanted to have that inside the name. 16297 2007-09-15 07:21:37 -0700 2007-09-17 04:25:27 -0700 Properly convert the name of the file FileSystemChooser-FileNameChanges.diff text/plain 3160 zecke ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg MmYxNjFhOS4uZmJiZjllNiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAwNy0wOS0xNSAgSG9sZ2VyIEhhbnMg UGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IHRoZSBmaWxlbmFtZXMgZnJvbSBX ZWJDb3JlOjpTdHJpbmcgdG8gdGhlIGZpbGVzeXN0ZW0gZW5jb2RpbmcKKyAgICAgICAgYW5kIHZp Y2UgdmVyc2EgdXNpbmcgZ19maWxlbmFtZV97ZnJvbSx0b31fdXRmOCBmdW5jdGlvbnMuIEFsc28g YWRkIHRoZSBuZWVkZWQgTlVMTAorICAgICAgICBjaGVja3MgZm9yIHRoZSByZXR1cm4gdmFsdWVz IHdoZXJlIGdsaWIgYW5kIGd0aysgY2FuIHJldHVybiBOVUxMLgorCisgICAgICAgICogcGxhdGZv cm0vZ2RrL0ZpbGVDaG9vc2VyR2RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVDaG9vc2Vy OjpvcGVuRmlsZUNob29zZXIpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUNob29zZXI6OmJhc2Vu YW1lRm9yV2lkdGgpOgorCisyMDA3LTA5LTE1ICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAg PHplY2tlQHNlbGZpc2gub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsuCiAKICAgICAg ICAgVXNlIHRoZSBuZXcgV2ViQ29yZTo6U3RyaW5nOjpmcm9tVVRGOCBmdW5jdGlvbiB0byBjcmVh dGUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZpbGVDaG9vc2VyR2RrLmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZpbGVDaG9vc2VyR2RrLmNwcAppbmRleCBkMWVjMjcwLi5m OWRkYjU2IDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dkay9GaWxlQ2hvb3Nlckdkay5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRmlsZUNob29zZXJHZGsuY3BwCkBAIC0zMyw3 ICszMyw2IEBACiAjaW5jbHVkZSAiSWNvbi5oIgogI2luY2x1ZGUgIkxvY2FsaXplZFN0cmluZ3Mu aCIKICNpbmNsdWRlICJTdHJpbmdUcnVuY2F0b3IuaCIKLSNpbmNsdWRlICJUZXh0RW5jb2Rpbmcu aCIKIAogI2luY2x1ZGUgPGdsaWIuaD4KICNpbmNsdWRlIDxnbGliL2dpMThuLmg+CkBAIC02OSw5 ICs2OCwxNiBAQCB2b2lkIEZpbGVDaG9vc2VyOjpvcGVuRmlsZUNob29zZXIoRG9jdW1lbnQqIGRv Y3VtZW50KQogICAgIFJlZlB0cjxGaWxlQ2hvb3Nlcj4gcHJvdGVjdG9yKHRoaXMpOwogCiAgICAg aWYgKGd0a19kaWFsb2dfcnVuKEdUS19ESUFMT0coZGlhbG9nKSkgPT0gR1RLX1JFU1BPTlNFX0FD Q0VQVCkgewotICAgICAgICBnY2hhciogZmlsZW5hbWUgPSBndGtfZmlsZV9jaG9vc2VyX2dldF9m aWxlbmFtZShHVEtfRklMRV9DSE9PU0VSKGRpYWxvZykpOwotICAgICAgICBjaG9vc2VGaWxlKFVU RjhFbmNvZGluZygpLmRlY29kZShmaWxlbmFtZSwgc3RybGVuKGZpbGVuYW1lKSkpOwotICAgICAg ICBnX2ZyZWUoZmlsZW5hbWUpOworICAgICAgICBnY2hhciogZmlsZW5hbWVTeXN0ZW0gPSBndGtf ZmlsZV9jaG9vc2VyX2dldF9maWxlbmFtZShHVEtfRklMRV9DSE9PU0VSKGRpYWxvZykpOworICAg ICAgICBpZiAoZmlsZW5hbWVTeXN0ZW0pIHsKKyAgICAgICAgICAgIGdjaGFyKiBmaWxlbmFtZSA9 IGdfZmlsZW5hbWVfdG9fdXRmOChmaWxlbmFtZVN5c3RlbSwgLTEsIDAsIDAsIDApOworICAgICAg ICAgICAgaWYgKGZpbGVuYW1lKSB7CisgICAgICAgICAgICAgICAgY2hvb3NlRmlsZShTdHJpbmc6 OmZyb21VVEY4KGZpbGVuYW1lKSk7CisgICAgICAgICAgICAgICAgZ19mcmVlKGZpbGVuYW1lKTsK KyAgICAgICAgICAgIH0KKworICAgICAgICAgICAgZ19mcmVlKGZpbGVuYW1lU3lzdGVtKTsKKyAg ICAgICAgfQogICAgIH0KIAogICAgIGd0a193aWRnZXRfZGVzdHJveShkaWFsb2cpOwpAQCAtODIs MTMgKzg4LDI0IEBAIFN0cmluZyBGaWxlQ2hvb3Nlcjo6YmFzZW5hbWVGb3JXaWR0aChjb25zdCBG b250JiBmb250LCBpbnQgd2lkdGgpIGNvbnN0CiAgICAgaWYgKHdpZHRoIDw9IDApCiAgICAgICAg IHJldHVybiBTdHJpbmcoKTsKIAotICAgIFN0cmluZyBzdHJpbmc7Ci0gICAgaWYgKG1fZmlsZW5h bWUuaXNFbXB0eSgpKQotICAgICAgICBzdHJpbmcgPSBmaWxlQnV0dG9uTm9GaWxlU2VsZWN0ZWRM YWJlbCgpOwotICAgIGVsc2UgewotICAgICAgICBnY2hhciogYmFzZW5hbWUgPSBnX3BhdGhfZ2V0 X2Jhc2VuYW1lKG1fZmlsZW5hbWUudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgIHN0cmluZyA9IFVU RjhFbmNvZGluZygpLmRlY29kZShiYXNlbmFtZSwgc3RybGVuKGJhc2VuYW1lKSk7Ci0gICAgICAg IGdfZnJlZShiYXNlbmFtZSk7CisgICAgU3RyaW5nIHN0cmluZyA9IGZpbGVCdXR0b25Ob0ZpbGVT ZWxlY3RlZExhYmVsKCk7CisKKyAgICBpZiAoIW1fZmlsZW5hbWUuaXNFbXB0eSgpKSB7CisgICAg ICAgIGdjaGFyKiBmaWxlbmFtZVN5c3RlbSA9IGdfZmlsZW5hbWVfZnJvbV91dGY4KG1fZmlsZW5h bWUudXRmOCgpLmRhdGEoKSwgLTEsIDAsIDAsIDApOworICAgICAgICBpZiAoZmlsZW5hbWVTeXN0 ZW0pIHsKKyAgICAgICAgICAgIGdjaGFyKiBiYXNlbmFtZVN5c3RlbSA9IGdfcGF0aF9nZXRfYmFz ZW5hbWUoZmlsZW5hbWVTeXN0ZW0pOworICAgICAgICAgICAgZ19mcmVlKGZpbGVuYW1lU3lzdGVt KTsKKworICAgICAgICAgICAgaWYgKGJhc2VuYW1lU3lzdGVtKSB7CisgICAgICAgICAgICAgICAg Z2NoYXIqIGJhc2VuYW1lID0gZ19maWxlbmFtZV90b191dGY4KGJhc2VuYW1lU3lzdGVtLCAtMSwg MCwgMCwgMCk7CisgICAgICAgICAgICAgICAgZ19mcmVlKGJhc2VuYW1lU3lzdGVtKTsKKworICAg ICAgICAgICAgICAgIGlmIChiYXNlbmFtZSkgeworICAgICAgICAgICAgICAgICAgICBzdHJpbmcg PSBTdHJpbmc6OmZyb21VVEY4KGJhc2VuYW1lKTsKKyAgICAgICAgICAgICAgICAgICAgZ19mcmVl KGJhc2VuYW1lKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisgICAgICAgIH0K ICAgICB9CiAKICAgICByZXR1cm4gU3RyaW5nVHJ1bmNhdG9yOjpjZW50ZXJUcnVuY2F0ZShzdHJp bmcsIHdpZHRoLCBmb250LCBmYWxzZSk7Cg== 16304 2007-09-17 04:25:27 -0700 2007-09-17 07:51:44 -0700 Convert properly webkitgtk-filesystem-encoding.diff text/plain 3566 zecke ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg Y2FmY2RiNC4uOTgyNGU0MiAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvV2Vi Q29yZS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxNyBAQAogMjAwNy0wOS0xNSAgSG9sZ2VyIEhhbnMg UGV0ZXIgRnJleXRoZXIgIDx6ZWNrZUBzZWxmaXNoLm9yZz4KIAorICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb252ZXJ0IHRoZSBmaWxlbmFtZXMgZnJvbSBX ZWJDb3JlOjpTdHJpbmcgdG8gdGhlIGZpbGVzeXN0ZW0gZW5jb2RpbmcKKyAgICAgICAgYW5kIHZp Y2UgdmVyc2EgdXNpbmcgZ19maWxlbmFtZV97ZnJvbSx0b31fdXRmOCBmdW5jdGlvbnMuIEFsc28g YWRkIHRoZSBuZWVkZWQgTlVMTAorICAgICAgICBjaGVja3MgZm9yIHRoZSByZXR1cm4gdmFsdWVz IHdoZXJlIGdsaWIgYW5kIGd0aysgY2FuIHJldHVybiBOVUxMLgorCisgICAgICAgICogcGxhdGZv cm0vZ2RrL0ZpbGVDaG9vc2VyR2RrLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZpbGVDaG9vc2Vy OjpvcGVuRmlsZUNob29zZXIpOgorICAgICAgICAoV2ViQ29yZTo6RmlsZUNob29zZXI6OmJhc2Vu YW1lRm9yV2lkdGgpOgorCisyMDA3LTA5LTE1ICBIb2xnZXIgSGFucyBQZXRlciBGcmV5dGhlciAg PHplY2tlQHNlbGZpc2gub3JnPgorCiAgICAgICAgIFJldmlld2VkIGJ5IE1hcmsuCiAKICAgICAg ICAgVXNlIHRoZSBuZXcgV2ViQ29yZTo6U3RyaW5nOjpmcm9tVVRGOCBmdW5jdGlvbiB0byBjcmVh dGUKZGlmZiAtLWdpdCBhL1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZpbGVDaG9vc2VyR2RrLmNwcCBi L1dlYkNvcmUvcGxhdGZvcm0vZ2RrL0ZpbGVDaG9vc2VyR2RrLmNwcAppbmRleCBkMWVjMjcwLi41 OTJiM2VhIDEwMDY0NAotLS0gYS9XZWJDb3JlL3BsYXRmb3JtL2dkay9GaWxlQ2hvb3Nlckdkay5j cHAKKysrIGIvV2ViQ29yZS9wbGF0Zm9ybS9nZGsvRmlsZUNob29zZXJHZGsuY3BwCkBAIC0zMywx MyArMzMsMjkgQEAKICNpbmNsdWRlICJJY29uLmgiCiAjaW5jbHVkZSAiTG9jYWxpemVkU3RyaW5n cy5oIgogI2luY2x1ZGUgIlN0cmluZ1RydW5jYXRvci5oIgotI2luY2x1ZGUgIlRleHRFbmNvZGlu Zy5oIgogCiAjaW5jbHVkZSA8Z2xpYi5oPgogI2luY2x1ZGUgPGdsaWIvZ2kxOG4uaD4KICNpbmNs dWRlIDxndGsvZ3RrLmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKKworc3RhdGljIGJvb2wgY29u dmVydFRvU3RyaW5nQnlBZG9wdGluZ1RoZUZpbGVzeXN0ZW1SZXByZXNlbnRhdGlvbihnY2hhciog ZmlsZW5hbWVTeXN0ZW0sIFN0cmluZyYgcmVzdWx0KQoreworICAgIGlmICghZmlsZW5hbWVTeXN0 ZW0pCisgICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIGdjaGFyKiBmaWxlbmFtZSA9IGdfZmls ZW5hbWVfdG9fdXRmOChmaWxlbmFtZVN5c3RlbSwgLTEsIDAsIDAsIDApOworICAgIGdfZnJlZShm aWxlbmFtZVN5c3RlbSk7CisKKyAgICBpZiAoIWZpbGVuYW1lKQorICAgICAgICByZXR1cm4gZmFs c2U7CisgICAgCisgICAgcmVzdWx0ID0gU3RyaW5nOjpmcm9tVVRGOChmaWxlbmFtZSk7CisgICAg Z19mcmVlKGZpbGVuYW1lKTsKKyAgICByZXR1cm4gdHJ1ZTsKK30KKwogRmlsZUNob29zZXI6OkZp bGVDaG9vc2VyKEZpbGVDaG9vc2VyQ2xpZW50KiBjbGllbnQsIGNvbnN0IFN0cmluZyYgZmlsZW5h bWUpCiAgICAgOiBtX2NsaWVudChjbGllbnQpCiAgICAgLCBtX2ZpbGVuYW1lKGZpbGVuYW1lKQpA QCAtNjcsMTMgKzgzLDExIEBAIHZvaWQgRmlsZUNob29zZXI6Om9wZW5GaWxlQ2hvb3NlcihEb2N1 bWVudCogZG9jdW1lbnQpCiAgICAgLy8gV2UgbmVlZCB0aGlzIHByb3RlY3RvciBiZWNhdXNlIG90 aGVyd2lzZSB3ZSBjYW4gYmUgZGVsZXRlZCBpZiB0aGUgZmlsZSB1cGxvYWQgY29udHJvbCBpcyBk ZXRhY2hlZCB3aGlsZQogICAgIC8vIHdlJ3JlIHdpdGhpbiB0aGUgZ3RrX3J1bl9kaWFsb2cgY2Fs bC4KICAgICBSZWZQdHI8RmlsZUNob29zZXI+IHByb3RlY3Rvcih0aGlzKTsKKyAgICBTdHJpbmcg cmVzdWx0OwogCi0gICAgaWYgKGd0a19kaWFsb2dfcnVuKEdUS19ESUFMT0coZGlhbG9nKSkgPT0g R1RLX1JFU1BPTlNFX0FDQ0VQVCkgewotICAgICAgICBnY2hhciogZmlsZW5hbWUgPSBndGtfZmls ZV9jaG9vc2VyX2dldF9maWxlbmFtZShHVEtfRklMRV9DSE9PU0VSKGRpYWxvZykpOwotICAgICAg ICBjaG9vc2VGaWxlKFVURjhFbmNvZGluZygpLmRlY29kZShmaWxlbmFtZSwgc3RybGVuKGZpbGVu YW1lKSkpOwotICAgICAgICBnX2ZyZWUoZmlsZW5hbWUpOwotICAgIH0KLQorICAgIGNvbnN0IGJv b2wgYWNjZXB0ZWREaWFsb2cgPSBndGtfZGlhbG9nX3J1bihHVEtfRElBTE9HKGRpYWxvZykpID09 IEdUS19SRVNQT05TRV9BQ0NFUFQ7CisgICAgaWYgKGFjY2VwdGVkRGlhbG9nICYmIGNvbnZlcnRU b1N0cmluZ0J5QWRvcHRpbmdUaGVGaWxlc3lzdGVtUmVwcmVzZW50YXRpb24oZ3RrX2ZpbGVfY2hv b3Nlcl9nZXRfZmlsZW5hbWUoR1RLX0ZJTEVfQ0hPT1NFUihkaWFsb2cpKSwgcmVzdWx0KSkKKyAg ICAgICAgY2hvb3NlRmlsZShyZXN1bHQpOwogICAgIGd0a193aWRnZXRfZGVzdHJveShkaWFsb2cp OwogfQogCkBAIC04MiwxMyArOTYsMTYgQEAgU3RyaW5nIEZpbGVDaG9vc2VyOjpiYXNlbmFtZUZv cldpZHRoKGNvbnN0IEZvbnQmIGZvbnQsIGludCB3aWR0aCkgY29uc3QKICAgICBpZiAod2lkdGgg PD0gMCkKICAgICAgICAgcmV0dXJuIFN0cmluZygpOwogCi0gICAgU3RyaW5nIHN0cmluZzsKLSAg ICBpZiAobV9maWxlbmFtZS5pc0VtcHR5KCkpCi0gICAgICAgIHN0cmluZyA9IGZpbGVCdXR0b25O b0ZpbGVTZWxlY3RlZExhYmVsKCk7Ci0gICAgZWxzZSB7Ci0gICAgICAgIGdjaGFyKiBiYXNlbmFt ZSA9IGdfcGF0aF9nZXRfYmFzZW5hbWUobV9maWxlbmFtZS51dGY4KCkuZGF0YSgpKTsKLSAgICAg ICAgc3RyaW5nID0gVVRGOEVuY29kaW5nKCkuZGVjb2RlKGJhc2VuYW1lLCBzdHJsZW4oYmFzZW5h bWUpKTsKLSAgICAgICAgZ19mcmVlKGJhc2VuYW1lKTsKKyAgICBTdHJpbmcgc3RyaW5nID0gZmls ZUJ1dHRvbk5vRmlsZVNlbGVjdGVkTGFiZWwoKTsKKworICAgIGlmICghbV9maWxlbmFtZS5pc0Vt cHR5KCkpIHsKKyAgICAgICAgZ2NoYXIqIGZpbGVuYW1lU3lzdGVtID0gZ19maWxlbmFtZV9mcm9t X3V0ZjgobV9maWxlbmFtZS51dGY4KCkuZGF0YSgpLCAtMSwgMCwgMCwgMCk7CisgICAgICAgIGlm IChmaWxlbmFtZVN5c3RlbSkgeworICAgICAgICAgICAgZ2NoYXIqIGJhc2VuYW1lU3lzdGVtID0g Z19wYXRoX2dldF9iYXNlbmFtZShmaWxlbmFtZVN5c3RlbSk7CisgICAgICAgICAgICBnX2ZyZWUo ZmlsZW5hbWVTeXN0ZW0pOworCisgICAgICAgICAgICBjb252ZXJ0VG9TdHJpbmdCeUFkb3B0aW5n VGhlRmlsZXN5c3RlbVJlcHJlc2VudGF0aW9uKGJhc2VuYW1lU3lzdGVtLCBzdHJpbmcpOworICAg ICAgICB9CiAgICAgfQogCiAgICAgcmV0dXJuIFN0cmluZ1RydW5jYXRvcjo6Y2VudGVyVHJ1bmNh dGUoc3RyaW5nLCB3aWR0aCwgZm9udCwgZmFsc2UpOwo=